Updates SeDJoCo algorithm in exp. IVA

fakufaku · Mar 22, 2021 · 438c573 · 438c573
1 parent 39ddcb2
commit 438c573
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/experiment_iva_plot.py b/experiment_iva_plot.py
@@ -28,6 +28,7 @@
     "auxiva-fullhead": "FH",
     "auxiva-fullhead_1e-5": "SeDJoCo",
     "auxiva-fullhead_1e-10": "SeDJoCo",
+    "auxiva-fullhead_1e-20": "SeDJoCo",
     "fastiva": "FastIVA",
 }
 
@@ -38,15 +39,15 @@
     "auxiva-iss",
     "auxiva2",
     "auxiva-ipa",
-    "auxiva-fullhead_1e-5",
+    "auxiva-fullhead_1e-20",
 ]
 
 include_algos_cost = [
     "auxiva",
     "auxiva-iss",
     "auxiva2",
     "auxiva-ipa",
-    "auxiva-fullhead_1e-5",
+    "auxiva-fullhead_1e-20",
 ]
 
 

diff --git a/prepare_figures.sh b/prepare_figures.sh
@@ -5,17 +5,17 @@ python ./make_figure_1_2_LQPQM.py
 
 # figure with box-plots of SDR/SIR
 python ./make_figure3_journal_ipa_separation_hist.py \
-  ./data/20201210-132325_speed_contest_journal_ipa_863b09be68 --pca
+  ./data/20201222-185917_speed_contest_journal_ipa_2bc728a163/ --pca
 
 # figure with wall-clock vs SDR/SIR
 python ./make_figure4_journal_ip_speed_contest.py \
-  ./data/20201210-132325_speed_contest_journal_ipa_863b09be68 --pca --pickle
+  ./data/20201222-185917_speed_contest_journal_ipa_2bc728a163/ --pca --pickle
 
 # figure for the HEAD experiment
 python ./experiment_head_plot.py data/20201211-113855_experiment_head_results.npz
 
 # figure for the IVA experiment
-python ./experiment_iva_plot.py data/20201205-024539_experiment_iva_results.npz
+python ./experiment_iva_plot.py data/merge_20210305-190428_experiment_iva_results_20210320-174319_experiment_iva_results.npz
 
 # table for the runtime table
-python ./make_table_runtime.py data/20201210-132325_speed_contest_journal_ipa_863b09be68/ --pickle
+python ./make_table_runtime.py data/20201222-185917_speed_contest_journal_ipa_2bc728a163/ --pickle