Moved case_21 in the infrastructure_risk tests

gem · Nov 7, 2024 · 7864a8d · 7864a8d
1 parent cd1e400
commit 7864a8d
Show file tree

Hide file tree

Showing 32 changed files with 31 additions and 68 deletions.
diff --git a/openquake/calculators/tests/infrastructure_risk_test.py b/openquake/calculators/tests/infrastructure_risk_test.py
@@ -21,7 +21,7 @@
 import numpy
 from openquake.baselib import InvalidFile
 from openquake.qa_tests_data.infrastructure_risk import (
-    case_15, five_nodes_demsup_directed, five_nodes_demsup_directedunweighted,
+    case_1, case_2, five_nodes_demsup_directed, five_nodes_demsup_directedunweighted,
     five_nodes_demsup_multidirected, demand_supply, directed, eff_loss_random,
     multidirected, multigraph, undirected)
 from openquake.calculators.export import export
@@ -49,102 +49,72 @@ def _check_csv_outputs(self, outputs_list, datastore, testcase,
         if replace_expected:
             raise ValueError('Remember to set replace_expected to False!')
 
-    def test_case_15(self):
-        self.run_calc(case_15.__file__, 'job.ini')
-        ds = self.calc.datastore
-
+    def test_case_1(self):
+        self.run_calc(case_1.__file__, 'job.ini')
         outputs_list = (
             'node_el avg_loss event_ccl event_efl event_pcl event_wcl'
             ' dem_cl').split()
+        self._check_csv_outputs(outputs_list, self.calc.datastore, case_1)
 
-        self._check_csv_outputs(outputs_list, ds, case_15)
+    def test_case_2(self):
+        # infrastructure risk for structural, liquefaction and landslides
+        out = self.run_calc(case_2.__file__, 'job.ini', exports='csv')
+        [agg_csv, aggparent_csv] = out[('aggrisk', 'csv')]
+        self.assertEqualFiles('expected/aggrisk.csv', agg_csv)
+        self.assertEqualFiles('expected/aggrisk-parent.csv', aggparent_csv)
 
     def test_demand_supply(self):
         self.run_calc(demand_supply.__file__, 'job.ini')
-        ds = self.calc.datastore
-
         outputs_list = (
             'avg_loss event_ccl event_efl event_pcl event_wcl node_el'
             ' dem_cl').split()
-
-        self._check_csv_outputs(outputs_list, ds, demand_supply)
+        self._check_csv_outputs(outputs_list, self.calc.datastore, demand_supply)
 
     def test_directed(self):
         self.run_calc(directed.__file__, 'job.ini')
-        ds = self.calc.datastore
-
-        outputs_list = (
-            'avg_loss event_efl event_pcl event_wcl node_el taz_cl').split()
-
-        self._check_csv_outputs(outputs_list, ds, directed)
+        outputs_list = 'avg_loss event_efl event_pcl event_wcl node_el taz_cl'.split()
+        self._check_csv_outputs(outputs_list, self.calc.datastore, directed)
 
     def test_eff_loss_random(self):
         self.run_calc(eff_loss_random.__file__, 'job.ini')
-        ds = self.calc.datastore
-
-        outputs_list = (
-            'avg_loss event_efl node_el').split()
+        outputs_list = 'avg_loss event_efl node_el'.split()
 
-        self._check_csv_outputs(outputs_list, ds, eff_loss_random)
+        self._check_csv_outputs(outputs_list, self.calc.datastore, eff_loss_random)
 
     def test_five_nodes_demsup_directed(self):
         self.run_calc(five_nodes_demsup_directed.__file__, 'job.ini')
-        ds = self.calc.datastore
-
-        outputs_list = (
-            'avg_loss event_ccl event_efl event_pcl event_wcl node_el'
-            ' dem_cl').split()
-
-        self._check_csv_outputs(outputs_list, ds, five_nodes_demsup_directed)
+        outputs_list = ('avg_loss event_ccl event_efl event_pcl event_wcl node_el'
+                        ' dem_cl').split()
+        self._check_csv_outputs(outputs_list, self.calc.datastore, five_nodes_demsup_directed)
 
     def test_five_nodes_demsup_directedunweighted(self):
         self.run_calc(five_nodes_demsup_directedunweighted.__file__, 'job.ini')
-        ds = self.calc.datastore
-
-        outputs_list = (
-            'avg_loss event_ccl event_efl event_pcl event_wcl node_el'
-            ' dem_cl').split()
-
+        outputs_list = ('avg_loss event_ccl event_efl event_pcl event_wcl node_el'
+                        ' dem_cl').split()
         self._check_csv_outputs(
-            outputs_list, ds, five_nodes_demsup_directedunweighted)
+            outputs_list, self.calc.datastore, five_nodes_demsup_directedunweighted)
 
     def test_five_nodes_demsup_multidirected(self):
         self.run_calc(five_nodes_demsup_multidirected.__file__, 'job.ini')
