protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)#871

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 4 commits into from
May 21, 2024
Merged

protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc) #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28fdbb6
protect columns in all simulate
i-am-sijia May 13, 2024
9ad1d0d
enabling compute settings for trip scheduling choice
i-am-sijia May 13, 2024
b562e08
move hardcoded protect columns to settings
i-am-sijia May 13, 2024
33edae6
allow protect columns in parking location choice
i-am-sijia May 14, 2024
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
14 changes: 12 additions & 2 deletions activitysim/abm/models/parking_location_choice.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,9 +186,19 @@ def choose_parking_location(
locals_dict["PARKING"] = skims["op_skims"].dest_key

spec = get_spec_for_segment(state, model_settings, segment_name)
trips = drop_unused_columns(trips, spec, locals_dict, custom_chooser=None)
trips = drop_unused_columns(
trips,
spec,
locals_dict,
custom_chooser=None,
additional_columns=model_settings.compute_settings.protect_columns,
)
alternatives = drop_unused_columns(
alternatives, spec, locals_dict, custom_chooser=None
alternatives,
spec,
locals_dict,
custom_chooser=None,
additional_columns=model_settings.compute_settings.protect_columns,
)

destination_sample = logit.interaction_dataset(
Expand Down
19 changes: 17 additions & 2 deletions activitysim/abm/models/trip_scheduling_choice.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,11 @@
get_time_windows,
)
from activitysim.core import chunk, expressions, simulate, tracing, workflow
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
from activitysim.core.configuration.base import (
ComputeSettings,
PreprocessorSettings,
PydanticReadable,
)
from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
from activitysim.core.skim_dataset import SkimDataset
from activitysim.core.skim_dictionary import SkimDict
Expand DownExpand Up@@ -223,6 +227,7 @@ def run_trip_scheduling_choice(
skims,
locals_dict: Mapping,
trace_label: str,
model_settings: TripSchedulingChoiceSettings,
):
NUM_TOUR_LEGS = 3
trace_label = tracing.extend_trace_label(trace_label, "interaction_sample_simulate")
Expand DownExpand Up@@ -296,6 +301,7 @@ def run_trip_scheduling_choice(
trace_choice_name="trip_schedule_stage_1",
estimator=None,
chunk_sizer=chunk_sizer,
compute_settings=model_settings.compute_settings,
)

assert len(choices.index) == len(choosers.index)
Expand DownExpand Up@@ -338,6 +344,9 @@ class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
SPECIFICATION: str
"""file name of specification file"""

compute_settings: ComputeSettings = ComputeSettings()
"""Compute settings for this component."""


@workflow.step
def trip_scheduling_choice(
Expand DownExpand Up@@ -419,7 +428,13 @@ def trip_scheduling_choice(
)

tours_df = run_trip_scheduling_choice(
state, spec, tours_df, skims, locals_dict, trace_label
state,
spec,
tours_df,
skims,
locals_dict,
trace_label,
model_settings,
)

state.add_table("tours", tours_df)
1 change: 1 addition & 0 deletions activitysim/core/configuration/base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
use_numexpr=self.use_numexpr,
use_numba=self.use_numba,
drop_unused_columns=self.drop_unused_columns,
protect_columns=self.protect_columns,
)


Expand Down
3 changes: 2 additions & 1 deletion activitysim/core/interaction_sample.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ def _interaction_sample(
locals_d,
custom_chooser=None,
sharrow_enabled=sharrow_enabled,
additional_columns=compute_settings.protect_columns,
)

alternatives = util.drop_unused_columns(
Expand All@@ -265,7 +266,7 @@ def _interaction_sample(
locals_d,
custom_chooser=None,
sharrow_enabled=sharrow_enabled,
additional_columns=["tdd", "origin_destination"],
additional_columns=["tdd"] + compute_settings.protect_columns,
)

if sharrow_enabled:
Expand Down
3 changes: 2 additions & 1 deletion activitysim/core/interaction_sample_simulate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
locals_d,
custom_chooser=None,
sharrow_enabled=sharrow_enabled,
additional_columns=compute_settings.protect_columns,
)

alternatives = util.drop_unused_columns(
Expand All@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
locals_d,
custom_chooser=None,
sharrow_enabled=sharrow_enabled,
additional_columns=["tdd", "origin_destination"],
additional_columns=["tdd"] + compute_settings.protect_columns,
)

interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
Expand Down
1 change: 1 addition & 0 deletions activitysim/core/interaction_simulate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -729,6 +729,7 @@ def _interaction_simulate(
locals_d,
custom_chooser=None,
sharrow_enabled=sharrow_enabled,
additional_columns=compute_settings.protect_columns,
)

if (
Expand Down
1 change: 1 addition & 0 deletions activitysim/core/simulate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
locals_d,
custom_chooser=None,
sharrow_enabled=state.settings.sharrow,
additional_columns=compute_settings.protect_columns,
)

if nest_spec is None:
Expand Down
4 changes: 4 additions & 0 deletions activitysim/examples/prototype_sandag_xborder/configs/tour_od_choice.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,3 +55,7 @@ SEGMENTS:

LOGSUM_SETTINGS: tour_mode_choice
LOGSUM_PREPROCESSOR: preprocessor

compute_settings:
protect_columns:
- origin_destination

@dhensledhensleMay 20, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will break the sandag model that's not in the test system... are we keeping track of these breaking changes anywhere? I think there have been a few of these since we started the Phase 8 work and I don't want them to get lost...

, '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
protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)#871

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

