* commented broken parts

* some analytics things, graph distance cache size increased

* added external cost, renamed class to cls/lower cased some things

* fixed some bugs

* more analytics stuff

* formatting

* fixed analytics bug where the avg stoplist length was computed incorrectly, and cython continuous space bug, where the coord_range was not pickled

* seat capacity and idling duration

Author: fxjung

ridepy/cli.py

@@ -13,12 +13,19 @@
 
 @cli.command()
 def update_filenames(
-    directory: Optional[Path] = typer.Option(
+    directory: Optional[Path] = typer.Argument(
         None, dir_okay=True, file_okay=False, exists=True
     )
 ):
     """
-    Update filenames to current simulation ids.
+    Update filenames and JSON structure to up-to-date simulation ids.
+
+    This reads all `.json` files, tries to parse the possibly
+    outdated format and generates a simulation id according
+    to the current scheme. Afterwards, new JSON files are stored using the
+    current format at `<new id>.json`.
+    The simulation data files ending with `.jsonl` are not modified. Instead,
+    symbolic links are created, pointing from `<new id>.jsonl` to `<old id>.jsonl`.
     """
     if directory is None:
         directory = Path.cwd()
@@ -35,7 +42,7 @@ def update_events_files(
     ),
 ):
     """
-    Update events files (*.jsonl) to current, flattened structure
+    Update events files (*.jsonl) to current, flattened structure.
     """
     if directory is None:
         directory = Path.cwd()

ridepy/extras/io_utils.py

@@ -10,6 +10,7 @@
 from pathlib import Path
 
 import loky
+from tqdm import tqdm
 
 from ridepy.extras.io import read_params_json, create_params_json, ParamsJSONDecoder
 from ridepy.extras.simulation_set import SimulationSet, make_file_path
@@ -44,7 +45,7 @@ def update_filenames(target_directory_path: Path):
 
     new_default_base_params = SimulationSet(data_dir=Path()).default_base_params
 
-    for old_id in old_ids:
+    for old_id in tqdm(old_ids):
         old_params_path = get_params_path(old_id)
         old_events_path = get_events_path(old_id)
 
@@ -70,6 +71,11 @@ def update_filenames(target_directory_path: Path):
                 "taxicab_dispatcher_drive_first",
                 "TaxicabDispatcherDriveFirst",
             )
+            .replace("TransportationRequestCls", "transportation_request_cls")
+            .replace("VehicleStateCls", "vehicle_state_cls")
+            .replace("FleetStateCls", "fleet_state_cls")
+            .replace("RequestGeneratorCls", "request_generator_cls")
+            .replace("dispatcher_class", "dispatcher_cls")
         )
 
         params = json.loads(params_json, cls=ParamsJSONDecoder)
@@ -82,7 +88,7 @@ def update_filenames(target_directory_path: Path):
                 )
 
         if "general" in params and "dispatcher" in params["general"]:
-            params["dispatcher"]["dispatcher_class"] = params["general"]["dispatcher"]
+            params["dispatcher"]["dispatcher_cls"] = params["general"]["dispatcher"]
             del params["general"]["dispatcher"]
 
         new_params_json = create_params_json(params=params)

ridepy/extras/simulation_set.py

@@ -173,13 +173,13 @@ def perform_single_simulation(
             - ``seat_capacity``
             - (``initial_location`` and ``n_vehicles``) or ``initial_locations``
             - ``space``
-            - ``TransportationRequestCls``
-            - ``VehicleStateCls``
-            - ``FleetStateCls``
+            - ``transportation_request_cls``
+            - ``vehicle_state_cls``
+            - ``fleet_state_cls``
         - ``request_generator``
-            - ``RequestGeneratorCls``
+            - ``request_generator_cls``
         - ``dispatcher``
-            - ``dispatcher_class``
+            - ``dispatcher_cls``
             - ...
     data_dir
         Existing directory in which to store parameters and events.
@@ -224,14 +224,14 @@ def perform_single_simulation(
             event_path.unlink()
 
     space = params["general"]["space"]
-    RequestGeneratorCls = params["request_generator"].pop("RequestGeneratorCls")
-    rg = RequestGeneratorCls(
+    request_generator_cls = params["request_generator"].pop("request_generator_cls")
+    rg = request_generator_cls(
         space=space,
-        request_class=params["general"]["TransportationRequestCls"],
+        request_class=params["general"]["transportation_request_cls"],
         **params["request_generator"],
     )
 
-    dispatcher = params["dispatcher"].pop("dispatcher_class")
+    dispatcher = params["dispatcher"].pop("dispatcher_cls")
     if (
         params["general"].get("n_vehicles") is not None
         and params["general"].get("initial_location") is not None
@@ -256,12 +256,12 @@ def perform_single_simulation(
             "must either specify 'n_vehicles' and 'initial_location' or 'initial_locations'"
         )
 
-    fs = params["general"]["FleetStateCls"](
+    fs = params["general"]["fleet_state_cls"](
         initial_locations=initial_locations,
         space=space,
         dispatcher=dispatcher(loc_type=space.loc_type, **params["dispatcher"]),
         seat_capacities=params["general"]["seat_capacity"],
-        vehicle_state_class=params["general"]["VehicleStateCls"],
+        vehicle_state_class=params["general"]["vehicle_state_cls"],
     )
 
     # NOTE: this string is matched for testing
@@ -496,39 +496,35 @@ def __init__(
         self._param_path_suffix = param_path_suffix
 
         if cython:
-            SpaceObj = CyEuclidean2D()
+            space_obj = CyEuclidean2D()
             dispatcher = CyBruteForceTotalTravelTimeMinimizingDispatcher
-            TransportationRequestCls = CyTransportationRequest
-            VehicleStateCls = CyVehicleState
+            transportation_request_cls = CyTransportationRequest
+            vehicle_state_cls = CyVehicleState
         else:
-            SpaceObj = Euclidean2D()
+            space_obj = Euclidean2D()
             dispatcher = BruteForceTotalTravelTimeMinimizingDispatcher
-            TransportationRequestCls = TransportationRequest
-            VehicleStateCls = VehicleState
+            transportation_request_cls = TransportationRequest
+            vehicle_state_cls = VehicleState
 
-        FleetStateCls = SlowSimpleFleetState
-        RequestGeneratorCls = RandomRequestGenerator
+        fleet_state_cls = SlowSimpleFleetState
+        request_generator_cls = RandomRequestGenerator
 
         self.default_base_params = dict(
             general=dict(
                 n_reqs=100,
                 t_cutoff=None,
-                space=SpaceObj,
+                space=space_obj,
                 n_vehicles=10,
                 initial_location=(0, 0),
                 initial_locations=None,
                 seat_capacity=8,
-                TransportationRequestCls=TransportationRequestCls,
-                VehicleStateCls=VehicleStateCls,
-                FleetStateCls=FleetStateCls,
+                transportation_request_cls=transportation_request_cls,
+                vehicle_state_cls=vehicle_state_cls,
+                fleet_state_cls=fleet_state_cls,
             ),
-            dispatcher=dict(dispatcher_class=dispatcher),
+            dispatcher=dict(dispatcher_cls=dispatcher),
             request_generator=dict(
-                RequestGeneratorCls=RequestGeneratorCls,
-                rate=10,
-                max_pickup_delay=3,
-                max_delivery_delay_rel=1.9,
-                seed=42,
+                request_generator_cls=request_generator_cls,
             ),
         )