Handling of mexico-city survey data for scenario generation

matsim/scenariogen/__main__.py

@@ -3,14 +3,14 @@
 
 import argparse
 
-from .data import run_create_ref_data
-from .data import run_extract_activities
-from .data import run_lookup_regiostar
-from .network import run_collect_results
-from .network import run_edges as sumo_edges
-from .network import run_intersections as sumo_intersections
-from .network import run_routes as sumo_routes
-from .network import run_train_model
+# from matsim.scenariogen.data import run_create_ref_data
+from data import run_extract_activities
+# from matsim.scenariogen.data import run_lookup_regiostar
+# from matsim.scenariogen.network import run_collect_results
+# from matsim.scenariogen.network import run_edges as sumo_edges
+# from matsim.scenariogen.network import run_intersections as sumo_intersections
+# from matsim.scenariogen.network import run_routes as sumo_routes
+# from matsim.scenariogen.network import run_train_model
 
 
 def _add(subparsers, m):
@@ -28,11 +28,11 @@ def main():
 
     subparsers = parser.add_subparsers(title="Subcommands")
 
-    _add(subparsers, sumo_edges)
-    _add(subparsers, sumo_routes)
-    _add(subparsers, sumo_intersections)
-    _add(subparsers, run_train_model)
-    _add(subparsers, run_collect_results)
+    # _add(subparsers, sumo_edges)
+    # _add(subparsers, sumo_routes)
+    # _add(subparsers, sumo_intersections)
+    # _add(subparsers, run_train_model)
+    # _add(subparsers, run_collect_results)
 
     try:
         from .network import run_opt_freespeed
@@ -41,8 +41,8 @@ def main():
         print("Opt freespeed not available", e)
 
     _add(subparsers, run_extract_activities)
-    _add(subparsers, run_create_ref_data)
-    _add(subparsers, run_lookup_regiostar)
+    # _add(subparsers, run_create_ref_data)
+    # _add(subparsers, run_lookup_regiostar)
 
     args = parser.parse_args()
 

matsim/scenariogen/data/__init__.py

@@ -30,7 +30,7 @@ def _batch(iterable: list, max_batch_size: int):
 def read_all(dirs: Union[str, List[str]], regio=None) -> Tuple[pd.DataFrame]:
     """ Scan directories and read everything into one dataframe """
 
-    from .formats import srv, mid
+    from .formats import srv, mid, eodmx
 
     hh = []
     pp = []
@@ -42,7 +42,7 @@ def read_all(dirs: Union[str, List[str]], regio=None) -> Tuple[pd.DataFrame]:
 
     for d in dirs:
 
-        for format in (srv, mid):
+        for format in (srv, mid, eodmx):
 
             files = []
 
@@ -112,14 +112,16 @@ class HouseholdType(AutoNameLowerStrEnum):
     MULTI_W_CHILDREN = auto()
     MULTI_WO_CHILDREN = auto()
     SINGLE = auto()
+    UNKNOWN = auto()
 
 
 class EconomicStatus(AutoNameLowerStrEnum):
-    VERY_LOW = auto()
+    # VERY_LOW = auto()
     LOW = auto()
-    MEDIUM = auto()
+    MEDIUMLOW= auto()
+    MEDIUMHIGH= auto()
     HIGH = auto()
-    VERY_HIGH = auto()
+    # VERY_HIGH = auto()
     UNKNOWN = auto()
 
 
@@ -189,6 +191,7 @@ class TripMode(AutoNameLowerStrEnum):
     PT = auto()
     MOTORCYCLE = auto()
     OTHER = auto()
+    COLECTIVO = auto()
 
 
 class DistanceGroup(AutoNameLowerStrEnum):
@@ -262,6 +265,7 @@ class SourceDestinationGroup(AutoNameLowerStrEnum):
     OTHER_WORK = auto()
     WORK_OTHER = auto()
     OTHER_OTHER = auto()
+    VISIT_OTHER = auto()
 
     UNKNOWN = auto()
 
@@ -309,6 +313,7 @@ class Person:
     present_on_day: bool
     reporting_day: int
     n_trips: int
+    home_district: str = ""
 
 
 @dataclass
@@ -327,16 +332,24 @@ class Trip:
     purpose: Purpose
     sd_group: SourceDestinationGroup
     valid: bool
+    dep_district: str = ""
+    arr_district: str = ""
+    arrival: int = 0
 
 
 @dataclass
 class Activity:
     """ Activity information (including leg) """
+    # all leg information relates to the leg leading to the activity
     a_id: str
-    p_id: str
+    p_index: str
     n: int
     type: Purpose
     duration: int
     leg_dist: float
     leg_duration: float
     leg_mode: TripMode
+    leg_dep_district: str = ""
+    leg_arr_district: str = ""
+    leg_departure: int = 0
+    start_time: int = 0

matsim/scenariogen/data/formats/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__all__ = ["srv", "mid"]
+__all__ = ["srv", "mid", "eodmx"]