from

May 21, 2024
 Merged

protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)
#871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
28fdbb6

protect columns in all simulate


i-am-sijia May 13, 2024
9ad1d0d

enabling compute settings for trip scheduling choice


i-am-sijia May 13, 2024
b562e08

move hardcoded protect columns to settings


i-am-sijia May 13, 2024
33edae6

allow protect columns in parking location choice


i-am-sijia May 14, 2024

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


14 changes: 12 additions & 2 deletions
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,9 +186,19 @@ def choose_parking_location(
 locals_dict["PARKING"] = skims["op_skims"].dest_key

 spec = get_spec_for_segment(state, model_settings, segment_name)
 trips = drop_unused_columns(trips, spec, locals_dict, custom_chooser=None)
 trips = drop_unused_columns(
 trips,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )
 alternatives = drop_unused_columns(
 alternatives, spec, locals_dict, custom_chooser=None
 alternatives,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 destination_sample = logit.interaction_dataset(
Expand Down

19 changes: 17 additions & 2 deletions
activitysim/abm/models/trip_scheduling_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,11 @@
 get_time_windows,
)
from activitysim.core import chunk, expressions, simulate, tracing, workflow
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
from activitysim.core.configuration.base import (
 ComputeSettings,
 PreprocessorSettings,
 PydanticReadable,
)
from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
from activitysim.core.skim_dataset import SkimDataset
from activitysim.core.skim_dictionary import SkimDict
Expand DownExpand Up@@ -223,6 +227,7 @@ def run_trip_scheduling_choice(
 skims,
 locals_dict: Mapping,
 trace_label: str,
 model_settings: TripSchedulingChoiceSettings,
):
 NUM_TOUR_LEGS = 3
 trace_label = tracing.extend_trace_label(trace_label, "interaction_sample_simulate")
Expand DownExpand Up@@ -296,6 +301,7 @@ def run_trip_scheduling_choice(
 trace_choice_name="trip_schedule_stage_1",
 estimator=None,
 chunk_sizer=chunk_sizer,
 compute_settings=model_settings.compute_settings,
 )

 assert len(choices.index) == len(choosers.index)
Expand DownExpand Up@@ -338,6 +344,9 @@ class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
 SPECIFICATION: str
 """file name of specification file"""

 compute_settings: ComputeSettings = ComputeSettings()
 """Compute settings for this component."""


@workflow.step
def trip_scheduling_choice(
Expand DownExpand Up@@ -419,7 +428,13 @@ def trip_scheduling_choice(
 )

 tours_df = run_trip_scheduling_choice(
 state, spec, tours_df, skims, locals_dict, trace_label
 state,
 spec,
 tours_df,
 skims,
 locals_dict,
 trace_label,
 model_settings,
 )

 state.add_table("tours", tours_df)

1 change: 1 addition & 0 deletions
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
 use_numexpr=self.use_numexpr,
 use_numba=self.use_numba,
 drop_unused_columns=self.drop_unused_columns,
 protect_columns=self.protect_columns,
 )


Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -265,7 +266,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 if sharrow_enabled:
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/interaction_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -729,6 +729,7 @@ def _interaction_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 if (
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=state.settings.sharrow,
 additional_columns=compute_settings.protect_columns,
 )

 if nest_spec is None:
Expand Down

4 changes: 4 additions & 0 deletions
activitysim/examples/prototype_sandag_xborder/configs/tour_od_choice.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,3 +55,7 @@ SEGMENTS:

LOGSUM_SETTINGS: tour_mode_choice
LOGSUM_PREPROCESSOR: preprocessor

compute_settings:
 protect_columns:
 - origin_destination
@dhensledhensleMay 20, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will break the sandag model that's not in the test system... are we keeping track of these breaking changes anywhere? I think there have been a few of these since we started the Phase 8 work and I don't want them to get lost...

, '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
protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)#871

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

from

May 21, 2024
 Merged

protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)
#871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
28fdbb6