-        ds = self.calc.datastore
-
-        outputs_list = (
-            'avg_loss event_ccl event_efl event_pcl event_wcl node_el'
-            ' dem_cl').split()
-
+        outputs_list = ('avg_loss event_ccl event_efl event_pcl event_wcl node_el'
+                        ' dem_cl').split()
         self._check_csv_outputs(
-            outputs_list, ds, five_nodes_demsup_multidirected)
+            outputs_list, self.calc.datastore, five_nodes_demsup_multidirected)
 
     def test_multidirected(self):
         self.run_calc(multidirected.__file__, 'job.ini')
-        ds = self.calc.datastore
-
-        outputs_list = (
-            'avg_loss event_efl event_pcl event_wcl node_el taz_cl').split()
-
-        self._check_csv_outputs(outputs_list, ds, multidirected)
+        outputs_list = 'avg_loss event_efl event_pcl event_wcl node_el taz_cl'.split()
+        self._check_csv_outputs(outputs_list, self.calc.datastore, multidirected)
 
     def test_multigraph(self):
         self.run_calc(multigraph.__file__, 'job.ini')
-        ds = self.calc.datastore
-
-        outputs_list = (
-            'avg_loss event_efl event_pcl event_wcl node_el taz_cl').split()
-
-        self._check_csv_outputs(outputs_list, ds, multigraph)
+        outputs_list = 'avg_loss event_efl event_pcl event_wcl node_el taz_cl'.split()
+        self._check_csv_outputs(outputs_list, self.calc.datastore, multigraph)
 
     def test_undirected(self):
         self.run_calc(undirected.__file__, 'job.ini')
-        ds = self.calc.datastore
-
-        outputs_list = (
-            'avg_loss event_efl event_pcl event_wcl node_el taz_cl').split()
-
-        self._check_csv_outputs(outputs_list, ds, undirected)
+        outputs_list = 'avg_loss event_efl event_pcl event_wcl node_el taz_cl'.split()
+        self._check_csv_outputs(outputs_list, self.calc.datastore, undirected)
 
     def test_missing_mandatory_column(self):
         with self.assertRaises(InvalidFile) as exc:

diff --git a/openquake/calculators/tests/scenario_damage_test.py b/openquake/calculators/tests/scenario_damage_test.py
@@ -24,7 +24,7 @@
 from openquake.qa_tests_data.scenario_damage import (
     case_1, case_1c, case_2, case_3, case_4, case_4b, case_5, case_5a,
     case_6, case_7, case_8, case_9, case_10, case_11, case_12, case_13,
-    case_14, case_16, case_17, case_18, case_19, case_20, case_21, case_22)
+    case_14, case_16, case_17, case_18, case_19, case_20, case_22)
 from openquake.calculators.tests import CalculatorTestCase, strip_calc_id
 from openquake.calculators.extract import extract
 from openquake.calculators.export import export
@@ -288,13 +288,6 @@ def test_case_20(self):
         [fname] = out[('aggrisk', 'csv')]
         self.assertEqualFiles('expected/aggrisk.csv', fname)
 
