Patch sharrow sandag#1009

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
jpn-- merged 9 commits into from
Nov 12, 2025
Merged

Patch sharrow sandag #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7fd19f2
descriptive error
jpn-- Oct 28, 2025
591fe1e
allow partial success in setting up skims
jpn-- Oct 29, 2025
f6ec70e
comments for better context on why
jpn-- Oct 29, 2025
5002215
require sharrow 2.15
jpn-- Oct 30, 2025
eb0bd60
update lock file
jpn-- Oct 31, 2025
9185b22
blacken
jpn-- Oct 31, 2025
5873be7
update docstring
jpn-- Oct 31, 2025
a84f771
address whitespace
jpn-- Oct 31, 2025
0a1b99a
Merge commit 'f50a261a6007a87164baa2d287c8f81c734a9bd8' into patch-sh…
jpn-- Nov 1, 2025
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
53 changes: 36 additions & 17 deletions activitysim/abm/models/trip_destination.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1496,23 +1496,42 @@ def run_trip_destination(
for primary_purpose, trips_segment in nth_trips.groupby(
"primary_purpose", observed=True
):
choices, destination_sample = choose_trip_destination(
state,
primary_purpose,
trips_segment,
alternatives,
tours_merged,
model_settings,
want_logsums,
want_sample_table,
size_term_matrix,
skim_hotel,
estimator,
chunk_size,
trace_label=tracing.extend_trace_label(
nth_trace_label, primary_purpose
),
)
try:
choices, destination_sample = choose_trip_destination(
state,
primary_purpose,
trips_segment,
alternatives,
tours_merged,
model_settings,
want_logsums,
want_sample_table,
size_term_matrix,
skim_hotel,
estimator,
chunk_size,
trace_label=tracing.extend_trace_label(
nth_trace_label, primary_purpose
),
)
except KeyError as err:
if err.args[0] == "purpose_index_num":
logger.error(
"""

When using the trip destination model with sharrow, it is necessary
to set a value for `purpose_index_num` in the trip destination
annotate trips preprocessor. This allows for an optimized compiled
lookup of the size term from the array of size terms. The value of
Comment thread
jpn-- marked this conversation as resolved.
`purpose_index_num` should be the integer column position in the size
matrix, with usual zero-based numpy indexing semantics (i.e. the first
column is zero). The preprocessor expression most likely needs to be
"size_terms.get_cols(df.purpose)" unless some unusual transform of
size terms has been employed.

"""
Comment thread
jpn-- marked this conversation as resolved.
)
raise

choices_list.append(choices)
if want_sample_table:
Expand Down
25 changes: 24 additions & 1 deletion activitysim/core/simulate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ def to_array(x):
# return utilities


def set_skim_wrapper_targets(df, skims):
def set_skim_wrapper_targets(df, skims, allow_partial_success: bool = True):
Comment thread
jpn-- marked this conversation as resolved.
"""
Add the dataframe to the SkimWrapper object so that it can be dereferenced
using the parameters of the skims object.
Expand All@@ -1007,6 +1007,11 @@ def set_skim_wrapper_targets(df, skims):
dataframe that comes back from interacting choosers with
alternatives. See the skims module for more documentation on how
the skims object is intended to be used.
allow_partial_success : bool, optional
If True (default), failures to set skim targets for some skim objects
(for example due to missing required columns in `df`) will be collected
and logged as warnings but will not raise an exception. If False, any
such failure will be raised immediately, preventing partial success.
"""

skims = (
Expand All@@ -1016,13 +1021,31 @@ def set_skim_wrapper_targets(df, skims):
if isinstance(skims, dict)
else [skims]
)
problems = []

# assume any object in skims can be treated as a skim
for skim in skims:
try:
skim.set_df(df)
except AttributeError:
# sometimes when passed as a dict, the skims have a few keys given as
# settings or constants, which are not actually "skim" objects and have
# no `set_df` attribute. This is fine and we just let them pass.
pass
except AssertionError as e:
# An assertion error will get triggered if the columns of `df` are
# missing one of the required keys needed to look up values in the
# skims. This may not be a problem, if this particular set of skims
# is not actually used in this model component. So we'll warn about
# it but usually not raise a showstopping error.
problems.append(e)
if not allow_partial_success:
raise

if problems:
# if problems were discovered, log them as warnings
for problem in problems:
logger.warning(str(problem))


#
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ dependencies = [
"requests >= 2.7",
"scikit-learn >= 1.2",
"setuptools>=80.9.0",
"sharrow >= 2.9.1",
"sharrow>=2.15",
"sparse",
"tables >= 3.9", # pytables is tables in pypi
"xarray >= 2024.05",
Expand Down
10 changes: 5 additions & 5 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

, '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
Patch sharrow sandag#1009

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

jpn--
merged 9 commits into

from

Nov 12, 2025
 Merged


Patch sharrow sandag
#1009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7fd19f2

descriptive error


jpn-- Oct 28, 2025
591fe1e

allow partial success in setting up skims


jpn-- Oct 29, 2025
f6ec70e

comments for better context on why


jpn-- Oct 29, 2025
5002215

require sharrow 2.15


jpn-- Oct 30, 2025
eb0bd60

update lock file


jpn-- Oct 31, 2025
9185b22

blacken


jpn-- Oct 31, 2025
5873be7

update docstring


jpn-- Oct 31, 2025
a84f771

address whitespace


jpn-- Oct 31, 2025
0a1b99a

Merge commit 'f50a261a6007a87164baa2d287c8f81c734a9bd8' into patch-sh…


jpn-- Nov 1, 2025

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


53 changes: 36 additions & 17 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1496,23 +1496,42 @@ def run_trip_destination(
 for primary_purpose, trips_segment in nth_trips.groupby(
 "primary_purpose", observed=True
 ):
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 try:
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 except KeyError as err:
 if err.args[0] == "purpose_index_num":
 logger.error(
 """

 When using the trip destination model with sharrow, it is necessary
 to set a value for `purpose_index_num` in the trip destination 
 annotate trips preprocessor. This allows for an optimized compiled 
 lookup of the size term from the array of size terms. The value of
Comment thread
jpn-- marked this conversation as resolved.

 `purpose_index_num` should be the integer column position in the size 
 matrix, with usual zero-based numpy indexing semantics (i.e. the first 
 column is zero). The preprocessor expression most likely needs to be
 "size_terms.get_cols(df.purpose)" unless some unusual transform of 
 size terms has been employed.

 """
Comment thread
jpn-- marked this conversation as resolved.

 )
 raise

 choices_list.append(choices)
 if want_sample_table:
Expand Down

25 changes: 24 additions & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ def to_array(x):
# return utilities


def set_skim_wrapper_targets(df, skims):
def set_skim_wrapper_targets(df, skims, allow_partial_success: bool = True):
Comment thread
jpn-- marked this conversation as resolved.

 """
 Add the dataframe to the SkimWrapper object so that it can be dereferenced
 using the parameters of the skims object.
Expand All@@ -1007,6 +1007,11 @@ def set_skim_wrapper_targets(df, skims):
 dataframe that comes back from interacting choosers with
 alternatives. See the skims module for more documentation on how
 the skims object is intended to be used.
 allow_partial_success : bool, optional
 If True (default), failures to set skim targets for some skim objects
 (for example due to missing required columns in `df`) will be collected
 and logged as warnings but will not raise an exception. If False, any
 such failure will be raised immediately, preventing partial success.
 """

 skims = (
Expand All@@ -1016,13 +1021,31 @@ def set_skim_wrapper_targets(df, skims):
 if isinstance(skims, dict)
 else [skims]
 )
 problems = []

 # assume any object in skims can be treated as a skim
 for skim in skims:
 try:
 skim.set_df(df)
 except AttributeError:
 # sometimes when passed as a dict, the skims have a few keys given as
 # settings or constants, which are not actually "skim" objects and have
 # no `set_df` attribute. This is fine and we just let them pass.
 pass
 except AssertionError as e:
 # An assertion error will get triggered if the columns of `df` are
 # missing one of the required keys needed to look up values in the
 # skims. This may not be a problem, if this particular set of skims
 # is not actually used in this model component. So we'll warn about
 # it but usually not raise a showstopping error.
 problems.append(e)
 if not allow_partial_success:
 raise

 if problems:
 # if problems were discovered, log them as warnings
 for problem in problems:
 logger.warning(str(problem))


#
Expand Down

2 changes: 1 addition & 1 deletion
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ dependencies = [
 "requests >= 2.7",
 "scikit-learn >= 1.2",
 "setuptools>=80.9.0",
 "sharrow >= 2.9.1",
 "sharrow>=2.15",
 "sparse",
 "tables >= 3.9", # pytables is tables in pypi
 "xarray >= 2024.05",
Expand Down

10 changes: 5 additions & 5 deletions
uv.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


, '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
Patch sharrow sandag#1009

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

jpn--
merged 9 commits into

from

Nov 12, 2025
 Merged


Patch sharrow sandag
#1009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7fd19f2

descriptive error


jpn-- Oct 28, 2025
591fe1e

allow partial success in setting up skims


jpn-- Oct 29, 2025
f6ec70e

comments for better context on why


jpn-- Oct 29, 2025
5002215

require sharrow 2.15


jpn-- Oct 30, 2025
eb0bd60

update lock file


jpn-- Oct 31, 2025
9185b22

blacken


jpn-- Oct 31, 2025
5873be7

update docstring


jpn-- Oct 31, 2025
a84f771

address whitespace


jpn-- Oct 31, 2025
0a1b99a

Merge commit 'f50a261a6007a87164baa2d287c8f81c734a9bd8' into patch-sh…


jpn-- Nov 1, 2025

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


53 changes: 36 additions & 17 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1496,23 +1496,42 @@ def run_trip_destination(
 for primary_purpose, trips_segment in nth_trips.groupby(
 "primary_purpose", observed=True
 ):
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 try:
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 except KeyError as err:
 if err.args[0] == "purpose_index_num":
 logger.error(
 """

 When using the trip destination model with sharrow, it is necessary
 to set a value for `purpose_index_num` in the trip destination 
 annotate trips preprocessor. This allows for an optimized compiled 
 lookup of the size term from the array of size terms. The value of
Comment thread
jpn-- marked this conversation as resolved.

 `purpose_index_num` should be the integer column position in the size 
 matrix, with usual zero-based numpy indexing semantics (i.e. the first 
 column is zero). The preprocessor expression most likely needs to be
 "size_terms.get_cols(df.purpose)" unless some unusual transform of 
 size terms has been employed.

 """
Comment thread
jpn-- marked this conversation as resolved.

 )
 raise

 choices_list.append(choices)
 if want_sample_table:
Expand Down

25 changes: 24 additions & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ def to_array(x):
# return utilities


def set_skim_wrapper_targets(df, skims):
def set_skim_wrapper_targets(df, skims, allow_partial_success: bool = True):
Comment thread
jpn-- marked this conversation as resolved.

 """
 Add the dataframe to the SkimWrapper object so that it can be dereferenced
 using the parameters of the skims object.
Expand All@@ -1007,6 +1007,11 @@ def set_skim_wrapper_targets(df, skims):
 dataframe that comes back from interacting choosers with
 alternatives. See the skims module for more documentation on how
 the skims object is intended to be used.
 allow_partial_success : bool, optional
 If True (default), failures to set skim targets for some skim objects
 (for example due to missing required columns in `df`) will be collected
 and logged as warnings but will not raise an exception. If False, any
 such failure will be raised immediately, preventing partial success.
 """

 skims = (
Expand All@@ -1016,13 +1021,31 @@ def set_skim_wrapper_targets(df, skims):
 if isinstance(skims, dict)
 else [skims]
 )
 problems = []

 # assume any object in skims can be treated as a skim
 for skim in skims:
 try:
 skim.set_df(df)
 except AttributeError:
 # sometimes when passed as a dict, the skims have a few keys given as
 # settings or constants, which are not actually "skim" objects and have
 # no `set_df` attribute. This is fine and we just let them pass.
 pass
 except AssertionError as e:
 # An assertion error will get triggered if the columns of `df` are
 # missing one of the required keys needed to look up values in the
 # skims. This may not be a problem, if this particular set of skims
 # is not actually used in this model component. So we'll warn about
 # it but usually not raise a showstopping error.
 problems.append(e)
 if not allow_partial_success:
 raise

 if problems:
 # if problems were discovered, log them as warnings
 for problem in problems:
 logger.warning(str(problem))


#
Expand Down

2 changes: 1 addition & 1 deletion
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ dependencies = [
 "requests >= 2.7",
 "scikit-learn >= 1.2",
 "setuptools>=80.9.0",
 "sharrow >= 2.9.1",
 "sharrow>=2.15",
 "sparse",
 "tables >= 3.9", # pytables is tables in pypi
 "xarray >= 2024.05",
Expand Down

10 changes: 5 additions & 5 deletions
uv.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


, '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
Patch sharrow sandag#1009

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

jpn--
merged 9 commits into

from

Nov 12, 2025
 Merged


Patch sharrow sandag
#1009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7fd19f2

descriptive error


jpn-- Oct 28, 2025
591fe1e

allow partial success in setting up skims


jpn-- Oct 29, 2025
f6ec70e

comments for better context on why


jpn-- Oct 29, 2025
5002215

require sharrow 2.15


jpn-- Oct 30, 2025
eb0bd60

update lock file


jpn-- Oct 31, 2025
9185b22

blacken


jpn-- Oct 31, 2025
5873be7

update docstring


jpn-- Oct 31, 2025
a84f771

address whitespace


jpn-- Oct 31, 2025
0a1b99a

Merge commit 'f50a261a6007a87164baa2d287c8f81c734a9bd8' into patch-sh…


jpn-- Nov 1, 2025

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


53 changes: 36 additions & 17 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1496,23 +1496,42 @@ def run_trip_destination(
 for primary_purpose, trips_segment in nth_trips.groupby(
 "primary_purpose", observed=True
 ):
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 try:
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 except KeyError as err:
 if err.args[0] == "purpose_index_num":
 logger.error(
 """

 When using the trip destination model with sharrow, it is necessary
 to set a value for `purpose_index_num` in the trip destination 
 annotate trips preprocessor. This allows for an optimized compiled 
 lookup of the size term from the array of size terms. The value of
Comment thread
jpn-- marked this conversation as resolved.

 `purpose_index_num` should be the integer column position in the size 
 matrix, with usual zero-based numpy indexing semantics (i.e. the first 
 column is zero). The preprocessor expression most likely needs to be
 "size_terms.get_cols(df.purpose)" unless some unusual transform of 
 size terms has been employed.

 """
Comment thread
jpn-- marked this conversation as resolved.

 )
 raise

 choices_list.append(choices)
 if want_sample_table:
Expand Down

25 changes: 24 additions & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ def to_array(x):
# return utilities


def set_skim_wrapper_targets(df, skims):
def set_skim_wrapper_targets(df, skims, allow_partial_success: bool = True):
Comment thread
jpn-- marked this conversation as resolved.

 """
 Add the dataframe to the SkimWrapper object so that it can be dereferenced
 using the parameters of the skims object.
Expand All@@ -1007,6 +1007,11 @@ def set_skim_wrapper_targets(df, skims):
 dataframe that comes back from interacting choosers with
 alternatives. See the skims module for more documentation on how
 the skims object is intended to be used.
 allow_partial_success : bool, optional
 If True (default), failures to set skim targets for some skim objects
 (for example due to missing required columns in `df`) will be collected
 and logged as warnings but will not raise an exception. If False, any
 such failure will be raised immediately, preventing partial success.
 """

 skims = (
Expand All@@ -1016,13 +1021,31 @@ def set_skim_wrapper_targets(df, skims):
 if isinstance(skims, dict)
 else [skims]
 )
 problems = []

 # assume any object in skims can be treated as a skim
 for skim in skims:
 try:
 skim.set_df(df)
 except AttributeError:
 # sometimes when passed as a dict, the skims have a few keys given as
 # settings or constants, which are not actually "skim" objects and have
 # no `set_df` attribute. This is fine and we just let them pass.
 pass
 except AssertionError as e:
 # An assertion error will get triggered if the columns of `df` are
 # missing one of the required keys needed to look up values in the
 # skims. This may not be a problem, if this particular set of skims
 # is not actually used in this model component. So we'll warn about
 # it but usually not raise a showstopping error.
 problems.append(e)
 if not allow_partial_success:
 raise

 if problems:
 # if problems were discovered, log them as warnings
 for problem in problems:
 logger.warning(str(problem))


#
Expand Down

2 changes: 1 addition & 1 deletion
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ dependencies = [
 "requests >= 2.7",
 "scikit-learn >= 1.2",
 "setuptools>=80.9.0",
 "sharrow >= 2.9.1",
 "sharrow>=2.15",
 "sparse",
 "tables >= 3.9", # pytables is tables in pypi
 "xarray >= 2024.05",
Expand Down

10 changes: 5 additions & 5 deletions
uv.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


, '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
Patch sharrow sandag#1009

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

jpn--
merged 9 commits into

from

Nov 12, 2025
 Merged


Patch sharrow sandag
#1009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7fd19f2

descriptive error


jpn-- Oct 28, 2025
591fe1e

allow partial success in setting up skims


jpn-- Oct 29, 2025
f6ec70e

comments for better context on why


jpn-- Oct 29, 2025
5002215

require sharrow 2.15


jpn-- Oct 30, 2025
eb0bd60

update lock file


jpn-- Oct 31, 2025
9185b22

blacken


jpn-- Oct 31, 2025
5873be7

update docstring


jpn-- Oct 31, 2025
a84f771

address whitespace


jpn-- Oct 31, 2025
0a1b99a

Merge commit 'f50a261a6007a87164baa2d287c8f81c734a9bd8' into patch-sh…


jpn-- Nov 1, 2025

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


53 changes: 36 additions & 17 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1496,23 +1496,42 @@ def run_trip_destination(
 for primary_purpose, trips_segment in nth_trips.groupby(
 "primary_purpose", observed=True
 ):
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 try:
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 except KeyError as err:
 if err.args[0] == "purpose_index_num":
 logger.error(
 """

 When using the trip destination model with sharrow, it is necessary
 to set a value for `purpose_index_num` in the trip destination 
 annotate trips preprocessor. This allows for an optimized compiled 
 lookup of the size term from the array of size terms. The value of
Comment thread
jpn-- marked this conversation as resolved.

 `purpose_index_num` should be the integer column position in the size 
 matrix, with usual zero-based numpy indexing semantics (i.e. the first 
 column is zero). The preprocessor expression most likely needs to be
 "size_terms.get_cols(df.purpose)" unless some unusual transform of 
 size terms has been employed.

 """
Comment thread
jpn-- marked this conversation as resolved.

 )
 raise

 choices_list.append(choices)
 if want_sample_table:
Expand Down

25 changes: 24 additions & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ def to_array(x):
# return utilities


def set_skim_wrapper_targets(df, skims):
def set_skim_wrapper_targets(df, skims, allow_partial_success: bool = True):
Comment thread
jpn-- marked this conversation as resolved.

 """
 Add the dataframe to the SkimWrapper object so that it can be dereferenced
 using the parameters of the skims object.
Expand All@@ -1007,6 +1007,11 @@ def set_skim_wrapper_targets(df, skims):
 dataframe that comes back from interacting choosers with
 alternatives. See the skims module for more documentation on how
 the skims object is intended to be used.
 allow_partial_success : bool, optional
 If True (default), failures to set skim targets for some skim objects
 (for example due to missing required columns in `df`) will be collected
 and logged as warnings but will not raise an exception. If False, any
 such failure will be raised immediately, preventing partial success.
 """

 skims = (
Expand All@@ -1016,13 +1021,31 @@ def set_skim_wrapper_targets(df, skims):
 if isinstance(skims, dict)
 else [skims]
 )
 problems = []

 # assume any object in skims can be treated as a skim
 for skim in skims:
 try:
 skim.set_df(df)
 except AttributeError:
 # sometimes when passed as a dict, the skims have a few keys given as
 # settings or constants, which are not actually "skim" objects and have
 # no `set_df` attribute. This is fine and we just let them pass.
 pass
 except AssertionError as e:
 # An assertion error will get triggered if the columns of `df` are
 # missing one of the required keys needed to look up values in the
 # skims. This may not be a problem, if this particular set of skims
 # is not actually used in this model component. So we'll warn about
 # it but usually not raise a showstopping error.
 problems.append(e)
 if not allow_partial_success:
 raise

 if problems:
 # if problems were discovered, log them as warnings
 for problem in problems:
 logger.warning(str(problem))


#
Expand Down

2 changes: 1 addition & 1 deletion
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ dependencies = [
 "requests >= 2.7",
 "scikit-learn >= 1.2",
 "setuptools>=80.9.0",
 "sharrow >= 2.9.1",
 "sharrow>=2.15",
 "sparse",
 "tables >= 3.9", # pytables is tables in pypi
 "xarray >= 2024.05",
Expand Down

10 changes: 5 additions & 5 deletions
uv.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


, '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
Patch sharrow sandag#1009

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

jpn--
merged 9 commits into

from

Nov 12, 2025
 Merged


Patch sharrow sandag
#1009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7fd19f2

descriptive error


jpn-- Oct 28, 2025
591fe1e

allow partial success in setting up skims


jpn-- Oct 29, 2025
f6ec70e

comments for better context on why


jpn-- Oct 29, 2025
5002215

require sharrow 2.15


jpn-- Oct 30, 2025
eb0bd60

update lock file


jpn-- Oct 31, 2025
9185b22

blacken


jpn-- Oct 31, 2025
5873be7

update docstring


jpn-- Oct 31, 2025
a84f771

address whitespace


jpn-- Oct 31, 2025
0a1b99a

Merge commit 'f50a261a6007a87164baa2d287c8f81c734a9bd8' into patch-sh…


jpn-- Nov 1, 2025

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


53 changes: 36 additions & 17 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1496,23 +1496,42 @@ def run_trip_destination(
 for primary_purpose, trips_segment in nth_trips.groupby(
 "primary_purpose", observed=True
 ):
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 try:
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 except KeyError as err:
 if err.args[0] == "purpose_index_num":
 logger.error(
 """

 When using the trip destination model with sharrow, it is necessary
 to set a value for `purpose_index_num` in the trip destination 
 annotate trips preprocessor. This allows for an optimized compiled 
 lookup of the size term from the array of size terms. The value of
Comment thread
jpn-- marked this conversation as resolved.

 `purpose_index_num` should be the integer column position in the size 
 matrix, with usual zero-based numpy indexing semantics (i.e. the first 
 column is zero). The preprocessor expression most likely needs to be
 "size_terms.get_cols(df.purpose)" unless some unusual transform of 
 size terms has been employed.

 """
Comment thread
jpn-- marked this conversation as resolved.

 )
 raise

 choices_list.append(choices)
 if want_sample_table:
Expand Down

25 changes: 24 additions & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ def to_array(x):
# return utilities


def set_skim_wrapper_targets(df, skims):
def set_skim_wrapper_targets(df, skims, allow_partial_success: bool = True):
Comment thread
jpn-- marked this conversation as resolved.

 """
 Add the dataframe to the SkimWrapper object so that it can be dereferenced
 using the parameters of the skims object.
Expand All@@ -1007,6 +1007,11 @@ def set_skim_wrapper_targets(df, skims):
 dataframe that comes back from interacting choosers with
 alternatives. See the skims module for more documentation on how
 the skims object is intended to be used.
 allow_partial_success : bool, optional
 If True (default), failures to set skim targets for some skim objects
 (for example due to missing required columns in `df`) will be collected
 and logged as warnings but will not raise an exception. If False, any
 such failure will be raised immediately, preventing partial success.
 """

 skims = (
Expand All@@ -1016,13 +1021,31 @@ def set_skim_wrapper_targets(df, skims):
 if isinstance(skims, dict)
 else [skims]
 )
 problems = []

 # assume any object in skims can be treated as a skim
 for skim in skims:
 try:
 skim.set_df(df)
 except AttributeError:
 # sometimes when passed as a dict, the skims have a few keys given as
 # settings or constants, which are not actually "skim" objects and have
 # no `set_df` attribute. This is fine and we just let them pass.
 pass
 except AssertionError as e:
 # An assertion error will get triggered if the columns of `df` are
 # missing one of the required keys needed to look up values in the
 # skims. This may not be a problem, if this particular set of skims
 # is not actually used in this model component. So we'll warn about
 # it but usually not raise a showstopping error.
 problems.append(e)
 if not allow_partial_success:
 raise

 if problems:
 # if problems were discovered, log them as warnings
 for problem in problems:
 logger.warning(str(problem))


#
Expand Down

2 changes: 1 addition & 1 deletion
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ dependencies = [
 "requests >= 2.7",
 "scikit-learn >= 1.2",
 "setuptools>=80.9.0",
 "sharrow >= 2.9.1",
 "sharrow>=2.15",
 "sparse",
 "tables >= 3.9", # pytables is tables in pypi
 "xarray >= 2024.05",
Expand Down

10 changes: 5 additions & 5 deletions
uv.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


, '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
Patch sharrow sandag#1009

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

jpn--
merged 9 commits into

from

Nov 12, 2025
 Merged


Patch sharrow sandag
#1009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7fd19f2

descriptive error


jpn-- Oct 28, 2025
591fe1e

allow partial success in setting up skims


jpn-- Oct 29, 2025
f6ec70e

comments for better context on why


jpn-- Oct 29, 2025
5002215

require sharrow 2.15


jpn-- Oct 30, 2025
eb0bd60

update lock file


jpn-- Oct 31, 2025
9185b22

blacken


jpn-- Oct 31, 2025
5873be7

update docstring


jpn-- Oct 31, 2025
a84f771

address whitespace


jpn-- Oct 31, 2025
0a1b99a

Merge commit 'f50a261a6007a87164baa2d287c8f81c734a9bd8' into patch-sh…


jpn-- Nov 1, 2025

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


53 changes: 36 additions & 17 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1496,23 +1496,42 @@ def run_trip_destination(
 for primary_purpose, trips_segment in nth_trips.groupby(
 "primary_purpose", observed=True
 ):
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 try:
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 except KeyError as err:
 if err.args[0] == "purpose_index_num":
 logger.error(
 """

 When using the trip destination model with sharrow, it is necessary
 to set a value for `purpose_index_num` in the trip destination 
 annotate trips preprocessor. This allows for an optimized compiled 
 lookup of the size term from the array of size terms. The value of
Comment thread
jpn-- marked this conversation as resolved.

 `purpose_index_num` should be the integer column position in the size 
 matrix, with usual zero-based numpy indexing semantics (i.e. the first 
 column is zero). The preprocessor expression most likely needs to be
 "size_terms.get_cols(df.purpose)" unless some unusual transform of 
 size terms has been employed.

 """
Comment thread
jpn-- marked this conversation as resolved.

 )
 raise

 choices_list.append(choices)
 if want_sample_table:
Expand Down

25 changes: 24 additions & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ def to_array(x):
# return utilities


def set_skim_wrapper_targets(df, skims):
def set_skim_wrapper_targets(df, skims, allow_partial_success: bool = True):
Comment thread
jpn-- marked this conversation as resolved.

 """
 Add the dataframe to the SkimWrapper object so that it can be dereferenced
 using the parameters of the skims object.
Expand All@@ -1007,6 +1007,11 @@ def set_skim_wrapper_targets(df, skims):
 dataframe that comes back from interacting choosers with
 alternatives. See the skims module for more documentation on how
 the skims object is intended to be used.
 allow_partial_success : bool, optional
 If True (default), failures to set skim targets for some skim objects
 (for example due to missing required columns in `df`) will be collected
 and logged as warnings but will not raise an exception. If False, any
 such failure will be raised immediately, preventing partial success.
 """

 skims = (
Expand All@@ -1016,13 +1021,31 @@ def set_skim_wrapper_targets(df, skims):
 if isinstance(skims, dict)
 else [skims]
 )
 problems = []

 # assume any object in skims can be treated as a skim
 for skim in skims:
 try:
 skim.set_df(df)
 except AttributeError:
 # sometimes when passed as a dict, the skims have a few keys given as
 # settings or constants, which are not actually "skim" objects and have
 # no `set_df` attribute. This is fine and we just let them pass.
 pass
 except AssertionError as e:
 # An assertion error will get triggered if the columns of `df` are
 # missing one of the required keys needed to look up values in the
 # skims. This may not be a problem, if this particular set of skims
 # is not actually used in this model component. So we'll warn about
 # it but usually not raise a showstopping error.
 problems.append(e)
 if not allow_partial_success:
 raise

 if problems:
 # if problems were discovered, log them as warnings
 for problem in problems:
 logger.warning(str(problem))


#
Expand Down

2 changes: 1 addition & 1 deletion
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ dependencies = [
 "requests >= 2.7",
 "scikit-learn >= 1.2",
 "setuptools>=80.9.0",
 "sharrow >= 2.9.1",
 "sharrow>=2.15",
 "sparse",
 "tables >= 3.9", # pytables is tables in pypi
 "xarray >= 2024.05",
Expand Down

10 changes: 5 additions & 5 deletions
uv.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


, '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
Patch sharrow sandag#1009

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

jpn--
merged 9 commits into

from

Nov 12, 2025
 Merged


Patch sharrow sandag
#1009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
7fd19f2

descriptive error


jpn-- Oct 28, 2025
591fe1e

allow partial success in setting up skims


jpn-- Oct 29, 2025
f6ec70e

comments for better context on why


jpn-- Oct 29, 2025
5002215

require sharrow 2.15


jpn-- Oct 30, 2025
eb0bd60

update lock file


jpn-- Oct 31, 2025
9185b22

blacken


jpn-- Oct 31, 2025
5873be7

update docstring


jpn-- Oct 31, 2025
a84f771

address whitespace


jpn-- Oct 31, 2025
0a1b99a

Merge commit 'f50a261a6007a87164baa2d287c8f81c734a9bd8' into patch-sh…


jpn-- Nov 1, 2025

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


53 changes: 36 additions & 17 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1496,23 +1496,42 @@ def run_trip_destination(
 for primary_purpose, trips_segment in nth_trips.groupby(
 "primary_purpose", observed=True
 ):
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 try:
 choices, destination_sample = choose_trip_destination(
 state,
 primary_purpose,
 trips_segment,
 alternatives,
 tours_merged,
 model_settings,
 want_logsums,
 want_sample_table,
 size_term_matrix,
 skim_hotel,
 estimator,
 chunk_size,
 trace_label=tracing.extend_trace_label(
 nth_trace_label, primary_purpose
 ),
 )
 except KeyError as err:
 if err.args[0] == "purpose_index_num":
 logger.error(
 """

 When using the trip destination model with sharrow, it is necessary
 to set a value for `purpose_index_num` in the trip destination 
 annotate trips preprocessor. This allows for an optimized compiled 
 lookup of the size term from the array of size terms. The value of
Comment thread
jpn-- marked this conversation as resolved.

 `purpose_index_num` should be the integer column position in the size 
 matrix, with usual zero-based numpy indexing semantics (i.e. the first 
 column is zero). The preprocessor expression most likely needs to be
 "size_terms.get_cols(df.purpose)" unless some unusual transform of 
 size terms has been employed.

 """
Comment thread
jpn-- marked this conversation as resolved.

 )
 raise

 choices_list.append(choices)
 if want_sample_table:
Expand Down

25 changes: 24 additions & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -989,7 +989,7 @@ def to_array(x):
# return utilities


def set_skim_wrapper_targets(df, skims):
def set_skim_wrapper_targets(df, skims, allow_partial_success: bool = True):
Comment thread
jpn-- marked this conversation as resolved.

 """
 Add the dataframe to the SkimWrapper object so that it can be dereferenced
 using the parameters of the skims object.
Expand All@@ -1007,6 +1007,11 @@ def set_skim_wrapper_targets(df, skims):
 dataframe that comes back from interacting choosers with
 alternatives. See the skims module for more documentation on how
 the skims object is intended to be used.
 allow_partial_success : bool, optional
 If True (default), failures to set skim targets for some skim objects
 (for example due to missing required columns in `df`) will be collected
 and logged as warnings but will not raise an exception. If False, any
 such failure will be raised immediately, preventing partial success.
 """

 skims = (
Expand All@@ -1016,13 +1021,31 @@ def set_skim_wrapper_targets(df, skims):
 if isinstance(skims, dict)
 else [skims]
 )
 problems = []

 # assume any object in skims can be treated as a skim
 for skim in skims:
 try:
 skim.set_df(df)
 except AttributeError:
 # sometimes when passed as a dict, the skims have a few keys given as
 # settings or constants, which are not actually "skim" objects and have
 # no `set_df` attribute. This is fine and we just let them pass.
 pass
 except AssertionError as e:
 # An assertion error will get triggered if the columns of `df` are
 # missing one of the required keys needed to look up values in the
 # skims. This may not be a problem, if this particular set of skims
 # is not actually used in this model component. So we'll warn about
 # it but usually not raise a showstopping error.
 problems.append(e)
 if not allow_partial_success:
 raise

 if problems:
 # if problems were discovered, log them as warnings
 for problem in problems:
 logger.warning(str(problem))


#
Expand Down

2 changes: 1 addition & 1 deletion
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ dependencies = [
 "requests >= 2.7",
 "scikit-learn >= 1.2",
 "setuptools>=80.9.0",
 "sharrow >= 2.9.1",
 "sharrow>=2.15",
 "sparse",
 "tables >= 3.9", # pytables is tables in pypi
 "xarray >= 2024.05",
Expand Down

10 changes: 5 additions & 5 deletions
uv.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.