Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile#963

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 7 commits into from
Aug 13, 2025
Merged

Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25d4692
adding activitysim version to log file
aletzdy Apr 15, 2025
64e1cd6
fix duplicate columns in parking location choice as described in #633
aletzdy Apr 21, 2025
f2bb16d
making tour mode choice logsum optional in destionation choice models…
aletzdy Apr 24, 2025
7795d89
logsum settings in location choice, trip dest, tour_od
dhensle May 21, 2025
917e8f5
optional logsums in trip destination
dhensle May 23, 2025
196418c
Merge branch 'ActivitySim:main' into phase9A_minor_fixes
dhensle Aug 4, 2025
065b0d0
blacken
dhensle Aug 4, 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
30 changes: 17 additions & 13 deletions activitysim/abm/models/location_choice.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -838,19 +838,23 @@ def run_location_choice(
)

# - location_logsums
location_sample_df = run_location_logsums(
state,
segment_name,
choosers,
network_los,
location_sample_df,
model_settings,
chunk_size,
chunk_tag=f"{chunk_tag}.logsums",
trace_label=tracing.extend_trace_label(
trace_label, "logsums.%s" % segment_name
),
)
# skip logsum calculations if LOGSUM_SETTINGS is None
if model_settings.LOGSUM_SETTINGS:
location_sample_df = run_location_logsums(
state,
segment_name,
choosers,
network_los,
location_sample_df,
model_settings,
chunk_size,
chunk_tag=f"{chunk_tag}.logsums",
trace_label=tracing.extend_trace_label(
trace_label, "logsums.%s" % segment_name
),
)
else:
location_sample_df[ALT_LOGSUM] = 0.0

