results folder for saved results and scripts modification

aicenter · Aug 28, 2021 · ba720ee · ba720ee
1 parent e2302eb
commit ba720ee
Show file tree

Hide file tree

Showing 108 changed files with 15 additions and 669 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,8 @@
 ################################################################################
 
 # Folders to ignore - files may be too large, too many, etc. NOTE: EDIT IF NEEDED.
-data
+data/experiments
+data/mnist_point_cloud
 videos
 plots
 notebooks

diff --git a/results/MIL/mill_names_scores.bson → data/results/MIL/mill_names_scores.bson b/results/MIL/mill_names_scores.bson → data/results/MIL/mill_names_scores.bson
diff --git a/results/MIL/mill_results_collection.bson → .../results/MIL/mill_results_collection.bson b/results/MIL/mill_results_collection.bson → .../results/MIL/mill_results_collection.bson
diff --git a/results/MIL/mill_results_scores.bson → data/results/MIL/mill_results_scores.bson b/results/MIL/mill_results_scores.bson → data/results/MIL/mill_results_scores.bson
diff --git a/results/MIL/mill_results_scores_agg.bson → .../results/MIL/mill_results_scores_agg.bson b/results/MIL/mill_results_scores_agg.bson → .../results/MIL/mill_results_scores_agg.bson
diff --git a/results/MNIST/leave-one-in/PoolModel.bson → ...results/MNIST/leave-one-in/PoolModel.bson b/results/MNIST/leave-one-in/PoolModel.bson → ...results/MNIST/leave-one-in/PoolModel.bson
diff --git a/results/MNIST/leave-one-in/statistician.bson → ...ults/MNIST/leave-one-in/statistician.bson b/results/MNIST/leave-one-in/statistician.bson → ...ults/MNIST/leave-one-in/statistician.bson
diff --git a/results/MNIST/leave-one-in/vae_instance.bson → ...ults/MNIST/leave-one-in/vae_instance.bson b/results/MNIST/leave-one-in/vae_instance.bson → ...ults/MNIST/leave-one-in/vae_instance.bson
diff --git a/...lts/MNIST/leave-one-out/vae_instance.bson → ...lts/MNIST/leave-one-out/vae_instance.bson b/...lts/MNIST/leave-one-out/vae_instance.bson → ...lts/MNIST/leave-one-out/vae_instance.bson
diff --git a/results/MNIST/mnist_results_in.bson → data/results/MNIST/mnist_results_in.bson b/results/MNIST/mnist_results_in.bson → data/results/MNIST/mnist_results_in.bson
diff --git a/results/MNIST/mnist_results_in_scores.bson → ...esults/MNIST/mnist_results_in_scores.bson b/results/MNIST/mnist_results_in_scores.bson → ...esults/MNIST/mnist_results_in_scores.bson
diff --git a/results/MNIST/mnist_results_out.bson → data/results/MNIST/mnist_results_out.bson b/results/MNIST/mnist_results_out.bson → data/results/MNIST/mnist_results_out.bson
diff --git a/results/MNIST/mnist_results_out_scores.bson → ...sults/MNIST/mnist_results_out_scores.bson b/results/MNIST/mnist_results_out_scores.bson → ...sults/MNIST/mnist_results_out_scores.bson
diff --git a/results/MNIST/models/vae-in.bson → data/results/MNIST/models/vae-in.bson b/results/MNIST/models/vae-in.bson → data/results/MNIST/models/vae-in.bson
diff --git a/results/MNIST/models/vae-out.bson → data/results/MNIST/models/vae-out.bson b/results/MNIST/models/vae-out.bson → data/results/MNIST/models/vae-out.bson
diff --git a/results/MNIST/models/vae.bson → data/results/MNIST/models/vae.bson b/results/MNIST/models/vae.bson → data/results/MNIST/models/vae.bson
diff --git a/images/MIL/validation/all/BrownCreeper.png b/images/MIL/validation/all/BrownCreeper.png
diff --git a/images/MIL/validation/all/CorelAfrican.png b/images/MIL/validation/all/CorelAfrican.png
diff --git a/images/MIL/validation/all/CorelBeach.png b/images/MIL/validation/all/CorelBeach.png
diff --git a/images/MIL/validation/all/Elephant.png b/images/MIL/validation/all/Elephant.png
diff --git a/images/MIL/validation/all/Fox.png b/images/MIL/validation/all/Fox.png
diff --git a/images/MIL/validation/all/Musk1.png b/images/MIL/validation/all/Musk1.png
diff --git a/images/MIL/validation/all/Musk2.png b/images/MIL/validation/all/Musk2.png
diff --git a/images/MIL/validation/all/Mutagenesis1.png b/images/MIL/validation/all/Mutagenesis1.png
diff --git a/images/MIL/validation/all/Mutagenesis2.png b/images/MIL/validation/all/Mutagenesis2.png
diff --git a/images/MIL/validation/all/Newsgroups1.png b/images/MIL/validation/all/Newsgroups1.png
diff --git a/images/MIL/validation/all/Newsgroups2.png b/images/MIL/validation/all/Newsgroups2.png
diff --git a/images/MIL/validation/all/Newsgroups3.png b/images/MIL/validation/all/Newsgroups3.png
diff --git a/images/MIL/validation/all/Protein.png b/images/MIL/validation/all/Protein.png
diff --git a/images/MIL/validation/all/Tiger.png b/images/MIL/validation/all/Tiger.png
diff --git a/images/MIL/validation/all/UCSBBreastCancer.png b/images/MIL/validation/all/UCSBBreastCancer.png
diff --git a/images/MIL/validation/all/Web1.png b/images/MIL/validation/all/Web1.png
diff --git a/images/MIL/validation/all/Web2.png b/images/MIL/validation/all/Web2.png
diff --git a/images/MIL/validation/all/Web3.png b/images/MIL/validation/all/Web3.png
diff --git a/images/MIL/validation/all/Web4.png b/images/MIL/validation/all/Web4.png
diff --git a/images/MIL/validation/all/WinterWren.png b/images/MIL/validation/all/WinterWren.png
diff --git a/images/MIL/validation/all_0/BrownCreeper.png b/images/MIL/validation/all_0/BrownCreeper.png
diff --git a/images/MIL/validation/all_0/CorelAfrican.png b/images/MIL/validation/all_0/CorelAfrican.png
diff --git a/images/MIL/validation/all_0/CorelBeach.png b/images/MIL/validation/all_0/CorelBeach.png
diff --git a/images/MIL/validation/all_0/Elephant.png b/images/MIL/validation/all_0/Elephant.png
diff --git a/images/MIL/validation/all_0/Fox.png b/images/MIL/validation/all_0/Fox.png
diff --git a/images/MIL/validation/all_0/Musk1.png b/images/MIL/validation/all_0/Musk1.png
diff --git a/images/MIL/validation/all_0/Musk2.png b/images/MIL/validation/all_0/Musk2.png
diff --git a/images/MIL/validation/all_0/Mutagenesis1.png b/images/MIL/validation/all_0/Mutagenesis1.png
diff --git a/images/MIL/validation/all_0/Mutagenesis2.png b/images/MIL/validation/all_0/Mutagenesis2.png
diff --git a/images/MIL/validation/all_0/Newsgroups1.png b/images/MIL/validation/all_0/Newsgroups1.png
diff --git a/images/MIL/validation/all_0/Newsgroups2.png b/images/MIL/validation/all_0/Newsgroups2.png
diff --git a/images/MIL/validation/all_0/Newsgroups3.png b/images/MIL/validation/all_0/Newsgroups3.png
diff --git a/images/MIL/validation/all_0/Protein.png b/images/MIL/validation/all_0/Protein.png
diff --git a/images/MIL/validation/all_0/Tiger.png b/images/MIL/validation/all_0/Tiger.png
diff --git a/images/MIL/validation/all_0/UCSBBreastCancer.png b/images/MIL/validation/all_0/UCSBBreastCancer.png
diff --git a/images/MIL/validation/all_0/Web1.png b/images/MIL/validation/all_0/Web1.png
diff --git a/images/MIL/validation/all_0/Web2.png b/images/MIL/validation/all_0/Web2.png
diff --git a/images/MIL/validation/all_0/Web3.png b/images/MIL/validation/all_0/Web3.png
diff --git a/images/MIL/validation/all_0/Web4.png b/images/MIL/validation/all_0/Web4.png
diff --git a/images/MIL/validation/all_0/WinterWren.png b/images/MIL/validation/all_0/WinterWren.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=1.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=1.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=10.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=10.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=2.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=2.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=3.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=3.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=4.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=4.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=5.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=5.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=6.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=6.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=7.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=7.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=8.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=8.png
diff --git a/images/MNIST/validation_MNIST/leave-one-in/class_index=9.png b/images/MNIST/validation_MNIST/leave-one-in/class_index=9.png
diff --git a/images/MNIST/validation_MNIST/leave-one-out/class_index=1.png b/images/MNIST/validation_MNIST/leave-one-out/class_index=1.png
diff --git a/images/MNIST/validation_MNIST/leave-one-out/class_index=2.png b/images/MNIST/validation_MNIST/leave-one-out/class_index=2.png
diff --git a/images/MNIST/validation_MNIST/leave-one-out/class_index=3.png b/images/MNIST/validation_MNIST/leave-one-out/class_index=3.png
diff --git a/images/MNIST/validation_MNIST/leave-one-out/class_index=4.png b/images/MNIST/validation_MNIST/leave-one-out/class_index=4.png
diff --git a/images/MNIST_vae_basic_in.png b/images/MNIST_vae_basic_in.png
diff --git a/images/MNIST_vae_basic_out.png b/images/MNIST_vae_basic_out.png
diff --git a/images/barplot_1-10.png b/images/barplot_1-10.png
diff --git a/images/barplot_11-20.png b/images/barplot_11-20.png
diff --git a/images/downsampled.png b/images/downsampled.png
diff --git a/images/mill_validation/README.md b/images/mill_validation/README.md
diff --git a/images/mill_validation/all_models_BrownCreeper.png b/images/mill_validation/all_models_BrownCreeper.png
diff --git a/images/mill_validation/all_models_CorelAfrican.png b/images/mill_validation/all_models_CorelAfrican.png
diff --git a/images/mill_validation/all_models_CorelBeach.png b/images/mill_validation/all_models_CorelBeach.png
diff --git a/images/mill_validation/all_models_Elephant.png b/images/mill_validation/all_models_Elephant.png
diff --git a/images/mill_validation/all_models_Fox.png b/images/mill_validation/all_models_Fox.png
diff --git a/images/mill_validation/all_models_Musk1.png b/images/mill_validation/all_models_Musk1.png
diff --git a/images/mill_validation/all_models_Musk2.png b/images/mill_validation/all_models_Musk2.png
diff --git a/images/mill_validation/all_models_Mutagenesis1.png b/images/mill_validation/all_models_Mutagenesis1.png
diff --git a/images/mill_validation/all_models_Mutagenesis2.png b/images/mill_validation/all_models_Mutagenesis2.png
diff --git a/images/mill_validation/all_models_Newsgroups1.png b/images/mill_validation/all_models_Newsgroups1.png
diff --git a/images/mill_validation/all_models_Newsgroups2.png b/images/mill_validation/all_models_Newsgroups2.png
diff --git a/images/mill_validation/all_models_Newsgroups3.png b/images/mill_validation/all_models_Newsgroups3.png
diff --git a/images/mill_validation/all_models_Protein.png b/images/mill_validation/all_models_Protein.png
diff --git a/images/mill_validation/all_models_Tiger.png b/images/mill_validation/all_models_Tiger.png
diff --git a/images/mill_validation/all_models_UCSBBreastCancer.png b/images/mill_validation/all_models_UCSBBreastCancer.png
diff --git a/images/mill_validation/all_models_Web1.png b/images/mill_validation/all_models_Web1.png
diff --git a/images/mill_validation/all_models_Web2.png b/images/mill_validation/all_models_Web2.png
diff --git a/images/mill_validation/all_models_Web3.png b/images/mill_validation/all_models_Web3.png
diff --git a/images/mill_validation/all_models_Web4.png b/images/mill_validation/all_models_Web4.png
diff --git a/images/mill_validation/all_models_WinterWren.png b/images/mill_validation/all_models_WinterWren.png
diff --git a/scripts/evaluation/MIL/mill_results.jl b/scripts/evaluation/MIL/mill_results.jl
@@ -60,9 +60,8 @@ save(datadir("dataframes", "mill_results_scores_agg.bson"), mill_results_scores_
 
 
 # if already calculated, just load the data
-mill_results_collection = load(datadir("dataframes", "mill_results_collection.bson"))
-mill_results_scores = load(datadir("dataframes", "mill_results_scores.bson"))
-mill_results_scores_agg = load(datadir("dataframes", "mill_results_scores_agg.bson"))
+mill_results_collection = load(datadir("results", "MIL", "mill_results_collection.bson"))
+mill_results_scores_agg = load(datadir("results", "MIL", "mill_results_scores_agg.bson"))
 
 
 ###################################################

diff --git a/scripts/evaluation/MIL/mill_results_table.jl b/scripts/evaluation/MIL/mill_results_table.jl
@@ -14,7 +14,7 @@ using BSON
 include(scriptsdir("evaluation", "MIL", "workflow.jl"))
 
 # load results dataframes
-mill_results_collection = load(datadir("dataframes", "mill_results_collection.bson"))
+mill_results_collection = load(datadir("results", "MIL", "mill_results_collection.bson"))
 knn_basic, vae_basic, vae_instance, statistician, poolmodel, mgmm = map(key -> mill_results_collection[key], modelnames)
 modelvec = [knn_basic, vae_basic, vae_instance, statistician, poolmodel, mgmm]
 # add modelname

diff --git a/scripts/evaluation/MNIST/best_model_downsampled.jl b/scripts/evaluation/MNIST/best_model_downsampled.jl
diff --git a/scripts/evaluation/MNIST/downsampling_src.jl b/scripts/evaluation/MNIST/downsampling_src.jl