removing tests and examples

Author: dhensle

.github/workflows/core_tests.yml

@@ -142,9 +142,7 @@ jobs:
         region:
           - prototype_mtc
           - placeholder_psrc
-          - prototype_marin
           - prototype_mtc_extended
-          - prototype_sandag_xborder
           - production_semcog
           - prototype_mwcog
           - placeholder_multiple_zone

activitysim/abm/models/trip_matrices.py

@@ -62,15 +62,13 @@ def write_trip_matrices(
     then aggregates trip counts and writes OD matrices to OMX.  Save annotated
     trips table to pipeline if desired.
 
-    Writes taz trip tables for one and two zone system.  Writes taz and tap
-    trip tables for three zone system.  Add ``is_tap:True`` to the settings file
-    to identify an output matrix as tap level trips as opposed to taz level trips.
+    Writes taz trip tables for one and two zone system.  Add ``is_tap:True`` to
+    the settings file to identify an output matrix as tap level trips as opposed
+    to taz level trips.
 
     For one zone system, uses the land use table for the set of possible tazs.
-    For two zone system, uses the taz skim zone names for the set of possible tazs.
-    For three zone system, uses the taz skim zone names for the set of possible tazs
-    and uses the tap skim zone names for the set of possible taps.
-
+    For two zone system, uses the taz skim zone names for the set of possible
+    tazs.
     """
 
     if trips is None:

activitysim/core/flow.py

@@ -518,7 +518,7 @@ def new_flow(
     zone_layer : {'taz', 'maz'}, default 'taz'
         Specify which zone layer of the skims is to be used.  You cannot use the
         'maz' zone layer in a one-zone model, but you can use the 'taz' layer in
-        a two- or three-zone model (e.g. for destination pre-sampling).
+        a two-zone model (e.g. for destination pre-sampling).
     aux_vars : Mapping
         Extra values that are available to expressions and which are written
         only by reference into compiled code (and thus can be changed later).
@@ -789,7 +789,7 @@ def apply_flow(
     zone_layer : {'taz', 'maz'}, default 'taz'
         Specify which zone layer of the skims is to be used.  You cannot use the
         'maz' zone layer in a one-zone model, but you can use the 'taz' layer in
-        a two- or three-zone model (e.g. for destination pre-sampling).
+        a two-zone model (e.g. for destination pre-sampling).
     compute_settings : ComputeSettings, optional
         Settings for the sharrow flow, including for skipping and fastmath.
 

activitysim/core/interaction_sample.py

@@ -181,7 +181,7 @@ def _interaction_sample(
     zone_layer : {'taz', 'maz'}, default 'taz'
         Specify which zone layer of the skims is to be used.  You cannot use the
         'maz' zone layer in a one-zone model, but you can use the 'taz' layer in
-        a two- or three-zone model (e.g. for destination pre-sampling).
+        a two-zone model (e.g. for destination pre-sampling).
 
     compute_settings : ComputeSettings, optional
         Settings to use if compiling with sharrow
@@ -643,7 +643,7 @@ def interaction_sample(
     zone_layer : {'taz', 'maz'}, default 'taz'
         Specify which zone layer of the skims is to be used.  You cannot use the
         'maz' zone layer in a one-zone model, but you can use the 'taz' layer in
-        a two- or three-zone model (e.g. for destination pre-sampling).
+        a two-zone model (e.g. for destination pre-sampling).
     explicit_chunk_size : float, optional
         If > 0, specifies the chunk size to use when chunking the interaction
         simulation. If < 1, specifies the fraction of the total number of choosers.

activitysim/core/interaction_simulate.py

@@ -73,7 +73,7 @@ def eval_interaction_utilities(
     zone_layer : {'taz', 'maz'}, default 'taz'
         Specify which zone layer of the skims is to be used.  You cannot use the
         'maz' zone layer in a one-zone model, but you can use the 'taz' layer in
-        a two- or three-zone model (e.g. for destination pre-sampling).
+        a two-zone model (e.g. for destination pre-sampling).
 
     Returns
     -------

activitysim/core/skim_dataset.py

@@ -603,14 +603,14 @@ def load_sparse_maz_skims(
     dataset : xarray.Dataset
         The existing dataset at TAZ resolution only.
     land_use_index : pandas.Index
-        The index of the land use table.  For two and three zone systems,
+        The index of the land use table.  For two zone systems,
         these index values should be MAZ identifiers.
     remapper : dict, optional
         A dictionary mapping where the keys are the original (nominal) zone
         id's, and the values are the recoded (typically zero-based contiguous)
         zone id's.  Recoding improves runtime efficiency.
     zone_system : int
-        Currently 1, 2 and 3 are supported.
+        Currently 1 and 2 are supported.
     maz2taz_file_name : str
     maz_to_maz_tables : Collection[]
     max_blend_distance : optional

activitysim/core/test/test_los.py

@@ -133,30 +133,6 @@ def test_two_zone():
         pdt.assert_series_equal(skims["DIST"], dist)
 
 
-def test_three_zone():
-    state = add_canonical_dirs("configs_3z").load_settings()
-
-    network_los = los.Network_LOS(state)
-
-    assert network_los.setting("zone_system") == los.THREE_ZONE
-
-    assert "z3_taz_skims.omx" in network_los.omx_file_names("taz")
-
-    assert network_los.blend_distance_skim_name == "DIST"
-
-    network_los.load_data()
-
-    od_df = pd.DataFrame(
-        {
-            "orig": [1000, 2000, 23000, 23000, 23000],
-            "dest": [2000, 2000, 20000, 21000, 22000],
-        }
-    )
-
-    dist = network_los.get_mazpairs(od_df.orig, od_df.dest, "DIST").astype(np.float32)
-    np.testing.assert_almost_equal(dist, [0.24, 0.14, 2.55, 1.9, 0.62])
-
-
 def test_30_minute_windows():
     state = add_canonical_dirs("configs_test_misc").default_settings()
     network_los = los.Network_LOS(state, los_settings_file_name="settings_30_min.yaml")