Add mode validation (#479)

* Add mode validation

* Refactor and fix test

* Fix mode import

* Add newline at end of file

* Add line

* Update validate_network.py

Co-authored-by: Johanna Piipponen <johanna.piipponen@hsl.fi>

Author: zptro

Scripts/assignment/emme_bindings/mock_project.py

@@ -4,6 +4,14 @@
 import os
 
 
+MODE_TYPES = {
+    "1": "AUTO",
+    "2": "TRANSIT",
+    "3": "AUX_TRANSIT",
+    "4": "AUX_AUTO",
+}
+
+
 class MockProject:
     """Mock-up version of `EmmeProject`.
 
@@ -87,7 +95,13 @@ def mode_transaction(self, transaction_file, revert_on_error=True,
                 if f.readline() == "t modes\n":
                     break
             while True:
-                rec = f.readline().split()
+                rec = f.readline().split("'")
+                if len(rec) == 3:
+                    rec = rec[0].split() + [rec[1]] + rec[2].split()
+                elif len(rec) <= 1:
+                    rec = rec[0].split()
+                else:
+                    raise SyntaxError("Extra single quotes (') found in mode table")
                 if not rec:
                     break
                 if rec[0] == "c":
@@ -97,11 +111,13 @@ def mode_transaction(self, transaction_file, revert_on_error=True,
                     pass
                 else:
                     if rec[0] == "a":
-                        network.create_mode(mode_type=rec[3], idx=rec[1])
+                        mode = network.create_mode(
+                            mode_type=MODE_TYPES[rec[3]], idx=rec[1])
                     elif rec[0] == "m":
-                        network.mode(idx=rec[1])
+                        mode = network.mode(idx=rec[1])
                     else:
                         raise SyntaxError("Unknown update code")
+                    mode.description = rec[2]
 
     def base_network_transaction(self, transaction_file, revert_on_error=True,
                                  scenario=None):
@@ -490,7 +506,7 @@ def modes(self):
     def create_mode(self, mode_type, idx):
         if not isinstance(idx, str) or len(idx) != 1:
             raise Exception("Invalid mode ID: " + idx)
-        mode = Mode(idx)
+        mode = Mode(idx, mode_type)
         self._modes[idx] = mode
         return mode
 
@@ -569,8 +585,10 @@ def create_transit_line(self, idx, transit_vehicle_id, itinerary):
 
 
 class Mode:
-    def __init__(self, idx):
+    def __init__(self, idx, mode_type):
         self.id = idx
+        self.type = mode_type
+        self.description = ""
 
     def __str__(self):
         return self.id

Scripts/utils/validate_network.py

@@ -4,6 +4,11 @@
 import parameters.assignment as param
 
 
+EMME_AUTO_MODE = "AUTO"
+EMME_AUX_AUTO_MODE = "AUX_AUTO"
+EMME_TRANSIT_MODE = "TRANSIT"
+EMME_AUX_TRANSIT_MODE = "AUX_TRANSIT"
+
 def validate(network, fares=None):
     """Validate EMME network in terms of HELMET compatibility.
 
@@ -42,6 +47,13 @@ def validate(network, fares=None):
                 found_zone_share)
             log.error(msg)
             raise ValueError(msg)
+    validate_mode(network, param.main_mode, EMME_AUTO_MODE)
+    for m in param.assignment_modes.values():
+        validate_mode(network, m, EMME_AUX_AUTO_MODE)
+    for m in param.transit_modes:
+        validate_mode(network, m, EMME_TRANSIT_MODE)
+    for m in param.aux_modes + [param.bike_mode]:
+        validate_mode(network, m, EMME_AUX_TRANSIT_MODE)
     modesets = []
     intervals = []
     for modes in param.official_node_numbers:
@@ -88,3 +100,10 @@ def validate(network, fares=None):
                 msg = "Headway missing for line {}".format(line.id)
                 log.error(msg)
                 raise ValueError(msg)
+
+def validate_mode(network, m, mode_type):
+    mode = network.mode(m)
+    if mode is None or mode.type != mode_type:
+        msg = f"{m} is not {mode_type} mode"
+        log.error(msg)
+        raise ValueError(msg)