BayDAG Contribution #13: Estimation Mode Usability#779

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 3 commits into from
Apr 1, 2024
Merged

BayDAG Contribution #13: Estimation Mode Usability #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ece02a8
estimation mode usability
dhensle Dec 16, 2023
e8144af
comments allowed in stop freq spec
dhensle Dec 16, 2023
f30a9ea
settings in write_omnibus_table
dhensle Mar 12, 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
2 changes: 1 addition & 1 deletion activitysim/abm/models/stop_frequency.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,7 +275,7 @@ def stop_frequency(
print(f"survey_trips_not_in_trips\n{survey_trips_not_in_trips}")
different = True
trips_not_in_survey_trips = trips[~trips.index.isin(survey_trips.index)]
if len(survey_trips_not_in_trips) > 0:
if len(trips_not_in_survey_trips) > 0:
print(f"trips_not_in_survey_trips\n{trips_not_in_survey_trips}")
different = True
assert not different
Expand Down
18 changes: 17 additions & 1 deletion activitysim/core/estimation.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,15 @@ def write_omnibus_table(self):
if len(self.omnibus_tables) == 0:
return

settings = self.state.filesystem.read_model_settings(
ESTIMATION_SETTINGS_FILE_NAME, mandatory=False
)

edbs_to_skip = settings.get("SKIP_BUNDLE_WRITE_FOR", [])
if self.bundle_name in edbs_to_skip:
self.debug(f"Skipping write to disk for {self.bundle_name}")
return

for omnibus_table, table_names in self.omnibus_tables.items():
self.debug(
"write_omnibus_table: %s table_names: %s" % (omnibus_table, table_names)
Expand All@@ -237,12 +246,19 @@ def write_omnibus_table(self):
1 if omnibus_table in self.omnibus_tables_append_columns else 0
)

df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)
if len(table_names) == 0:
# empty tables
df = pd.DataFrame()
else:
df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)

self.debug(f"sorting tables: {table_names}")
df.sort_index(ascending=True, inplace=True, kind="mergesort")

file_path = self.output_file_path(omnibus_table, "csv")
assert not os.path.isfile(file_path)

self.debug(f"writing table: {file_path}")
df.to_csv(file_path, mode="a", index=True, header=True)

self.debug("write_omnibus_choosers: %s" % file_path)
Expand Down
6 changes: 6 additions & 0 deletions activitysim/estimation/larch/location_choice.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,9 @@ def _file_exists(filename):
.set_index("segment")
)
size_spec = size_spec.loc[:, size_spec.max() > 0]
assert (
len(size_spec) > 0
), f"Empty size_spec, is model_selector {SIZE_TERM_SELECTOR} in your size term file?"

size_coef = size_coefficients_from_spec(size_spec)

Expand DownExpand Up@@ -294,6 +297,9 @@ def split(a, n):
else:
av = 1

assert len(x_co) > 0, "Empty chooser dataframe"
assert len(x_ca_1) > 0, "Empty alternatives dataframe"

d = DataFrames(co=x_co, ca=x_ca_1, av=av)

