faster to use series.map if zone_ids is a series

bstabler · bstabler · commit c8e05f87d5dd · 2021-08-01T09:12:52.000-07:00
diff --git a/activitysim/core/skim_dictionary.py b/activitysim/core/skim_dictionary.py
@@ -123,8 +123,13 @@ def map(self, zone_ids):
         if self.offset_series is not None:
             assert(self.offset_int is None)
             assert isinstance(self.offset_series, pd.Series)
-            # FIXME - faster to use series.map if zone_ids is a series?
-            offsets = quick_loc_series(zone_ids, self.offset_series).fillna(NOT_IN_SKIM_ZONE_ID).astype(int)
+
+            # FIXME - turns out it is faster to use series.map if zone_ids is a series
+            # offsets = quick_loc_series(zone_ids, self.offset_series).fillna(NOT_IN_SKIM_ZONE_ID).astype(int)
+
+            if isinstance(zone_ids, np.ndarray):
+                zone_ids = pd.Series(zone_ids)
+            offsets = zone_ids.map(self.offset_series, na_action='ignore').fillna(NOT_IN_SKIM_ZONE_ID).astype(int)
 
         elif self.offset_int:
             assert (self.offset_series is None)
