Merge branch 'develop_tripDestUpdate' into feature-sharrow-tt

ActivitySim · Dec 22, 2022 · f6ee1e9 · f6ee1e9
2 parents e270830 + b7e08c4
commit f6ee1e9
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/activitysim/abm/models/trip_destination.py b/activitysim/abm/models/trip_destination.py
@@ -983,6 +983,7 @@ def sample_skims(self, presample):
 
         o = self.model_settings["TRIP_ORIGIN"]
         d = self.model_settings["ALT_DEST_COL_NAME"]
+        n = self.model_settings.get("PRIMARY_ORIGIN", "origin")
         p = self.model_settings["PRIMARY_DEST"]
 
         if presample:
@@ -994,6 +995,8 @@ def sample_skims(self, presample):
         skims = {
             "od_skims": skim_dict.wrap(o, d),
             "dp_skims": skim_dict.wrap(d, p),
+            "op_skims": skim_dict.wrap(o, p),
+            "nd_skims": skim_dict.wrap(n, d),
             "odt_skims": skim_dict.wrap_3d(
                 orig_key=o, dest_key=d, dim3_key="trip_period"
             ),
@@ -1006,6 +1009,18 @@ def sample_skims(self, presample):
             "pdt_skims": skim_dict.wrap_3d(
                 orig_key=p, dest_key=d, dim3_key="trip_period"
             ),
+            "opt_skims": skim_dict.wrap_3d(
+                orig_key=o, dest_key=p, dim3_key="trip_period"
+            ),
+            "pot_skims": skim_dict.wrap_3d(
+                orig_key=p, dest_key=o, dim3_key="trip_period"
+            ),
+            "ndt_skims": skim_dict.wrap_3d(
+                orig_key=n, dest_key=d, dim3_key="trip_period"
+            ),
+            "dnt_skims": skim_dict.wrap_3d(
+                orig_key=d, dest_key=n, dim3_key="trip_period"
+            ),
         }
 
         return skims