-    def test_case_21(self):
-        # infrastructure risk for structural, liquefaction and landslides
-        out = self.run_calc(case_21.__file__, 'job.ini', exports='csv')
-        [agg_csv, aggparent_csv] = out[('aggrisk', 'csv')]
-        self.assertEqualFiles('expected/aggrisk.csv', agg_csv)
-        self.assertEqualFiles('expected/aggrisk-parent.csv', aggparent_csv)
-
     def test_case_22(self):
         # losses with liquefaction and landslides
         self.run_calc(case_22.__file__, 'job_h.ini')

diff --git a/...a/infrastructure_risk/case_15/__init__.py → ...ta/infrastructure_risk/case_1/__init__.py b/...a/infrastructure_risk/case_15/__init__.py → ...ta/infrastructure_risk/case_1/__init__.py
diff --git a/..._risk/case_15/expected/infra-avg_loss.csv → ...e_risk/case_1/expected/infra-avg_loss.csv b/..._risk/case_15/expected/infra-avg_loss.csv → ...e_risk/case_1/expected/infra-avg_loss.csv
diff --git a/...re_risk/case_15/expected/infra-dem_cl.csv → ...ure_risk/case_1/expected/infra-dem_cl.csv b/...re_risk/case_15/expected/infra-dem_cl.csv → ...ure_risk/case_1/expected/infra-dem_cl.csv
diff --git a/...risk/case_15/expected/infra-event_ccl.csv → ..._risk/case_1/expected/infra-event_ccl.csv b/...risk/case_15/expected/infra-event_ccl.csv → ..._risk/case_1/expected/infra-event_ccl.csv
diff --git a/...risk/case_15/expected/infra-event_efl.csv → ..._risk/case_1/expected/infra-event_efl.csv b/...risk/case_15/expected/infra-event_efl.csv → ..._risk/case_1/expected/infra-event_efl.csv
diff --git a/...risk/case_15/expected/infra-event_pcl.csv → ..._risk/case_1/expected/infra-event_pcl.csv b/...risk/case_15/expected/infra-event_pcl.csv → ..._risk/case_1/expected/infra-event_pcl.csv
diff --git a/...risk/case_15/expected/infra-event_wcl.csv → ..._risk/case_1/expected/infra-event_wcl.csv b/...risk/case_15/expected/infra-event_wcl.csv → ..._risk/case_1/expected/infra-event_wcl.csv
diff --git a/...e_risk/case_15/expected/infra-node_el.csv → ...re_risk/case_1/expected/infra-node_el.csv b/...e_risk/case_15/expected/infra-node_el.csv → ...re_risk/case_1/expected/infra-node_el.csv
diff --git a/.../infrastructure_risk/case_15/exposure.xml → ...a/infrastructure_risk/case_1/exposure.xml b/.../infrastructure_risk/case_15/exposure.xml → ...a/infrastructure_risk/case_1/exposure.xml
diff --git a/...ture_risk/case_15/exposure_demo_edges.csv → ...cture_risk/case_1/exposure_demo_edges.csv b/...ture_risk/case_15/exposure_demo_edges.csv → ...cture_risk/case_1/exposure_demo_edges.csv
diff --git a/...ture_risk/case_15/exposure_demo_nodes.csv → ...cture_risk/case_1/exposure_demo_nodes.csv b/...ture_risk/case_15/exposure_demo_nodes.csv → ...cture_risk/case_1/exposure_demo_nodes.csv
diff --git a/...tructure_risk/case_15/fragility_model.xml → ...structure_risk/case_1/fragility_model.xml b/...tructure_risk/case_15/fragility_model.xml → ...structure_risk/case_1/fragility_model.xml
diff --git a/..._data/infrastructure_risk/case_15/job.ini → ...s_data/infrastructure_risk/case_1/job.ini b/..._data/infrastructure_risk/case_15/job.ini → ...s_data/infrastructure_risk/case_1/job.ini
diff --git a/...astructure_risk/case_15/nonfunctional.csv → ...rastructure_risk/case_1/nonfunctional.csv b/...astructure_risk/case_15/nonfunctional.csv → ...rastructure_risk/case_1/nonfunctional.csv
diff --git a/...astructure_risk/case_15/rupture_model.xml → ...rastructure_risk/case_1/rupture_model.xml b/...astructure_risk/case_15/rupture_model.xml → ...rastructure_risk/case_1/rupture_model.xml
diff --git a/...ture_risk/case_15/site_model_measured.xml → ...cture_risk/case_1/site_model_measured.xml b/...ture_risk/case_15/site_model_measured.xml → ...cture_risk/case_1/site_model_measured.xml
diff --git a/..._data/scenario_damage/case_21/__init__.py → ...ta/infrastructure_risk/case_2/__init__.py b/..._data/scenario_damage/case_21/__init__.py → ...ta/infrastructure_risk/case_2/__init__.py
diff --git a/...se_21/consequence_multiple_loss_types.csv → ...ase_2/consequence_multiple_loss_types.csv b/...se_21/consequence_multiple_loss_types.csv → ...ase_2/consequence_multiple_loss_types.csv
diff --git a/...amage/case_21/expected/aggrisk-parent.csv → ...e_risk/case_2/expected/aggrisk-parent.csv b/...amage/case_21/expected/aggrisk-parent.csv → ...e_risk/case_2/expected/aggrisk-parent.csv
diff --git a/...nario_damage/case_21/expected/aggrisk.csv → ...tructure_risk/case_2/expected/aggrisk.csv b/...nario_damage/case_21/expected/aggrisk.csv → ...tructure_risk/case_2/expected/aggrisk.csv
diff --git a/...data/scenario_damage/case_21/exposure.xml → ...a/infrastructure_risk/case_2/exposure.xml b/...data/scenario_damage/case_21/exposure.xml → ...a/infrastructure_risk/case_2/exposure.xml
diff --git a/...io_damage/case_21/exposure_demo_edges.csv → ...cture_risk/case_2/exposure_demo_edges.csv b/...io_damage/case_21/exposure_demo_edges.csv → ...cture_risk/case_2/exposure_demo_edges.csv
diff --git a/...io_damage/case_21/exposure_demo_nodes.csv → ...cture_risk/case_2/exposure_demo_nodes.csv b/...io_damage/case_21/exposure_demo_nodes.csv → ...cture_risk/case_2/exposure_demo_nodes.csv
diff --git a/...age/case_21/fragility_model_landslide.xml → ...risk/case_2/fragility_model_landslide.xml b/...age/case_21/fragility_model_landslide.xml → ...risk/case_2/fragility_model_landslide.xml
diff --git a/.../case_21/fragility_model_liquefaction.xml → ...k/case_2/fragility_model_liquefaction.xml b/.../case_21/fragility_model_liquefaction.xml → ...k/case_2/fragility_model_liquefaction.xml
diff --git a/...ge/case_21/fragility_model_structural.xml → ...isk/case_2/fragility_model_structural.xml b/...ge/case_21/fragility_model_structural.xml → ...isk/case_2/fragility_model_structural.xml
diff --git a/...o_damage/case_21/gmpe_logic_tree_ascr.xml → ...ture_risk/case_2/gmpe_logic_tree_ascr.xml b/...o_damage/case_21/gmpe_logic_tree_ascr.xml → ...ture_risk/case_2/gmpe_logic_tree_ascr.xml
diff --git a/...ests_data/scenario_damage/case_21/job.ini → ...s_data/infrastructure_risk/case_2/job.ini b/...ests_data/scenario_damage/case_21/job.ini → ...s_data/infrastructure_risk/case_2/job.ini
diff --git a/..._data/scenario_damage/case_21/rupture.xml → ...ta/infrastructure_risk/case_2/rupture.xml b/..._data/scenario_damage/case_21/rupture.xml → ...ta/infrastructure_risk/case_2/rupture.xml
diff --git a/...ta/scenario_damage/case_21/site_model.csv → ...infrastructure_risk/case_2/site_model.csv b/...ta/scenario_damage/case_21/site_model.csv → ...infrastructure_risk/case_2/site_model.csv