protect columns in all simulate


i-am-sijia May 13, 2024
9ad1d0d

enabling compute settings for trip scheduling choice


i-am-sijia May 13, 2024
b562e08

move hardcoded protect columns to settings


i-am-sijia May 13, 2024
33edae6

allow protect columns in parking location choice


i-am-sijia May 14, 2024

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


14 changes: 12 additions & 2 deletions
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,9 +186,19 @@ def choose_parking_location(
 locals_dict["PARKING"] = skims["op_skims"].dest_key

 spec = get_spec_for_segment(state, model_settings, segment_name)
 trips = drop_unused_columns(trips, spec, locals_dict, custom_chooser=None)
 trips = drop_unused_columns(
 trips,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )
 alternatives = drop_unused_columns(
 alternatives, spec, locals_dict, custom_chooser=None
 alternatives,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 destination_sample = logit.interaction_dataset(
Expand Down

19 changes: 17 additions & 2 deletions
activitysim/abm/models/trip_scheduling_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,11 @@
 get_time_windows,
)
from activitysim.core import chunk, expressions, simulate, tracing, workflow
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
from activitysim.core.configuration.base import (
 ComputeSettings,
 PreprocessorSettings,
 PydanticReadable,
)
from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
from activitysim.core.skim_dataset import SkimDataset
from activitysim.core.skim_dictionary import SkimDict
Expand DownExpand Up@@ -223,6 +227,7 @@ def run_trip_scheduling_choice(
 skims,
 locals_dict: Mapping,
 trace_label: str,
 model_settings: TripSchedulingChoiceSettings,
):
 NUM_TOUR_LEGS = 3
 trace_label = tracing.extend_trace_label(trace_label, "interaction_sample_simulate")
Expand DownExpand Up@@ -296,6 +301,7 @@ def run_trip_scheduling_choice(
 trace_choice_name="trip_schedule_stage_1",
 estimator=None,
 chunk_sizer=chunk_sizer,
 compute_settings=model_settings.compute_settings,
 )

 assert len(choices.index) == len(choosers.index)
Expand DownExpand Up@@ -338,6 +344,9 @@ class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
 SPECIFICATION: str
 """file name of specification file"""

 compute_settings: ComputeSettings = ComputeSettings()
 """Compute settings for this component."""


@workflow.step
def trip_scheduling_choice(
Expand DownExpand Up@@ -419,7 +428,13 @@ def trip_scheduling_choice(
 )

 tours_df = run_trip_scheduling_choice(
 state, spec, tours_df, skims, locals_dict, trace_label
 state,
 spec,
 tours_df,
 skims,
 locals_dict,
 trace_label,
 model_settings,
 )

 state.add_table("tours", tours_df)

1 change: 1 addition & 0 deletions
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
 use_numexpr=self.use_numexpr,
 use_numba=self.use_numba,
 drop_unused_columns=self.drop_unused_columns,
 protect_columns=self.protect_columns,
 )


Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -265,7 +266,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 if sharrow_enabled:
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/interaction_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -729,6 +729,7 @@ def _interaction_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 if (
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=state.settings.sharrow,
 additional_columns=compute_settings.protect_columns,
 )

 if nest_spec is None:
Expand Down

4 changes: 4 additions & 0 deletions
activitysim/examples/prototype_sandag_xborder/configs/tour_od_choice.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,3 +55,7 @@ SEGMENTS:

LOGSUM_SETTINGS: tour_mode_choice
LOGSUM_PREPROCESSOR: preprocessor

compute_settings:
 protect_columns:
 - origin_destination
@dhensledhensleMay 20, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will break the sandag model that's not in the test system... are we keeping track of these breaking changes anywhere? I think there have been a few of these since we started the Phase 8 work and I don't want them to get lost...

, '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
protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)#871

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

from

May 21, 2024
 Merged

protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)
#871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
28fdbb6

