Skip to content

faster maz-to-maz lookups #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 4, 2021
Merged

faster maz-to-maz lookups #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f86eb55
for #431
bstabler Jun 25, 2021
a7689e6
Merge remote-tracking branch 'remotes/origin/develop' into faster-maz…
bstabler Jul 28, 2021
c8e05f8
faster to use series.map if zone_ids is a series
bstabler Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions activitysim/core/skim_dictionary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
21 changes: 1 addition & 20 deletions activitysim/core/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,32 +243,13 @@ def quick_loc_df(loc_list, target_df, attribute=None):
-------
pandas.DataFrame or, if attribbute specified, pandas.Series
"""

left_on = "left"

if isinstance(loc_list, pd.Int64Index):
left_df = pd.DataFrame({left_on: loc_list.values})
elif isinstance(loc_list, pd.Series):
left_df = loc_list.to_frame(name=left_on)
elif isinstance(loc_list, np.ndarray):
left_df = pd.DataFrame({left_on: loc_list})
else:
raise RuntimeError("quick_loc_df loc_list of unexpected type %s" % type(loc_list))

if attribute:
target_df = target_df[[attribute]]

df = pd.merge(left_df,
target_df,
left_on=left_on,
right_index=True,
how="left").set_index(left_on)
df = target_df.reindex(loc_list)

df.index.name = target_df.index.name

# regression test
# assert df.equals(target_df.loc[loc_list])

if attribute:
# return series
return df[attribute]
Expand Down