Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 101 additions & 40 deletions activitysim/abm/models/school_escorting.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,14 @@ def determine_escorting_participants(
& (persons.cdap_activity == "M")
]
households_with_escortees = escortees["household_id"]
choosers = choosers[choosers.index.isin(households_with_escortees)]
if len(households_with_escortees) == 0:
logger.warning("No households with escortees found!")
else:
tot_households = len(choosers)
choosers = choosers[choosers.index.isin(households_with_escortees)]
logger.info(
f"Proceeding with {len(choosers)} households with escortees out of {tot_households} total households"
)

# can specify different weights to determine chaperones
persontype_weight = model_settings.PERSON_WEIGHT
Expand DownExpand Up@@ -140,7 +147,7 @@ def add_prev_choices_to_choosers(
stage_alts,
how="left",
left_on=escorting_choice,
right_on=stage_alts.index.name,
right_index=True,
)
.set_index("household_id")
)
Expand DownExpand Up@@ -216,8 +223,12 @@ def create_school_escorting_bundles_table(choosers, tours, stage):
bundles : pd.DataFrame
one school escorting bundle per row
"""
# making a table of bundles
choosers = choosers.reset_index()
# want to keep household_id in columns, which is already there if running in estimation mode
if "household_id" in choosers.columns:
choosers = choosers.reset_index(drop=True)
else:
choosers = choosers.reset_index()
# creating a row for every school escorting bundle
choosers = choosers.loc[choosers.index.repeat(choosers["nbundles"])]

bundles = pd.DataFrame()
Expand DownExpand Up@@ -460,7 +471,11 @@ def school_escorting(

trace_hh_id = state.settings.trace_hh_id

alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
# FIXME setting index as "Alt" causes crash in estimation mode...
# happens in joint_tour_frequency_composition too!
# alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
alts = simulate.read_model_alts(state, model_settings.ALTS, set_index=None)
alts.index = alts["Alt"].values
Comment thread
jpn-- marked this conversation as resolved.

choosers, participant_columns = determine_escorting_participants(
households_merged, persons, model_settings
Expand All@@ -478,7 +493,9 @@ def school_escorting(
for stage_num, stage in enumerate(school_escorting_stages):
stage_trace_label = trace_label + "_" + stage
estimator = estimation.manager.begin_estimation(
state, "school_escorting_" + stage
state,
model_name="school_escorting_" + stage,
bundle_name="school_escorting",
)

model_spec_raw = state.filesystem.read_model_spec(
Expand DownExpand Up@@ -533,9 +550,26 @@ def school_escorting(

if estimator:
estimator.write_model_settings(model_settings, model_settings_file_name)
estimator.write_spec(model_settings)
estimator.write_coefficients(coefficients_df, model_settings)
estimator.write_spec(model_settings, tag=stage.upper() + "_SPEC")
estimator.write_coefficients(
coefficients_df, file_name=stage.upper() + "_COEFFICIENTS"
)
estimator.write_choosers(choosers)
estimator.write_alternatives(alts, bundle_directory=True)

# FIXME #interaction_simulate_estimation_requires_chooser_id_in_df_column
# shuold we do it here or have interaction_simulate do it?
# chooser index must be duplicated in column or it will be omitted from interaction_dataset
# estimation requires that chooser_id is either in index or a column of interaction_dataset
# so it can be reformatted (melted) and indexed by chooser_id and alt_id
assert choosers.index.name == "household_id"
assert "household_id" not in choosers.columns
choosers["household_id"] = choosers.index

# FIXME set_alt_id - do we need this for interaction_simulate estimation bundle tables?
estimator.set_alt_id("alt_id")
Comment thread
jpn-- marked this conversation as resolved.

estimator.set_chooser_id(choosers.index.name)

log_alt_losers = state.settings.log_alt_losers

Expand DownExpand Up@@ -580,47 +614,74 @@ def school_escorting(

if stage_num >= 1:
choosers["Alt"] = choices
choosers = choosers.join(alts, how="left", on="Alt")
choosers = choosers.join(alts.set_index("Alt"), how="left", on="Alt")
bundles = create_school_escorting_bundles_table(
choosers[choosers["Alt"] > 1], tours, stage
)
escort_bundles.append(bundles)

escort_bundles = pd.concat(escort_bundles)
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."
# Only want to create bundles and tours and trips if at least one household has school escorting
if len(escort_bundles) > 0:
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

tours = school_escort_tours_trips.add_pure_escort_tours(tours, school_escort_tours)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)

school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."

tours = school_escort_tours_trips.add_pure_escort_tours(
tours, school_escort_tours
)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)

else:
# create empty school escort tours & trips tables to be used downstream
tours["school_esc_outbound"] = pd.NA
tours["school_esc_inbound"] = pd.NA
tours["school_escort_direction"] = pd.NA
tours["next_pure_escort_start"] = pd.NA
school_escort_tours = pd.DataFrame(columns=tours.columns)
trip_cols = [
"household_id",
"person_id",
"tour_id",
"trip_id",
"outbound",
"depart",
"purpose",
"destination",
"escort_participants",
"chauf_tour_id",
"primary_purpose",
]
school_escort_trips = pd.DataFrame(columns=trip_cols)

school_escort_trips["primary_purpose"] = school_escort_trips[
"primary_purpose"
Expand Down
17 changes: 17 additions & 0 deletions activitysim/abm/models/util/school_escort_tours_trips.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,19 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
tours = state.get_dataframe("tours")
trips = state.get_dataframe("trips")

# checking to see if there are school escort trips to merge in
if len(school_escort_trips) == 0:
# if no trips, fill escorting columns with NA
trips[
[
"escort_participants",
"school_escort_direction",
"school_escort_trip_id",
]
] = pd.NA
state.add_table("trips", trips)
return trips

# want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops
out_se_tours = tours[
tours["school_esc_outbound"].isin(["pure_escort", "ride_share"])
Expand DownExpand Up@@ -643,6 +656,10 @@ def force_escortee_tour_modes_to_match_chauffeur(state: workflow.State, tours):
# Does it even matter if trip modes are getting matched later?
escort_bundles = state.get_dataframe("escort_bundles")

if len(escort_bundles) == 0:
# do not need to do anything if no escorting
return tours

# grabbing the school tour ids for each school escort bundle
se_tours = escort_bundles[["school_tour_ids", "chauf_tour_id"]].copy()
# merging in chauffeur tour mode
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 101 additions & 40 deletions activitysim/abm/models/school_escorting.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,14 @@ def determine_escorting_participants(
& (persons.cdap_activity == "M")
]
households_with_escortees = escortees["household_id"]
choosers = choosers[choosers.index.isin(households_with_escortees)]
if len(households_with_escortees) == 0:
logger.warning("No households with escortees found!")
else:
tot_households = len(choosers)
choosers = choosers[choosers.index.isin(households_with_escortees)]
logger.info(
f"Proceeding with {len(choosers)} households with escortees out of {tot_households} total households"
)

# can specify different weights to determine chaperones
persontype_weight = model_settings.PERSON_WEIGHT
Expand DownExpand Up@@ -140,7 +147,7 @@ def add_prev_choices_to_choosers(
stage_alts,
how="left",
left_on=escorting_choice,
right_on=stage_alts.index.name,
right_index=True,
)
.set_index("household_id")
)
Expand DownExpand Up@@ -216,8 +223,12 @@ def create_school_escorting_bundles_table(choosers, tours, stage):
bundles : pd.DataFrame
one school escorting bundle per row
"""
# making a table of bundles
choosers = choosers.reset_index()
# want to keep household_id in columns, which is already there if running in estimation mode
if "household_id" in choosers.columns:
choosers = choosers.reset_index(drop=True)
else:
choosers = choosers.reset_index()
# creating a row for every school escorting bundle
choosers = choosers.loc[choosers.index.repeat(choosers["nbundles"])]

