From 70ce6a0feb8572ddcf888c3d377d631ea4a24370 Mon Sep 17 00:00:00 2001 From: Sichong Date: Thu, 21 Apr 2022 05:41:12 -0700 Subject: [PATCH] fix: preserve dtypes across paramspace (#1578) * Use itertuples instead of iterrows to preserve dtypes across columns * Updated tests for paramspace to include dtype check * black formatting --- snakemake/utils.py | 4 ++-- .../{alpha~1.0 => alpha~1}/beta~0.1/gamma~0.99.pdf | Bin .../{alpha~2.0 => alpha~2}/beta~0.0/gamma~3.9.pdf | Bin .../simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv | 1 - .../simulations/alpha~1/beta~0.1/gamma~0.99.tsv | 1 + .../simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv | 1 - .../simulations/alpha~2/beta~0.0/gamma~3.9.tsv | 1 + .../{alpha~1.0 => alpha~1}/beta~0.1/gamma~0.99.pdf | Bin .../{alpha~2.0 => alpha~2}/beta~0.0/gamma~3.9.pdf | Bin .../simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv | 1 - .../simulations/alpha~1/beta~0.1/gamma~0.99.tsv | 1 + .../simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv | 1 - .../simulations/alpha~2/beta~0.0/gamma~3.9.tsv | 1 + ...mma~0.99.pdf => alpha~1_beta~0.1_gamma~0.99.pdf} | Bin ...gamma~3.9.pdf => alpha~2_beta~0.0_gamma~3.9.pdf} | Bin .../simulations/alpha~1.0_beta~0.1_gamma~0.99.tsv | 1 - .../simulations/alpha~1_beta~0.1_gamma~0.99.tsv | 1 + .../simulations/alpha~2.0_beta~0.0_gamma~3.9.tsv | 1 - .../full/simulations/alpha~2_beta~0.0_gamma~3.9.tsv | 1 + ...alpha~2.0.pdf => beta~0.0_gamma~3.9_alpha~2.pdf} | Bin ...lpha~1.0.pdf => beta~0.1_gamma~0.99_alpha~1.pdf} | Bin .../simulations/beta~0.0_gamma~3.9_alpha~2.0.tsv | 1 - .../simulations/beta~0.0_gamma~3.9_alpha~2.tsv | 1 + .../simulations/beta~0.1_gamma~0.99_alpha~1.0.tsv | 1 - .../simulations/beta~0.1_gamma~0.99_alpha~1.tsv | 1 + .../{alpha~1.0 => alpha~1}/gamma~0.99/beta~0.1.pdf | Bin .../{alpha~2.0 => alpha~2}/gamma~3.9/beta~0.0.pdf | Bin .../simulations/alpha~1.0/gamma~0.99/beta~0.1.tsv | 1 - .../one/simulations/alpha~1/gamma~0.99/beta~0.1.tsv | 1 + .../simulations/alpha~2.0/gamma~3.9/beta~0.0.tsv | 1 - .../one/simulations/alpha~2/gamma~3.9/beta~0.0.tsv | 1 + .../beta_is_0.1/gamma_is_0.99.pdf | Bin .../beta_is_0.0/gamma_is_3.9.pdf | Bin .../alpha_is_1.0/beta_is_0.1/gamma_is_0.99.tsv | 1 - .../alpha_is_1/beta_is_0.1/gamma_is_0.99.tsv | 1 + .../alpha_is_2.0/beta_is_0.0/gamma_is_3.9.tsv | 1 - .../alpha_is_2/beta_is_0.0/gamma_is_3.9.tsv | 1 + ...alpha=2.0.pdf => beta=0.0_gamma=3.9_alpha=2.pdf} | Bin ...lpha=1.0.pdf => beta=0.1_gamma=0.99_alpha=1.pdf} | Bin .../simulations/beta=0.0_gamma=3.9_alpha=2.0.tsv | 1 - .../simulations/beta=0.0_gamma=3.9_alpha=2.tsv | 1 + .../simulations/beta=0.1_gamma=0.99_alpha=1.0.tsv | 1 - .../simulations/beta=0.1_gamma=0.99_alpha=1.tsv | 1 + .../{alpha~1.0 => alpha~1}/beta~0.1_gamma~0.99.pdf | Bin .../{alpha~2.0 => alpha~2}/beta~0.0_gamma~3.9.pdf | Bin .../simulations/alpha~1.0/beta~0.1_gamma~0.99.tsv | 1 - .../two/simulations/alpha~1/beta~0.1_gamma~0.99.tsv | 1 + .../simulations/alpha~2.0/beta~0.0_gamma~3.9.tsv | 1 - .../two/simulations/alpha~2/beta~0.0_gamma~3.9.tsv | 1 + tests/test_paramspace/params.tsv | 4 ++-- 50 files changed, 20 insertions(+), 20 deletions(-) rename tests/test_paramspace/expected-results/results/default/plots/{alpha~1.0 => alpha~1}/beta~0.1/gamma~0.99.pdf (100%) rename tests/test_paramspace/expected-results/results/default/plots/{alpha~2.0 => alpha~2}/beta~0.0/gamma~3.9.pdf (100%) delete mode 100644 tests/test_paramspace/expected-results/results/default/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv create mode 100644 tests/test_paramspace/expected-results/results/default/simulations/alpha~1/beta~0.1/gamma~0.99.tsv delete mode 100644 tests/test_paramspace/expected-results/results/default/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv create mode 100644 tests/test_paramspace/expected-results/results/default/simulations/alpha~2/beta~0.0/gamma~3.9.tsv rename tests/test_paramspace/expected-results/results/empty/plots/{alpha~1.0 => alpha~1}/beta~0.1/gamma~0.99.pdf (100%) rename tests/test_paramspace/expected-results/results/empty/plots/{alpha~2.0 => alpha~2}/beta~0.0/gamma~3.9.pdf (100%) delete mode 100644 tests/test_paramspace/expected-results/results/empty/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv create mode 100644 tests/test_paramspace/expected-results/results/empty/simulations/alpha~1/beta~0.1/gamma~0.99.tsv delete mode 100644 tests/test_paramspace/expected-results/results/empty/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv create mode 100644 tests/test_paramspace/expected-results/results/empty/simulations/alpha~2/beta~0.0/gamma~3.9.tsv rename tests/test_paramspace/expected-results/results/full/plots/{alpha~1.0_beta~0.1_gamma~0.99.pdf => alpha~1_beta~0.1_gamma~0.99.pdf} (100%) rename tests/test_paramspace/expected-results/results/full/plots/{alpha~2.0_beta~0.0_gamma~3.9.pdf => alpha~2_beta~0.0_gamma~3.9.pdf} (100%) delete mode 100644 tests/test_paramspace/expected-results/results/full/simulations/alpha~1.0_beta~0.1_gamma~0.99.tsv create mode 100644 tests/test_paramspace/expected-results/results/full/simulations/alpha~1_beta~0.1_gamma~0.99.tsv delete mode 100644 tests/test_paramspace/expected-results/results/full/simulations/alpha~2.0_beta~0.0_gamma~3.9.tsv create mode 100644 tests/test_paramspace/expected-results/results/full/simulations/alpha~2_beta~0.0_gamma~3.9.tsv rename tests/test_paramspace/expected-results/results/full_reorder/plots/{beta~0.0_gamma~3.9_alpha~2.0.pdf => beta~0.0_gamma~3.9_alpha~2.pdf} (100%) rename tests/test_paramspace/expected-results/results/full_reorder/plots/{beta~0.1_gamma~0.99_alpha~1.0.pdf => beta~0.1_gamma~0.99_alpha~1.pdf} (100%) delete mode 100644 tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.0.tsv create mode 100644 tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.tsv delete mode 100644 tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.0.tsv create mode 100644 tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.tsv rename tests/test_paramspace/expected-results/results/one/plots/{alpha~1.0 => alpha~1}/gamma~0.99/beta~0.1.pdf (100%) rename tests/test_paramspace/expected-results/results/one/plots/{alpha~2.0 => alpha~2}/gamma~3.9/beta~0.0.pdf (100%) delete mode 100644 tests/test_paramspace/expected-results/results/one/simulations/alpha~1.0/gamma~0.99/beta~0.1.tsv create mode 100644 tests/test_paramspace/expected-results/results/one/simulations/alpha~1/gamma~0.99/beta~0.1.tsv delete mode 100644 tests/test_paramspace/expected-results/results/one/simulations/alpha~2.0/gamma~3.9/beta~0.0.tsv create mode 100644 tests/test_paramspace/expected-results/results/one/simulations/alpha~2/gamma~3.9/beta~0.0.tsv rename tests/test_paramspace/expected-results/results/sep/plots/{alpha_is_1.0 => alpha_is_1}/beta_is_0.1/gamma_is_0.99.pdf (100%) rename tests/test_paramspace/expected-results/results/sep/plots/{alpha_is_2.0 => alpha_is_2}/beta_is_0.0/gamma_is_3.9.pdf (100%) delete mode 100644 tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_1.0/beta_is_0.1/gamma_is_0.99.tsv create mode 100644 tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_1/beta_is_0.1/gamma_is_0.99.tsv delete mode 100644 tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_2.0/beta_is_0.0/gamma_is_3.9.tsv create mode 100644 tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_2/beta_is_0.0/gamma_is_3.9.tsv rename tests/test_paramspace/expected-results/results/sep_and_pattern/plots/{beta=0.0_gamma=3.9_alpha=2.0.pdf => beta=0.0_gamma=3.9_alpha=2.pdf} (100%) rename tests/test_paramspace/expected-results/results/sep_and_pattern/plots/{beta=0.1_gamma=0.99_alpha=1.0.pdf => beta=0.1_gamma=0.99_alpha=1.pdf} (100%) delete mode 100644 tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.0.tsv create mode 100644 tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.tsv delete mode 100644 tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.0.tsv create mode 100644 tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.tsv rename tests/test_paramspace/expected-results/results/two/plots/{alpha~1.0 => alpha~1}/beta~0.1_gamma~0.99.pdf (100%) rename tests/test_paramspace/expected-results/results/two/plots/{alpha~2.0 => alpha~2}/beta~0.0_gamma~3.9.pdf (100%) delete mode 100644 tests/test_paramspace/expected-results/results/two/simulations/alpha~1.0/beta~0.1_gamma~0.99.tsv create mode 100644 tests/test_paramspace/expected-results/results/two/simulations/alpha~1/beta~0.1_gamma~0.99.tsv delete mode 100644 tests/test_paramspace/expected-results/results/two/simulations/alpha~2.0/beta~0.0_gamma~3.9.tsv create mode 100644 tests/test_paramspace/expected-results/results/two/simulations/alpha~2/beta~0.0_gamma~3.9.tsv diff --git a/snakemake/utils.py b/snakemake/utils.py index a846d028e..7338faec9 100644 --- a/snakemake/utils.py +++ b/snakemake/utils.py @@ -693,10 +693,10 @@ def instance_patterns(self): self.pattern.format( *( self.param_sep.join(("{}", "{}")).format(name, value) - for name, value in row.items() + for name, value in row._asdict().items() ) ) - for index, row in self.dataframe.iterrows() + for row in self.dataframe.itertuples(index=False) ) def instance(self, wildcards): diff --git a/tests/test_paramspace/expected-results/results/default/plots/alpha~1.0/beta~0.1/gamma~0.99.pdf b/tests/test_paramspace/expected-results/results/default/plots/alpha~1/beta~0.1/gamma~0.99.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/default/plots/alpha~1.0/beta~0.1/gamma~0.99.pdf rename to tests/test_paramspace/expected-results/results/default/plots/alpha~1/beta~0.1/gamma~0.99.pdf diff --git a/tests/test_paramspace/expected-results/results/default/plots/alpha~2.0/beta~0.0/gamma~3.9.pdf b/tests/test_paramspace/expected-results/results/default/plots/alpha~2/beta~0.0/gamma~3.9.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/default/plots/alpha~2.0/beta~0.0/gamma~3.9.pdf rename to tests/test_paramspace/expected-results/results/default/plots/alpha~2/beta~0.0/gamma~3.9.pdf diff --git a/tests/test_paramspace/expected-results/results/default/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv b/tests/test_paramspace/expected-results/results/default/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv deleted file mode 100644 index 4ba5e2159..000000000 --- a/tests/test_paramspace/expected-results/results/default/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 1.0, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/default/simulations/alpha~1/beta~0.1/gamma~0.99.tsv b/tests/test_paramspace/expected-results/results/default/simulations/alpha~1/beta~0.1/gamma~0.99.tsv new file mode 100644 index 000000000..979067998 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/default/simulations/alpha~1/beta~0.1/gamma~0.99.tsv @@ -0,0 +1 @@ +{'alpha': 1, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/default/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv b/tests/test_paramspace/expected-results/results/default/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv deleted file mode 100644 index 0c2073ac0..000000000 --- a/tests/test_paramspace/expected-results/results/default/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 2.0, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/default/simulations/alpha~2/beta~0.0/gamma~3.9.tsv b/tests/test_paramspace/expected-results/results/default/simulations/alpha~2/beta~0.0/gamma~3.9.tsv new file mode 100644 index 000000000..13fed5800 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/default/simulations/alpha~2/beta~0.0/gamma~3.9.tsv @@ -0,0 +1 @@ +{'alpha': 2, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/empty/plots/alpha~1.0/beta~0.1/gamma~0.99.pdf b/tests/test_paramspace/expected-results/results/empty/plots/alpha~1/beta~0.1/gamma~0.99.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/empty/plots/alpha~1.0/beta~0.1/gamma~0.99.pdf rename to tests/test_paramspace/expected-results/results/empty/plots/alpha~1/beta~0.1/gamma~0.99.pdf diff --git a/tests/test_paramspace/expected-results/results/empty/plots/alpha~2.0/beta~0.0/gamma~3.9.pdf b/tests/test_paramspace/expected-results/results/empty/plots/alpha~2/beta~0.0/gamma~3.9.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/empty/plots/alpha~2.0/beta~0.0/gamma~3.9.pdf rename to tests/test_paramspace/expected-results/results/empty/plots/alpha~2/beta~0.0/gamma~3.9.pdf diff --git a/tests/test_paramspace/expected-results/results/empty/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv b/tests/test_paramspace/expected-results/results/empty/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv deleted file mode 100644 index 4ba5e2159..000000000 --- a/tests/test_paramspace/expected-results/results/empty/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 1.0, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/empty/simulations/alpha~1/beta~0.1/gamma~0.99.tsv b/tests/test_paramspace/expected-results/results/empty/simulations/alpha~1/beta~0.1/gamma~0.99.tsv new file mode 100644 index 000000000..979067998 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/empty/simulations/alpha~1/beta~0.1/gamma~0.99.tsv @@ -0,0 +1 @@ +{'alpha': 1, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/empty/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv b/tests/test_paramspace/expected-results/results/empty/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv deleted file mode 100644 index 0c2073ac0..000000000 --- a/tests/test_paramspace/expected-results/results/empty/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 2.0, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/empty/simulations/alpha~2/beta~0.0/gamma~3.9.tsv b/tests/test_paramspace/expected-results/results/empty/simulations/alpha~2/beta~0.0/gamma~3.9.tsv new file mode 100644 index 000000000..13fed5800 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/empty/simulations/alpha~2/beta~0.0/gamma~3.9.tsv @@ -0,0 +1 @@ +{'alpha': 2, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/full/plots/alpha~1.0_beta~0.1_gamma~0.99.pdf b/tests/test_paramspace/expected-results/results/full/plots/alpha~1_beta~0.1_gamma~0.99.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/full/plots/alpha~1.0_beta~0.1_gamma~0.99.pdf rename to tests/test_paramspace/expected-results/results/full/plots/alpha~1_beta~0.1_gamma~0.99.pdf diff --git a/tests/test_paramspace/expected-results/results/full/plots/alpha~2.0_beta~0.0_gamma~3.9.pdf b/tests/test_paramspace/expected-results/results/full/plots/alpha~2_beta~0.0_gamma~3.9.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/full/plots/alpha~2.0_beta~0.0_gamma~3.9.pdf rename to tests/test_paramspace/expected-results/results/full/plots/alpha~2_beta~0.0_gamma~3.9.pdf diff --git a/tests/test_paramspace/expected-results/results/full/simulations/alpha~1.0_beta~0.1_gamma~0.99.tsv b/tests/test_paramspace/expected-results/results/full/simulations/alpha~1.0_beta~0.1_gamma~0.99.tsv deleted file mode 100644 index 4ba5e2159..000000000 --- a/tests/test_paramspace/expected-results/results/full/simulations/alpha~1.0_beta~0.1_gamma~0.99.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 1.0, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/full/simulations/alpha~1_beta~0.1_gamma~0.99.tsv b/tests/test_paramspace/expected-results/results/full/simulations/alpha~1_beta~0.1_gamma~0.99.tsv new file mode 100644 index 000000000..979067998 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/full/simulations/alpha~1_beta~0.1_gamma~0.99.tsv @@ -0,0 +1 @@ +{'alpha': 1, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/full/simulations/alpha~2.0_beta~0.0_gamma~3.9.tsv b/tests/test_paramspace/expected-results/results/full/simulations/alpha~2.0_beta~0.0_gamma~3.9.tsv deleted file mode 100644 index 0c2073ac0..000000000 --- a/tests/test_paramspace/expected-results/results/full/simulations/alpha~2.0_beta~0.0_gamma~3.9.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 2.0, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/full/simulations/alpha~2_beta~0.0_gamma~3.9.tsv b/tests/test_paramspace/expected-results/results/full/simulations/alpha~2_beta~0.0_gamma~3.9.tsv new file mode 100644 index 000000000..13fed5800 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/full/simulations/alpha~2_beta~0.0_gamma~3.9.tsv @@ -0,0 +1 @@ +{'alpha': 2, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/full_reorder/plots/beta~0.0_gamma~3.9_alpha~2.0.pdf b/tests/test_paramspace/expected-results/results/full_reorder/plots/beta~0.0_gamma~3.9_alpha~2.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/full_reorder/plots/beta~0.0_gamma~3.9_alpha~2.0.pdf rename to tests/test_paramspace/expected-results/results/full_reorder/plots/beta~0.0_gamma~3.9_alpha~2.pdf diff --git a/tests/test_paramspace/expected-results/results/full_reorder/plots/beta~0.1_gamma~0.99_alpha~1.0.pdf b/tests/test_paramspace/expected-results/results/full_reorder/plots/beta~0.1_gamma~0.99_alpha~1.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/full_reorder/plots/beta~0.1_gamma~0.99_alpha~1.0.pdf rename to tests/test_paramspace/expected-results/results/full_reorder/plots/beta~0.1_gamma~0.99_alpha~1.pdf diff --git a/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.0.tsv b/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.0.tsv deleted file mode 100644 index 4c562655e..000000000 --- a/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.0.tsv +++ /dev/null @@ -1 +0,0 @@ -{'beta': 0.0, 'gamma': 3.9, 'alpha': 2.0} diff --git a/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.tsv b/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.tsv new file mode 100644 index 000000000..8bed09fcf --- /dev/null +++ b/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.tsv @@ -0,0 +1 @@ +{'beta': 0.0, 'gamma': 3.9, 'alpha': 2} diff --git a/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.0.tsv b/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.0.tsv deleted file mode 100644 index a33bb2012..000000000 --- a/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.0.tsv +++ /dev/null @@ -1 +0,0 @@ -{'beta': 0.1, 'gamma': 0.99, 'alpha': 1.0} diff --git a/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.tsv b/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.tsv new file mode 100644 index 000000000..7e19a12d2 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.tsv @@ -0,0 +1 @@ +{'beta': 0.1, 'gamma': 0.99, 'alpha': 1} diff --git a/tests/test_paramspace/expected-results/results/one/plots/alpha~1.0/gamma~0.99/beta~0.1.pdf b/tests/test_paramspace/expected-results/results/one/plots/alpha~1/gamma~0.99/beta~0.1.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/one/plots/alpha~1.0/gamma~0.99/beta~0.1.pdf rename to tests/test_paramspace/expected-results/results/one/plots/alpha~1/gamma~0.99/beta~0.1.pdf diff --git a/tests/test_paramspace/expected-results/results/one/plots/alpha~2.0/gamma~3.9/beta~0.0.pdf b/tests/test_paramspace/expected-results/results/one/plots/alpha~2/gamma~3.9/beta~0.0.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/one/plots/alpha~2.0/gamma~3.9/beta~0.0.pdf rename to tests/test_paramspace/expected-results/results/one/plots/alpha~2/gamma~3.9/beta~0.0.pdf diff --git a/tests/test_paramspace/expected-results/results/one/simulations/alpha~1.0/gamma~0.99/beta~0.1.tsv b/tests/test_paramspace/expected-results/results/one/simulations/alpha~1.0/gamma~0.99/beta~0.1.tsv deleted file mode 100644 index b0df44246..000000000 --- a/tests/test_paramspace/expected-results/results/one/simulations/alpha~1.0/gamma~0.99/beta~0.1.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 1.0, 'gamma': 0.99, 'beta': 0.1} diff --git a/tests/test_paramspace/expected-results/results/one/simulations/alpha~1/gamma~0.99/beta~0.1.tsv b/tests/test_paramspace/expected-results/results/one/simulations/alpha~1/gamma~0.99/beta~0.1.tsv new file mode 100644 index 000000000..47fd5573d --- /dev/null +++ b/tests/test_paramspace/expected-results/results/one/simulations/alpha~1/gamma~0.99/beta~0.1.tsv @@ -0,0 +1 @@ +{'alpha': 1, 'gamma': 0.99, 'beta': 0.1} diff --git a/tests/test_paramspace/expected-results/results/one/simulations/alpha~2.0/gamma~3.9/beta~0.0.tsv b/tests/test_paramspace/expected-results/results/one/simulations/alpha~2.0/gamma~3.9/beta~0.0.tsv deleted file mode 100644 index fb58b0e5c..000000000 --- a/tests/test_paramspace/expected-results/results/one/simulations/alpha~2.0/gamma~3.9/beta~0.0.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 2.0, 'gamma': 3.9, 'beta': 0.0} diff --git a/tests/test_paramspace/expected-results/results/one/simulations/alpha~2/gamma~3.9/beta~0.0.tsv b/tests/test_paramspace/expected-results/results/one/simulations/alpha~2/gamma~3.9/beta~0.0.tsv new file mode 100644 index 000000000..4aebc7ff2 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/one/simulations/alpha~2/gamma~3.9/beta~0.0.tsv @@ -0,0 +1 @@ +{'alpha': 2, 'gamma': 3.9, 'beta': 0.0} diff --git a/tests/test_paramspace/expected-results/results/sep/plots/alpha_is_1.0/beta_is_0.1/gamma_is_0.99.pdf b/tests/test_paramspace/expected-results/results/sep/plots/alpha_is_1/beta_is_0.1/gamma_is_0.99.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/sep/plots/alpha_is_1.0/beta_is_0.1/gamma_is_0.99.pdf rename to tests/test_paramspace/expected-results/results/sep/plots/alpha_is_1/beta_is_0.1/gamma_is_0.99.pdf diff --git a/tests/test_paramspace/expected-results/results/sep/plots/alpha_is_2.0/beta_is_0.0/gamma_is_3.9.pdf b/tests/test_paramspace/expected-results/results/sep/plots/alpha_is_2/beta_is_0.0/gamma_is_3.9.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/sep/plots/alpha_is_2.0/beta_is_0.0/gamma_is_3.9.pdf rename to tests/test_paramspace/expected-results/results/sep/plots/alpha_is_2/beta_is_0.0/gamma_is_3.9.pdf diff --git a/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_1.0/beta_is_0.1/gamma_is_0.99.tsv b/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_1.0/beta_is_0.1/gamma_is_0.99.tsv deleted file mode 100644 index 4ba5e2159..000000000 --- a/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_1.0/beta_is_0.1/gamma_is_0.99.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 1.0, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_1/beta_is_0.1/gamma_is_0.99.tsv b/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_1/beta_is_0.1/gamma_is_0.99.tsv new file mode 100644 index 000000000..979067998 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_1/beta_is_0.1/gamma_is_0.99.tsv @@ -0,0 +1 @@ +{'alpha': 1, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_2.0/beta_is_0.0/gamma_is_3.9.tsv b/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_2.0/beta_is_0.0/gamma_is_3.9.tsv deleted file mode 100644 index 0c2073ac0..000000000 --- a/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_2.0/beta_is_0.0/gamma_is_3.9.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 2.0, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_2/beta_is_0.0/gamma_is_3.9.tsv b/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_2/beta_is_0.0/gamma_is_3.9.tsv new file mode 100644 index 000000000..13fed5800 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/sep/simulations/alpha_is_2/beta_is_0.0/gamma_is_3.9.tsv @@ -0,0 +1 @@ +{'alpha': 2, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/sep_and_pattern/plots/beta=0.0_gamma=3.9_alpha=2.0.pdf b/tests/test_paramspace/expected-results/results/sep_and_pattern/plots/beta=0.0_gamma=3.9_alpha=2.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/sep_and_pattern/plots/beta=0.0_gamma=3.9_alpha=2.0.pdf rename to tests/test_paramspace/expected-results/results/sep_and_pattern/plots/beta=0.0_gamma=3.9_alpha=2.pdf diff --git a/tests/test_paramspace/expected-results/results/sep_and_pattern/plots/beta=0.1_gamma=0.99_alpha=1.0.pdf b/tests/test_paramspace/expected-results/results/sep_and_pattern/plots/beta=0.1_gamma=0.99_alpha=1.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/sep_and_pattern/plots/beta=0.1_gamma=0.99_alpha=1.0.pdf rename to tests/test_paramspace/expected-results/results/sep_and_pattern/plots/beta=0.1_gamma=0.99_alpha=1.pdf diff --git a/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.0.tsv b/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.0.tsv deleted file mode 100644 index 4c562655e..000000000 --- a/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.0.tsv +++ /dev/null @@ -1 +0,0 @@ -{'beta': 0.0, 'gamma': 3.9, 'alpha': 2.0} diff --git a/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.tsv b/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.tsv new file mode 100644 index 000000000..8bed09fcf --- /dev/null +++ b/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.tsv @@ -0,0 +1 @@ +{'beta': 0.0, 'gamma': 3.9, 'alpha': 2} diff --git a/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.0.tsv b/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.0.tsv deleted file mode 100644 index a33bb2012..000000000 --- a/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.0.tsv +++ /dev/null @@ -1 +0,0 @@ -{'beta': 0.1, 'gamma': 0.99, 'alpha': 1.0} diff --git a/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.tsv b/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.tsv new file mode 100644 index 000000000..7e19a12d2 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.tsv @@ -0,0 +1 @@ +{'beta': 0.1, 'gamma': 0.99, 'alpha': 1} diff --git a/tests/test_paramspace/expected-results/results/two/plots/alpha~1.0/beta~0.1_gamma~0.99.pdf b/tests/test_paramspace/expected-results/results/two/plots/alpha~1/beta~0.1_gamma~0.99.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/two/plots/alpha~1.0/beta~0.1_gamma~0.99.pdf rename to tests/test_paramspace/expected-results/results/two/plots/alpha~1/beta~0.1_gamma~0.99.pdf diff --git a/tests/test_paramspace/expected-results/results/two/plots/alpha~2.0/beta~0.0_gamma~3.9.pdf b/tests/test_paramspace/expected-results/results/two/plots/alpha~2/beta~0.0_gamma~3.9.pdf similarity index 100% rename from tests/test_paramspace/expected-results/results/two/plots/alpha~2.0/beta~0.0_gamma~3.9.pdf rename to tests/test_paramspace/expected-results/results/two/plots/alpha~2/beta~0.0_gamma~3.9.pdf diff --git a/tests/test_paramspace/expected-results/results/two/simulations/alpha~1.0/beta~0.1_gamma~0.99.tsv b/tests/test_paramspace/expected-results/results/two/simulations/alpha~1.0/beta~0.1_gamma~0.99.tsv deleted file mode 100644 index 4ba5e2159..000000000 --- a/tests/test_paramspace/expected-results/results/two/simulations/alpha~1.0/beta~0.1_gamma~0.99.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 1.0, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/two/simulations/alpha~1/beta~0.1_gamma~0.99.tsv b/tests/test_paramspace/expected-results/results/two/simulations/alpha~1/beta~0.1_gamma~0.99.tsv new file mode 100644 index 000000000..979067998 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/two/simulations/alpha~1/beta~0.1_gamma~0.99.tsv @@ -0,0 +1 @@ +{'alpha': 1, 'beta': 0.1, 'gamma': 0.99} diff --git a/tests/test_paramspace/expected-results/results/two/simulations/alpha~2.0/beta~0.0_gamma~3.9.tsv b/tests/test_paramspace/expected-results/results/two/simulations/alpha~2.0/beta~0.0_gamma~3.9.tsv deleted file mode 100644 index 0c2073ac0..000000000 --- a/tests/test_paramspace/expected-results/results/two/simulations/alpha~2.0/beta~0.0_gamma~3.9.tsv +++ /dev/null @@ -1 +0,0 @@ -{'alpha': 2.0, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/expected-results/results/two/simulations/alpha~2/beta~0.0_gamma~3.9.tsv b/tests/test_paramspace/expected-results/results/two/simulations/alpha~2/beta~0.0_gamma~3.9.tsv new file mode 100644 index 000000000..13fed5800 --- /dev/null +++ b/tests/test_paramspace/expected-results/results/two/simulations/alpha~2/beta~0.0_gamma~3.9.tsv @@ -0,0 +1 @@ +{'alpha': 2, 'beta': 0.0, 'gamma': 3.9} diff --git a/tests/test_paramspace/params.tsv b/tests/test_paramspace/params.tsv index a5908d99a..bb33954ab 100644 --- a/tests/test_paramspace/params.tsv +++ b/tests/test_paramspace/params.tsv @@ -1,3 +1,3 @@ alpha beta gamma -1.0 0.1 0.99 -2.0 0.0 3.9 +1 0.1 0.99 +2 0.0 3.9