m = Model(dataservice=d)
Expand Down
7 changes: 3 additions & 4 deletions activitysim/estimation/larch/stop_frequency.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,7 @@ def stop_frequency_data(
seg_purpose = seg_["primary_purpose"]
seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
segment_coef[seg_["primary_purpose"]] = pd.read_csv(
seg_subdir / seg_["COEFFICIENTS"],
index_col="coefficient_name",
seg_subdir / seg_["COEFFICIENTS"], index_col="coefficient_name", comment="#"
)

for seg in segments:
Expand DownExpand Up@@ -89,13 +88,13 @@ def stop_frequency_data(
seg_purpose = seg["primary_purpose"]
seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
coeffs_ = pd.read_csv(
seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name"
seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name", comment="#"
)
coeffs_.index = pd.Index(
[f"{i}_{seg_purpose}" for i in coeffs_.index], name="coefficient_name"
)
seg_coefficients.append(coeffs_)
spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv")
spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv", comment="#")
spec = remove_apostrophes(spec, ["Label"])
# spec.iloc[:, 3:] = spec.iloc[:, 3:].applymap(lambda x: f"{x}_{seg_purpose}" if not pd.isna(x) else x)
seg_spec.append(spec)
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
BayDAG Contribution #13: Estimation Mode Usability#779

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

from

Apr 1, 2024
 Merged


BayDAG Contribution #13: Estimation Mode Usability
#779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ece02a8

estimation mode usability


dhensle Dec 16, 2023
e8144af

comments allowed in stop freq spec


dhensle Dec 16, 2023
f30a9ea

settings in write_omnibus_table


dhensle Mar 12, 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


2 changes: 1 addition & 1 deletion
activitysim/abm/models/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,7 +275,7 @@ def stop_frequency(
 print(f"survey_trips_not_in_trips\n{survey_trips_not_in_trips}")
 different = True
 trips_not_in_survey_trips = trips[~trips.index.isin(survey_trips.index)]
 if len(survey_trips_not_in_trips) > 0:
 if len(trips_not_in_survey_trips) > 0:
 print(f"trips_not_in_survey_trips\n{trips_not_in_survey_trips}")
 different = True
 assert not different
Expand Down

18 changes: 17 additions & 1 deletion
activitysim/core/estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,15 @@ def write_omnibus_table(self):
 if len(self.omnibus_tables) == 0:
 return

 settings = self.state.filesystem.read_model_settings(
 ESTIMATION_SETTINGS_FILE_NAME, mandatory=False
 )

 edbs_to_skip = settings.get("SKIP_BUNDLE_WRITE_FOR", [])
 if self.bundle_name in edbs_to_skip:
 self.debug(f"Skipping write to disk for {self.bundle_name}")
 return

 for omnibus_table, table_names in self.omnibus_tables.items():
 self.debug(
 "write_omnibus_table: %s table_names: %s" % (omnibus_table, table_names)
Expand All@@ -237,12 +246,19 @@ def write_omnibus_table(self):
 1 if omnibus_table in self.omnibus_tables_append_columns else 0
 )

 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)
 if len(table_names) == 0:
 # empty tables
 df = pd.DataFrame()
 else:
 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)

 self.debug(f"sorting tables: {table_names}")
 df.sort_index(ascending=True, inplace=True, kind="mergesort")

 file_path = self.output_file_path(omnibus_table, "csv")
 assert not os.path.isfile(file_path)

 self.debug(f"writing table: {file_path}")
 df.to_csv(file_path, mode="a", index=True, header=True)

 self.debug("write_omnibus_choosers: %s" % file_path)
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/estimation/larch/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,9 @@ def _file_exists(filename):
 .set_index("segment")
 )
 size_spec = size_spec.loc[:, size_spec.max() > 0]
 assert (
 len(size_spec) > 0
 ), f"Empty size_spec, is model_selector {SIZE_TERM_SELECTOR} in your size term file?"

 size_coef = size_coefficients_from_spec(size_spec)

Expand DownExpand Up@@ -294,6 +297,9 @@ def split(a, n):
 else:
 av = 1

 assert len(x_co) > 0, "Empty chooser dataframe"
 assert len(x_ca_1) > 0, "Empty alternatives dataframe"

 d = DataFrames(co=x_co, ca=x_ca_1, av=av)

 m = Model(dataservice=d)
Expand Down