bundles = pd.DataFrame()
Expand DownExpand Up@@ -460,7 +471,11 @@ def school_escorting(

trace_hh_id = state.settings.trace_hh_id

alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
# FIXME setting index as "Alt" causes crash in estimation mode...
# happens in joint_tour_frequency_composition too!
# alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
alts = simulate.read_model_alts(state, model_settings.ALTS, set_index=None)
alts.index = alts["Alt"].values
Comment thread
jpn-- marked this conversation as resolved.

choosers, participant_columns = determine_escorting_participants(
households_merged, persons, model_settings
Expand All@@ -478,7 +493,9 @@ def school_escorting(
for stage_num, stage in enumerate(school_escorting_stages):
stage_trace_label = trace_label + "_" + stage
estimator = estimation.manager.begin_estimation(
state, "school_escorting_" + stage
state,
model_name="school_escorting_" + stage,
bundle_name="school_escorting",
)

model_spec_raw = state.filesystem.read_model_spec(
Expand DownExpand Up@@ -533,9 +550,26 @@ def school_escorting(

if estimator:
estimator.write_model_settings(model_settings, model_settings_file_name)
estimator.write_spec(model_settings)
estimator.write_coefficients(coefficients_df, model_settings)
estimator.write_spec(model_settings, tag=stage.upper() + "_SPEC")
estimator.write_coefficients(
coefficients_df, file_name=stage.upper() + "_COEFFICIENTS"
)
estimator.write_choosers(choosers)
estimator.write_alternatives(alts, bundle_directory=True)

# FIXME #interaction_simulate_estimation_requires_chooser_id_in_df_column
# shuold we do it here or have interaction_simulate do it?
# chooser index must be duplicated in column or it will be omitted from interaction_dataset
# estimation requires that chooser_id is either in index or a column of interaction_dataset
# so it can be reformatted (melted) and indexed by chooser_id and alt_id
assert choosers.index.name == "household_id"
assert "household_id" not in choosers.columns
choosers["household_id"] = choosers.index

# FIXME set_alt_id - do we need this for interaction_simulate estimation bundle tables?
estimator.set_alt_id("alt_id")
Comment thread
jpn-- marked this conversation as resolved.

estimator.set_chooser_id(choosers.index.name)

log_alt_losers = state.settings.log_alt_losers

Expand DownExpand Up@@ -580,47 +614,74 @@ def school_escorting(

if stage_num >= 1:
choosers["Alt"] = choices
choosers = choosers.join(alts, how="left", on="Alt")
choosers = choosers.join(alts.set_index("Alt"), how="left", on="Alt")
bundles = create_school_escorting_bundles_table(
choosers[choosers["Alt"] > 1], tours, stage
)
escort_bundles.append(bundles)

escort_bundles = pd.concat(escort_bundles)
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."
# Only want to create bundles and tours and trips if at least one household has school escorting
if len(escort_bundles) > 0:
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

tours = school_escort_tours_trips.add_pure_escort_tours(tours, school_escort_tours)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)

school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."

tours = school_escort_tours_trips.add_pure_escort_tours(
tours, school_escort_tours
)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)

else:
# create empty school escort tours & trips tables to be used downstream
tours["school_esc_outbound"] = pd.NA
tours["school_esc_inbound"] = pd.NA
tours["school_escort_direction"] = pd.NA
tours["next_pure_escort_start"] = pd.NA
school_escort_tours = pd.DataFrame(columns=tours.columns)
trip_cols = [
"household_id",
"person_id",
"tour_id",
"trip_id",
"outbound",
"depart",
"purpose",
"destination",
"escort_participants",
"chauf_tour_id",
"primary_purpose",
]
school_escort_trips = pd.DataFrame(columns=trip_cols)

school_escort_trips["primary_purpose"] = school_escort_trips[
"primary_purpose"
Expand Down
17 changes: 17 additions & 0 deletions activitysim/abm/models/util/school_escort_tours_trips.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,19 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
tours = state.get_dataframe("tours")
trips = state.get_dataframe("trips")

# checking to see if there are school escort trips to merge in
if len(school_escort_trips) == 0:
# if no trips, fill escorting columns with NA
trips[
[
"escort_participants",
"school_escort_direction",
"school_escort_trip_id",
]
] = pd.NA
state.add_table("trips", trips)
return trips

# want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops
out_se_tours = tours[
tours["school_esc_outbound"].isin(["pure_escort", "ride_share"])
Expand DownExpand Up@@ -643,6 +656,10 @@ def force_escortee_tour_modes_to_match_chauffeur(state: workflow.State, tours):
# Does it even matter if trip modes are getting matched later?
escort_bundles = state.get_dataframe("escort_bundles")

if len(escort_bundles) == 0:
# do not need to do anything if no escorting
return tours

# grabbing the school tour ids for each school escort bundle
se_tours = escort_bundles[["school_tour_ids", "chauf_tour_id"]].copy()
# merging in chauffeur tour mode
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 101 additions & 40 deletions activitysim/abm/models/school_escorting.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,14 @@ def determine_escorting_participants(
& (persons.cdap_activity == "M")
]
households_with_escortees = escortees["household_id"]
choosers = choosers[choosers.index.isin(households_with_escortees)]
if len(households_with_escortees) == 0:
logger.warning("No households with escortees found!")
else:
tot_households = len(choosers)
choosers = choosers[choosers.index.isin(households_with_escortees)]
logger.info(
f"Proceeding with {len(choosers)} households with escortees out of {tot_households} total households"
)

# can specify different weights to determine chaperones
persontype_weight = model_settings.PERSON_WEIGHT
Expand DownExpand Up@@ -140,7 +147,7 @@ def add_prev_choices_to_choosers(
stage_alts,
how="left",
left_on=escorting_choice,
right_on=stage_alts.index.name,
right_index=True,
)
.set_index("household_id")
)
Expand DownExpand Up@@ -216,8 +223,12 @@ def create_school_escorting_bundles_table(choosers, tours, stage):
bundles : pd.DataFrame
one school escorting bundle per row
"""
# making a table of bundles
choosers = choosers.reset_index()
# want to keep household_id in columns, which is already there if running in estimation mode
if "household_id" in choosers.columns:
choosers = choosers.reset_index(drop=True)
else:
choosers = choosers.reset_index()
# creating a row for every school escorting bundle
choosers = choosers.loc[choosers.index.repeat(choosers["nbundles"])]

bundles = pd.DataFrame()
Expand DownExpand Up@@ -460,7 +471,11 @@ def school_escorting(

trace_hh_id = state.settings.trace_hh_id

alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
# FIXME setting index as "Alt" causes crash in estimation mode...
# happens in joint_tour_frequency_composition too!
# alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
alts = simulate.read_model_alts(state, model_settings.ALTS, set_index=None)
alts.index = alts["Alt"].values
Comment thread
jpn-- marked this conversation as resolved.

choosers, participant_columns = determine_escorting_participants(
households_merged, persons, model_settings
Expand All@@ -478,7 +493,9 @@ def school_escorting(
for stage_num, stage in enumerate(school_escorting_stages):
stage_trace_label = trace_label + "_" + stage
estimator = estimation.manager.begin_estimation(
state, "school_escorting_" + stage
state,
model_name="school_escorting_" + stage,
bundle_name="school_escorting",
)

model_spec_raw = state.filesystem.read_model_spec(
Expand DownExpand Up@@ -533,9 +550,26 @@ def school_escorting(

if estimator:
estimator.write_model_settings(model_settings, model_settings_file_name)
estimator.write_spec(model_settings)
estimator.write_coefficients(coefficients_df, model_settings)
estimator.write_spec(model_settings, tag=stage.upper() + "_SPEC")
estimator.write_coefficients(
coefficients_df, file_name=stage.upper() + "_COEFFICIENTS"
)
estimator.write_choosers(choosers)
estimator.write_alternatives(alts, bundle_directory=True)

# FIXME #interaction_simulate_estimation_requires_chooser_id_in_df_column
# shuold we do it here or have interaction_simulate do it?
# chooser index must be duplicated in column or it will be omitted from interaction_dataset
# estimation requires that chooser_id is either in index or a column of interaction_dataset
# so it can be reformatted (melted) and indexed by chooser_id and alt_id
assert choosers.index.name == "household_id"
assert "household_id" not in choosers.columns
choosers["household_id"] = choosers.index

# FIXME set_alt_id - do we need this for interaction_simulate estimation bundle tables?
estimator.set_alt_id("alt_id")
Comment thread
jpn-- marked this conversation as resolved.

estimator.set_chooser_id(choosers.index.name)

log_alt_losers = state.settings.log_alt_losers

Expand DownExpand Up@@ -580,47 +614,74 @@ def school_escorting(

if stage_num >= 1:
choosers["Alt"] = choices
choosers = choosers.join(alts, how="left", on="Alt")
choosers = choosers.join(alts.set_index("Alt"), how="left", on="Alt")
bundles = create_school_escorting_bundles_table(
choosers[choosers["Alt"] > 1], tours, stage
)
escort_bundles.append(bundles)

escort_bundles = pd.concat(escort_bundles)
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."
# Only want to create bundles and tours and trips if at least one household has school escorting
if len(escort_bundles) > 0:
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

tours = school_escort_tours_trips.add_pure_escort_tours(tours, school_escort_tours)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)

school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."

tours = school_escort_tours_trips.add_pure_escort_tours(
tours, school_escort_tours
)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)

else:
# create empty school escort tours & trips tables to be used downstream
tours["school_esc_outbound"] = pd.NA
tours["school_esc_inbound"] = pd.NA
tours["school_escort_direction"] = pd.NA
tours["next_pure_escort_start"] = pd.NA
school_escort_tours = pd.DataFrame(columns=tours.columns)
trip_cols = [
"household_id",
"person_id",
"tour_id",
"trip_id",
"outbound",
"depart",
"purpose",
"destination",
"escort_participants",
"chauf_tour_id",
"primary_purpose",
]
school_escort_trips = pd.DataFrame(columns=trip_cols)

school_escort_trips["primary_purpose"] = school_escort_trips[
"primary_purpose"
Expand Down
17 changes: 17 additions & 0 deletions activitysim/abm/models/util/school_escort_tours_trips.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,19 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
tours = state.get_dataframe("tours")
trips = state.get_dataframe("trips")

# checking to see if there are school escort trips to merge in
if len(school_escort_trips) == 0:
# if no trips, fill escorting columns with NA
trips[
[
"escort_participants",
"school_escort_direction",
"school_escort_trip_id",
]
] = pd.NA
state.add_table("trips", trips)
return trips

# want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops
out_se_tours = tours[
tours["school_esc_outbound"].isin(["pure_escort", "ride_share"])
Expand DownExpand Up@@ -643,6 +656,10 @@ def force_escortee_tour_modes_to_match_chauffeur(state: workflow.State, tours):
# Does it even matter if trip modes are getting matched later?
escort_bundles = state.get_dataframe("escort_bundles")

if len(escort_bundles) == 0:
# do not need to do anything if no escorting
return tours

# grabbing the school tour ids for each school escort bundle
se_tours = escort_bundles[["school_tour_ids", "chauf_tour_id"]].copy()
# merging in chauffeur tour mode
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 101 additions & 40 deletions activitysim/abm/models/school_escorting.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,14 @@ def determine_escorting_participants(
& (persons.cdap_activity == "M")
]
households_with_escortees = escortees["household_id"]
choosers = choosers[choosers.index.isin(households_with_escortees)]
if len(households_with_escortees) == 0:
logger.warning("No households with escortees found!")
else:
tot_households = len(choosers)
choosers = choosers[choosers.index.isin(households_with_escortees)]
logger.info(
f"Proceeding with {len(choosers)} households with escortees out of {tot_households} total households"
)

# can specify different weights to determine chaperones
persontype_weight = model_settings.PERSON_WEIGHT
Expand DownExpand Up@@ -140,7 +147,7 @@ def add_prev_choices_to_choosers(
stage_alts,
how="left",
left_on=escorting_choice,
right_on=stage_alts.index.name,
right_index=True,
)
.set_index("household_id")
)
Expand DownExpand Up@@ -216,8 +223,12 @@ def create_school_escorting_bundles_table(choosers, tours, stage):
bundles : pd.DataFrame
one school escorting bundle per row
"""
# making a table of bundles
choosers = choosers.reset_index()
# want to keep household_id in columns, which is already there if running in estimation mode
if "household_id" in choosers.columns:
choosers = choosers.reset_index(drop=True)
else:
choosers = choosers.reset_index()
# creating a row for every school escorting bundle
choosers = choosers.loc[choosers.index.repeat(choosers["nbundles"])]

bundles = pd.DataFrame()
Expand DownExpand Up@@ -460,7 +471,11 @@ def school_escorting(

trace_hh_id = state.settings.trace_hh_id

alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
# FIXME setting index as "Alt" causes crash in estimation mode...
# happens in joint_tour_frequency_composition too!
# alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
alts = simulate.read_model_alts(state, model_settings.ALTS, set_index=None)
alts.index = alts["Alt"].values
Comment thread
jpn-- marked this conversation as resolved.

choosers, participant_columns = determine_escorting_participants(
households_merged, persons, model_settings
Expand All@@ -478,7 +493,9 @@ def school_escorting(
for stage_num, stage in enumerate(school_escorting_stages):
stage_trace_label = trace_label + "_" + stage
estimator = estimation.manager.begin_estimation(
state, "school_escorting_" + stage
state,
model_name="school_escorting_" + stage,
bundle_name="school_escorting",
)

model_spec_raw = state.filesystem.read_model_spec(
Expand DownExpand Up@@ -533,9 +550,26 @@ def school_escorting(

if estimator:
estimator.write_model_settings(model_settings, model_settings_file_name)
estimator.write_spec(model_settings)
estimator.write_coefficients(coefficients_df, model_settings)
estimator.write_spec(model_settings, tag=stage.upper() + "_SPEC")
estimator.write_coefficients(
coefficients_df, file_name=stage.upper() + "_COEFFICIENTS"
)
estimator.write_choosers(choosers)
estimator.write_alternatives(alts, bundle_directory=True)

# FIXME #interaction_simulate_estimation_requires_chooser_id_in_df_column
# shuold we do it here or have interaction_simulate do it?
# chooser index must be duplicated in column or it will be omitted from interaction_dataset
# estimation requires that chooser_id is either in index or a column of interaction_dataset
# so it can be reformatted (melted) and indexed by chooser_id and alt_id
assert choosers.index.name == "household_id"
assert "household_id" not in choosers.columns
choosers["household_id"] = choosers.index

# FIXME set_alt_id - do we need this for interaction_simulate estimation bundle tables?
estimator.set_alt_id("alt_id")
Comment thread
jpn-- marked this conversation as resolved.

estimator.set_chooser_id(choosers.index.name)

log_alt_losers = state.settings.log_alt_losers

Expand DownExpand Up@@ -580,47 +614,74 @@ def school_escorting(

if stage_num >= 1:
choosers["Alt"] = choices
choosers = choosers.join(alts, how="left", on="Alt")
choosers = choosers.join(alts.set_index("Alt"), how="left", on="Alt")
bundles = create_school_escorting_bundles_table(
choosers[choosers["Alt"] > 1], tours, stage
)
escort_bundles.append(bundles)

escort_bundles = pd.concat(escort_bundles)
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."
# Only want to create bundles and tours and trips if at least one household has school escorting
if len(escort_bundles) > 0:
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

tours = school_escort_tours_trips.add_pure_escort_tours(tours, school_escort_tours)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)

school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."

tours = school_escort_tours_trips.add_pure_escort_tours(
tours, school_escort_tours
)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)

else:
# create empty school escort tours & trips tables to be used downstream
tours["school_esc_outbound"] = pd.NA
tours["school_esc_inbound"] = pd.NA
tours["school_escort_direction"] = pd.NA
tours["next_pure_escort_start"] = pd.NA
school_escort_tours = pd.DataFrame(columns=tours.columns)
trip_cols = [
"household_id",
"person_id",
"tour_id",
"trip_id",
"outbound",
"depart",
"purpose",
"destination",
"escort_participants",
"chauf_tour_id",
"primary_purpose",
]
school_escort_trips = pd.DataFrame(columns=trip_cols)

school_escort_trips["primary_purpose"] = school_escort_trips[
"primary_purpose"
Expand Down
17 changes: 17 additions & 0 deletions activitysim/abm/models/util/school_escort_tours_trips.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,19 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
tours = state.get_dataframe("tours")
trips = state.get_dataframe("trips")

# checking to see if there are school escort trips to merge in
if len(school_escort_trips) == 0:
# if no trips, fill escorting columns with NA
trips[
[
"escort_participants",
"school_escort_direction",
"school_escort_trip_id",
]
] = pd.NA
state.add_table("trips", trips)
return trips

# want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops
out_se_tours = tours[
tours["school_esc_outbound"].isin(["pure_escort", "ride_share"])
Expand DownExpand Up@@ -643,6 +656,10 @@ def force_escortee_tour_modes_to_match_chauffeur(state: workflow.State, tours):
# Does it even matter if trip modes are getting matched later?
escort_bundles = state.get_dataframe("escort_bundles")

if len(escort_bundles) == 0:
# do not need to do anything if no escorting
return tours

# grabbing the school tour ids for each school escort bundle
se_tours = escort_bundles[["school_tour_ids", "chauf_tour_id"]].copy()
# merging in chauffeur tour mode
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 101 additions & 40 deletions activitysim/abm/models/school_escorting.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,14 @@ def determine_escorting_participants(
& (persons.cdap_activity == "M")
]
households_with_escortees = escortees["household_id"]
choosers = choosers[choosers.index.isin(households_with_escortees)]
if len(households_with_escortees) == 0:
logger.warning("No households with escortees found!")
else:
tot_households = len(choosers)
choosers = choosers[choosers.index.isin(households_with_escortees)]
logger.info(
f"Proceeding with {len(choosers)} households with escortees out of {tot_households} total households"
)

# can specify different weights to determine chaperones
persontype_weight = model_settings.PERSON_WEIGHT
Expand DownExpand Up@@ -140,7 +147,7 @@ def add_prev_choices_to_choosers(
stage_alts,
how="left",
left_on=escorting_choice,
right_on=stage_alts.index.name,
right_index=True,
)
.set_index("household_id")
)
Expand DownExpand Up@@ -216,8 +223,12 @@ def create_school_escorting_bundles_table(choosers, tours, stage):
bundles : pd.DataFrame
one school escorting bundle per row
"""
# making a table of bundles
choosers = choosers.reset_index()
# want to keep household_id in columns, which is already there if running in estimation mode
if "household_id" in choosers.columns:
choosers = choosers.reset_index(drop=True)
else:
choosers = choosers.reset_index()
# creating a row for every school escorting bundle
choosers = choosers.loc[choosers.index.repeat(choosers["nbundles"])]

bundles = pd.DataFrame()
Expand DownExpand Up@@ -460,7 +471,11 @@ def school_escorting(

trace_hh_id = state.settings.trace_hh_id

alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
# FIXME setting index as "Alt" causes crash in estimation mode...
# happens in joint_tour_frequency_composition too!
# alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
alts = simulate.read_model_alts(state, model_settings.ALTS, set_index=None)
alts.index = alts["Alt"].values
Comment thread
jpn-- marked this conversation as resolved.

choosers, participant_columns = determine_escorting_participants(
households_merged, persons, model_settings
Expand All@@ -478,7 +493,9 @@ def school_escorting(
for stage_num, stage in enumerate(school_escorting_stages):
stage_trace_label = trace_label + "_" + stage
estimator = estimation.manager.begin_estimation(
state, "school_escorting_" + stage
state,
model_name="school_escorting_" + stage,
bundle_name="school_escorting",
)

model_spec_raw = state.filesystem.read_model_spec(
Expand DownExpand Up@@ -533,9 +550,26 @@ def school_escorting(

if estimator:
estimator.write_model_settings(model_settings, model_settings_file_name)
estimator.write_spec(model_settings)
estimator.write_coefficients(coefficients_df, model_settings)
estimator.write_spec(model_settings, tag=stage.upper() + "_SPEC")
estimator.write_coefficients(
coefficients_df, file_name=stage.upper() + "_COEFFICIENTS"
)
estimator.write_choosers(choosers)
estimator.write_alternatives(alts, bundle_directory=True)

# FIXME #interaction_simulate_estimation_requires_chooser_id_in_df_column
# shuold we do it here or have interaction_simulate do it?
# chooser index must be duplicated in column or it will be omitted from interaction_dataset
# estimation requires that chooser_id is either in index or a column of interaction_dataset
# so it can be reformatted (melted) and indexed by chooser_id and alt_id
assert choosers.index.name == "household_id"
assert "household_id" not in choosers.columns
choosers["household_id"] = choosers.index

# FIXME set_alt_id - do we need this for interaction_simulate estimation bundle tables?
estimator.set_alt_id("alt_id")
Comment thread
jpn-- marked this conversation as resolved.

estimator.set_chooser_id(choosers.index.name)

log_alt_losers = state.settings.log_alt_losers

Expand DownExpand Up@@ -580,47 +614,74 @@ def school_escorting(

if stage_num >= 1:
choosers["Alt"] = choices
choosers = choosers.join(alts, how="left", on="Alt")
choosers = choosers.join(alts.set_index("Alt"), how="left", on="Alt")
bundles = create_school_escorting_bundles_table(
choosers[choosers["Alt"] > 1], tours, stage
)
escort_bundles.append(bundles)

escort_bundles = pd.concat(escort_bundles)
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."
# Only want to create bundles and tours and trips if at least one household has school escorting
if len(escort_bundles) > 0:
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

tours = school_escort_tours_trips.add_pure_escort_tours(tours, school_escort_tours)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)

school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."

tours = school_escort_tours_trips.add_pure_escort_tours(
tours, school_escort_tours
)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)

else:
# create empty school escort tours & trips tables to be used downstream
tours["school_esc_outbound"] = pd.NA
tours["school_esc_inbound"] = pd.NA
tours["school_escort_direction"] = pd.NA
tours["next_pure_escort_start"] = pd.NA
school_escort_tours = pd.DataFrame(columns=tours.columns)
trip_cols = [
"household_id",
"person_id",
"tour_id",
"trip_id",
"outbound",
"depart",
"purpose",
"destination",
"escort_participants",
"chauf_tour_id",
"primary_purpose",
]
school_escort_trips = pd.DataFrame(columns=trip_cols)

school_escort_trips["primary_purpose"] = school_escort_trips[
"primary_purpose"
Expand Down
17 changes: 17 additions & 0 deletions activitysim/abm/models/util/school_escort_tours_trips.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,19 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
tours = state.get_dataframe("tours")
trips = state.get_dataframe("trips")

# checking to see if there are school escort trips to merge in
if len(school_escort_trips) == 0:
# if no trips, fill escorting columns with NA
trips[
[
"escort_participants",
"school_escort_direction",
"school_escort_trip_id",
]
] = pd.NA
state.add_table("trips", trips)
return trips

# want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops
out_se_tours = tours[
tours["school_esc_outbound"].isin(["pure_escort", "ride_share"])
Expand DownExpand Up@@ -643,6 +656,10 @@ def force_escortee_tour_modes_to_match_chauffeur(state: workflow.State, tours):
# Does it even matter if trip modes are getting matched later?
escort_bundles = state.get_dataframe("escort_bundles")

if len(escort_bundles) == 0:
# do not need to do anything if no escorting
return tours

# grabbing the school tour ids for each school escort bundle
se_tours = escort_bundles[["school_tour_ids", "chauf_tour_id"]].copy()
# merging in chauffeur tour mode
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 101 additions & 40 deletions activitysim/abm/models/school_escorting.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,14 @@ def determine_escorting_participants(
& (persons.cdap_activity == "M")
]
households_with_escortees = escortees["household_id"]
choosers = choosers[choosers.index.isin(households_with_escortees)]
if len(households_with_escortees) == 0:
logger.warning("No households with escortees found!")
else:
tot_households = len(choosers)
choosers = choosers[choosers.index.isin(households_with_escortees)]
logger.info(
f"Proceeding with {len(choosers)} households with escortees out of {tot_households} total households"
)

# can specify different weights to determine chaperones
persontype_weight = model_settings.PERSON_WEIGHT
Expand DownExpand Up@@ -140,7 +147,7 @@ def add_prev_choices_to_choosers(
stage_alts,
how="left",
left_on=escorting_choice,
right_on=stage_alts.index.name,
right_index=True,
)
.set_index("household_id")
)
Expand DownExpand Up@@ -216,8 +223,12 @@ def create_school_escorting_bundles_table(choosers, tours, stage):
bundles : pd.DataFrame
one school escorting bundle per row
"""
# making a table of bundles
choosers = choosers.reset_index()
# want to keep household_id in columns, which is already there if running in estimation mode
if "household_id" in choosers.columns:
choosers = choosers.reset_index(drop=True)
else:
choosers = choosers.reset_index()
# creating a row for every school escorting bundle
choosers = choosers.loc[choosers.index.repeat(choosers["nbundles"])]

bundles = pd.DataFrame()
Expand DownExpand Up@@ -460,7 +471,11 @@ def school_escorting(

trace_hh_id = state.settings.trace_hh_id

alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
# FIXME setting index as "Alt" causes crash in estimation mode...
# happens in joint_tour_frequency_composition too!
# alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
alts = simulate.read_model_alts(state, model_settings.ALTS, set_index=None)
alts.index = alts["Alt"].values
Comment thread
jpn-- marked this conversation as resolved.

choosers, participant_columns = determine_escorting_participants(
households_merged, persons, model_settings
Expand All@@ -478,7 +493,9 @@ def school_escorting(
for stage_num, stage in enumerate(school_escorting_stages):
stage_trace_label = trace_label + "_" + stage
estimator = estimation.manager.begin_estimation(
state, "school_escorting_" + stage
state,
model_name="school_escorting_" + stage,
bundle_name="school_escorting",
)

model_spec_raw = state.filesystem.read_model_spec(
Expand DownExpand Up@@ -533,9 +550,26 @@ def school_escorting(

if estimator:
estimator.write_model_settings(model_settings, model_settings_file_name)
estimator.write_spec(model_settings)
estimator.write_coefficients(coefficients_df, model_settings)
estimator.write_spec(model_settings, tag=stage.upper() + "_SPEC")
estimator.write_coefficients(
coefficients_df, file_name=stage.upper() + "_COEFFICIENTS"
)
estimator.write_choosers(choosers)
estimator.write_alternatives(alts, bundle_directory=True)

# FIXME #interaction_simulate_estimation_requires_chooser_id_in_df_column
# shuold we do it here or have interaction_simulate do it?
# chooser index must be duplicated in column or it will be omitted from interaction_dataset
# estimation requires that chooser_id is either in index or a column of interaction_dataset
# so it can be reformatted (melted) and indexed by chooser_id and alt_id
assert choosers.index.name == "household_id"
assert "household_id" not in choosers.columns
choosers["household_id"] = choosers.index

# FIXME set_alt_id - do we need this for interaction_simulate estimation bundle tables?
estimator.set_alt_id("alt_id")
Comment thread
jpn-- marked this conversation as resolved.

estimator.set_chooser_id(choosers.index.name)

log_alt_losers = state.settings.log_alt_losers

Expand DownExpand Up@@ -580,47 +614,74 @@ def school_escorting(

if stage_num >= 1:
choosers["Alt"] = choices
choosers = choosers.join(alts, how="left", on="Alt")
choosers = choosers.join(alts.set_index("Alt"), how="left", on="Alt")
bundles = create_school_escorting_bundles_table(
choosers[choosers["Alt"] > 1], tours, stage
)
escort_bundles.append(bundles)

escort_bundles = pd.concat(escort_bundles)
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."
# Only want to create bundles and tours and trips if at least one household has school escorting
if len(escort_bundles) > 0:
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

tours = school_escort_tours_trips.add_pure_escort_tours(tours, school_escort_tours)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)

school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."

tours = school_escort_tours_trips.add_pure_escort_tours(
tours, school_escort_tours
)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)

else:
# create empty school escort tours & trips tables to be used downstream
tours["school_esc_outbound"] = pd.NA
tours["school_esc_inbound"] = pd.NA
tours["school_escort_direction"] = pd.NA
tours["next_pure_escort_start"] = pd.NA
school_escort_tours = pd.DataFrame(columns=tours.columns)
trip_cols = [
"household_id",
"person_id",
"tour_id",
"trip_id",
"outbound",
"depart",
"purpose",
"destination",
"escort_participants",
"chauf_tour_id",
"primary_purpose",
]
school_escort_trips = pd.DataFrame(columns=trip_cols)

school_escort_trips["primary_purpose"] = school_escort_trips[
"primary_purpose"
Expand Down
17 changes: 17 additions & 0 deletions activitysim/abm/models/util/school_escort_tours_trips.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,19 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
tours = state.get_dataframe("tours")
trips = state.get_dataframe("trips")

# checking to see if there are school escort trips to merge in
if len(school_escort_trips) == 0:
# if no trips, fill escorting columns with NA
trips[
[
"escort_participants",
"school_escort_direction",
"school_escort_trip_id",
]
] = pd.NA
state.add_table("trips", trips)
return trips

# want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops
out_se_tours = tours[
tours["school_esc_outbound"].isin(["pure_escort", "ride_share"])
Expand DownExpand Up@@ -643,6 +656,10 @@ def force_escortee_tour_modes_to_match_chauffeur(state: workflow.State, tours):
# Does it even matter if trip modes are getting matched later?
escort_bundles = state.get_dataframe("escort_bundles")

if len(escort_bundles) == 0:
# do not need to do anything if no escorting
return tours

# grabbing the school tour ids for each school escort bundle
se_tours = escort_bundles[["school_tour_ids", "chauf_tour_id"]].copy()
# merging in chauffeur tour mode
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 101 additions & 40 deletions activitysim/abm/models/school_escorting.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,14 @@ def determine_escorting_participants(
& (persons.cdap_activity == "M")
]
households_with_escortees = escortees["household_id"]
choosers = choosers[choosers.index.isin(households_with_escortees)]
if len(households_with_escortees) == 0:
logger.warning("No households with escortees found!")
else:
tot_households = len(choosers)
choosers = choosers[choosers.index.isin(households_with_escortees)]
logger.info(
f"Proceeding with {len(choosers)} households with escortees out of {tot_households} total households"
)

# can specify different weights to determine chaperones
persontype_weight = model_settings.PERSON_WEIGHT
Expand DownExpand Up@@ -140,7 +147,7 @@ def add_prev_choices_to_choosers(
stage_alts,
how="left",
left_on=escorting_choice,
right_on=stage_alts.index.name,
right_index=True,
)
.set_index("household_id")
)
Expand DownExpand Up@@ -216,8 +223,12 @@ def create_school_escorting_bundles_table(choosers, tours, stage):
bundles : pd.DataFrame
one school escorting bundle per row
"""
# making a table of bundles
choosers = choosers.reset_index()
# want to keep household_id in columns, which is already there if running in estimation mode
if "household_id" in choosers.columns:
choosers = choosers.reset_index(drop=True)
else:
choosers = choosers.reset_index()
# creating a row for every school escorting bundle
choosers = choosers.loc[choosers.index.repeat(choosers["nbundles"])]

bundles = pd.DataFrame()
Expand DownExpand Up@@ -460,7 +471,11 @@ def school_escorting(

trace_hh_id = state.settings.trace_hh_id

alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
# FIXME setting index as "Alt" causes crash in estimation mode...
# happens in joint_tour_frequency_composition too!
# alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
alts = simulate.read_model_alts(state, model_settings.ALTS, set_index=None)
alts.index = alts["Alt"].values
Comment thread
jpn-- marked this conversation as resolved.

choosers, participant_columns = determine_escorting_participants(
households_merged, persons, model_settings
Expand All@@ -478,7 +493,9 @@ def school_escorting(
for stage_num, stage in enumerate(school_escorting_stages):
stage_trace_label = trace_label + "_" + stage
estimator = estimation.manager.begin_estimation(
state, "school_escorting_" + stage
state,
model_name="school_escorting_" + stage,
bundle_name="school_escorting",
)

model_spec_raw = state.filesystem.read_model_spec(
Expand DownExpand Up@@ -533,9 +550,26 @@ def school_escorting(

if estimator:
estimator.write_model_settings(model_settings, model_settings_file_name)
estimator.write_spec(model_settings)
estimator.write_coefficients(coefficients_df, model_settings)
estimator.write_spec(model_settings, tag=stage.upper() + "_SPEC")
estimator.write_coefficients(
coefficients_df, file_name=stage.upper() + "_COEFFICIENTS"
)
estimator.write_choosers(choosers)
estimator.write_alternatives(alts, bundle_directory=True)

# FIXME #interaction_simulate_estimation_requires_chooser_id_in_df_column
# shuold we do it here or have interaction_simulate do it?
# chooser index must be duplicated in column or it will be omitted from interaction_dataset
# estimation requires that chooser_id is either in index or a column of interaction_dataset
# so it can be reformatted (melted) and indexed by chooser_id and alt_id
assert choosers.index.name == "household_id"
assert "household_id" not in choosers.columns
choosers["household_id"] = choosers.index

# FIXME set_alt_id - do we need this for interaction_simulate estimation bundle tables?
estimator.set_alt_id("alt_id")
Comment thread
jpn-- marked this conversation as resolved.

estimator.set_chooser_id(choosers.index.name)

log_alt_losers = state.settings.log_alt_losers

Expand DownExpand Up@@ -580,47 +614,74 @@ def school_escorting(

if stage_num >= 1:
choosers["Alt"] = choices
choosers = choosers.join(alts, how="left", on="Alt")
choosers = choosers.join(alts.set_index("Alt"), how="left", on="Alt")
bundles = create_school_escorting_bundles_table(
choosers[choosers["Alt"] > 1], tours, stage
)
escort_bundles.append(bundles)

escort_bundles = pd.concat(escort_bundles)
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."
# Only want to create bundles and tours and trips if at least one household has school escorting
if len(escort_bundles) > 0:
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

tours = school_escort_tours_trips.add_pure_escort_tours(tours, school_escort_tours)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)

school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."

tours = school_escort_tours_trips.add_pure_escort_tours(
tours, school_escort_tours
)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)

else:
# create empty school escort tours & trips tables to be used downstream
tours["school_esc_outbound"] = pd.NA
tours["school_esc_inbound"] = pd.NA
tours["school_escort_direction"] = pd.NA
tours["next_pure_escort_start"] = pd.NA
school_escort_tours = pd.DataFrame(columns=tours.columns)
trip_cols = [
"household_id",
"person_id",
"tour_id",
"trip_id",
"outbound",
"depart",
"purpose",
"destination",
"escort_participants",
"chauf_tour_id",
"primary_purpose",
]
school_escort_trips = pd.DataFrame(columns=trip_cols)

school_escort_trips["primary_purpose"] = school_escort_trips[
"primary_purpose"
Expand Down
17 changes: 17 additions & 0 deletions activitysim/abm/models/util/school_escort_tours_trips.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,19 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
tours = state.get_dataframe("tours")
trips = state.get_dataframe("trips")

# checking to see if there are school escort trips to merge in
if len(school_escort_trips) == 0:
# if no trips, fill escorting columns with NA
trips[
[
"escort_participants",
"school_escort_direction",
"school_escort_trip_id",
]
] = pd.NA
state.add_table("trips", trips)
return trips

# want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops
out_se_tours = tours[
tours["school_esc_outbound"].isin(["pure_escort", "ride_share"])
Expand DownExpand Up@@ -643,6 +656,10 @@ def force_escortee_tour_modes_to_match_chauffeur(state: workflow.State, tours):
# Does it even matter if trip modes are getting matched later?
escort_bundles = state.get_dataframe("escort_bundles")

if len(escort_bundles) == 0:
# do not need to do anything if no escorting
return tours

# grabbing the school tour ids for each school escort bundle
se_tours = escort_bundles[["school_tour_ids", "chauf_tour_id"]].copy()
# merging in chauffeur tour mode
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 101 additions & 40 deletions activitysim/abm/models/school_escorting.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,14 @@ def determine_escorting_participants(
& (persons.cdap_activity == "M")
]
households_with_escortees = escortees["household_id"]
choosers = choosers[choosers.index.isin(households_with_escortees)]
if len(households_with_escortees) == 0:
logger.warning("No households with escortees found!")
else:
tot_households = len(choosers)
choosers = choosers[choosers.index.isin(households_with_escortees)]
logger.info(
f"Proceeding with {len(choosers)} households with escortees out of {tot_households} total households"
)

# can specify different weights to determine chaperones
persontype_weight = model_settings.PERSON_WEIGHT
Expand DownExpand Up@@ -140,7 +147,7 @@ def add_prev_choices_to_choosers(
stage_alts,
how="left",
left_on=escorting_choice,
right_on=stage_alts.index.name,
right_index=True,
)
.set_index("household_id")
)
Expand DownExpand Up@@ -216,8 +223,12 @@ def create_school_escorting_bundles_table(choosers, tours, stage):
bundles : pd.DataFrame
one school escorting bundle per row
"""
# making a table of bundles
choosers = choosers.reset_index()
# want to keep household_id in columns, which is already there if running in estimation mode
if "household_id" in choosers.columns:
choosers = choosers.reset_index(drop=True)
else:
choosers = choosers.reset_index()
# creating a row for every school escorting bundle
choosers = choosers.loc[choosers.index.repeat(choosers["nbundles"])]

bundles = pd.DataFrame()
Expand DownExpand Up@@ -460,7 +471,11 @@ def school_escorting(

trace_hh_id = state.settings.trace_hh_id

alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
# FIXME setting index as "Alt" causes crash in estimation mode...
# happens in joint_tour_frequency_composition too!
# alts = simulate.read_model_alts(state, model_settings.ALTS, set_index="Alt")
alts = simulate.read_model_alts(state, model_settings.ALTS, set_index=None)
alts.index = alts["Alt"].values
Comment thread
jpn-- marked this conversation as resolved.

choosers, participant_columns = determine_escorting_participants(
households_merged, persons, model_settings
Expand All@@ -478,7 +493,9 @@ def school_escorting(
for stage_num, stage in enumerate(school_escorting_stages):
stage_trace_label = trace_label + "_" + stage
estimator = estimation.manager.begin_estimation(
state, "school_escorting_" + stage
state,
model_name="school_escorting_" + stage,
bundle_name="school_escorting",
)

model_spec_raw = state.filesystem.read_model_spec(
Expand DownExpand Up@@ -533,9 +550,26 @@ def school_escorting(

if estimator:
estimator.write_model_settings(model_settings, model_settings_file_name)
estimator.write_spec(model_settings)
estimator.write_coefficients(coefficients_df, model_settings)
estimator.write_spec(model_settings, tag=stage.upper() + "_SPEC")
estimator.write_coefficients(
coefficients_df, file_name=stage.upper() + "_COEFFICIENTS"
)
estimator.write_choosers(choosers)
estimator.write_alternatives(alts, bundle_directory=True)

# FIXME #interaction_simulate_estimation_requires_chooser_id_in_df_column
# shuold we do it here or have interaction_simulate do it?
# chooser index must be duplicated in column or it will be omitted from interaction_dataset
# estimation requires that chooser_id is either in index or a column of interaction_dataset
# so it can be reformatted (melted) and indexed by chooser_id and alt_id
assert choosers.index.name == "household_id"
assert "household_id" not in choosers.columns
choosers["household_id"] = choosers.index

# FIXME set_alt_id - do we need this for interaction_simulate estimation bundle tables?
estimator.set_alt_id("alt_id")
Comment thread
jpn-- marked this conversation as resolved.

estimator.set_chooser_id(choosers.index.name)

log_alt_losers = state.settings.log_alt_losers

Expand DownExpand Up@@ -580,47 +614,74 @@ def school_escorting(

if stage_num >= 1:
choosers["Alt"] = choices
choosers = choosers.join(alts, how="left", on="Alt")
choosers = choosers.join(alts.set_index("Alt"), how="left", on="Alt")
bundles = create_school_escorting_bundles_table(
choosers[choosers["Alt"] > 1], tours, stage
)
escort_bundles.append(bundles)

escort_bundles = pd.concat(escort_bundles)
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."
# Only want to create bundles and tours and trips if at least one household has school escorting
if len(escort_bundles) > 0:
escort_bundles["bundle_id"] = (
escort_bundles["household_id"] * 10
+ escort_bundles.groupby("household_id").cumcount()
+ 1
)
escort_bundles.sort_values(
by=["household_id", "school_escort_direction"],
ascending=[True, False],
inplace=True,
)

tours = school_escort_tours_trips.add_pure_escort_tours(tours, school_escort_tours)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_tours = school_escort_tours_trips.create_pure_school_escort_tours(
state, escort_bundles
)
chauf_tour_id_map = {
v: k for k, v in school_escort_tours["bundle_id"].to_dict().items()
}
escort_bundles["chauf_tour_id"] = np.where(
escort_bundles["escort_type"] == "ride_share",
escort_bundles["first_mand_tour_id"],
escort_bundles["bundle_id"].map(chauf_tour_id_map),
)

school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)
assert (
escort_bundles["chauf_tour_id"].notnull().all()
), f"chauf_tour_id is null for {escort_bundles[escort_bundles['chauf_tour_id'].isna()]}. Check availability conditions."

tours = school_escort_tours_trips.add_pure_escort_tours(
tours, school_escort_tours
)
tours = school_escort_tours_trips.process_tours_after_escorting_model(
state, escort_bundles, tours
)
school_escort_trips = school_escort_tours_trips.create_school_escort_trips(
escort_bundles
)

else:
# create empty school escort tours & trips tables to be used downstream
tours["school_esc_outbound"] = pd.NA
tours["school_esc_inbound"] = pd.NA
tours["school_escort_direction"] = pd.NA
tours["next_pure_escort_start"] = pd.NA
school_escort_tours = pd.DataFrame(columns=tours.columns)
trip_cols = [
"household_id",
"person_id",
"tour_id",
"trip_id",
"outbound",
"depart",
"purpose",
"destination",
"escort_participants",
"chauf_tour_id",
"primary_purpose",
]
school_escort_trips = pd.DataFrame(columns=trip_cols)

school_escort_trips["primary_purpose"] = school_escort_trips[
"primary_purpose"
Expand Down
17 changes: 17 additions & 0 deletions activitysim/abm/models/util/school_escort_tours_trips.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,19 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
tours = state.get_dataframe("tours")
trips = state.get_dataframe("trips")

# checking to see if there are school escort trips to merge in
if len(school_escort_trips) == 0:
# if no trips, fill escorting columns with NA
trips[
[
"escort_participants",
"school_escort_direction",
"school_escort_trip_id",
]
] = pd.NA
state.add_table("trips", trips)
return trips

# want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops
out_se_tours = tours[
tours["school_esc_outbound"].isin(["pure_escort", "ride_share"])
Expand DownExpand Up@@ -643,6 +656,10 @@ def force_escortee_tour_modes_to_match_chauffeur(state: workflow.State, tours):
# Does it even matter if trip modes are getting matched later?
escort_bundles = state.get_dataframe("escort_bundles")

if len(escort_bundles) == 0:
# do not need to do anything if no escorting
return tours

# grabbing the school tour ids for each school escort bundle
se_tours = escort_bundles[["school_tour_ids", "chauf_tour_id"]].copy()
# merging in chauffeur tour mode
Expand Down