Trip Scheduling Choice -- Same Results Single Process and Multi-Process (#1005)

* single process run with

* ensured schedule order when generating alternatives

* trip scheduling choice test fix

* scheduling choice fix with linting

* trip departture choice test fix

* deleted extra outputs folder

* restoring deleted arc test files

* deleting extra added files

* more file cleanup

* removing arc from CI test list

* improved testing (#10)

* improved testing

* blacken

* stable sorting

* blacken

* addressing review comments

---------

Co-authored-by: juangacosta <juan.acosta@rsginc.com>
Co-authored-by: Jeffrey Newman <jeff@driftless.xyz>

Author: 3 people

activitysim/abm/models/trip_scheduling_choice.py

@@ -18,6 +18,7 @@
     PreprocessorSettings,
     PydanticReadable,
 )
+from activitysim.core.configuration.logit import LogitComponentSettings
 from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
 from activitysim.core.skim_dataset import SkimDataset
 from activitysim.core.skim_dictionary import SkimDict
@@ -81,6 +82,8 @@ def generate_schedule_alternatives(tours):
 
     schedules = pd.concat([no_stops, one_way, two_way], sort=True)
     schedules[SCHEDULE_ID] = np.arange(1, schedules.shape[0] + 1)
+    # this sort is necessary to keep single process and multiprocess results the same!
+    schedules.sort_values(by=["tour_id", SCHEDULE_ID], inplace=True)
 
     return schedules
 
@@ -207,9 +210,7 @@ def get_spec_for_segment(
     :return: array of utility equations
     """
 
-    omnibus_spec = state.filesystem.read_model_spec(
-        file_name=model_settings.SPECIFICATION
-    )
+    omnibus_spec = state.filesystem.read_model_spec(file_name=model_settings.SPEC)
 
     spec = omnibus_spec[[segment]]
 
@@ -344,21 +345,12 @@ def run_trip_scheduling_choice(
     return tours
 
 
-class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
+class TripSchedulingChoiceSettings(LogitComponentSettings, extra="forbid"):
     """
     Settings for the `trip_scheduling_choice` component.
     """
 
-    PREPROCESSOR: PreprocessorSettings | None = None
-    """Setting for the preprocessor."""
-    alts_preprocessor: PreprocessorSettings | None = None
-    """Setting for the alternatives preprocessor."""
-
-    SPECIFICATION: str
-    """file name of specification file"""
-
-    compute_settings: ComputeSettings = ComputeSettings()
-    """Compute settings for this component."""
+    pass
 
 
 @workflow.step

activitysim/abm/test/test_misc/configs_test_misc/network_los.yaml

@@ -0,0 +1,14 @@
+# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
+read_skim_cache: False
+# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
+write_skim_cache: True
+
+zone_system: 1
+
+taz_skims: skims.omx
+
+skim_time_periods:
+    time_window: 1440
+    period_minutes: 60
+    periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
+    labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']

activitysim/abm/test/test_misc/configs_test_misc/settings_60_min.yaml

@@ -0,0 +1,9 @@
+zone_system: 1
+
+taz_skims: z1_taz_skims.omx
+
+skim_time_periods:
+    time_window: 1440
+    period_minutes: 60
+    periods: [0, 6, 11, 16, 20, 24]
+    labels: ['EA', 'AM', 'MD', 'PM', 'EV']