7 changes: 3 additions & 4 deletions
activitysim/estimation/larch/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,7 @@ def stop_frequency_data(
 seg_purpose = seg_["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 segment_coef[seg_["primary_purpose"]] = pd.read_csv(
 seg_subdir / seg_["COEFFICIENTS"],
 index_col="coefficient_name",
 seg_subdir / seg_["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )

 for seg in segments:
Expand DownExpand Up@@ -89,13 +88,13 @@ def stop_frequency_data(
 seg_purpose = seg["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 coeffs_ = pd.read_csv(
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name"
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )
 coeffs_.index = pd.Index(
 [f"{i}_{seg_purpose}" for i in coeffs_.index], name="coefficient_name"
 )
 seg_coefficients.append(coeffs_)
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv")
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv", comment="#")
 spec = remove_apostrophes(spec, ["Label"])
 # spec.iloc[:, 3:] = spec.iloc[:, 3:].applymap(lambda x: f"{x}_{seg_purpose}" if not pd.isna(x) else x)
 seg_spec.append(spec)
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
BayDAG Contribution #13: Estimation Mode Usability#779

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

from

Apr 1, 2024
 Merged


BayDAG Contribution #13: Estimation Mode Usability
#779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ece02a8

estimation mode usability


dhensle Dec 16, 2023
e8144af

comments allowed in stop freq spec


dhensle Dec 16, 2023
f30a9ea

settings in write_omnibus_table


dhensle Mar 12, 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


2 changes: 1 addition & 1 deletion
activitysim/abm/models/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,7 +275,7 @@ def stop_frequency(
 print(f"survey_trips_not_in_trips\n{survey_trips_not_in_trips}")
 different = True
 trips_not_in_survey_trips = trips[~trips.index.isin(survey_trips.index)]
 if len(survey_trips_not_in_trips) > 0:
 if len(trips_not_in_survey_trips) > 0:
 print(f"trips_not_in_survey_trips\n{trips_not_in_survey_trips}")
 different = True
 assert not different
Expand Down

18 changes: 17 additions & 1 deletion
activitysim/core/estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,15 @@ def write_omnibus_table(self):
 if len(self.omnibus_tables) == 0:
 return

 settings = self.state.filesystem.read_model_settings(
 ESTIMATION_SETTINGS_FILE_NAME, mandatory=False
 )

 edbs_to_skip = settings.get("SKIP_BUNDLE_WRITE_FOR", [])
 if self.bundle_name in edbs_to_skip:
 self.debug(f"Skipping write to disk for {self.bundle_name}")
 return

 for omnibus_table, table_names in self.omnibus_tables.items():
 self.debug(
 "write_omnibus_table: %s table_names: %s" % (omnibus_table, table_names)
Expand All@@ -237,12 +246,19 @@ def write_omnibus_table(self):
 1 if omnibus_table in self.omnibus_tables_append_columns else 0
 )

 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)
 if len(table_names) == 0:
 # empty tables
 df = pd.DataFrame()
 else:
 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)

 self.debug(f"sorting tables: {table_names}")
 df.sort_index(ascending=True, inplace=True, kind="mergesort")

 file_path = self.output_file_path(omnibus_table, "csv")
 assert not os.path.isfile(file_path)

 self.debug(f"writing table: {file_path}")
 df.to_csv(file_path, mode="a", index=True, header=True)

 self.debug("write_omnibus_choosers: %s" % file_path)
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/estimation/larch/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,9 @@ def _file_exists(filename):
 .set_index("segment")
 )
 size_spec = size_spec.loc[:, size_spec.max() > 0]
 assert (
 len(size_spec) > 0
 ), f"Empty size_spec, is model_selector {SIZE_TERM_SELECTOR} in your size term file?"

 size_coef = size_coefficients_from_spec(size_spec)

Expand DownExpand Up@@ -294,6 +297,9 @@ def split(a, n):
 else:
 av = 1

 assert len(x_co) > 0, "Empty chooser dataframe"
 assert len(x_ca_1) > 0, "Empty alternatives dataframe"

 d = DataFrames(co=x_co, ca=x_ca_1, av=av)

 m = Model(dataservice=d)
Expand Down

7 changes: 3 additions & 4 deletions
activitysim/estimation/larch/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,7 @@ def stop_frequency_data(
 seg_purpose = seg_["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 segment_coef[seg_["primary_purpose"]] = pd.read_csv(
 seg_subdir / seg_["COEFFICIENTS"],
 index_col="coefficient_name",
 seg_subdir / seg_["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )

 for seg in segments:
Expand DownExpand Up@@ -89,13 +88,13 @@ def stop_frequency_data(
 seg_purpose = seg["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 coeffs_ = pd.read_csv(
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name"
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )
 coeffs_.index = pd.Index(
 [f"{i}_{seg_purpose}" for i in coeffs_.index], name="coefficient_name"
 )
 seg_coefficients.append(coeffs_)
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv")
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv", comment="#")
 spec = remove_apostrophes(spec, ["Label"])
 # spec.iloc[:, 3:] = spec.iloc[:, 3:].applymap(lambda x: f"{x}_{seg_purpose}" if not pd.isna(x) else x)
 seg_spec.append(spec)
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
BayDAG Contribution #13: Estimation Mode Usability#779

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

from

Apr 1, 2024
 Merged


BayDAG Contribution #13: Estimation Mode Usability
#779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ece02a8

estimation mode usability


dhensle Dec 16, 2023
e8144af

comments allowed in stop freq spec


dhensle Dec 16, 2023
f30a9ea

settings in write_omnibus_table


dhensle Mar 12, 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


2 changes: 1 addition & 1 deletion
activitysim/abm/models/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,7 +275,7 @@ def stop_frequency(
 print(f"survey_trips_not_in_trips\n{survey_trips_not_in_trips}")
 different = True
 trips_not_in_survey_trips = trips[~trips.index.isin(survey_trips.index)]
 if len(survey_trips_not_in_trips) > 0:
 if len(trips_not_in_survey_trips) > 0:
 print(f"trips_not_in_survey_trips\n{trips_not_in_survey_trips}")
 different = True
 assert not different
Expand Down

18 changes: 17 additions & 1 deletion
activitysim/core/estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,15 @@ def write_omnibus_table(self):
 if len(self.omnibus_tables) == 0:
 return

 settings = self.state.filesystem.read_model_settings(
 ESTIMATION_SETTINGS_FILE_NAME, mandatory=False
 )

 edbs_to_skip = settings.get("SKIP_BUNDLE_WRITE_FOR", [])
 if self.bundle_name in edbs_to_skip:
 self.debug(f"Skipping write to disk for {self.bundle_name}")
 return

 for omnibus_table, table_names in self.omnibus_tables.items():
 self.debug(
 "write_omnibus_table: %s table_names: %s" % (omnibus_table, table_names)
Expand All@@ -237,12 +246,19 @@ def write_omnibus_table(self):
 1 if omnibus_table in self.omnibus_tables_append_columns else 0
 )

 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)
 if len(table_names) == 0:
 # empty tables
 df = pd.DataFrame()
 else:
 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)

 self.debug(f"sorting tables: {table_names}")
 df.sort_index(ascending=True, inplace=True, kind="mergesort")

 file_path = self.output_file_path(omnibus_table, "csv")
 assert not os.path.isfile(file_path)

 self.debug(f"writing table: {file_path}")
 df.to_csv(file_path, mode="a", index=True, header=True)

 self.debug("write_omnibus_choosers: %s" % file_path)
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/estimation/larch/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,9 @@ def _file_exists(filename):
 .set_index("segment")
 )
 size_spec = size_spec.loc[:, size_spec.max() > 0]
 assert (
 len(size_spec) > 0
 ), f"Empty size_spec, is model_selector {SIZE_TERM_SELECTOR} in your size term file?"

 size_coef = size_coefficients_from_spec(size_spec)

Expand DownExpand Up@@ -294,6 +297,9 @@ def split(a, n):
 else:
 av = 1

 assert len(x_co) > 0, "Empty chooser dataframe"
 assert len(x_ca_1) > 0, "Empty alternatives dataframe"

 d = DataFrames(co=x_co, ca=x_ca_1, av=av)

 m = Model(dataservice=d)
Expand Down

7 changes: 3 additions & 4 deletions
activitysim/estimation/larch/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,7 @@ def stop_frequency_data(
 seg_purpose = seg_["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 segment_coef[seg_["primary_purpose"]] = pd.read_csv(
 seg_subdir / seg_["COEFFICIENTS"],
 index_col="coefficient_name",
 seg_subdir / seg_["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )

 for seg in segments:
Expand DownExpand Up@@ -89,13 +88,13 @@ def stop_frequency_data(
 seg_purpose = seg["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 coeffs_ = pd.read_csv(
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name"
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )
 coeffs_.index = pd.Index(
 [f"{i}_{seg_purpose}" for i in coeffs_.index], name="coefficient_name"
 )
 seg_coefficients.append(coeffs_)
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv")
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv", comment="#")
 spec = remove_apostrophes(spec, ["Label"])
 # spec.iloc[:, 3:] = spec.iloc[:, 3:].applymap(lambda x: f"{x}_{seg_purpose}" if not pd.isna(x) else x)
 seg_spec.append(spec)
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
BayDAG Contribution #13: Estimation Mode Usability#779

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

from

Apr 1, 2024
 Merged


BayDAG Contribution #13: Estimation Mode Usability
#779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ece02a8

estimation mode usability


dhensle Dec 16, 2023
e8144af

comments allowed in stop freq spec


dhensle Dec 16, 2023
f30a9ea

settings in write_omnibus_table


dhensle Mar 12, 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


2 changes: 1 addition & 1 deletion
activitysim/abm/models/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,7 +275,7 @@ def stop_frequency(
 print(f"survey_trips_not_in_trips\n{survey_trips_not_in_trips}")
 different = True
 trips_not_in_survey_trips = trips[~trips.index.isin(survey_trips.index)]
 if len(survey_trips_not_in_trips) > 0:
 if len(trips_not_in_survey_trips) > 0:
 print(f"trips_not_in_survey_trips\n{trips_not_in_survey_trips}")
 different = True
 assert not different
Expand Down

18 changes: 17 additions & 1 deletion
activitysim/core/estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,15 @@ def write_omnibus_table(self):
 if len(self.omnibus_tables) == 0:
 return

 settings = self.state.filesystem.read_model_settings(
 ESTIMATION_SETTINGS_FILE_NAME, mandatory=False
 )

 edbs_to_skip = settings.get("SKIP_BUNDLE_WRITE_FOR", [])
 if self.bundle_name in edbs_to_skip:
 self.debug(f"Skipping write to disk for {self.bundle_name}")
 return

 for omnibus_table, table_names in self.omnibus_tables.items():
 self.debug(
 "write_omnibus_table: %s table_names: %s" % (omnibus_table, table_names)
Expand All@@ -237,12 +246,19 @@ def write_omnibus_table(self):
 1 if omnibus_table in self.omnibus_tables_append_columns else 0
 )

 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)
 if len(table_names) == 0:
 # empty tables
 df = pd.DataFrame()
 else:
 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)

 self.debug(f"sorting tables: {table_names}")
 df.sort_index(ascending=True, inplace=True, kind="mergesort")

 file_path = self.output_file_path(omnibus_table, "csv")
 assert not os.path.isfile(file_path)

 self.debug(f"writing table: {file_path}")
 df.to_csv(file_path, mode="a", index=True, header=True)

 self.debug("write_omnibus_choosers: %s" % file_path)
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/estimation/larch/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,9 @@ def _file_exists(filename):
 .set_index("segment")
 )
 size_spec = size_spec.loc[:, size_spec.max() > 0]
 assert (
 len(size_spec) > 0
 ), f"Empty size_spec, is model_selector {SIZE_TERM_SELECTOR} in your size term file?"

 size_coef = size_coefficients_from_spec(size_spec)

Expand DownExpand Up@@ -294,6 +297,9 @@ def split(a, n):
 else:
 av = 1

 assert len(x_co) > 0, "Empty chooser dataframe"
 assert len(x_ca_1) > 0, "Empty alternatives dataframe"

 d = DataFrames(co=x_co, ca=x_ca_1, av=av)

 m = Model(dataservice=d)
Expand Down

7 changes: 3 additions & 4 deletions
activitysim/estimation/larch/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,7 @@ def stop_frequency_data(
 seg_purpose = seg_["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 segment_coef[seg_["primary_purpose"]] = pd.read_csv(
 seg_subdir / seg_["COEFFICIENTS"],
 index_col="coefficient_name",
 seg_subdir / seg_["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )

 for seg in segments:
Expand DownExpand Up@@ -89,13 +88,13 @@ def stop_frequency_data(
 seg_purpose = seg["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 coeffs_ = pd.read_csv(
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name"
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )
 coeffs_.index = pd.Index(
 [f"{i}_{seg_purpose}" for i in coeffs_.index], name="coefficient_name"
 )
 seg_coefficients.append(coeffs_)
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv")
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv", comment="#")
 spec = remove_apostrophes(spec, ["Label"])
 # spec.iloc[:, 3:] = spec.iloc[:, 3:].applymap(lambda x: f"{x}_{seg_purpose}" if not pd.isna(x) else x)
 seg_spec.append(spec)
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
BayDAG Contribution #13: Estimation Mode Usability#779

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

from

Apr 1, 2024
 Merged


BayDAG Contribution #13: Estimation Mode Usability
#779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ece02a8

estimation mode usability


dhensle Dec 16, 2023
e8144af

comments allowed in stop freq spec


dhensle Dec 16, 2023
f30a9ea

settings in write_omnibus_table


dhensle Mar 12, 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


2 changes: 1 addition & 1 deletion
activitysim/abm/models/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,7 +275,7 @@ def stop_frequency(
 print(f"survey_trips_not_in_trips\n{survey_trips_not_in_trips}")
 different = True
 trips_not_in_survey_trips = trips[~trips.index.isin(survey_trips.index)]
 if len(survey_trips_not_in_trips) > 0:
 if len(trips_not_in_survey_trips) > 0:
 print(f"trips_not_in_survey_trips\n{trips_not_in_survey_trips}")
 different = True
 assert not different
Expand Down

18 changes: 17 additions & 1 deletion
activitysim/core/estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,15 @@ def write_omnibus_table(self):
 if len(self.omnibus_tables) == 0:
 return

 settings = self.state.filesystem.read_model_settings(
 ESTIMATION_SETTINGS_FILE_NAME, mandatory=False
 )

 edbs_to_skip = settings.get("SKIP_BUNDLE_WRITE_FOR", [])
 if self.bundle_name in edbs_to_skip:
 self.debug(f"Skipping write to disk for {self.bundle_name}")
 return

 for omnibus_table, table_names in self.omnibus_tables.items():
 self.debug(
 "write_omnibus_table: %s table_names: %s" % (omnibus_table, table_names)
Expand All@@ -237,12 +246,19 @@ def write_omnibus_table(self):
 1 if omnibus_table in self.omnibus_tables_append_columns else 0
 )

 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)
 if len(table_names) == 0:
 # empty tables
 df = pd.DataFrame()
 else:
 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)

 self.debug(f"sorting tables: {table_names}")
 df.sort_index(ascending=True, inplace=True, kind="mergesort")

 file_path = self.output_file_path(omnibus_table, "csv")
 assert not os.path.isfile(file_path)

 self.debug(f"writing table: {file_path}")
 df.to_csv(file_path, mode="a", index=True, header=True)

 self.debug("write_omnibus_choosers: %s" % file_path)
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/estimation/larch/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,9 @@ def _file_exists(filename):
 .set_index("segment")
 )
 size_spec = size_spec.loc[:, size_spec.max() > 0]
 assert (
 len(size_spec) > 0
 ), f"Empty size_spec, is model_selector {SIZE_TERM_SELECTOR} in your size term file?"

 size_coef = size_coefficients_from_spec(size_spec)

Expand DownExpand Up@@ -294,6 +297,9 @@ def split(a, n):
 else:
 av = 1

 assert len(x_co) > 0, "Empty chooser dataframe"
 assert len(x_ca_1) > 0, "Empty alternatives dataframe"

 d = DataFrames(co=x_co, ca=x_ca_1, av=av)

 m = Model(dataservice=d)
Expand Down

7 changes: 3 additions & 4 deletions
activitysim/estimation/larch/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,7 @@ def stop_frequency_data(
 seg_purpose = seg_["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 segment_coef[seg_["primary_purpose"]] = pd.read_csv(
 seg_subdir / seg_["COEFFICIENTS"],
 index_col="coefficient_name",
 seg_subdir / seg_["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )

 for seg in segments:
Expand DownExpand Up@@ -89,13 +88,13 @@ def stop_frequency_data(
 seg_purpose = seg["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 coeffs_ = pd.read_csv(
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name"
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )
 coeffs_.index = pd.Index(
 [f"{i}_{seg_purpose}" for i in coeffs_.index], name="coefficient_name"
 )
 seg_coefficients.append(coeffs_)
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv")
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv", comment="#")
 spec = remove_apostrophes(spec, ["Label"])
 # spec.iloc[:, 3:] = spec.iloc[:, 3:].applymap(lambda x: f"{x}_{seg_purpose}" if not pd.isna(x) else x)
 seg_spec.append(spec)
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
BayDAG Contribution #13: Estimation Mode Usability#779

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

from

Apr 1, 2024
 Merged


BayDAG Contribution #13: Estimation Mode Usability
#779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ece02a8

estimation mode usability


dhensle Dec 16, 2023
e8144af

comments allowed in stop freq spec


dhensle Dec 16, 2023
f30a9ea

settings in write_omnibus_table


dhensle Mar 12, 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


2 changes: 1 addition & 1 deletion
activitysim/abm/models/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,7 +275,7 @@ def stop_frequency(
 print(f"survey_trips_not_in_trips\n{survey_trips_not_in_trips}")
 different = True
 trips_not_in_survey_trips = trips[~trips.index.isin(survey_trips.index)]
 if len(survey_trips_not_in_trips) > 0:
 if len(trips_not_in_survey_trips) > 0:
 print(f"trips_not_in_survey_trips\n{trips_not_in_survey_trips}")
 different = True
 assert not different
Expand Down

18 changes: 17 additions & 1 deletion
activitysim/core/estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,15 @@ def write_omnibus_table(self):
 if len(self.omnibus_tables) == 0:
 return

 settings = self.state.filesystem.read_model_settings(
 ESTIMATION_SETTINGS_FILE_NAME, mandatory=False
 )

 edbs_to_skip = settings.get("SKIP_BUNDLE_WRITE_FOR", [])
 if self.bundle_name in edbs_to_skip:
 self.debug(f"Skipping write to disk for {self.bundle_name}")
 return

 for omnibus_table, table_names in self.omnibus_tables.items():
 self.debug(
 "write_omnibus_table: %s table_names: %s" % (omnibus_table, table_names)
Expand All@@ -237,12 +246,19 @@ def write_omnibus_table(self):
 1 if omnibus_table in self.omnibus_tables_append_columns else 0
 )

 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)
 if len(table_names) == 0:
 # empty tables
 df = pd.DataFrame()
 else:
 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)

 self.debug(f"sorting tables: {table_names}")
 df.sort_index(ascending=True, inplace=True, kind="mergesort")

 file_path = self.output_file_path(omnibus_table, "csv")
 assert not os.path.isfile(file_path)

 self.debug(f"writing table: {file_path}")
 df.to_csv(file_path, mode="a", index=True, header=True)

 self.debug("write_omnibus_choosers: %s" % file_path)
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/estimation/larch/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,9 @@ def _file_exists(filename):
 .set_index("segment")
 )
 size_spec = size_spec.loc[:, size_spec.max() > 0]
 assert (
 len(size_spec) > 0
 ), f"Empty size_spec, is model_selector {SIZE_TERM_SELECTOR} in your size term file?"

 size_coef = size_coefficients_from_spec(size_spec)

Expand DownExpand Up@@ -294,6 +297,9 @@ def split(a, n):
 else:
 av = 1

 assert len(x_co) > 0, "Empty chooser dataframe"
 assert len(x_ca_1) > 0, "Empty alternatives dataframe"

 d = DataFrames(co=x_co, ca=x_ca_1, av=av)

 m = Model(dataservice=d)
Expand Down

7 changes: 3 additions & 4 deletions
activitysim/estimation/larch/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,7 @@ def stop_frequency_data(
 seg_purpose = seg_["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 segment_coef[seg_["primary_purpose"]] = pd.read_csv(
 seg_subdir / seg_["COEFFICIENTS"],
 index_col="coefficient_name",
 seg_subdir / seg_["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )

 for seg in segments:
Expand DownExpand Up@@ -89,13 +88,13 @@ def stop_frequency_data(
 seg_purpose = seg["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 coeffs_ = pd.read_csv(
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name"
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )
 coeffs_.index = pd.Index(
 [f"{i}_{seg_purpose}" for i in coeffs_.index], name="coefficient_name"
 )
 seg_coefficients.append(coeffs_)
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv")
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv", comment="#")
 spec = remove_apostrophes(spec, ["Label"])
 # spec.iloc[:, 3:] = spec.iloc[:, 3:].applymap(lambda x: f"{x}_{seg_purpose}" if not pd.isna(x) else x)
 seg_spec.append(spec)
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
BayDAG Contribution #13: Estimation Mode Usability#779

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

from

Apr 1, 2024
 Merged


BayDAG Contribution #13: Estimation Mode Usability
#779
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ece02a8

estimation mode usability


dhensle Dec 16, 2023
e8144af

comments allowed in stop freq spec


dhensle Dec 16, 2023
f30a9ea

settings in write_omnibus_table


dhensle Mar 12, 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


2 changes: 1 addition & 1 deletion
activitysim/abm/models/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,7 +275,7 @@ def stop_frequency(
 print(f"survey_trips_not_in_trips\n{survey_trips_not_in_trips}")
 different = True
 trips_not_in_survey_trips = trips[~trips.index.isin(survey_trips.index)]
 if len(survey_trips_not_in_trips) > 0:
 if len(trips_not_in_survey_trips) > 0:
 print(f"trips_not_in_survey_trips\n{trips_not_in_survey_trips}")
 different = True
 assert not different
Expand Down

18 changes: 17 additions & 1 deletion
activitysim/core/estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,15 @@ def write_omnibus_table(self):
 if len(self.omnibus_tables) == 0:
 return

 settings = self.state.filesystem.read_model_settings(
 ESTIMATION_SETTINGS_FILE_NAME, mandatory=False
 )

 edbs_to_skip = settings.get("SKIP_BUNDLE_WRITE_FOR", [])
 if self.bundle_name in edbs_to_skip:
 self.debug(f"Skipping write to disk for {self.bundle_name}")
 return

 for omnibus_table, table_names in self.omnibus_tables.items():
 self.debug(
 "write_omnibus_table: %s table_names: %s" % (omnibus_table, table_names)
Expand All@@ -237,12 +246,19 @@ def write_omnibus_table(self):
 1 if omnibus_table in self.omnibus_tables_append_columns else 0
 )

 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)
 if len(table_names) == 0:
 # empty tables
 df = pd.DataFrame()
 else:
 df = pd.concat([self.tables[t] for t in table_names], axis=concat_axis)

 self.debug(f"sorting tables: {table_names}")
 df.sort_index(ascending=True, inplace=True, kind="mergesort")

 file_path = self.output_file_path(omnibus_table, "csv")
 assert not os.path.isfile(file_path)

 self.debug(f"writing table: {file_path}")
 df.to_csv(file_path, mode="a", index=True, header=True)

 self.debug("write_omnibus_choosers: %s" % file_path)
Expand Down

6 changes: 6 additions & 0 deletions
activitysim/estimation/larch/location_choice.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,9 @@ def _file_exists(filename):
 .set_index("segment")
 )
 size_spec = size_spec.loc[:, size_spec.max() > 0]
 assert (
 len(size_spec) > 0
 ), f"Empty size_spec, is model_selector {SIZE_TERM_SELECTOR} in your size term file?"

 size_coef = size_coefficients_from_spec(size_spec)

Expand DownExpand Up@@ -294,6 +297,9 @@ def split(a, n):
 else:
 av = 1

 assert len(x_co) > 0, "Empty chooser dataframe"
 assert len(x_ca_1) > 0, "Empty alternatives dataframe"

 d = DataFrames(co=x_co, ca=x_ca_1, av=av)

 m = Model(dataservice=d)
Expand Down

7 changes: 3 additions & 4 deletions
activitysim/estimation/larch/stop_frequency.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,7 @@ def stop_frequency_data(
 seg_purpose = seg_["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 segment_coef[seg_["primary_purpose"]] = pd.read_csv(
 seg_subdir / seg_["COEFFICIENTS"],
 index_col="coefficient_name",
 seg_subdir / seg_["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )

 for seg in segments:
Expand DownExpand Up@@ -89,13 +88,13 @@ def stop_frequency_data(
 seg_purpose = seg["primary_purpose"]
 seg_subdir = Path(os.path.join(edb_directory, seg_purpose))
 coeffs_ = pd.read_csv(
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name"
 seg_subdir / seg["COEFFICIENTS"], index_col="coefficient_name", comment="#"
 )
 coeffs_.index = pd.Index(
 [f"{i}_{seg_purpose}" for i in coeffs_.index], name="coefficient_name"
 )
 seg_coefficients.append(coeffs_)
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv")
 spec = pd.read_csv(seg_subdir / "stop_frequency_SPEC_.csv", comment="#")
 spec = remove_apostrophes(spec, ["Label"])
 # spec.iloc[:, 3:] = spec.iloc[:, 3:].applymap(lambda x: f"{x}_{seg_purpose}" if not pd.isna(x) else x)
 seg_spec.append(spec)
Expand Down