protect columns in all simulate


i-am-sijia May 13, 2024
9ad1d0d

enabling compute settings for trip scheduling choice


i-am-sijia May 13, 2024
b562e08

move hardcoded protect columns to settings


i-am-sijia May 13, 2024
33edae6

allow protect columns in parking location choice


i-am-sijia May 14, 2024

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


14 changes: 12 additions & 2 deletions
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,9 +186,19 @@ def choose_parking_location(
 locals_dict["PARKING"] = skims["op_skims"].dest_key

 spec = get_spec_for_segment(state, model_settings, segment_name)
 trips = drop_unused_columns(trips, spec, locals_dict, custom_chooser=None)
 trips = drop_unused_columns(
 trips,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )
 alternatives = drop_unused_columns(
 alternatives, spec, locals_dict, custom_chooser=None
 alternatives,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 destination_sample = logit.interaction_dataset(
Expand Down

19 changes: 17 additions & 2 deletions
activitysim/abm/models/trip_scheduling_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,11 @@
 get_time_windows,
)
from activitysim.core import chunk, expressions, simulate, tracing, workflow
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
from activitysim.core.configuration.base import (
 ComputeSettings,
 PreprocessorSettings,
 PydanticReadable,
)
from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
from activitysim.core.skim_dataset import SkimDataset
from activitysim.core.skim_dictionary import SkimDict
Expand DownExpand Up@@ -223,6 +227,7 @@ def run_trip_scheduling_choice(
 skims,
 locals_dict: Mapping,
 trace_label: str,
 model_settings: TripSchedulingChoiceSettings,
):
 NUM_TOUR_LEGS = 3
 trace_label = tracing.extend_trace_label(trace_label, "interaction_sample_simulate")
Expand DownExpand Up@@ -296,6 +301,7 @@ def run_trip_scheduling_choice(
 trace_choice_name="trip_schedule_stage_1",
 estimator=None,
 chunk_sizer=chunk_sizer,
 compute_settings=model_settings.compute_settings,
 )

 assert len(choices.index) == len(choosers.index)
Expand DownExpand Up@@ -338,6 +344,9 @@ class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
 SPECIFICATION: str
 """file name of specification file"""

 compute_settings: ComputeSettings = ComputeSettings()
 """Compute settings for this component."""


@workflow.step
def trip_scheduling_choice(
Expand DownExpand Up@@ -419,7 +428,13 @@ def trip_scheduling_choice(
 )

 tours_df = run_trip_scheduling_choice(
 state, spec, tours_df, skims, locals_dict, trace_label
 state,
 spec,
 tours_df,
 skims,
 locals_dict,
 trace_label,
 model_settings,
 )

 state.add_table("tours", tours_df)

1 change: 1 addition & 0 deletions
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
 use_numexpr=self.use_numexpr,
 use_numba=self.use_numba,
 drop_unused_columns=self.drop_unused_columns,
 protect_columns=self.protect_columns,
 )


Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -265,7 +266,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 if sharrow_enabled:
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/interaction_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -729,6 +729,7 @@ def _interaction_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 if (
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=state.settings.sharrow,
 additional_columns=compute_settings.protect_columns,
 )

 if nest_spec is None:
Expand Down

4 changes: 4 additions & 0 deletions
activitysim/examples/prototype_sandag_xborder/configs/tour_od_choice.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,3 +55,7 @@ SEGMENTS:

LOGSUM_SETTINGS: tour_mode_choice
LOGSUM_PREPROCESSOR: preprocessor

compute_settings:
 protect_columns:
 - origin_destination
@dhensledhensleMay 20, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will break the sandag model that's not in the test system... are we keeping track of these breaking changes anywhere? I think there have been a few of these since we started the Phase 8 work and I don't want them to get lost...

, '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
protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)#871

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

from

May 21, 2024
 Merged

protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)
#871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
28fdbb6

