update to eng_trans data file

quaquel · Nov 15, 2023 · 9699a6e · 9699a6e
1 parent 45c5942
commit 9699a6e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 2,471 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ ci:
 
 repos:
 -   repo: https://github.com/psf/black
-    rev: 23.11.0
+    rev: 23.10.1
     hooks:
       - id: black-jupyter
 -   repo: https://github.com/asottile/pyupgrade

diff --git a/test/data/eng_trans.tar.gz b/test/data/eng_trans.tar.gz
diff --git a/test/data/eng_trans/TIME.csv b/test/data/eng_trans/TIME.csv
diff --git a/test/data/eng_trans/experiments metadata.csv b/test/data/eng_trans/experiments metadata.csv
diff --git a/test/data/eng_trans/experiments.csv b/test/data/eng_trans/experiments.csv
diff --git a/test/data/eng_trans/outcomes metadata.csv b/test/data/eng_trans/outcomes metadata.csv
diff --git a/test/data/eng_trans/total capacity installed.csv b/test/data/eng_trans/total capacity installed.csv
diff --git a/test/data/eng_trans/total fraction new technologies.csv b/test/data/eng_trans/total fraction new technologies.csv
diff --git a/test/test_analysis/test_plotting.py b/test/test_analysis/test_plotting.py
@@ -73,12 +73,12 @@ def test_group_results(self):
         print(experiments.shape[0], total_data)
 
         # test continuous parameter type
-        array = experiments["average planning and construction period T1"]
+        array = experiments["average_planning_and_construction_period_T1"]
         grouping_specifiers = make_continuous_grouping_specifiers(array, nr_of_groups=5)
         groups = group_results(
             experiments,
             outcomes,
-            group_by="average planning and construction period T1",
+            group_by="average_planning_and_construction_period_T1",
             grouping_specifiers=grouping_specifiers,
             grouping_labels=[str(entry) for entry in grouping_specifiers],
         )
@@ -88,12 +88,12 @@ def test_group_results(self):
         print(experiments.shape[0], total_data)
 
         # test integer type
-        array = experiments["seed PR T1"]
+        array = experiments["seed_PR_T1"]
         grouping_specifiers = make_continuous_grouping_specifiers(array, nr_of_groups=10)
         groups = group_results(
             experiments,
             outcomes,
-            group_by="seed PR T1",
+            group_by="seed_PR_T1",
             grouping_specifiers=grouping_specifiers,
             grouping_labels=[str(entry) for entry in grouping_specifiers],
         )
@@ -122,7 +122,7 @@ def test_lines(self):
         lines(
             experiments,
             outcomes,
-            outcomes_to_show="total fraction new technologies",
+            outcomes_to_show="total_fraction_new_technologies",
             experiments_to_show=np.arange(0, 600, 20),
             group_by="policy",
             grouping_specifiers="basic policy",
@@ -292,7 +292,7 @@ def test_envelopes(self):
         envelopes(experiments, outcomes, density=None, titles=None)
         envelopes(experiments, outcomes, density=None, titles={})
         envelopes(
-            experiments, outcomes, density=None, titles={"total fraction new technologies": "a"}
+            experiments, outcomes, density=None, titles={"total_fraction_new_technologies": "a"}
         )
 
         plt.draw()
@@ -302,7 +302,7 @@ def test_envelopes(self):
         envelopes(experiments, outcomes, density=None, ylabels=None)
         envelopes(experiments, outcomes, density=None, ylabels={})
         envelopes(
-            experiments, outcomes, density=None, ylabels={"total fraction new technologies": "a"}
+            experiments, outcomes, density=None, ylabels={"total_fraction_new_technologies": "a"}
         )
 
         plt.draw()
@@ -401,7 +401,7 @@ def test_kde_over_time(self):
 
     def test_multiple_densities(self):
         experiments, outcomes = utilities.load_eng_trans_data()
-        ooi = "total fraction new technologies"
+        ooi = "total_fraction_new_technologies"
 
         multiple_densities(experiments, outcomes, group_by="policy", points_in_time=[2010])
         multiple_densities(