Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 39 additions & 8 deletions activitysim/abm/tables/disaggregate_accessibility.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,41 @@ def find_nearest_accessibility_zone(
def weighted_average(df, values, weights):
return df[values].T.dot(df[weights]) / df[weights].sum()

def nearest_skim(oz, zones):
# need to pass equal # of origins and destinations to skim_dict
orig_zones = np.full(shape=len(zones), fill_value=oz, dtype=int)
return (
oz,
zones[np.argmin(skim_dict.lookup(orig_zones, zones, "DIST"))],
)
def find_nearest_zones_via_skims(origin_zones, dest_zones, skim_dict):
"""
Vectorized lookup to find nearest destination zone for each origin zone.
Performs a single batched skim lookup instead of one per origin zone.
"""
origin_zones = np.asarray(origin_zones)
dest_zones = np.asarray(dest_zones)
n_origins = len(origin_zones)
n_dests = len(dest_zones)

# handle empty input case
if n_origins == 0 or n_dests == 0:
return []

# Process in batches to avoid allocating arrays of size n_origins * n_dests
max_pairs = 5_000_000
batch_size = max(1, int(max_pairs // n_dests))

results = []
for start in range(0, n_origins, batch_size):
batch_orig = origin_zones[start : start + batch_size]

# create all origin-destination pairs for this batch
all_orig = np.repeat(batch_orig, n_dests)
all_dest = np.tile(dest_zones, len(batch_orig))

# single skim lookup for all pairs in the batch
all_dists = skim_dict.lookup(all_orig, all_dest, "DIST")
dist_matrix = np.asarray(all_dists).reshape(len(batch_orig), n_dests)

# find the index of the nearest destination zone for each origin in the batch
nearest_indices = np.argmin(dist_matrix, axis=1)
results.extend(zip(batch_orig, dest_zones[nearest_indices]))

return results

def nearest_node(oz, zones_df):
_idx = util.nearest_node_index(_centroids.loc[oz].XY, zones_df.to_list())
Expand DownExpand Up@@ -70,7 +98,10 @@ def nearest_node(oz, zones_df):

else:
skim_dict = state.get_injectable("skim_dict")
nearest = [nearest_skim(Oz, accessibility_zones) for Oz in unmatched_zones]
# Vectorized lookup: single skim call for all origin-destination pairs
nearest = find_nearest_zones_via_skims(
unmatched_zones, accessibility_zones, skim_dict
)

# Add the nearest zones to the matched zones
matched = [(x, x) for x in matched_zones]
Expand Down
43 changes: 42 additions & 1 deletion activitysim/core/skim_dictionary.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ class OffsetMapper(object):

def __init__(self, offset_int=None, offset_list=None, offset_series=None):
self.offset_int = self.offset_series = None
self._offset_array = None # numpy array for fast O(1) lookups

assert (offset_int is not None) + (offset_list is not None) + (
offset_series is not None
Expand DownExpand Up@@ -72,6 +73,28 @@ def set_offset_series(self, offset_series):
self.offset_series = offset_series
self.offset_int = None

# Build numpy lookup array for fast O(1) mapping
# This replaces slow pandas Series.map() with direct numpy indexing
index_vals = offset_series.index.values
if len(index_vals) > 0:
min_zone = int(index_vals.min())
max_zone = int(index_vals.max())
span = max_zone - min_zone + 1
# Only build array if zone IDs are non-negative and range is reasonable
# (avoid huge arrays for sparse zone IDs)
if min_zone >= 0 and span <= len(index_vals) * 10:
self._offset_array_min_zone = min_zone
self._offset_array = np.full(span, NOT_IN_SKIM_ZONE_ID, dtype=np.int32)
self._offset_array[
index_vals.astype(int) - min_zone
] = offset_series.values.astype(np.int32)
else:
self._offset_array = None
self._offset_array_min_zone = 0
else:
self._offset_array = None
self._offset_array_min_zone = 0

def set_offset_list(self, offset_list):
"""
Convenience method to set offset_series using an integer list the same size as target skim dimension
Expand DownExpand Up@@ -110,6 +133,7 @@ def set_offset_int(self, offset_int):

self.offset_int = int(offset_int)
self.offset_series = None
self._offset_array = None # not needed for simple int offset

def map(self, zone_ids):
"""
Expand All@@ -124,7 +148,24 @@ def map(self, zone_ids):
offsets : numpy array of int
"""

if self.offset_series is not None:
if self._offset_array is not None:
# Fast path: use numpy array indexing (O(1) per element)
zone_ids = np.asanyarray(zone_ids).astype(int)
min_zone = getattr(self, "_offset_array_min_zone", 0)
idx = zone_ids - min_zone
# Clip to valid range to avoid index errors, then mark out-of-range as NOT_IN_SKIM
max_valid = len(self._offset_array) - 1
valid_mask = (idx >= 0) & (idx <= max_valid)
# Use clip to safely index, then apply mask
clipped_idx = np.clip(idx, 0, max_valid)
offsets = np.where(
valid_mask,
self._offset_array[clipped_idx],
NOT_IN_SKIM_ZONE_ID,
)
return offsets

elif self.offset_series is not None:
assert self.offset_int is None
assert isinstance(self.offset_series, pd.Series)

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 39 additions & 8 deletions activitysim/abm/tables/disaggregate_accessibility.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,41 @@ def find_nearest_accessibility_zone(
def weighted_average(df, values, weights):
return df[values].T.dot(df[weights]) / df[weights].sum()

def nearest_skim(oz, zones):
# need to pass equal # of origins and destinations to skim_dict
orig_zones = np.full(shape=len(zones), fill_value=oz, dtype=int)
return (
oz,
zones[np.argmin(skim_dict.lookup(orig_zones, zones, "DIST"))],
)
def find_nearest_zones_via_skims(origin_zones, dest_zones, skim_dict):
"""
Vectorized lookup to find nearest destination zone for each origin zone.
Performs a single batched skim lookup instead of one per origin zone.
"""
origin_zones = np.asarray(origin_zones)
dest_zones = np.asarray(dest_zones)
n_origins = len(origin_zones)
n_dests = len(dest_zones)

# handle empty input case
if n_origins == 0 or n_dests == 0:
return []

# Process in batches to avoid allocating arrays of size n_origins * n_dests
max_pairs = 5_000_000
batch_size = max(1, int(max_pairs // n_dests))

results = []
for start in range(0, n_origins, batch_size):
batch_orig = origin_zones[start : start + batch_size]

# create all origin-destination pairs for this batch
all_orig = np.repeat(batch_orig, n_dests)
all_dest = np.tile(dest_zones, len(batch_orig))

# single skim lookup for all pairs in the batch
all_dists = skim_dict.lookup(all_orig, all_dest, "DIST")
dist_matrix = np.asarray(all_dists).reshape(len(batch_orig), n_dests)

# find the index of the nearest destination zone for each origin in the batch
nearest_indices = np.argmin(dist_matrix, axis=1)
results.extend(zip(batch_orig, dest_zones[nearest_indices]))

return results

def nearest_node(oz, zones_df):
_idx = util.nearest_node_index(_centroids.loc[oz].XY, zones_df.to_list())
Expand DownExpand Up@@ -70,7 +98,10 @@ def nearest_node(oz, zones_df):

else:
skim_dict = state.get_injectable("skim_dict")
nearest = [nearest_skim(Oz, accessibility_zones) for Oz in unmatched_zones]
# Vectorized lookup: single skim call for all origin-destination pairs
nearest = find_nearest_zones_via_skims(
unmatched_zones, accessibility_zones, skim_dict
)

# Add the nearest zones to the matched zones
matched = [(x, x) for x in matched_zones]
Expand Down
43 changes: 42 additions & 1 deletion activitysim/core/skim_dictionary.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ class OffsetMapper(object):

def __init__(self, offset_int=None, offset_list=None, offset_series=None):
self.offset_int = self.offset_series = None
self._offset_array = None # numpy array for fast O(1) lookups

assert (offset_int is not None) + (offset_list is not None) + (
offset_series is not None
Expand DownExpand Up@@ -72,6 +73,28 @@ def set_offset_series(self, offset_series):
self.offset_series = offset_series
self.offset_int = None

# Build numpy lookup array for fast O(1) mapping
# This replaces slow pandas Series.map() with direct numpy indexing
index_vals = offset_series.index.values
if len(index_vals) > 0:
min_zone = int(index_vals.min())
max_zone = int(index_vals.max())
span = max_zone - min_zone + 1
# Only build array if zone IDs are non-negative and range is reasonable
# (avoid huge arrays for sparse zone IDs)
if min_zone >= 0 and span <= len(index_vals) * 10:
self._offset_array_min_zone = min_zone
self._offset_array = np.full(span, NOT_IN_SKIM_ZONE_ID, dtype=np.int32)
self._offset_array[
index_vals.astype(int) - min_zone
] = offset_series.values.astype(np.int32)
else:
self._offset_array = None
self._offset_array_min_zone = 0
else:
self._offset_array = None
self._offset_array_min_zone = 0

def set_offset_list(self, offset_list):
"""
Convenience method to set offset_series using an integer list the same size as target skim dimension
Expand DownExpand Up@@ -110,6 +133,7 @@ def set_offset_int(self, offset_int):

self.offset_int = int(offset_int)
self.offset_series = None
self._offset_array = None # not needed for simple int offset

def map(self, zone_ids):
"""
Expand All@@ -124,7 +148,24 @@ def map(self, zone_ids):
offsets : numpy array of int
"""

if self.offset_series is not None:
if self._offset_array is not None:
# Fast path: use numpy array indexing (O(1) per element)
zone_ids = np.asanyarray(zone_ids).astype(int)
min_zone = getattr(self, "_offset_array_min_zone", 0)
idx = zone_ids - min_zone
# Clip to valid range to avoid index errors, then mark out-of-range as NOT_IN_SKIM
max_valid = len(self._offset_array) - 1
valid_mask = (idx >= 0) & (idx <= max_valid)
# Use clip to safely index, then apply mask
clipped_idx = np.clip(idx, 0, max_valid)
offsets = np.where(
valid_mask,
self._offset_array[clipped_idx],
NOT_IN_SKIM_ZONE_ID,
)
return offsets

elif self.offset_series is not None:
assert self.offset_int is None
assert isinstance(self.offset_series, pd.Series)

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 39 additions & 8 deletions activitysim/abm/tables/disaggregate_accessibility.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,41 @@ def find_nearest_accessibility_zone(
def weighted_average(df, values, weights):
return df[values].T.dot(df[weights]) / df[weights].sum()

def nearest_skim(oz, zones):
# need to pass equal # of origins and destinations to skim_dict
orig_zones = np.full(shape=len(zones), fill_value=oz, dtype=int)
return (
oz,
zones[np.argmin(skim_dict.lookup(orig_zones, zones, "DIST"))],
)
def find_nearest_zones_via_skims(origin_zones, dest_zones, skim_dict):
"""
Vectorized lookup to find nearest destination zone for each origin zone.
Performs a single batched skim lookup instead of one per origin zone.
"""
origin_zones = np.asarray(origin_zones)
dest_zones = np.asarray(dest_zones)
n_origins = len(origin_zones)
n_dests = len(dest_zones)

# handle empty input case
if n_origins == 0 or n_dests == 0:
return []

# Process in batches to avoid allocating arrays of size n_origins * n_dests
max_pairs = 5_000_000
batch_size = max(1, int(max_pairs // n_dests))

results = []
for start in range(0, n_origins, batch_size):
batch_orig = origin_zones[start : start + batch_size]

# create all origin-destination pairs for this batch
all_orig = np.repeat(batch_orig, n_dests)
all_dest = np.tile(dest_zones, len(batch_orig))

# single skim lookup for all pairs in the batch
all_dists = skim_dict.lookup(all_orig, all_dest, "DIST")
dist_matrix = np.asarray(all_dists).reshape(len(batch_orig), n_dests)

# find the index of the nearest destination zone for each origin in the batch
nearest_indices = np.argmin(dist_matrix, axis=1)
results.extend(zip(batch_orig, dest_zones[nearest_indices]))

return results

def nearest_node(oz, zones_df):
_idx = util.nearest_node_index(_centroids.loc[oz].XY, zones_df.to_list())
Expand DownExpand Up@@ -70,7 +98,10 @@ def nearest_node(oz, zones_df):

else:
skim_dict = state.get_injectable("skim_dict")
nearest = [nearest_skim(Oz, accessibility_zones) for Oz in unmatched_zones]
# Vectorized lookup: single skim call for all origin-destination pairs
nearest = find_nearest_zones_via_skims(
unmatched_zones, accessibility_zones, skim_dict
)

# Add the nearest zones to the matched zones
matched = [(x, x) for x in matched_zones]
Expand Down
43 changes: 42 additions & 1 deletion activitysim/core/skim_dictionary.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ class OffsetMapper(object):

def __init__(self, offset_int=None, offset_list=None, offset_series=None):
self.offset_int = self.offset_series = None
self._offset_array = None # numpy array for fast O(1) lookups

assert (offset_int is not None) + (offset_list is not None) + (
offset_series is not None
Expand DownExpand Up@@ -72,6 +73,28 @@ def set_offset_series(self, offset_series):
self.offset_series = offset_series
self.offset_int = None

# Build numpy lookup array for fast O(1) mapping
# This replaces slow pandas Series.map() with direct numpy indexing
index_vals = offset_series.index.values
if len(index_vals) > 0:
min_zone = int(index_vals.min())
max_zone = int(index_vals.max())
span = max_zone - min_zone + 1
# Only build array if zone IDs are non-negative and range is reasonable
# (avoid huge arrays for sparse zone IDs)
if min_zone >= 0 and span <= len(index_vals) * 10:
self._offset_array_min_zone = min_zone
self._offset_array = np.full(span, NOT_IN_SKIM_ZONE_ID, dtype=np.int32)
self._offset_array[
index_vals.astype(int) - min_zone
] = offset_series.values.astype(np.int32)
else:
self._offset_array = None
self._offset_array_min_zone = 0
else:
self._offset_array = None
self._offset_array_min_zone = 0

def set_offset_list(self, offset_list):
"""
Convenience method to set offset_series using an integer list the same size as target skim dimension
Expand DownExpand Up@@ -110,6 +133,7 @@ def set_offset_int(self, offset_int):

self.offset_int = int(offset_int)
self.offset_series = None
self._offset_array = None # not needed for simple int offset

def map(self, zone_ids):
"""
Expand All@@ -124,7 +148,24 @@ def map(self, zone_ids):
offsets : numpy array of int
"""

if self.offset_series is not None:
if self._offset_array is not None:
# Fast path: use numpy array indexing (O(1) per element)
zone_ids = np.asanyarray(zone_ids).astype(int)
min_zone = getattr(self, "_offset_array_min_zone", 0)
idx = zone_ids - min_zone
# Clip to valid range to avoid index errors, then mark out-of-range as NOT_IN_SKIM
max_valid = len(self._offset_array) - 1
valid_mask = (idx >= 0) & (idx <= max_valid)
# Use clip to safely index, then apply mask
clipped_idx = np.clip(idx, 0, max_valid)
offsets = np.where(
valid_mask,
self._offset_array[clipped_idx],
NOT_IN_SKIM_ZONE_ID,
)
return offsets

elif self.offset_series is not None:
assert self.offset_int is None
assert isinstance(self.offset_series, pd.Series)

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 39 additions & 8 deletions activitysim/abm/tables/disaggregate_accessibility.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,41 @@ def find_nearest_accessibility_zone(
def weighted_average(df, values, weights):
return df[values].T.dot(df[weights]) / df[weights].sum()

def nearest_skim(oz, zones):
# need to pass equal # of origins and destinations to skim_dict
orig_zones = np.full(shape=len(zones), fill_value=oz, dtype=int)
return (
oz,
zones[np.argmin(skim_dict.lookup(orig_zones, zones, "DIST"))],
)
def find_nearest_zones_via_skims(origin_zones, dest_zones, skim_dict):
"""
Vectorized lookup to find nearest destination zone for each origin zone.
Performs a single batched skim lookup instead of one per origin zone.
"""
origin_zones = np.asarray(origin_zones)
dest_zones = np.asarray(dest_zones)
n_origins = len(origin_zones)
n_dests = len(dest_zones)

# handle empty input case
if n_origins == 0 or n_dests == 0:
return []

# Process in batches to avoid allocating arrays of size n_origins * n_dests
max_pairs = 5_000_000
batch_size = max(1, int(max_pairs // n_dests))

results = []
for start in range(0, n_origins, batch_size):
batch_orig = origin_zones[start : start + batch_size]

# create all origin-destination pairs for this batch
all_orig = np.repeat(batch_orig, n_dests)
all_dest = np.tile(dest_zones, len(batch_orig))

# single skim lookup for all pairs in the batch
all_dists = skim_dict.lookup(all_orig, all_dest, "DIST")
dist_matrix = np.asarray(all_dists).reshape(len(batch_orig), n_dests)

# find the index of the nearest destination zone for each origin in the batch
nearest_indices = np.argmin(dist_matrix, axis=1)
results.extend(zip(batch_orig, dest_zones[nearest_indices]))

return results

def nearest_node(oz, zones_df):
_idx = util.nearest_node_index(_centroids.loc[oz].XY, zones_df.to_list())
Expand DownExpand Up@@ -70,7 +98,10 @@ def nearest_node(oz, zones_df):

else:
skim_dict = state.get_injectable("skim_dict")
nearest = [nearest_skim(Oz, accessibility_zones) for Oz in unmatched_zones]
# Vectorized lookup: single skim call for all origin-destination pairs
nearest = find_nearest_zones_via_skims(
unmatched_zones, accessibility_zones, skim_dict
)

# Add the nearest zones to the matched zones
matched = [(x, x) for x in matched_zones]
Expand Down
43 changes: 42 additions & 1 deletion activitysim/core/skim_dictionary.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ class OffsetMapper(object):

def __init__(self, offset_int=None, offset_list=None, offset_series=None):
self.offset_int = self.offset_series = None
self._offset_array = None # numpy array for fast O(1) lookups

assert (offset_int is not None) + (offset_list is not None) + (
offset_series is not None
Expand DownExpand Up@@ -72,6 +73,28 @@ def set_offset_series(self, offset_series):
self.offset_series = offset_series
self.offset_int = None

# Build numpy lookup array for fast O(1) mapping
# This replaces slow pandas Series.map() with direct numpy indexing
index_vals = offset_series.index.values
if len(index_vals) > 0:
min_zone = int(index_vals.min())
max_zone = int(index_vals.max())
span = max_zone - min_zone + 1
# Only build array if zone IDs are non-negative and range is reasonable
# (avoid huge arrays for sparse zone IDs)
if min_zone >= 0 and span <= len(index_vals) * 10:
self._offset_array_min_zone = min_zone
self._offset_array = np.full(span, NOT_IN_SKIM_ZONE_ID, dtype=np.int32)
self._offset_array[
index_vals.astype(int) - min_zone
] = offset_series.values.astype(np.int32)
else:
self._offset_array = None
self._offset_array_min_zone = 0
else:
self._offset_array = None
self._offset_array_min_zone = 0

def set_offset_list(self, offset_list):
"""
Convenience method to set offset_series using an integer list the same size as target skim dimension
Expand DownExpand Up@@ -110,6 +133,7 @@ def set_offset_int(self, offset_int):

self.offset_int = int(offset_int)
self.offset_series = None
self._offset_array = None # not needed for simple int offset

def map(self, zone_ids):
"""
Expand All@@ -124,7 +148,24 @@ def map(self, zone_ids):
offsets : numpy array of int
"""

if self.offset_series is not None:
if self._offset_array is not None:
# Fast path: use numpy array indexing (O(1) per element)
zone_ids = np.asanyarray(zone_ids).astype(int)
min_zone = getattr(self, "_offset_array_min_zone", 0)
idx = zone_ids - min_zone
# Clip to valid range to avoid index errors, then mark out-of-range as NOT_IN_SKIM
max_valid = len(self._offset_array) - 1
valid_mask = (idx >= 0) & (idx <= max_valid)
# Use clip to safely index, then apply mask
clipped_idx = np.clip(idx, 0, max_valid)
offsets = np.where(
valid_mask,
self._offset_array[clipped_idx],
NOT_IN_SKIM_ZONE_ID,
)
return offsets

elif self.offset_series is not None:
assert self.offset_int is None
assert isinstance(self.offset_series, pd.Series)

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 39 additions & 8 deletions activitysim/abm/tables/disaggregate_accessibility.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,41 @@ def find_nearest_accessibility_zone(
def weighted_average(df, values, weights):
return df[values].T.dot(df[weights]) / df[weights].sum()

def nearest_skim(oz, zones):
# need to pass equal # of origins and destinations to skim_dict
orig_zones = np.full(shape=len(zones), fill_value=oz, dtype=int)
return (
oz,
zones[np.argmin(skim_dict.lookup(orig_zones, zones, "DIST"))],
)
def find_nearest_zones_via_skims(origin_zones, dest_zones, skim_dict):
"""
Vectorized lookup to find nearest destination zone for each origin zone.
Performs a single batched skim lookup instead of one per origin zone.
"""
origin_zones = np.asarray(origin_zones)
dest_zones = np.asarray(dest_zones)
n_origins = len(origin_zones)
n_dests = len(dest_zones)

# handle empty input case
if n_origins == 0 or n_dests == 0:
return []

# Process in batches to avoid allocating arrays of size n_origins * n_dests
max_pairs = 5_000_000
batch_size = max(1, int(max_pairs // n_dests))

results = []
for start in range(0, n_origins, batch_size):
batch_orig = origin_zones[start : start + batch_size]

# create all origin-destination pairs for this batch
all_orig = np.repeat(batch_orig, n_dests)
all_dest = np.tile(dest_zones, len(batch_orig))

# single skim lookup for all pairs in the batch
all_dists = skim_dict.lookup(all_orig, all_dest, "DIST")
dist_matrix = np.asarray(all_dists).reshape(len(batch_orig), n_dests)

# find the index of the nearest destination zone for each origin in the batch
nearest_indices = np.argmin(dist_matrix, axis=1)
results.extend(zip(batch_orig, dest_zones[nearest_indices]))

return results

def nearest_node(oz, zones_df):
_idx = util.nearest_node_index(_centroids.loc[oz].XY, zones_df.to_list())
Expand DownExpand Up@@ -70,7 +98,10 @@ def nearest_node(oz, zones_df):

else:
skim_dict = state.get_injectable("skim_dict")
nearest = [nearest_skim(Oz, accessibility_zones) for Oz in unmatched_zones]
# Vectorized lookup: single skim call for all origin-destination pairs
nearest = find_nearest_zones_via_skims(
unmatched_zones, accessibility_zones, skim_dict
)

# Add the nearest zones to the matched zones
matched = [(x, x) for x in matched_zones]
Expand Down
43 changes: 42 additions & 1 deletion activitysim/core/skim_dictionary.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ class OffsetMapper(object):

def __init__(self, offset_int=None, offset_list=None, offset_series=None):
self.offset_int = self.offset_series = None
self._offset_array = None # numpy array for fast O(1) lookups

assert (offset_int is not None) + (offset_list is not None) + (
offset_series is not None
Expand DownExpand Up@@ -72,6 +73,28 @@ def set_offset_series(self, offset_series):
self.offset_series = offset_series
self.offset_int = None

# Build numpy lookup array for fast O(1) mapping
# This replaces slow pandas Series.map() with direct numpy indexing
index_vals = offset_series.index.values
if len(index_vals) > 0:
min_zone = int(index_vals.min())
max_zone = int(index_vals.max())
span = max_zone - min_zone + 1
# Only build array if zone IDs are non-negative and range is reasonable
# (avoid huge arrays for sparse zone IDs)
if min_zone >= 0 and span <= len(index_vals) * 10:
self._offset_array_min_zone = min_zone
self._offset_array = np.full(span, NOT_IN_SKIM_ZONE_ID, dtype=np.int32)
self._offset_array[
index_vals.astype(int) - min_zone
] = offset_series.values.astype(np.int32)
else:
self._offset_array = None
self._offset_array_min_zone = 0
else:
self._offset_array = None
self._offset_array_min_zone = 0

def set_offset_list(self, offset_list):
"""
Convenience method to set offset_series using an integer list the same size as target skim dimension
Expand DownExpand Up@@ -110,6 +133,7 @@ def set_offset_int(self, offset_int):

self.offset_int = int(offset_int)
self.offset_series = None
self._offset_array = None # not needed for simple int offset

def map(self, zone_ids):
"""
Expand All@@ -124,7 +148,24 @@ def map(self, zone_ids):
offsets : numpy array of int
"""

if self.offset_series is not None:
if self._offset_array is not None:
# Fast path: use numpy array indexing (O(1) per element)
zone_ids = np.asanyarray(zone_ids).astype(int)
min_zone = getattr(self, "_offset_array_min_zone", 0)
idx = zone_ids - min_zone
# Clip to valid range to avoid index errors, then mark out-of-range as NOT_IN_SKIM
max_valid = len(self._offset_array) - 1
valid_mask = (idx >= 0) & (idx <= max_valid)
# Use clip to safely index, then apply mask
clipped_idx = np.clip(idx, 0, max_valid)
offsets = np.where(
valid_mask,
self._offset_array[clipped_idx],
NOT_IN_SKIM_ZONE_ID,
)
return offsets

elif self.offset_series is not None:
assert self.offset_int is None
assert isinstance(self.offset_series, pd.Series)

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 39 additions & 8 deletions activitysim/abm/tables/disaggregate_accessibility.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,41 @@ def find_nearest_accessibility_zone(
def weighted_average(df, values, weights):
return df[values].T.dot(df[weights]) / df[weights].sum()

def nearest_skim(oz, zones):
# need to pass equal # of origins and destinations to skim_dict
orig_zones = np.full(shape=len(zones), fill_value=oz, dtype=int)
return (
oz,
zones[np.argmin(skim_dict.lookup(orig_zones, zones, "DIST"))],
)
def find_nearest_zones_via_skims(origin_zones, dest_zones, skim_dict):
"""
Vectorized lookup to find nearest destination zone for each origin zone.
Performs a single batched skim lookup instead of one per origin zone.
"""
origin_zones = np.asarray(origin_zones)
dest_zones = np.asarray(dest_zones)
n_origins = len(origin_zones)
n_dests = len(dest_zones)

# handle empty input case
if n_origins == 0 or n_dests == 0:
return []

# Process in batches to avoid allocating arrays of size n_origins * n_dests
max_pairs = 5_000_000
batch_size = max(1, int(max_pairs // n_dests))

results = []
for start in range(0, n_origins, batch_size):
batch_orig = origin_zones[start : start + batch_size]

# create all origin-destination pairs for this batch
all_orig = np.repeat(batch_orig, n_dests)
all_dest = np.tile(dest_zones, len(batch_orig))

# single skim lookup for all pairs in the batch
all_dists = skim_dict.lookup(all_orig, all_dest, "DIST")
dist_matrix = np.asarray(all_dists).reshape(len(batch_orig), n_dests)

# find the index of the nearest destination zone for each origin in the batch
nearest_indices = np.argmin(dist_matrix, axis=1)
results.extend(zip(batch_orig, dest_zones[nearest_indices]))

return results

def nearest_node(oz, zones_df):
_idx = util.nearest_node_index(_centroids.loc[oz].XY, zones_df.to_list())
Expand DownExpand Up@@ -70,7 +98,10 @@ def nearest_node(oz, zones_df):

else:
skim_dict = state.get_injectable("skim_dict")
nearest = [nearest_skim(Oz, accessibility_zones) for Oz in unmatched_zones]
# Vectorized lookup: single skim call for all origin-destination pairs
nearest = find_nearest_zones_via_skims(
unmatched_zones, accessibility_zones, skim_dict
)

# Add the nearest zones to the matched zones
matched = [(x, x) for x in matched_zones]
Expand Down
43 changes: 42 additions & 1 deletion activitysim/core/skim_dictionary.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ class OffsetMapper(object):

def __init__(self, offset_int=None, offset_list=None, offset_series=None):
self.offset_int = self.offset_series = None
self._offset_array = None # numpy array for fast O(1) lookups

assert (offset_int is not None) + (offset_list is not None) + (
offset_series is not None
Expand DownExpand Up@@ -72,6 +73,28 @@ def set_offset_series(self, offset_series):
self.offset_series = offset_series
self.offset_int = None

# Build numpy lookup array for fast O(1) mapping
# This replaces slow pandas Series.map() with direct numpy indexing
index_vals = offset_series.index.values
if len(index_vals) > 0:
min_zone = int(index_vals.min())
max_zone = int(index_vals.max())
span = max_zone - min_zone + 1
# Only build array if zone IDs are non-negative and range is reasonable
# (avoid huge arrays for sparse zone IDs)
if min_zone >= 0 and span <= len(index_vals) * 10:
self._offset_array_min_zone = min_zone
self._offset_array = np.full(span, NOT_IN_SKIM_ZONE_ID, dtype=np.int32)
self._offset_array[
index_vals.astype(int) - min_zone
] = offset_series.values.astype(np.int32)
else:
self._offset_array = None
self._offset_array_min_zone = 0
else:
self._offset_array = None
self._offset_array_min_zone = 0

def set_offset_list(self, offset_list):
"""
Convenience method to set offset_series using an integer list the same size as target skim dimension
Expand DownExpand Up@@ -110,6 +133,7 @@ def set_offset_int(self, offset_int):

self.offset_int = int(offset_int)
self.offset_series = None
self._offset_array = None # not needed for simple int offset

def map(self, zone_ids):
"""
Expand All@@ -124,7 +148,24 @@ def map(self, zone_ids):
offsets : numpy array of int
"""

if self.offset_series is not None:
if self._offset_array is not None:
# Fast path: use numpy array indexing (O(1) per element)
zone_ids = np.asanyarray(zone_ids).astype(int)
min_zone = getattr(self, "_offset_array_min_zone", 0)
idx = zone_ids - min_zone
# Clip to valid range to avoid index errors, then mark out-of-range as NOT_IN_SKIM
max_valid = len(self._offset_array) - 1
valid_mask = (idx >= 0) & (idx <= max_valid)
# Use clip to safely index, then apply mask
clipped_idx = np.clip(idx, 0, max_valid)
offsets = np.where(
valid_mask,
self._offset_array[clipped_idx],
NOT_IN_SKIM_ZONE_ID,
)
return offsets

elif self.offset_series is not None:
assert self.offset_int is None
assert isinstance(self.offset_series, pd.Series)

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 39 additions & 8 deletions activitysim/abm/tables/disaggregate_accessibility.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,41 @@ def find_nearest_accessibility_zone(
def weighted_average(df, values, weights):
return df[values].T.dot(df[weights]) / df[weights].sum()

def nearest_skim(oz, zones):
# need to pass equal # of origins and destinations to skim_dict
orig_zones = np.full(shape=len(zones), fill_value=oz, dtype=int)
return (
oz,
zones[np.argmin(skim_dict.lookup(orig_zones, zones, "DIST"))],
)
def find_nearest_zones_via_skims(origin_zones, dest_zones, skim_dict):
"""
Vectorized lookup to find nearest destination zone for each origin zone.
Performs a single batched skim lookup instead of one per origin zone.
"""
origin_zones = np.asarray(origin_zones)
dest_zones = np.asarray(dest_zones)
n_origins = len(origin_zones)
n_dests = len(dest_zones)

# handle empty input case
if n_origins == 0 or n_dests == 0:
return []

# Process in batches to avoid allocating arrays of size n_origins * n_dests
max_pairs = 5_000_000
batch_size = max(1, int(max_pairs // n_dests))

results = []
for start in range(0, n_origins, batch_size):
batch_orig = origin_zones[start : start + batch_size]

# create all origin-destination pairs for this batch
all_orig = np.repeat(batch_orig, n_dests)
all_dest = np.tile(dest_zones, len(batch_orig))

# single skim lookup for all pairs in the batch
all_dists = skim_dict.lookup(all_orig, all_dest, "DIST")
dist_matrix = np.asarray(all_dists).reshape(len(batch_orig), n_dests)

# find the index of the nearest destination zone for each origin in the batch
nearest_indices = np.argmin(dist_matrix, axis=1)
results.extend(zip(batch_orig, dest_zones[nearest_indices]))

return results

def nearest_node(oz, zones_df):
_idx = util.nearest_node_index(_centroids.loc[oz].XY, zones_df.to_list())
Expand DownExpand Up@@ -70,7 +98,10 @@ def nearest_node(oz, zones_df):

else:
skim_dict = state.get_injectable("skim_dict")
nearest = [nearest_skim(Oz, accessibility_zones) for Oz in unmatched_zones]
# Vectorized lookup: single skim call for all origin-destination pairs
nearest = find_nearest_zones_via_skims(
unmatched_zones, accessibility_zones, skim_dict
)

# Add the nearest zones to the matched zones
matched = [(x, x) for x in matched_zones]
Expand Down
43 changes: 42 additions & 1 deletion activitysim/core/skim_dictionary.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ class OffsetMapper(object):

def __init__(self, offset_int=None, offset_list=None, offset_series=None):
self.offset_int = self.offset_series = None
self._offset_array = None # numpy array for fast O(1) lookups

assert (offset_int is not None) + (offset_list is not None) + (
offset_series is not None
Expand DownExpand Up@@ -72,6 +73,28 @@ def set_offset_series(self, offset_series):
self.offset_series = offset_series
self.offset_int = None

# Build numpy lookup array for fast O(1) mapping
# This replaces slow pandas Series.map() with direct numpy indexing
index_vals = offset_series.index.values
if len(index_vals) > 0:
min_zone = int(index_vals.min())
max_zone = int(index_vals.max())
span = max_zone - min_zone + 1
# Only build array if zone IDs are non-negative and range is reasonable
# (avoid huge arrays for sparse zone IDs)
if min_zone >= 0 and span <= len(index_vals) * 10:
self._offset_array_min_zone = min_zone
self._offset_array = np.full(span, NOT_IN_SKIM_ZONE_ID, dtype=np.int32)
self._offset_array[
index_vals.astype(int) - min_zone
] = offset_series.values.astype(np.int32)
else:
self._offset_array = None
self._offset_array_min_zone = 0
else:
self._offset_array = None
self._offset_array_min_zone = 0

def set_offset_list(self, offset_list):
"""
Convenience method to set offset_series using an integer list the same size as target skim dimension
Expand DownExpand Up@@ -110,6 +133,7 @@ def set_offset_int(self, offset_int):

self.offset_int = int(offset_int)
self.offset_series = None
self._offset_array = None # not needed for simple int offset

def map(self, zone_ids):
"""
Expand All@@ -124,7 +148,24 @@ def map(self, zone_ids):
offsets : numpy array of int
"""

if self.offset_series is not None:
if self._offset_array is not None:
# Fast path: use numpy array indexing (O(1) per element)
zone_ids = np.asanyarray(zone_ids).astype(int)
min_zone = getattr(self, "_offset_array_min_zone", 0)
idx = zone_ids - min_zone
# Clip to valid range to avoid index errors, then mark out-of-range as NOT_IN_SKIM
max_valid = len(self._offset_array) - 1
valid_mask = (idx >= 0) & (idx <= max_valid)
# Use clip to safely index, then apply mask
clipped_idx = np.clip(idx, 0, max_valid)
offsets = np.where(
valid_mask,
self._offset_array[clipped_idx],
NOT_IN_SKIM_ZONE_ID,
)
return offsets

elif self.offset_series is not None:
assert self.offset_int is None
assert isinstance(self.offset_series, pd.Series)

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 39 additions & 8 deletions activitysim/abm/tables/disaggregate_accessibility.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,41 @@ def find_nearest_accessibility_zone(
def weighted_average(df, values, weights):
return df[values].T.dot(df[weights]) / df[weights].sum()

def nearest_skim(oz, zones):
# need to pass equal # of origins and destinations to skim_dict
orig_zones = np.full(shape=len(zones), fill_value=oz, dtype=int)
return (
oz,
zones[np.argmin(skim_dict.lookup(orig_zones, zones, "DIST"))],
)
def find_nearest_zones_via_skims(origin_zones, dest_zones, skim_dict):
"""
Vectorized lookup to find nearest destination zone for each origin zone.
Performs a single batched skim lookup instead of one per origin zone.
"""
origin_zones = np.asarray(origin_zones)
dest_zones = np.asarray(dest_zones)
n_origins = len(origin_zones)
n_dests = len(dest_zones)

# handle empty input case
if n_origins == 0 or n_dests == 0:
return []

# Process in batches to avoid allocating arrays of size n_origins * n_dests
max_pairs = 5_000_000
batch_size = max(1, int(max_pairs // n_dests))

results = []
for start in range(0, n_origins, batch_size):
batch_orig = origin_zones[start : start + batch_size]

# create all origin-destination pairs for this batch
all_orig = np.repeat(batch_orig, n_dests)
all_dest = np.tile(dest_zones, len(batch_orig))

# single skim lookup for all pairs in the batch
all_dists = skim_dict.lookup(all_orig, all_dest, "DIST")
dist_matrix = np.asarray(all_dists).reshape(len(batch_orig), n_dests)

# find the index of the nearest destination zone for each origin in the batch
nearest_indices = np.argmin(dist_matrix, axis=1)
results.extend(zip(batch_orig, dest_zones[nearest_indices]))

return results

def nearest_node(oz, zones_df):
_idx = util.nearest_node_index(_centroids.loc[oz].XY, zones_df.to_list())
Expand DownExpand Up@@ -70,7 +98,10 @@ def nearest_node(oz, zones_df):

else:
skim_dict = state.get_injectable("skim_dict")
nearest = [nearest_skim(Oz, accessibility_zones) for Oz in unmatched_zones]
# Vectorized lookup: single skim call for all origin-destination pairs
nearest = find_nearest_zones_via_skims(
unmatched_zones, accessibility_zones, skim_dict
)

# Add the nearest zones to the matched zones
matched = [(x, x) for x in matched_zones]
Expand Down
43 changes: 42 additions & 1 deletion activitysim/core/skim_dictionary.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ class OffsetMapper(object):

def __init__(self, offset_int=None, offset_list=None, offset_series=None):
self.offset_int = self.offset_series = None
self._offset_array = None # numpy array for fast O(1) lookups

assert (offset_int is not None) + (offset_list is not None) + (
offset_series is not None
Expand DownExpand Up@@ -72,6 +73,28 @@ def set_offset_series(self, offset_series):
self.offset_series = offset_series
self.offset_int = None

# Build numpy lookup array for fast O(1) mapping
# This replaces slow pandas Series.map() with direct numpy indexing
index_vals = offset_series.index.values
if len(index_vals) > 0:
min_zone = int(index_vals.min())
max_zone = int(index_vals.max())
span = max_zone - min_zone + 1
# Only build array if zone IDs are non-negative and range is reasonable
# (avoid huge arrays for sparse zone IDs)
if min_zone >= 0 and span <= len(index_vals) * 10:
self._offset_array_min_zone = min_zone
self._offset_array = np.full(span, NOT_IN_SKIM_ZONE_ID, dtype=np.int32)
self._offset_array[
index_vals.astype(int) - min_zone
] = offset_series.values.astype(np.int32)
else:
self._offset_array = None
self._offset_array_min_zone = 0
else:
self._offset_array = None
self._offset_array_min_zone = 0

def set_offset_list(self, offset_list):
"""
Convenience method to set offset_series using an integer list the same size as target skim dimension
Expand DownExpand Up@@ -110,6 +133,7 @@ def set_offset_int(self, offset_int):

self.offset_int = int(offset_int)
self.offset_series = None
self._offset_array = None # not needed for simple int offset

def map(self, zone_ids):
"""
Expand All@@ -124,7 +148,24 @@ def map(self, zone_ids):
offsets : numpy array of int
"""

if self.offset_series is not None:
if self._offset_array is not None:
# Fast path: use numpy array indexing (O(1) per element)
zone_ids = np.asanyarray(zone_ids).astype(int)
min_zone = getattr(self, "_offset_array_min_zone", 0)
idx = zone_ids - min_zone
# Clip to valid range to avoid index errors, then mark out-of-range as NOT_IN_SKIM
max_valid = len(self._offset_array) - 1
valid_mask = (idx >= 0) & (idx <= max_valid)
# Use clip to safely index, then apply mask
clipped_idx = np.clip(idx, 0, max_valid)
offsets = np.where(
valid_mask,
self._offset_array[clipped_idx],
NOT_IN_SKIM_ZONE_ID,
)
return offsets

elif self.offset_series is not None:
assert self.offset_int is None
assert isinstance(self.offset_series, pd.Series)

Expand Down
Loading