protect columns in all simulate


i-am-sijia May 13, 2024
9ad1d0d

enabling compute settings for trip scheduling choice


i-am-sijia May 13, 2024
b562e08

move hardcoded protect columns to settings


i-am-sijia May 13, 2024
33edae6

allow protect columns in parking location choice


i-am-sijia May 14, 2024

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


14 changes: 12 additions & 2 deletions
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,9 +186,19 @@ def choose_parking_location(
 locals_dict["PARKING"] = skims["op_skims"].dest_key

 spec = get_spec_for_segment(state, model_settings, segment_name)
 trips = drop_unused_columns(trips, spec, locals_dict, custom_chooser=None)
 trips = drop_unused_columns(
 trips,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )
 alternatives = drop_unused_columns(
 alternatives, spec, locals_dict, custom_chooser=None
 alternatives,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 destination_sample = logit.interaction_dataset(
Expand Down

19 changes: 17 additions & 2 deletions
activitysim/abm/models/trip_scheduling_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,11 @@
 get_time_windows,
)
from activitysim.core import chunk, expressions, simulate, tracing, workflow
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
from activitysim.core.configuration.base import (
 ComputeSettings,
 PreprocessorSettings,
 PydanticReadable,
)
from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
from activitysim.core.skim_dataset import SkimDataset
from activitysim.core.skim_dictionary import SkimDict
Expand DownExpand Up@@ -223,6 +227,7 @@ def run_trip_scheduling_choice(
 skims,
 locals_dict: Mapping,
 trace_label: str,
 model_settings: TripSchedulingChoiceSettings,
):
 NUM_TOUR_LEGS = 3
 trace_label = tracing.extend_trace_label(trace_label, "interaction_sample_simulate")
Expand DownExpand Up@@ -296,6 +301,7 @@ def run_trip_scheduling_choice(
 trace_choice_name="trip_schedule_stage_1",
 estimator=None,
 chunk_sizer=chunk_sizer,
 compute_settings=model_settings.compute_settings,
 )

 assert len(choices.index) == len(choosers.index)
Expand DownExpand Up@@ -338,6 +344,9 @@ class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
 SPECIFICATION: str
 """file name of specification file"""

 compute_settings: ComputeSettings = ComputeSettings()
 """Compute settings for this component."""


@workflow.step
def trip_scheduling_choice(
Expand DownExpand Up@@ -419,7 +428,13 @@ def trip_scheduling_choice(
 )

 tours_df = run_trip_scheduling_choice(
 state, spec, tours_df, skims, locals_dict, trace_label
 state,
 spec,
 tours_df,
 skims,
 locals_dict,
 trace_label,
 model_settings,
 )

 state.add_table("tours", tours_df)

1 change: 1 addition & 0 deletions
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
 use_numexpr=self.use_numexpr,
 use_numba=self.use_numba,
 drop_unused_columns=self.drop_unused_columns,
 protect_columns=self.protect_columns,
 )


Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -265,7 +266,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 if sharrow_enabled:
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/interaction_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -729,6 +729,7 @@ def _interaction_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 if (
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=state.settings.sharrow,
 additional_columns=compute_settings.protect_columns,
 )

 if nest_spec is None:
Expand Down

4 changes: 4 additions & 0 deletions
activitysim/examples/prototype_sandag_xborder/configs/tour_od_choice.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,3 +55,7 @@ SEGMENTS:

LOGSUM_SETTINGS: tour_mode_choice
LOGSUM_PREPROCESSOR: preprocessor

compute_settings:
 protect_columns:
 - origin_destination
@dhensledhensleMay 20, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will break the sandag model that's not in the test system... are we keeping track of these breaking changes anywhere? I think there have been a few of these since we started the Phase 8 work and I don't want them to get lost...

, '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
protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)#871

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

from

May 21, 2024
 Merged

protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)
#871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
28fdbb6

protect columns in all simulate