# - location_simulate
choices_df = run_location_simulate(
Expand Down
4 changes: 3 additions & 1 deletion activitysim/abm/models/parking_location_choice.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -203,8 +203,10 @@ def choose_parking_location(
additional_columns=model_settings.compute_settings.protect_columns,
)

# Passing only the index of the trips table to the interaction_dataset
# See ActivitySim issue #633
destination_sample = logit.interaction_dataset(
state, trips, alternatives, alt_index_id=alt_dest_col_name
state, trips[[]], alternatives, alt_index_id=alt_dest_col_name
)
destination_sample.index = np.repeat(trips.index.values, len(alternatives))
destination_sample.index.name = trips.index.name
Expand Down
40 changes: 26 additions & 14 deletions activitysim/abm/models/trip_destination.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,16 +1053,21 @@ def choose_trip_destination(
return pd.Series(index=trips.index).to_frame("choice"), None

# - compute logsums
destination_sample = compute_logsums(
state,
primary_purpose=primary_purpose,
trips=trips,
destination_sample=destination_sample,
tours_merged=tours_merged,
model_settings=model_settings,
skim_hotel=skim_hotel,
trace_label=trace_label,
)
# If LOGSUM_SETTINGS is set to None, we don't want to compute logsums
if model_settings.LOGSUM_SETTINGS:
destination_sample = compute_logsums(
state,
primary_purpose=primary_purpose,
trips=trips,
destination_sample=destination_sample,
tours_merged=tours_merged,
model_settings=model_settings,
skim_hotel=skim_hotel,
trace_label=trace_label,
)
else:
destination_sample["od_logsum"] = 0.0
destination_sample["dp_logsum"] = 0.0

t0 = print_elapsed_time("%s.compute_logsums" % trace_label, t0)

Expand DownExpand Up@@ -1272,9 +1277,14 @@ def run_trip_destination(
state.filesystem, model_settings_file_name
)
preprocessor_settings = model_settings.preprocessor
logsum_settings = state.filesystem.read_model_settings(
model_settings.LOGSUM_SETTINGS
)

# read in logsum settings if they exist, otherwise logsum calculations are skipped
if model_settings.LOGSUM_SETTINGS:
logsum_settings = state.filesystem.read_model_settings(
model_settings.LOGSUM_SETTINGS
)
else:
logsum_settings = None

logsum_column_name = model_settings.DEST_CHOICE_LOGSUM_COLUMN_NAME
want_logsums = logsum_column_name is not None
Expand DownExpand Up@@ -1342,7 +1352,9 @@ def run_trip_destination(

# - filter tours_merged (AFTER copying destination and origin columns to trips)
# tours_merged is used for logsums, we filter it here upfront to save space and time
tours_merged_cols = logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"]
tours_merged_cols = (
logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"] if logsum_settings else []
)
redundant_cols = model_settings.REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS or []
if redundant_cols:
tours_merged_cols = [c for c in tours_merged_cols if c not in redundant_cols]
Expand Down
26 changes: 15 additions & 11 deletions activitysim/abm/models/util/tour_destination.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -894,17 +894,21 @@ def run_tour_destination(
)

# - destination_logsums
tour_purpose = segment_name # tour_purpose is segment_name
location_sample_df = run_destination_logsums(
state,
tour_purpose,
persons_merged,
location_sample_df,
model_settings,
network_los,
chunk_size=state.settings.chunk_size,
trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
)
# if LOGSUM_SETTINGS is set to 'None', we skip this step
if model_settings.LOGSUM_SETTINGS:
tour_purpose = segment_name # tour_purpose is segment_name
location_sample_df = run_destination_logsums(
state,
tour_purpose,
persons_merged,
location_sample_df,
model_settings,
network_los,
chunk_size=state.settings.chunk_size,
trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
)
else:
location_sample_df["mode_choice_logsum"] = 0

# - destination_simulate
spec_segment_name = segment_name # spec_segment_name is segment_name
Expand Down
32 changes: 18 additions & 14 deletions activitysim/abm/models/util/tour_od.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1132,20 +1132,24 @@ def run_tour_od(
)

# - destination_logsums
od_sample_df = run_od_logsums(
state,
spec_segment_name,
choosers,
od_sample_df,
model_settings,
network_los,
estimator,
chunk_size=chunk_size,
trace_hh_id=trace_hh_id,
trace_label=tracing.extend_trace_label(
trace_label, f"logsums.{segment_name}"
),
)
# Skip logsum calculation step if LOGSUM_SETTINGS is None
if model_settings.LOGSUM_SETTINGS:
od_sample_df = run_od_logsums(
state,
spec_segment_name,
choosers,
od_sample_df,
model_settings,
network_los,
estimator,
chunk_size=chunk_size,
trace_hh_id=trace_hh_id,
trace_label=tracing.extend_trace_label(
trace_label, f"logsums.{segment_name}"
),
)
else:
od_sample_df["tour_mode_choice_logsum"] = 0.0

# - od_simulate
choices = run_od_simulate(
Expand Down
3 changes: 3 additions & 0 deletions activitysim/cli/run.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,9 @@ def run(args):
config.filter_warnings(state)
logging.captureWarnings(capture=True)

activitysim_version = importlib.metadata.version("activitysim")
logger.info(f"ActivitySim Version: {activitysim_version}")

# directories
for k in ["configs_dir", "settings_file_name", "data_dir", "output_dir"]:
logger.info("SETTING %s: %s" % (k, getattr(state.filesystem, k, None)))
Expand Down
7 changes: 5 additions & 2 deletions activitysim/core/configuration/logit.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,11 @@ class LocationComponentSettings(BaseLogitComponentSettings):
SAMPLE_SIZE: int
"""This many candidate alternatives will be sampled for each choice."""

LOGSUM_SETTINGS: Path
"""Settings for the logsum computation."""
LOGSUM_SETTINGS: Path | None = None
"""
Settings for the logsum computation.
If None, no logsum is computed and logsum field is populated with zeros.
"""

explicit_chunk: float = 0
"""
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
Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile#963

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 7 commits into

from

Aug 13, 2025
 Merged


Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile
#963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
25d4692

adding activitysim version to log file


aletzdy Apr 15, 2025
64e1cd6

fix duplicate columns in parking location choice as described in #633


aletzdy Apr 21, 2025
f2bb16d

making tour mode choice logsum optional in destionation choice models…


aletzdy Apr 24, 2025
7795d89

logsum settings in location choice, trip dest, tour_od


dhensle May 21, 2025
917e8f5

optional logsums in trip destination


dhensle May 23, 2025
196418c

Merge branch 'ActivitySim:main' into phase9A_minor_fixes


dhensle Aug 4, 2025
065b0d0

blacken


dhensle Aug 4, 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


30 changes: 17 additions & 13 deletions
activitysim/abm/models/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,19 +838,23 @@ def run_location_choice(
 )

 # - location_logsums
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 # skip logsum calculations if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 else:
 location_sample_df[ALT_LOGSUM] = 0.0

 # - location_simulate
 choices_df = run_location_simulate(
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,8 +203,10 @@ def choose_parking_location(
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 # Passing only the index of the trips table to the interaction_dataset
 # See ActivitySim issue #633
 destination_sample = logit.interaction_dataset(
 state, trips, alternatives, alt_index_id=alt_dest_col_name
 state, trips[[]], alternatives, alt_index_id=alt_dest_col_name
 )
 destination_sample.index = np.repeat(trips.index.values, len(alternatives))
 destination_sample.index.name = trips.index.name
Expand Down

40 changes: 26 additions & 14 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,16 +1053,21 @@ def choose_trip_destination(
 return pd.Series(index=trips.index).to_frame("choice"), None

 # - compute logsums
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 # If LOGSUM_SETTINGS is set to None, we don't want to compute logsums
 if model_settings.LOGSUM_SETTINGS:
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 else:
 destination_sample["od_logsum"] = 0.0
 destination_sample["dp_logsum"] = 0.0

 t0 = print_elapsed_time("%s.compute_logsums" % trace_label, t0)

Expand DownExpand Up@@ -1272,9 +1277,14 @@ def run_trip_destination(
 state.filesystem, model_settings_file_name
 )
 preprocessor_settings = model_settings.preprocessor
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )

 # read in logsum settings if they exist, otherwise logsum calculations are skipped
 if model_settings.LOGSUM_SETTINGS:
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )
 else:
 logsum_settings = None

 logsum_column_name = model_settings.DEST_CHOICE_LOGSUM_COLUMN_NAME
 want_logsums = logsum_column_name is not None
Expand DownExpand Up@@ -1342,7 +1352,9 @@ def run_trip_destination(

 # - filter tours_merged (AFTER copying destination and origin columns to trips)
 # tours_merged is used for logsums, we filter it here upfront to save space and time
 tours_merged_cols = logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"]
 tours_merged_cols = (
 logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"] if logsum_settings else []
 )
 redundant_cols = model_settings.REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS or []
 if redundant_cols:
 tours_merged_cols = [c for c in tours_merged_cols if c not in redundant_cols]
Expand Down

26 changes: 15 additions & 11 deletions
activitysim/abm/models/util/tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -894,17 +894,21 @@ def run_tour_destination(
 )

 # - destination_logsums
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 # if LOGSUM_SETTINGS is set to 'None', we skip this step
 if model_settings.LOGSUM_SETTINGS:
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 else:
 location_sample_df["mode_choice_logsum"] = 0

 # - destination_simulate
 spec_segment_name = segment_name # spec_segment_name is segment_name
Expand Down

32 changes: 18 additions & 14 deletions
activitysim/abm/models/util/tour_od.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1132,20 +1132,24 @@ def run_tour_od(
 )

 # - destination_logsums
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 # Skip logsum calculation step if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 else:
 od_sample_df["tour_mode_choice_logsum"] = 0.0

 # - od_simulate
 choices = run_od_simulate(
Expand Down

3 changes: 3 additions & 0 deletions
activitysim/cli/run.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,9 @@ def run(args):
 config.filter_warnings(state)
 logging.captureWarnings(capture=True)

 activitysim_version = importlib.metadata.version("activitysim")
 logger.info(f"ActivitySim Version: {activitysim_version}")

 # directories
 for k in ["configs_dir", "settings_file_name", "data_dir", "output_dir"]:
 logger.info("SETTING %s: %s" % (k, getattr(state.filesystem, k, None)))
Expand Down

7 changes: 5 additions & 2 deletions
activitysim/core/configuration/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,11 @@ class LocationComponentSettings(BaseLogitComponentSettings):
 SAMPLE_SIZE: int
 """This many candidate alternatives will be sampled for each choice."""

 LOGSUM_SETTINGS: Path
 """Settings for the logsum computation."""
 LOGSUM_SETTINGS: Path | None = None
 """
 Settings for the logsum computation.
 If None, no logsum is computed and logsum field is populated with zeros.
 """

 explicit_chunk: float = 0
 """
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
Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile#963

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 7 commits into

from

Aug 13, 2025
 Merged


Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile
#963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
25d4692

adding activitysim version to log file


aletzdy Apr 15, 2025
64e1cd6

fix duplicate columns in parking location choice as described in #633


aletzdy Apr 21, 2025
f2bb16d

making tour mode choice logsum optional in destionation choice models…


aletzdy Apr 24, 2025
7795d89

logsum settings in location choice, trip dest, tour_od


dhensle May 21, 2025
917e8f5

optional logsums in trip destination


dhensle May 23, 2025
196418c

Merge branch 'ActivitySim:main' into phase9A_minor_fixes


dhensle Aug 4, 2025
065b0d0

blacken


dhensle Aug 4, 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


30 changes: 17 additions & 13 deletions
activitysim/abm/models/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,19 +838,23 @@ def run_location_choice(
 )

 # - location_logsums
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 # skip logsum calculations if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 else:
 location_sample_df[ALT_LOGSUM] = 0.0

 # - location_simulate
 choices_df = run_location_simulate(
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,8 +203,10 @@ def choose_parking_location(
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 # Passing only the index of the trips table to the interaction_dataset
 # See ActivitySim issue #633
 destination_sample = logit.interaction_dataset(
 state, trips, alternatives, alt_index_id=alt_dest_col_name
 state, trips[[]], alternatives, alt_index_id=alt_dest_col_name
 )
 destination_sample.index = np.repeat(trips.index.values, len(alternatives))
 destination_sample.index.name = trips.index.name
Expand Down

40 changes: 26 additions & 14 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,16 +1053,21 @@ def choose_trip_destination(
 return pd.Series(index=trips.index).to_frame("choice"), None

 # - compute logsums
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 # If LOGSUM_SETTINGS is set to None, we don't want to compute logsums
 if model_settings.LOGSUM_SETTINGS:
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 else:
 destination_sample["od_logsum"] = 0.0
 destination_sample["dp_logsum"] = 0.0

 t0 = print_elapsed_time("%s.compute_logsums" % trace_label, t0)

Expand DownExpand Up@@ -1272,9 +1277,14 @@ def run_trip_destination(
 state.filesystem, model_settings_file_name
 )
 preprocessor_settings = model_settings.preprocessor
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )

 # read in logsum settings if they exist, otherwise logsum calculations are skipped
 if model_settings.LOGSUM_SETTINGS:
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )
 else:
 logsum_settings = None

 logsum_column_name = model_settings.DEST_CHOICE_LOGSUM_COLUMN_NAME
 want_logsums = logsum_column_name is not None
Expand DownExpand Up@@ -1342,7 +1352,9 @@ def run_trip_destination(

 # - filter tours_merged (AFTER copying destination and origin columns to trips)
 # tours_merged is used for logsums, we filter it here upfront to save space and time
 tours_merged_cols = logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"]
 tours_merged_cols = (
 logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"] if logsum_settings else []
 )
 redundant_cols = model_settings.REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS or []
 if redundant_cols:
 tours_merged_cols = [c for c in tours_merged_cols if c not in redundant_cols]
Expand Down

26 changes: 15 additions & 11 deletions
activitysim/abm/models/util/tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -894,17 +894,21 @@ def run_tour_destination(
 )

 # - destination_logsums
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 # if LOGSUM_SETTINGS is set to 'None', we skip this step
 if model_settings.LOGSUM_SETTINGS:
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 else:
 location_sample_df["mode_choice_logsum"] = 0

 # - destination_simulate
 spec_segment_name = segment_name # spec_segment_name is segment_name
Expand Down

32 changes: 18 additions & 14 deletions
activitysim/abm/models/util/tour_od.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1132,20 +1132,24 @@ def run_tour_od(
 )

 # - destination_logsums
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 # Skip logsum calculation step if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 else:
 od_sample_df["tour_mode_choice_logsum"] = 0.0

 # - od_simulate
 choices = run_od_simulate(
Expand Down

3 changes: 3 additions & 0 deletions
activitysim/cli/run.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,9 @@ def run(args):
 config.filter_warnings(state)
 logging.captureWarnings(capture=True)

 activitysim_version = importlib.metadata.version("activitysim")
 logger.info(f"ActivitySim Version: {activitysim_version}")

 # directories
 for k in ["configs_dir", "settings_file_name", "data_dir", "output_dir"]:
 logger.info("SETTING %s: %s" % (k, getattr(state.filesystem, k, None)))
Expand Down

7 changes: 5 additions & 2 deletions
activitysim/core/configuration/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,11 @@ class LocationComponentSettings(BaseLogitComponentSettings):
 SAMPLE_SIZE: int
 """This many candidate alternatives will be sampled for each choice."""

 LOGSUM_SETTINGS: Path
 """Settings for the logsum computation."""
 LOGSUM_SETTINGS: Path | None = None
 """
 Settings for the logsum computation.
 If None, no logsum is computed and logsum field is populated with zeros.
 """

 explicit_chunk: float = 0
 """
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
Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile#963

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 7 commits into

from

Aug 13, 2025
 Merged


Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile
#963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
25d4692

adding activitysim version to log file


aletzdy Apr 15, 2025
64e1cd6

fix duplicate columns in parking location choice as described in #633


aletzdy Apr 21, 2025
f2bb16d

making tour mode choice logsum optional in destionation choice models…


aletzdy Apr 24, 2025
7795d89

logsum settings in location choice, trip dest, tour_od


dhensle May 21, 2025
917e8f5

optional logsums in trip destination


dhensle May 23, 2025
196418c

Merge branch 'ActivitySim:main' into phase9A_minor_fixes


dhensle Aug 4, 2025
065b0d0

blacken


dhensle Aug 4, 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


30 changes: 17 additions & 13 deletions
activitysim/abm/models/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,19 +838,23 @@ def run_location_choice(
 )

 # - location_logsums
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 # skip logsum calculations if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 else:
 location_sample_df[ALT_LOGSUM] = 0.0

 # - location_simulate
 choices_df = run_location_simulate(
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,8 +203,10 @@ def choose_parking_location(
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 # Passing only the index of the trips table to the interaction_dataset
 # See ActivitySim issue #633
 destination_sample = logit.interaction_dataset(
 state, trips, alternatives, alt_index_id=alt_dest_col_name
 state, trips[[]], alternatives, alt_index_id=alt_dest_col_name
 )
 destination_sample.index = np.repeat(trips.index.values, len(alternatives))
 destination_sample.index.name = trips.index.name
Expand Down

40 changes: 26 additions & 14 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,16 +1053,21 @@ def choose_trip_destination(
 return pd.Series(index=trips.index).to_frame("choice"), None

 # - compute logsums
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 # If LOGSUM_SETTINGS is set to None, we don't want to compute logsums
 if model_settings.LOGSUM_SETTINGS:
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 else:
 destination_sample["od_logsum"] = 0.0
 destination_sample["dp_logsum"] = 0.0

 t0 = print_elapsed_time("%s.compute_logsums" % trace_label, t0)

Expand DownExpand Up@@ -1272,9 +1277,14 @@ def run_trip_destination(
 state.filesystem, model_settings_file_name
 )
 preprocessor_settings = model_settings.preprocessor
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )

 # read in logsum settings if they exist, otherwise logsum calculations are skipped
 if model_settings.LOGSUM_SETTINGS:
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )
 else:
 logsum_settings = None

 logsum_column_name = model_settings.DEST_CHOICE_LOGSUM_COLUMN_NAME
 want_logsums = logsum_column_name is not None
Expand DownExpand Up@@ -1342,7 +1352,9 @@ def run_trip_destination(

 # - filter tours_merged (AFTER copying destination and origin columns to trips)
 # tours_merged is used for logsums, we filter it here upfront to save space and time
 tours_merged_cols = logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"]
 tours_merged_cols = (
 logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"] if logsum_settings else []
 )
 redundant_cols = model_settings.REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS or []
 if redundant_cols:
 tours_merged_cols = [c for c in tours_merged_cols if c not in redundant_cols]
Expand Down

26 changes: 15 additions & 11 deletions
activitysim/abm/models/util/tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -894,17 +894,21 @@ def run_tour_destination(
 )

 # - destination_logsums
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 # if LOGSUM_SETTINGS is set to 'None', we skip this step
 if model_settings.LOGSUM_SETTINGS:
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 else:
 location_sample_df["mode_choice_logsum"] = 0

 # - destination_simulate
 spec_segment_name = segment_name # spec_segment_name is segment_name
Expand Down

32 changes: 18 additions & 14 deletions
activitysim/abm/models/util/tour_od.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1132,20 +1132,24 @@ def run_tour_od(
 )

 # - destination_logsums
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 # Skip logsum calculation step if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 else:
 od_sample_df["tour_mode_choice_logsum"] = 0.0

 # - od_simulate
 choices = run_od_simulate(
Expand Down

3 changes: 3 additions & 0 deletions
activitysim/cli/run.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,9 @@ def run(args):
 config.filter_warnings(state)
 logging.captureWarnings(capture=True)

 activitysim_version = importlib.metadata.version("activitysim")
 logger.info(f"ActivitySim Version: {activitysim_version}")

 # directories
 for k in ["configs_dir", "settings_file_name", "data_dir", "output_dir"]:
 logger.info("SETTING %s: %s" % (k, getattr(state.filesystem, k, None)))
Expand Down

7 changes: 5 additions & 2 deletions
activitysim/core/configuration/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,11 @@ class LocationComponentSettings(BaseLogitComponentSettings):
 SAMPLE_SIZE: int
 """This many candidate alternatives will be sampled for each choice."""

 LOGSUM_SETTINGS: Path
 """Settings for the logsum computation."""
 LOGSUM_SETTINGS: Path | None = None
 """
 Settings for the logsum computation.
 If None, no logsum is computed and logsum field is populated with zeros.
 """

 explicit_chunk: float = 0
 """
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
Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile#963

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 7 commits into

from

Aug 13, 2025
 Merged


Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile
#963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
25d4692

adding activitysim version to log file


aletzdy Apr 15, 2025
64e1cd6

fix duplicate columns in parking location choice as described in #633


aletzdy Apr 21, 2025
f2bb16d

making tour mode choice logsum optional in destionation choice models…


aletzdy Apr 24, 2025
7795d89

logsum settings in location choice, trip dest, tour_od


dhensle May 21, 2025
917e8f5

optional logsums in trip destination


dhensle May 23, 2025
196418c

Merge branch 'ActivitySim:main' into phase9A_minor_fixes


dhensle Aug 4, 2025
065b0d0

blacken


dhensle Aug 4, 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


30 changes: 17 additions & 13 deletions
activitysim/abm/models/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,19 +838,23 @@ def run_location_choice(
 )

 # - location_logsums
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 # skip logsum calculations if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 else:
 location_sample_df[ALT_LOGSUM] = 0.0

 # - location_simulate
 choices_df = run_location_simulate(
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,8 +203,10 @@ def choose_parking_location(
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 # Passing only the index of the trips table to the interaction_dataset
 # See ActivitySim issue #633
 destination_sample = logit.interaction_dataset(
 state, trips, alternatives, alt_index_id=alt_dest_col_name
 state, trips[[]], alternatives, alt_index_id=alt_dest_col_name
 )
 destination_sample.index = np.repeat(trips.index.values, len(alternatives))
 destination_sample.index.name = trips.index.name
Expand Down

40 changes: 26 additions & 14 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,16 +1053,21 @@ def choose_trip_destination(
 return pd.Series(index=trips.index).to_frame("choice"), None

 # - compute logsums
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 # If LOGSUM_SETTINGS is set to None, we don't want to compute logsums
 if model_settings.LOGSUM_SETTINGS:
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 else:
 destination_sample["od_logsum"] = 0.0
 destination_sample["dp_logsum"] = 0.0

 t0 = print_elapsed_time("%s.compute_logsums" % trace_label, t0)

Expand DownExpand Up@@ -1272,9 +1277,14 @@ def run_trip_destination(
 state.filesystem, model_settings_file_name
 )
 preprocessor_settings = model_settings.preprocessor
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )

 # read in logsum settings if they exist, otherwise logsum calculations are skipped
 if model_settings.LOGSUM_SETTINGS:
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )
 else:
 logsum_settings = None

 logsum_column_name = model_settings.DEST_CHOICE_LOGSUM_COLUMN_NAME
 want_logsums = logsum_column_name is not None
Expand DownExpand Up@@ -1342,7 +1352,9 @@ def run_trip_destination(

 # - filter tours_merged (AFTER copying destination and origin columns to trips)
 # tours_merged is used for logsums, we filter it here upfront to save space and time
 tours_merged_cols = logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"]
 tours_merged_cols = (
 logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"] if logsum_settings else []
 )
 redundant_cols = model_settings.REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS or []
 if redundant_cols:
 tours_merged_cols = [c for c in tours_merged_cols if c not in redundant_cols]
Expand Down

26 changes: 15 additions & 11 deletions
activitysim/abm/models/util/tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -894,17 +894,21 @@ def run_tour_destination(
 )

 # - destination_logsums
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 # if LOGSUM_SETTINGS is set to 'None', we skip this step
 if model_settings.LOGSUM_SETTINGS:
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 else:
 location_sample_df["mode_choice_logsum"] = 0

 # - destination_simulate
 spec_segment_name = segment_name # spec_segment_name is segment_name
Expand Down

32 changes: 18 additions & 14 deletions
activitysim/abm/models/util/tour_od.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1132,20 +1132,24 @@ def run_tour_od(
 )

 # - destination_logsums
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 # Skip logsum calculation step if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 else:
 od_sample_df["tour_mode_choice_logsum"] = 0.0

 # - od_simulate
 choices = run_od_simulate(
Expand Down

3 changes: 3 additions & 0 deletions
activitysim/cli/run.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,9 @@ def run(args):
 config.filter_warnings(state)
 logging.captureWarnings(capture=True)

 activitysim_version = importlib.metadata.version("activitysim")
 logger.info(f"ActivitySim Version: {activitysim_version}")

 # directories
 for k in ["configs_dir", "settings_file_name", "data_dir", "output_dir"]:
 logger.info("SETTING %s: %s" % (k, getattr(state.filesystem, k, None)))
Expand Down

7 changes: 5 additions & 2 deletions
activitysim/core/configuration/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,11 @@ class LocationComponentSettings(BaseLogitComponentSettings):
 SAMPLE_SIZE: int
 """This many candidate alternatives will be sampled for each choice."""

 LOGSUM_SETTINGS: Path
 """Settings for the logsum computation."""
 LOGSUM_SETTINGS: Path | None = None
 """
 Settings for the logsum computation.
 If None, no logsum is computed and logsum field is populated with zeros.
 """

 explicit_chunk: float = 0
 """
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
Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile#963

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 7 commits into

from

Aug 13, 2025
 Merged


Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile
#963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
25d4692

adding activitysim version to log file


aletzdy Apr 15, 2025
64e1cd6

fix duplicate columns in parking location choice as described in #633


aletzdy Apr 21, 2025
f2bb16d

making tour mode choice logsum optional in destionation choice models…


aletzdy Apr 24, 2025
7795d89

logsum settings in location choice, trip dest, tour_od


dhensle May 21, 2025
917e8f5

optional logsums in trip destination


dhensle May 23, 2025
196418c

Merge branch 'ActivitySim:main' into phase9A_minor_fixes


dhensle Aug 4, 2025
065b0d0

blacken


dhensle Aug 4, 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


30 changes: 17 additions & 13 deletions
activitysim/abm/models/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,19 +838,23 @@ def run_location_choice(
 )

 # - location_logsums
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 # skip logsum calculations if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 else:
 location_sample_df[ALT_LOGSUM] = 0.0

 # - location_simulate
 choices_df = run_location_simulate(
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,8 +203,10 @@ def choose_parking_location(
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 # Passing only the index of the trips table to the interaction_dataset
 # See ActivitySim issue #633
 destination_sample = logit.interaction_dataset(
 state, trips, alternatives, alt_index_id=alt_dest_col_name
 state, trips[[]], alternatives, alt_index_id=alt_dest_col_name
 )
 destination_sample.index = np.repeat(trips.index.values, len(alternatives))
 destination_sample.index.name = trips.index.name
Expand Down

40 changes: 26 additions & 14 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,16 +1053,21 @@ def choose_trip_destination(
 return pd.Series(index=trips.index).to_frame("choice"), None

 # - compute logsums
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 # If LOGSUM_SETTINGS is set to None, we don't want to compute logsums
 if model_settings.LOGSUM_SETTINGS:
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 else:
 destination_sample["od_logsum"] = 0.0
 destination_sample["dp_logsum"] = 0.0

 t0 = print_elapsed_time("%s.compute_logsums" % trace_label, t0)

Expand DownExpand Up@@ -1272,9 +1277,14 @@ def run_trip_destination(
 state.filesystem, model_settings_file_name
 )
 preprocessor_settings = model_settings.preprocessor
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )

 # read in logsum settings if they exist, otherwise logsum calculations are skipped
 if model_settings.LOGSUM_SETTINGS:
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )
 else:
 logsum_settings = None

 logsum_column_name = model_settings.DEST_CHOICE_LOGSUM_COLUMN_NAME
 want_logsums = logsum_column_name is not None
Expand DownExpand Up@@ -1342,7 +1352,9 @@ def run_trip_destination(

 # - filter tours_merged (AFTER copying destination and origin columns to trips)
 # tours_merged is used for logsums, we filter it here upfront to save space and time
 tours_merged_cols = logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"]
 tours_merged_cols = (
 logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"] if logsum_settings else []
 )
 redundant_cols = model_settings.REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS or []
 if redundant_cols:
 tours_merged_cols = [c for c in tours_merged_cols if c not in redundant_cols]
Expand Down

26 changes: 15 additions & 11 deletions
activitysim/abm/models/util/tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -894,17 +894,21 @@ def run_tour_destination(
 )

 # - destination_logsums
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 # if LOGSUM_SETTINGS is set to 'None', we skip this step
 if model_settings.LOGSUM_SETTINGS:
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 else:
 location_sample_df["mode_choice_logsum"] = 0

 # - destination_simulate
 spec_segment_name = segment_name # spec_segment_name is segment_name
Expand Down

32 changes: 18 additions & 14 deletions
activitysim/abm/models/util/tour_od.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1132,20 +1132,24 @@ def run_tour_od(
 )

 # - destination_logsums
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 # Skip logsum calculation step if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 else:
 od_sample_df["tour_mode_choice_logsum"] = 0.0

 # - od_simulate
 choices = run_od_simulate(
Expand Down

3 changes: 3 additions & 0 deletions
activitysim/cli/run.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,9 @@ def run(args):
 config.filter_warnings(state)
 logging.captureWarnings(capture=True)

 activitysim_version = importlib.metadata.version("activitysim")
 logger.info(f"ActivitySim Version: {activitysim_version}")

 # directories
 for k in ["configs_dir", "settings_file_name", "data_dir", "output_dir"]:
 logger.info("SETTING %s: %s" % (k, getattr(state.filesystem, k, None)))
Expand Down

7 changes: 5 additions & 2 deletions
activitysim/core/configuration/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,11 @@ class LocationComponentSettings(BaseLogitComponentSettings):
 SAMPLE_SIZE: int
 """This many candidate alternatives will be sampled for each choice."""

 LOGSUM_SETTINGS: Path
 """Settings for the logsum computation."""
 LOGSUM_SETTINGS: Path | None = None
 """
 Settings for the logsum computation.
 If None, no logsum is computed and logsum field is populated with zeros.
 """

 explicit_chunk: float = 0
 """
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
Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile#963

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 7 commits into

from

Aug 13, 2025
 Merged


Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile
#963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
25d4692

adding activitysim version to log file


aletzdy Apr 15, 2025
64e1cd6

fix duplicate columns in parking location choice as described in #633


aletzdy Apr 21, 2025
f2bb16d

making tour mode choice logsum optional in destionation choice models…


aletzdy Apr 24, 2025
7795d89

logsum settings in location choice, trip dest, tour_od


dhensle May 21, 2025
917e8f5

optional logsums in trip destination


dhensle May 23, 2025
196418c

Merge branch 'ActivitySim:main' into phase9A_minor_fixes


dhensle Aug 4, 2025
065b0d0

blacken


dhensle Aug 4, 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


30 changes: 17 additions & 13 deletions
activitysim/abm/models/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,19 +838,23 @@ def run_location_choice(
 )

 # - location_logsums
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 # skip logsum calculations if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 else:
 location_sample_df[ALT_LOGSUM] = 0.0

 # - location_simulate
 choices_df = run_location_simulate(
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,8 +203,10 @@ def choose_parking_location(
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 # Passing only the index of the trips table to the interaction_dataset
 # See ActivitySim issue #633
 destination_sample = logit.interaction_dataset(
 state, trips, alternatives, alt_index_id=alt_dest_col_name
 state, trips[[]], alternatives, alt_index_id=alt_dest_col_name
 )
 destination_sample.index = np.repeat(trips.index.values, len(alternatives))
 destination_sample.index.name = trips.index.name
Expand Down

40 changes: 26 additions & 14 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,16 +1053,21 @@ def choose_trip_destination(
 return pd.Series(index=trips.index).to_frame("choice"), None

 # - compute logsums
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 # If LOGSUM_SETTINGS is set to None, we don't want to compute logsums
 if model_settings.LOGSUM_SETTINGS:
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 else:
 destination_sample["od_logsum"] = 0.0
 destination_sample["dp_logsum"] = 0.0

 t0 = print_elapsed_time("%s.compute_logsums" % trace_label, t0)

Expand DownExpand Up@@ -1272,9 +1277,14 @@ def run_trip_destination(
 state.filesystem, model_settings_file_name
 )
 preprocessor_settings = model_settings.preprocessor
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )

 # read in logsum settings if they exist, otherwise logsum calculations are skipped
 if model_settings.LOGSUM_SETTINGS:
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )
 else:
 logsum_settings = None

 logsum_column_name = model_settings.DEST_CHOICE_LOGSUM_COLUMN_NAME
 want_logsums = logsum_column_name is not None
Expand DownExpand Up@@ -1342,7 +1352,9 @@ def run_trip_destination(

 # - filter tours_merged (AFTER copying destination and origin columns to trips)
 # tours_merged is used for logsums, we filter it here upfront to save space and time
 tours_merged_cols = logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"]
 tours_merged_cols = (
 logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"] if logsum_settings else []
 )
 redundant_cols = model_settings.REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS or []
 if redundant_cols:
 tours_merged_cols = [c for c in tours_merged_cols if c not in redundant_cols]
Expand Down

26 changes: 15 additions & 11 deletions
activitysim/abm/models/util/tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -894,17 +894,21 @@ def run_tour_destination(
 )

 # - destination_logsums
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 # if LOGSUM_SETTINGS is set to 'None', we skip this step
 if model_settings.LOGSUM_SETTINGS:
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 else:
 location_sample_df["mode_choice_logsum"] = 0

 # - destination_simulate
 spec_segment_name = segment_name # spec_segment_name is segment_name
Expand Down

32 changes: 18 additions & 14 deletions
activitysim/abm/models/util/tour_od.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1132,20 +1132,24 @@ def run_tour_od(
 )

 # - destination_logsums
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 # Skip logsum calculation step if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 else:
 od_sample_df["tour_mode_choice_logsum"] = 0.0

 # - od_simulate
 choices = run_od_simulate(
Expand Down

3 changes: 3 additions & 0 deletions
activitysim/cli/run.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,9 @@ def run(args):
 config.filter_warnings(state)
 logging.captureWarnings(capture=True)

 activitysim_version = importlib.metadata.version("activitysim")
 logger.info(f"ActivitySim Version: {activitysim_version}")

 # directories
 for k in ["configs_dir", "settings_file_name", "data_dir", "output_dir"]:
 logger.info("SETTING %s: %s" % (k, getattr(state.filesystem, k, None)))
Expand Down

7 changes: 5 additions & 2 deletions
activitysim/core/configuration/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,11 @@ class LocationComponentSettings(BaseLogitComponentSettings):
 SAMPLE_SIZE: int
 """This many candidate alternatives will be sampled for each choice."""

 LOGSUM_SETTINGS: Path
 """Settings for the logsum computation."""
 LOGSUM_SETTINGS: Path | None = None
 """
 Settings for the logsum computation.
 If None, no logsum is computed and logsum field is populated with zeros.
 """

 explicit_chunk: float = 0
 """
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
Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile#963

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 7 commits into

from

Aug 13, 2025
 Merged


Minor Fixes: optional logsums, duplicate data in parking lot choice, activitysim version to logfile
#963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
25d4692

adding activitysim version to log file


aletzdy Apr 15, 2025
64e1cd6

fix duplicate columns in parking location choice as described in #633


aletzdy Apr 21, 2025
f2bb16d

making tour mode choice logsum optional in destionation choice models…


aletzdy Apr 24, 2025
7795d89

logsum settings in location choice, trip dest, tour_od


dhensle May 21, 2025
917e8f5

optional logsums in trip destination


dhensle May 23, 2025
196418c

Merge branch 'ActivitySim:main' into phase9A_minor_fixes


dhensle Aug 4, 2025
065b0d0

blacken


dhensle Aug 4, 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


30 changes: 17 additions & 13 deletions
activitysim/abm/models/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,19 +838,23 @@ def run_location_choice(
 )

 # - location_logsums
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 # skip logsum calculations if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 location_sample_df = run_location_logsums(
 state,
 segment_name,
 choosers,
 network_los,
 location_sample_df,
 model_settings,
 chunk_size,
 chunk_tag=f"{chunk_tag}.logsums",
 trace_label=tracing.extend_trace_label(
 trace_label, "logsums.%s" % segment_name
 ),
 )
 else:
 location_sample_df[ALT_LOGSUM] = 0.0

 # - location_simulate
 choices_df = run_location_simulate(
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,8 +203,10 @@ def choose_parking_location(
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 # Passing only the index of the trips table to the interaction_dataset
 # See ActivitySim issue #633
 destination_sample = logit.interaction_dataset(
 state, trips, alternatives, alt_index_id=alt_dest_col_name
 state, trips[[]], alternatives, alt_index_id=alt_dest_col_name
 )
 destination_sample.index = np.repeat(trips.index.values, len(alternatives))
 destination_sample.index.name = trips.index.name
Expand Down

40 changes: 26 additions & 14 deletions
activitysim/abm/models/trip_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,16 +1053,21 @@ def choose_trip_destination(
 return pd.Series(index=trips.index).to_frame("choice"), None

 # - compute logsums
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 # If LOGSUM_SETTINGS is set to None, we don't want to compute logsums
 if model_settings.LOGSUM_SETTINGS:
 destination_sample = compute_logsums(
 state,
 primary_purpose=primary_purpose,
 trips=trips,
 destination_sample=destination_sample,
 tours_merged=tours_merged,
 model_settings=model_settings,
 skim_hotel=skim_hotel,
 trace_label=trace_label,
 )
 else:
 destination_sample["od_logsum"] = 0.0
 destination_sample["dp_logsum"] = 0.0

 t0 = print_elapsed_time("%s.compute_logsums" % trace_label, t0)

Expand DownExpand Up@@ -1272,9 +1277,14 @@ def run_trip_destination(
 state.filesystem, model_settings_file_name
 )
 preprocessor_settings = model_settings.preprocessor
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )

 # read in logsum settings if they exist, otherwise logsum calculations are skipped
 if model_settings.LOGSUM_SETTINGS:
 logsum_settings = state.filesystem.read_model_settings(
 model_settings.LOGSUM_SETTINGS
 )
 else:
 logsum_settings = None

 logsum_column_name = model_settings.DEST_CHOICE_LOGSUM_COLUMN_NAME
 want_logsums = logsum_column_name is not None
Expand DownExpand Up@@ -1342,7 +1352,9 @@ def run_trip_destination(

 # - filter tours_merged (AFTER copying destination and origin columns to trips)
 # tours_merged is used for logsums, we filter it here upfront to save space and time
 tours_merged_cols = logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"]
 tours_merged_cols = (
 logsum_settings["TOURS_MERGED_CHOOSER_COLUMNS"] if logsum_settings else []
 )
 redundant_cols = model_settings.REDUNDANT_TOURS_MERGED_CHOOSER_COLUMNS or []
 if redundant_cols:
 tours_merged_cols = [c for c in tours_merged_cols if c not in redundant_cols]
Expand Down

26 changes: 15 additions & 11 deletions
activitysim/abm/models/util/tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -894,17 +894,21 @@ def run_tour_destination(
 )

 # - destination_logsums
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 # if LOGSUM_SETTINGS is set to 'None', we skip this step
 if model_settings.LOGSUM_SETTINGS:
 tour_purpose = segment_name # tour_purpose is segment_name
 location_sample_df = run_destination_logsums(
 state,
 tour_purpose,
 persons_merged,
 location_sample_df,
 model_settings,
 network_los,
 chunk_size=state.settings.chunk_size,
 trace_label=tracing.extend_trace_label(segment_trace_label, "logsums"),
 )
 else:
 location_sample_df["mode_choice_logsum"] = 0

 # - destination_simulate
 spec_segment_name = segment_name # spec_segment_name is segment_name
Expand Down

32 changes: 18 additions & 14 deletions
activitysim/abm/models/util/tour_od.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1132,20 +1132,24 @@ def run_tour_od(
 )

 # - destination_logsums
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 # Skip logsum calculation step if LOGSUM_SETTINGS is None
 if model_settings.LOGSUM_SETTINGS:
 od_sample_df = run_od_logsums(
 state,
 spec_segment_name,
 choosers,
 od_sample_df,
 model_settings,
 network_los,
 estimator,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
 trace_label=tracing.extend_trace_label(
 trace_label, f"logsums.{segment_name}"
 ),
 )
 else:
 od_sample_df["tour_mode_choice_logsum"] = 0.0

 # - od_simulate
 choices = run_od_simulate(
Expand Down

3 changes: 3 additions & 0 deletions
activitysim/cli/run.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,9 @@ def run(args):
 config.filter_warnings(state)
 logging.captureWarnings(capture=True)

 activitysim_version = importlib.metadata.version("activitysim")
 logger.info(f"ActivitySim Version: {activitysim_version}")

 # directories
 for k in ["configs_dir", "settings_file_name", "data_dir", "output_dir"]:
 logger.info("SETTING %s: %s" % (k, getattr(state.filesystem, k, None)))
Expand Down

7 changes: 5 additions & 2 deletions
activitysim/core/configuration/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,11 @@ class LocationComponentSettings(BaseLogitComponentSettings):
 SAMPLE_SIZE: int
 """This many candidate alternatives will be sampled for each choice."""

 LOGSUM_SETTINGS: Path
 """Settings for the logsum computation."""
 LOGSUM_SETTINGS: Path | None = None
 """
 Settings for the logsum computation.
 If None, no logsum is computed and logsum field is populated with zeros.
 """

 explicit_chunk: float = 0
 """
Expand Down
Loading