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 · Apr 21, 2022 · 70ce6a0 · 70ce6a0
1 parent 667ee86
commit 70ce6a0
Show file tree

Hide file tree

Showing 50 changed files with 20 additions and 20 deletions.
diff --git 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/...t/plots/alpha~1.0/beta~0.1/gamma~0.99.pdf → ...ult/plots/alpha~1/beta~0.1/gamma~0.99.pdf b/...t/plots/alpha~1.0/beta~0.1/gamma~0.99.pdf → ...ult/plots/alpha~1/beta~0.1/gamma~0.99.pdf
diff --git a/...lt/plots/alpha~2.0/beta~0.0/gamma~3.9.pdf → ...ault/plots/alpha~2/beta~0.0/gamma~3.9.pdf b/...lt/plots/alpha~2.0/beta~0.0/gamma~3.9.pdf → ...ault/plots/alpha~2/beta~0.0/gamma~3.9.pdf
diff --git a/...paramspace/expected-results/results/default/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv b/...paramspace/expected-results/results/default/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv
diff --git a/...t_paramspace/expected-results/results/default/simulations/alpha~1/beta~0.1/gamma~0.99.tsv b/...t_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/..._paramspace/expected-results/results/default/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv b/..._paramspace/expected-results/results/default/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv
diff --git a/...st_paramspace/expected-results/results/default/simulations/alpha~2/beta~0.0/gamma~3.9.tsv b/...st_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/...y/plots/alpha~1.0/beta~0.1/gamma~0.99.pdf → ...pty/plots/alpha~1/beta~0.1/gamma~0.99.pdf b/...y/plots/alpha~1.0/beta~0.1/gamma~0.99.pdf → ...pty/plots/alpha~1/beta~0.1/gamma~0.99.pdf
diff --git a/...ty/plots/alpha~2.0/beta~0.0/gamma~3.9.pdf → ...mpty/plots/alpha~2/beta~0.0/gamma~3.9.pdf b/...ty/plots/alpha~2.0/beta~0.0/gamma~3.9.pdf → ...mpty/plots/alpha~2/beta~0.0/gamma~3.9.pdf
diff --git a/...t_paramspace/expected-results/results/empty/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv b/...t_paramspace/expected-results/results/empty/simulations/alpha~1.0/beta~0.1/gamma~0.99.tsv
diff --git a/...est_paramspace/expected-results/results/empty/simulations/alpha~1/beta~0.1/gamma~0.99.tsv b/...est_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/...st_paramspace/expected-results/results/empty/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv b/...st_paramspace/expected-results/results/empty/simulations/alpha~2.0/beta~0.0/gamma~3.9.tsv
diff --git a/...test_paramspace/expected-results/results/empty/simulations/alpha~2/beta~0.0/gamma~3.9.tsv b/...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/...l/plots/alpha~1.0_beta~0.1_gamma~0.99.pdf → ...ull/plots/alpha~1_beta~0.1_gamma~0.99.pdf b/...l/plots/alpha~1.0_beta~0.1_gamma~0.99.pdf → ...ull/plots/alpha~1_beta~0.1_gamma~0.99.pdf
diff --git a/...ll/plots/alpha~2.0_beta~0.0_gamma~3.9.pdf → ...full/plots/alpha~2_beta~0.0_gamma~3.9.pdf b/...ll/plots/alpha~2.0_beta~0.0_gamma~3.9.pdf → ...full/plots/alpha~2_beta~0.0_gamma~3.9.pdf
diff --git a/...st_paramspace/expected-results/results/full/simulations/alpha~1.0_beta~0.1_gamma~0.99.tsv b/...st_paramspace/expected-results/results/full/simulations/alpha~1.0_beta~0.1_gamma~0.99.tsv
diff --git a/...test_paramspace/expected-results/results/full/simulations/alpha~1_beta~0.1_gamma~0.99.tsv b/...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/...est_paramspace/expected-results/results/full/simulations/alpha~2.0_beta~0.0_gamma~3.9.tsv b/...est_paramspace/expected-results/results/full/simulations/alpha~2.0_beta~0.0_gamma~3.9.tsv
diff --git a/.../test_paramspace/expected-results/results/full/simulations/alpha~2_beta~0.0_gamma~3.9.tsv b/.../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/...er/plots/beta~0.0_gamma~3.9_alpha~2.0.pdf → ...rder/plots/beta~0.0_gamma~3.9_alpha~2.pdf b/...er/plots/beta~0.0_gamma~3.9_alpha~2.0.pdf → ...rder/plots/beta~0.0_gamma~3.9_alpha~2.pdf
diff --git a/...r/plots/beta~0.1_gamma~0.99_alpha~1.0.pdf → ...der/plots/beta~0.1_gamma~0.99_alpha~1.pdf b/...r/plots/beta~0.1_gamma~0.99_alpha~1.0.pdf → ...der/plots/beta~0.1_gamma~0.99_alpha~1.pdf
diff --git a/...mspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.0.tsv b/...mspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.0.tsv
diff --git a/...ramspace/expected-results/results/full_reorder/simulations/beta~0.0_gamma~3.9_alpha~2.tsv b/...ramspace/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/...space/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.0.tsv b/...space/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.0.tsv
diff --git a/...amspace/expected-results/results/full_reorder/simulations/beta~0.1_gamma~0.99_alpha~1.tsv b/...amspace/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/...e/plots/alpha~1.0/gamma~0.99/beta~0.1.pdf → ...one/plots/alpha~1/gamma~0.99/beta~0.1.pdf b/...e/plots/alpha~1.0/gamma~0.99/beta~0.1.pdf → ...one/plots/alpha~1/gamma~0.99/beta~0.1.pdf
diff --git a/...ne/plots/alpha~2.0/gamma~3.9/beta~0.0.pdf → .../one/plots/alpha~2/gamma~3.9/beta~0.0.pdf b/...ne/plots/alpha~2.0/gamma~3.9/beta~0.0.pdf → .../one/plots/alpha~2/gamma~3.9/beta~0.0.pdf
diff --git a/...est_paramspace/expected-results/results/one/simulations/alpha~1.0/gamma~0.99/beta~0.1.tsv b/...est_paramspace/expected-results/results/one/simulations/alpha~1.0/gamma~0.99/beta~0.1.tsv
diff --git a/.../test_paramspace/expected-results/results/one/simulations/alpha~1/gamma~0.99/beta~0.1.tsv b/.../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/...test_paramspace/expected-results/results/one/simulations/alpha~2.0/gamma~3.9/beta~0.0.tsv b/...test_paramspace/expected-results/results/one/simulations/alpha~2.0/gamma~3.9/beta~0.0.tsv
diff --git a/...s/test_paramspace/expected-results/results/one/simulations/alpha~2/gamma~3.9/beta~0.0.tsv b/...s/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/...lpha_is_1.0/beta_is_0.1/gamma_is_0.99.pdf → .../alpha_is_1/beta_is_0.1/gamma_is_0.99.pdf b/...lpha_is_1.0/beta_is_0.1/gamma_is_0.99.pdf → .../alpha_is_1/beta_is_0.1/gamma_is_0.99.pdf
diff --git a/...alpha_is_2.0/beta_is_0.0/gamma_is_3.9.pdf → ...s/alpha_is_2/beta_is_0.0/gamma_is_3.9.pdf b/...alpha_is_2.0/beta_is_0.0/gamma_is_3.9.pdf → ...s/alpha_is_2/beta_is_0.0/gamma_is_3.9.pdf
diff --git a/...space/expected-results/results/sep/simulations/alpha_is_1.0/beta_is_0.1/gamma_is_0.99.tsv b/...space/expected-results/results/sep/simulations/alpha_is_1.0/beta_is_0.1/gamma_is_0.99.tsv
diff --git a/...amspace/expected-results/results/sep/simulations/alpha_is_1/beta_is_0.1/gamma_is_0.99.tsv b/...amspace/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/...mspace/expected-results/results/sep/simulations/alpha_is_2.0/beta_is_0.0/gamma_is_3.9.tsv b/...mspace/expected-results/results/sep/simulations/alpha_is_2.0/beta_is_0.0/gamma_is_3.9.tsv
diff --git a/...ramspace/expected-results/results/sep/simulations/alpha_is_2/beta_is_0.0/gamma_is_3.9.tsv b/...ramspace/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/...rn/plots/beta=0.0_gamma=3.9_alpha=2.0.pdf → ...tern/plots/beta=0.0_gamma=3.9_alpha=2.pdf b/...rn/plots/beta=0.0_gamma=3.9_alpha=2.0.pdf → ...tern/plots/beta=0.0_gamma=3.9_alpha=2.pdf
diff --git a/...n/plots/beta=0.1_gamma=0.99_alpha=1.0.pdf → ...ern/plots/beta=0.1_gamma=0.99_alpha=1.pdf b/...n/plots/beta=0.1_gamma=0.99_alpha=1.0.pdf → ...ern/plots/beta=0.1_gamma=0.99_alpha=1.pdf
diff --git a/...ace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.0.tsv b/...ace/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.0.tsv
diff --git a/...space/expected-results/results/sep_and_pattern/simulations/beta=0.0_gamma=3.9_alpha=2.tsv b/...space/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/...ce/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.0.tsv b/...ce/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.0.tsv
diff --git a/...pace/expected-results/results/sep_and_pattern/simulations/beta=0.1_gamma=0.99_alpha=1.tsv b/...pace/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/...o/plots/alpha~1.0/beta~0.1_gamma~0.99.pdf → ...two/plots/alpha~1/beta~0.1_gamma~0.99.pdf b/...o/plots/alpha~1.0/beta~0.1_gamma~0.99.pdf → ...two/plots/alpha~1/beta~0.1_gamma~0.99.pdf
diff --git a/...wo/plots/alpha~2.0/beta~0.0_gamma~3.9.pdf → .../two/plots/alpha~2/beta~0.0_gamma~3.9.pdf b/...wo/plots/alpha~2.0/beta~0.0_gamma~3.9.pdf → .../two/plots/alpha~2/beta~0.0_gamma~3.9.pdf
diff --git a/...est_paramspace/expected-results/results/two/simulations/alpha~1.0/beta~0.1_gamma~0.99.tsv b/...est_paramspace/expected-results/results/two/simulations/alpha~1.0/beta~0.1_gamma~0.99.tsv
diff --git a/.../test_paramspace/expected-results/results/two/simulations/alpha~1/beta~0.1_gamma~0.99.tsv b/.../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/...test_paramspace/expected-results/results/two/simulations/alpha~2.0/beta~0.0_gamma~3.9.tsv b/...test_paramspace/expected-results/results/two/simulations/alpha~2.0/beta~0.0_gamma~3.9.tsv
diff --git a/...s/test_paramspace/expected-results/results/two/simulations/alpha~2/beta~0.0_gamma~3.9.tsv b/...s/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
@@ -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