i-am-sijia May 13, 2024
9ad1d0d

enabling compute settings for trip scheduling choice


i-am-sijia May 13, 2024
b562e08

move hardcoded protect columns to settings


i-am-sijia May 13, 2024
33edae6

allow protect columns in parking location choice


i-am-sijia May 14, 2024

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


14 changes: 12 additions & 2 deletions
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,9 +186,19 @@ def choose_parking_location(
 locals_dict["PARKING"] = skims["op_skims"].dest_key

 spec = get_spec_for_segment(state, model_settings, segment_name)
 trips = drop_unused_columns(trips, spec, locals_dict, custom_chooser=None)
 trips = drop_unused_columns(
 trips,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )
 alternatives = drop_unused_columns(
 alternatives, spec, locals_dict, custom_chooser=None
 alternatives,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 destination_sample = logit.interaction_dataset(
Expand Down

19 changes: 17 additions & 2 deletions
activitysim/abm/models/trip_scheduling_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,11 @@
 get_time_windows,
)
from activitysim.core import chunk, expressions, simulate, tracing, workflow
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
from activitysim.core.configuration.base import (
 ComputeSettings,
 PreprocessorSettings,
 PydanticReadable,
)
from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
from activitysim.core.skim_dataset import SkimDataset
from activitysim.core.skim_dictionary import SkimDict
Expand DownExpand Up@@ -223,6 +227,7 @@ def run_trip_scheduling_choice(
 skims,
 locals_dict: Mapping,
 trace_label: str,
 model_settings: TripSchedulingChoiceSettings,
):
 NUM_TOUR_LEGS = 3
 trace_label = tracing.extend_trace_label(trace_label, "interaction_sample_simulate")
Expand DownExpand Up@@ -296,6 +301,7 @@ def run_trip_scheduling_choice(
 trace_choice_name="trip_schedule_stage_1",
 estimator=None,
 chunk_sizer=chunk_sizer,
 compute_settings=model_settings.compute_settings,
 )

 assert len(choices.index) == len(choosers.index)
Expand DownExpand Up@@ -338,6 +344,9 @@ class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
 SPECIFICATION: str
 """file name of specification file"""

 compute_settings: ComputeSettings = ComputeSettings()
 """Compute settings for this component."""


@workflow.step
def trip_scheduling_choice(
Expand DownExpand Up@@ -419,7 +428,13 @@ def trip_scheduling_choice(
 )

 tours_df = run_trip_scheduling_choice(
 state, spec, tours_df, skims, locals_dict, trace_label
 state,
 spec,
 tours_df,
 skims,
 locals_dict,
 trace_label,
 model_settings,
 )

 state.add_table("tours", tours_df)

1 change: 1 addition & 0 deletions
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
 use_numexpr=self.use_numexpr,
 use_numba=self.use_numba,
 drop_unused_columns=self.drop_unused_columns,
 protect_columns=self.protect_columns,
 )


Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -265,7 +266,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 if sharrow_enabled:
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/interaction_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -729,6 +729,7 @@ def _interaction_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 if (
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=state.settings.sharrow,
 additional_columns=compute_settings.protect_columns,
 )

 if nest_spec is None:
Expand Down

4 changes: 4 additions & 0 deletions
activitysim/examples/prototype_sandag_xborder/configs/tour_od_choice.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,3 +55,7 @@ SEGMENTS:

LOGSUM_SETTINGS: tour_mode_choice
LOGSUM_PREPROCESSOR: preprocessor

compute_settings:
 protect_columns:
 - origin_destination
@dhensledhensleMay 20, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will break the sandag model that's not in the test system... are we keeping track of these breaking changes anywhere? I think there have been a few of these since we started the Phase 8 work and I don't want them to get lost...

, '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
protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)#871

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

from

May 21, 2024
 Merged

protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)
#871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
28fdbb6

protect columns in all simulate


i-am-sijia May 13, 2024
9ad1d0d

enabling compute settings for trip scheduling choice


i-am-sijia May 13, 2024
b562e08

move hardcoded protect columns to settings


i-am-sijia May 13, 2024
33edae6

allow protect columns in parking location choice


i-am-sijia May 14, 2024

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


