Change baseline zonedata folder name (#413)

Author: Jens West

Scripts/helmet.py

@@ -19,7 +19,7 @@ def main(args):
     else:
         raise ArgumentTypeError(
             "Iteration number {} not valid".format(args.iterations))
-    base_zonedata_path = os.path.join(args.baseline_data_path, "2016_zonedata")
+    base_zonedata_path = os.path.join(args.baseline_data_path, "2018_zonedata")
     base_matrices_path = os.path.join(args.baseline_data_path, "base_matrices")
     forecast_zonedata_path = args.forecast_data_path
     results_path = args.results_path

Scripts/helmet_validate_inputfiles.py

@@ -11,7 +11,7 @@
 
 
 def main(args):
-    base_zonedata_path = os.path.join(args.baseline_data_path, "2016_zonedata")
+    base_zonedata_path = os.path.join(args.baseline_data_path, "2018_zonedata")
     base_matrices_path = os.path.join(args.baseline_data_path, "base_matrices")
     emme_paths = args.emme_paths
     first_scenario_ids = args.first_scenario_ids

Scripts/tests/integration/test_data_handling.py

@@ -57,15 +57,15 @@ class ZoneDataTest(unittest.TestCase):
 
     def _get_freight_data_2016(self):
         zdata = ZoneData(
-            os.path.join(TEST_DATA_PATH, "Base_input_data", "2016_zonedata"),
+            os.path.join(TEST_DATA_PATH, "Base_input_data", "2018_zonedata"),
             ZONE_INDEXES)
         df = zdata.get_freight_data()
         self.assertIsNotNone(df)
         return df
 
     def test_csv_file_read(self):
         zdata2016 = ZoneData(
-            os.path.join(TEST_DATA_PATH, "Base_input_data", "2016_zonedata"),
+            os.path.join(TEST_DATA_PATH, "Base_input_data", "2018_zonedata"),
             ZONE_INDEXES)
         self.assertIsNotNone(zdata2016["population"])
         self.assertIsNotNone(zdata2016["workplaces"])

Scripts/tests/integration/test_models.py

@@ -29,7 +29,7 @@ def test_models(self):
         zone_data_path = os.path.join(
             TEST_DATA_PATH, "Scenario_input_data", "2030_test")
         base_zone_data_path = os.path.join(
-            TEST_DATA_PATH, "Base_input_data", "2016_zonedata")
+            TEST_DATA_PATH, "Base_input_data", "2018_zonedata")
         base_matrices_path = os.path.join(
             TEST_DATA_PATH, "Base_input_data", "base_matrices")
         model = ModelSystem(
@@ -65,7 +65,7 @@ def test_agent_model(self):
         zone_data_path = os.path.join(
             TEST_DATA_PATH, "Scenario_input_data", "2030_test")
         base_zone_data_path = os.path.join(
-            TEST_DATA_PATH, "Base_input_data", "2016_zonedata")
+            TEST_DATA_PATH, "Base_input_data", "2018_zonedata")
         base_matrices_path = os.path.join(
             TEST_DATA_PATH, "Base_input_data", "base_matrices")
         model = AgentModelSystem(