14 changes: 12 additions & 2 deletions
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,9 +186,19 @@ def choose_parking_location(
 locals_dict["PARKING"] = skims["op_skims"].dest_key

 spec = get_spec_for_segment(state, model_settings, segment_name)
 trips = drop_unused_columns(trips, spec, locals_dict, custom_chooser=None)
 trips = drop_unused_columns(
 trips,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )
 alternatives = drop_unused_columns(
 alternatives, spec, locals_dict, custom_chooser=None
 alternatives,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 destination_sample = logit.interaction_dataset(
Expand Down

19 changes: 17 additions & 2 deletions
activitysim/abm/models/trip_scheduling_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,11 @@
 get_time_windows,
)
from activitysim.core import chunk, expressions, simulate, tracing, workflow
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
from activitysim.core.configuration.base import (
 ComputeSettings,
 PreprocessorSettings,
 PydanticReadable,
)
from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
from activitysim.core.skim_dataset import SkimDataset
from activitysim.core.skim_dictionary import SkimDict
Expand DownExpand Up@@ -223,6 +227,7 @@ def run_trip_scheduling_choice(
 skims,
 locals_dict: Mapping,
 trace_label: str,
 model_settings: TripSchedulingChoiceSettings,
):
 NUM_TOUR_LEGS = 3
 trace_label = tracing.extend_trace_label(trace_label, "interaction_sample_simulate")
Expand DownExpand Up@@ -296,6 +301,7 @@ def run_trip_scheduling_choice(
 trace_choice_name="trip_schedule_stage_1",
 estimator=None,
 chunk_sizer=chunk_sizer,
 compute_settings=model_settings.compute_settings,
 )

 assert len(choices.index) == len(choosers.index)
Expand DownExpand Up@@ -338,6 +344,9 @@ class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
 SPECIFICATION: str
 """file name of specification file"""

 compute_settings: ComputeSettings = ComputeSettings()
 """Compute settings for this component."""


@workflow.step
def trip_scheduling_choice(
Expand DownExpand Up@@ -419,7 +428,13 @@ def trip_scheduling_choice(
 )

 tours_df = run_trip_scheduling_choice(
 state, spec, tours_df, skims, locals_dict, trace_label
 state,
 spec,
 tours_df,
 skims,
 locals_dict,
 trace_label,
 model_settings,
 )

 state.add_table("tours", tours_df)

1 change: 1 addition & 0 deletions
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
 use_numexpr=self.use_numexpr,
 use_numba=self.use_numba,
 drop_unused_columns=self.drop_unused_columns,
 protect_columns=self.protect_columns,
 )


Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -265,7 +266,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 if sharrow_enabled:
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/interaction_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -729,6 +729,7 @@ def _interaction_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 if (
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=state.settings.sharrow,
 additional_columns=compute_settings.protect_columns,
 )

 if nest_spec is None:
Expand Down

4 changes: 4 additions & 0 deletions
activitysim/examples/prototype_sandag_xborder/configs/tour_od_choice.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,3 +55,7 @@ SEGMENTS:

LOGSUM_SETTINGS: tour_mode_choice
LOGSUM_PREPROCESSOR: preprocessor

compute_settings:
 protect_columns:
 - origin_destination
@dhensledhensleMay 20, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will break the sandag model that's not in the test system... are we keeping track of these breaking changes anywhere? I think there have been a few of these since we started the Phase 8 work and I don't want them to get lost...

, '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
protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)#871

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

from

May 21, 2024
 Merged

protect_columns for all simulations (choosers, alts, simple simulate, interaction simulate, etc)
#871
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
28fdbb6

protect columns in all simulate


i-am-sijia May 13, 2024
9ad1d0d

enabling compute settings for trip scheduling choice


i-am-sijia May 13, 2024
b562e08

move hardcoded protect columns to settings


i-am-sijia May 13, 2024
33edae6

allow protect columns in parking location choice


i-am-sijia May 14, 2024

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


14 changes: 12 additions & 2 deletions
activitysim/abm/models/parking_location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,9 +186,19 @@ def choose_parking_location(
 locals_dict["PARKING"] = skims["op_skims"].dest_key

 spec = get_spec_for_segment(state, model_settings, segment_name)
 trips = drop_unused_columns(trips, spec, locals_dict, custom_chooser=None)
 trips = drop_unused_columns(
 trips,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )
 alternatives = drop_unused_columns(
 alternatives, spec, locals_dict, custom_chooser=None
 alternatives,
 spec,
 locals_dict,
 custom_chooser=None,
 additional_columns=model_settings.compute_settings.protect_columns,
 )

 destination_sample = logit.interaction_dataset(
Expand Down

19 changes: 17 additions & 2 deletions
activitysim/abm/models/trip_scheduling_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,11 @@
 get_time_windows,
)
from activitysim.core import chunk, expressions, simulate, tracing, workflow
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
from activitysim.core.configuration.base import (
 ComputeSettings,
 PreprocessorSettings,
 PydanticReadable,
)
from activitysim.core.interaction_sample_simulate import _interaction_sample_simulate
from activitysim.core.skim_dataset import SkimDataset
from activitysim.core.skim_dictionary import SkimDict
Expand DownExpand Up@@ -223,6 +227,7 @@ def run_trip_scheduling_choice(
 skims,
 locals_dict: Mapping,
 trace_label: str,
 model_settings: TripSchedulingChoiceSettings,
):
 NUM_TOUR_LEGS = 3
 trace_label = tracing.extend_trace_label(trace_label, "interaction_sample_simulate")
Expand DownExpand Up@@ -296,6 +301,7 @@ def run_trip_scheduling_choice(
 trace_choice_name="trip_schedule_stage_1",
 estimator=None,
 chunk_sizer=chunk_sizer,
 compute_settings=model_settings.compute_settings,
 )

 assert len(choices.index) == len(choosers.index)
Expand DownExpand Up@@ -338,6 +344,9 @@ class TripSchedulingChoiceSettings(PydanticReadable, extra="forbid"):
 SPECIFICATION: str
 """file name of specification file"""

 compute_settings: ComputeSettings = ComputeSettings()
 """Compute settings for this component."""


@workflow.step
def trip_scheduling_choice(
Expand DownExpand Up@@ -419,7 +428,13 @@ def trip_scheduling_choice(
 )

 tours_df = run_trip_scheduling_choice(
 state, spec, tours_df, skims, locals_dict, trace_label
 state,
 spec,
 tours_df,
 skims,
 locals_dict,
 trace_label,
 model_settings,
 )

 state.add_table("tours", tours_df)

1 change: 1 addition & 0 deletions
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,6 +243,7 @@ def subcomponent_settings(self, subcomponent: str) -> ComputeSettings:
 use_numexpr=self.use_numexpr,
 use_numba=self.use_numba,
 drop_unused_columns=self.drop_unused_columns,
 protect_columns=self.protect_columns,
 )


Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -265,7 +266,7 @@ def _interaction_sample(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 if sharrow_enabled:
Expand Down

3 changes: 2 additions & 1 deletion
activitysim/core/interaction_sample_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 alternatives = util.drop_unused_columns(
Expand All@@ -166,7 +167,7 @@ def _interaction_sample_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=["tdd", "origin_destination"],
 additional_columns=["tdd"] + compute_settings.protect_columns,
 )

 interaction_df = alternatives.join(choosers, how="left", rsuffix="_chooser")
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/interaction_simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -729,6 +729,7 @@ def _interaction_simulate(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=sharrow_enabled,
 additional_columns=compute_settings.protect_columns,
 )

 if (
Expand Down

1 change: 1 addition & 0 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1989,6 +1989,7 @@ def _simple_simulate_logsums(
 locals_d,
 custom_chooser=None,
 sharrow_enabled=state.settings.sharrow,
 additional_columns=compute_settings.protect_columns,
 )

 if nest_spec is None:
Expand Down

4 changes: 4 additions & 0 deletions
activitysim/examples/prototype_sandag_xborder/configs/tour_od_choice.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,3 +55,7 @@ SEGMENTS:

LOGSUM_SETTINGS: tour_mode_choice
LOGSUM_PREPROCESSOR: preprocessor

compute_settings:
 protect_columns:
 - origin_destination
@dhensledhensleMay 20, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will break the sandag model that's not in the test system... are we keeping track of these breaking changes anywhere? I think there have been a few of these since we started the Phase 8 work and I don't want them to get lost...