Allow Formulas in Coefficients File#332

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

Closed
danielsclint wants to merge 8 commits into from
Closed

Allow Formulas in Coefficients File #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c04fe90
Error check for COEFFICIENT files
Aug 25, 2020
4c31626
Allow coefficient files to have formulas
Aug 26, 2020
09e142b
Remove duplicate coefficient.
Aug 26, 2020
325b739
Only look for model constants in model_settings
Aug 26, 2020
37a8dc5
Clean-up whitespace
Aug 26, 2020
53d03f8
move coefficient processing up
Aug 27, 2020
b8e9ffb
Update joint_tour_destination.py
Aug 27, 2020
e8170f6
Fix reference to joint tour destination.yaml
Aug 27, 2020
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
4 changes: 2 additions & 2 deletions activitysim/abm/models/joint_tour_destination.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,8 +326,8 @@ def joint_tour_destination(
person that's making the tour)
"""

trace_label = 'non_mandatory_tour_destination'
model_settings_file_name = 'non_mandatory_tour_destination.yaml'
trace_label = 'joint_tour_destination'
model_settings_file_name = 'joint_tour_destination.yaml'
model_settings = config.read_model_settings(model_settings_file_name)

logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
Expand Down
9 changes: 4 additions & 5 deletions activitysim/abm/models/util/vectorize_tour_scheduling.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
locals_dict.update(constants)
locals_dict.update(skims)

# constrained coefficients can appear in expressions
coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
locals_dict.update(coefficients)

# - run preprocessor to annotate choosers
# allow specification of alternate preprocessor for nontour choosers
preprocessor = model_settings.get('LOGSUM_PREPROCESSOR', 'preprocessor')
Expand All@@ -92,17 +96,12 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
trace_label=trace_label)

# - compute logsums

coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
logsum_spec = simulate.read_model_spec(file_name=logsum_settings['SPEC'])
logsum_spec = simulate.eval_coefficients(logsum_spec, coefficients, estimator=None)

nest_spec = config.get_logit_model_settings(logsum_settings)
nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients)

# constrained coefficients can appear in expressions
locals_dict.update(coefficients)

logsums = simulate.simple_simulate_logsums(
choosers,
logsum_spec,
Expand Down
21 changes: 18 additions & 3 deletions activitysim/core/simulate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
import numpy as np
import pandas as pd

from .assign import evaluate_constants
from .skim import SkimDictWrapper, SkimStackWrapper
from . import logit
from . import tracing
Expand DownExpand Up@@ -140,9 +141,23 @@ def read_model_coefficients(model_settings=None, file_name=None):
file_name = model_settings['COEFFICIENTS']

file_path = config.config_file_path(file_name)
coefficients = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
print(file_path)
try:
coefficients_df = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
assert {'constrain', 'value'}.issubset(coefficients_df.columns)
except ValueError:
logger.exception("Coefficient File Invalid: %s" % str(file_path))
raise

if model_settings is not None and 'CONSTANTS' in model_settings:
constants = model_settings['CONSTANTS']
else:
constants = None

coeffs = evaluate_constants(coefficients_df['value'], constants)

return coefficients
return pd.concat([pd.DataFrame(coeffs.values(), index=coeffs.keys(), columns=['value']),
coefficients_df['constrain']], axis=1)


def spec_for_segment(model_settings, spec_id, segment_name, estimator):
Expand All@@ -163,7 +178,7 @@ def spec_for_segment(model_settings, spec_id, segment_name, estimator):
"""

spec = read_model_spec(file_name=model_settings[spec_id])
coefficients = read_model_coefficients(model_settings)
coefficients = read_model_coefficients(model_settings, None)

if len(spec.columns) > 1:
# if spec is segmented
Expand Down
4 changes: 3 additions & 1 deletion activitysim/examples/example_mtc/configs/joint_tour_destination.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ SEGMENTS:
- eatout
- social


SAMPLE_SIZE: 30

# we can't use use household income_segment as this will also be set for non-workers
CHOOSER_SEGMENT_COLUMN_NAME: tour_type

SIMULATE_CHOOSER_COLUMNS:
- tour_type
- TAZ
Expand Down
2 changes: 1 addition & 1 deletion activitysim/examples/example_mtc/configs/non_mandatory_tour_destination_coeffs.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ coef_mode_logsum,0.6755,F
coef_escort_dist_0_2,-0.1499,F
coef_eatout_dist_0_2,-0.5609,F
coef_eatout_social_0_2,-0.5609,F
coef_eatout_dist_0_2,-0.7841,F
#coef_eatout_dist_0_2,-0.7841,F
coef_othdiscr_dist_0_2,-0.1677,F
coef_escort_dist_2_5,-0.8671,F
coef_shopping_dist_2_5,-0.5655,F
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
Allow Formulas in Coefficients File#332

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

 Closed

danielsclint
wants to merge
8
commits into

from

 Closed


Allow Formulas in Coefficients File
#332
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c04fe90

Error check for COEFFICIENT files

Aug 25, 2020
4c31626

Allow coefficient files to have formulas

Aug 26, 2020
09e142b

Remove duplicate coefficient.

Aug 26, 2020
325b739

Only look for model constants in model_settings

Aug 26, 2020
37a8dc5

Clean-up whitespace

Aug 26, 2020
53d03f8

move coefficient processing up

Aug 27, 2020
b8e9ffb

Update joint_tour_destination.py

Aug 27, 2020
e8170f6

Fix reference to joint tour destination.yaml

Aug 27, 2020

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


4 changes: 2 additions & 2 deletions
activitysim/abm/models/joint_tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -326,8 +326,8 @@ def joint_tour_destination(
 person that's making the tour)
 """

 trace_label = 'non_mandatory_tour_destination'
 model_settings_file_name = 'non_mandatory_tour_destination.yaml'
 trace_label = 'joint_tour_destination'
 model_settings_file_name = 'joint_tour_destination.yaml'
 model_settings = config.read_model_settings(model_settings_file_name)

 logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
Expand Down

9 changes: 4 additions & 5 deletions
activitysim/abm/models/util/vectorize_tour_scheduling.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 locals_dict.update(constants)
 locals_dict.update(skims)

 # constrained coefficients can appear in expressions
 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 locals_dict.update(coefficients)

 # - run preprocessor to annotate choosers
 # allow specification of alternate preprocessor for nontour choosers
 preprocessor = model_settings.get('LOGSUM_PREPROCESSOR', 'preprocessor')
Expand All@@ -92,17 +96,12 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 trace_label=trace_label)

 # - compute logsums

 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 logsum_spec = simulate.read_model_spec(file_name=logsum_settings['SPEC'])
 logsum_spec = simulate.eval_coefficients(logsum_spec, coefficients, estimator=None)

 nest_spec = config.get_logit_model_settings(logsum_settings)
 nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients)

 # constrained coefficients can appear in expressions
 locals_dict.update(coefficients)

 logsums = simulate.simple_simulate_logsums(
 choosers,
 logsum_spec,
Expand Down

21 changes: 18 additions & 3 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
import numpy as np
import pandas as pd

from .assign import evaluate_constants
from .skim import SkimDictWrapper, SkimStackWrapper
from . import logit
from . import tracing
Expand DownExpand Up@@ -140,9 +141,23 @@ def read_model_coefficients(model_settings=None, file_name=None):
 file_name = model_settings['COEFFICIENTS']

 file_path = config.config_file_path(file_name)
 coefficients = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 print(file_path)
 try:
 coefficients_df = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 assert {'constrain', 'value'}.issubset(coefficients_df.columns)
 except ValueError:
 logger.exception("Coefficient File Invalid: %s" % str(file_path))
 raise

 if model_settings is not None and 'CONSTANTS' in model_settings:
 constants = model_settings['CONSTANTS']
 else:
 constants = None

 coeffs = evaluate_constants(coefficients_df['value'], constants)

 return coefficients
 return pd.concat([pd.DataFrame(coeffs.values(), index=coeffs.keys(), columns=['value']),
 coefficients_df['constrain']], axis=1)


def spec_for_segment(model_settings, spec_id, segment_name, estimator):
Expand All@@ -163,7 +178,7 @@ def spec_for_segment(model_settings, spec_id, segment_name, estimator):
 """

 spec = read_model_spec(file_name=model_settings[spec_id])
 coefficients = read_model_coefficients(model_settings)
 coefficients = read_model_coefficients(model_settings, None)

 if len(spec.columns) > 1:
 # if spec is segmented
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/examples/example_mtc/configs/joint_tour_destination.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ SEGMENTS:
 - eatout
 - social


SAMPLE_SIZE: 30

# we can't use use household income_segment as this will also be set for non-workers
CHOOSER_SEGMENT_COLUMN_NAME: tour_type

SIMULATE_CHOOSER_COLUMNS:
 - tour_type
 - TAZ
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/examples/example_mtc/configs/non_mandatory_tour_destination_coeffs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ coef_mode_logsum,0.6755,F
coef_escort_dist_0_2,-0.1499,F
coef_eatout_dist_0_2,-0.5609,F
coef_eatout_social_0_2,-0.5609,F
coef_eatout_dist_0_2,-0.7841,F
#coef_eatout_dist_0_2,-0.7841,F
coef_othdiscr_dist_0_2,-0.1677,F
coef_escort_dist_2_5,-0.8671,F
coef_shopping_dist_2_5,-0.5655,F
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
Allow Formulas in Coefficients File#332

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

 Closed

danielsclint
wants to merge
8
commits into

from

 Closed


Allow Formulas in Coefficients File
#332
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c04fe90

Error check for COEFFICIENT files

Aug 25, 2020
4c31626

Allow coefficient files to have formulas

Aug 26, 2020
09e142b

Remove duplicate coefficient.

Aug 26, 2020
325b739

Only look for model constants in model_settings

Aug 26, 2020
37a8dc5

Clean-up whitespace

Aug 26, 2020
53d03f8

move coefficient processing up

Aug 27, 2020
b8e9ffb

Update joint_tour_destination.py

Aug 27, 2020
e8170f6

Fix reference to joint tour destination.yaml

Aug 27, 2020

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


4 changes: 2 additions & 2 deletions
activitysim/abm/models/joint_tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -326,8 +326,8 @@ def joint_tour_destination(
 person that's making the tour)
 """

 trace_label = 'non_mandatory_tour_destination'
 model_settings_file_name = 'non_mandatory_tour_destination.yaml'
 trace_label = 'joint_tour_destination'
 model_settings_file_name = 'joint_tour_destination.yaml'
 model_settings = config.read_model_settings(model_settings_file_name)

 logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
Expand Down

9 changes: 4 additions & 5 deletions
activitysim/abm/models/util/vectorize_tour_scheduling.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 locals_dict.update(constants)
 locals_dict.update(skims)

 # constrained coefficients can appear in expressions
 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 locals_dict.update(coefficients)

 # - run preprocessor to annotate choosers
 # allow specification of alternate preprocessor for nontour choosers
 preprocessor = model_settings.get('LOGSUM_PREPROCESSOR', 'preprocessor')
Expand All@@ -92,17 +96,12 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 trace_label=trace_label)

 # - compute logsums

 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 logsum_spec = simulate.read_model_spec(file_name=logsum_settings['SPEC'])
 logsum_spec = simulate.eval_coefficients(logsum_spec, coefficients, estimator=None)

 nest_spec = config.get_logit_model_settings(logsum_settings)
 nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients)

 # constrained coefficients can appear in expressions
 locals_dict.update(coefficients)

 logsums = simulate.simple_simulate_logsums(
 choosers,
 logsum_spec,
Expand Down

21 changes: 18 additions & 3 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
import numpy as np
import pandas as pd

from .assign import evaluate_constants
from .skim import SkimDictWrapper, SkimStackWrapper
from . import logit
from . import tracing
Expand DownExpand Up@@ -140,9 +141,23 @@ def read_model_coefficients(model_settings=None, file_name=None):
 file_name = model_settings['COEFFICIENTS']

 file_path = config.config_file_path(file_name)
 coefficients = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 print(file_path)
 try:
 coefficients_df = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 assert {'constrain', 'value'}.issubset(coefficients_df.columns)
 except ValueError:
 logger.exception("Coefficient File Invalid: %s" % str(file_path))
 raise

 if model_settings is not None and 'CONSTANTS' in model_settings:
 constants = model_settings['CONSTANTS']
 else:
 constants = None

 coeffs = evaluate_constants(coefficients_df['value'], constants)

 return coefficients
 return pd.concat([pd.DataFrame(coeffs.values(), index=coeffs.keys(), columns=['value']),
 coefficients_df['constrain']], axis=1)


def spec_for_segment(model_settings, spec_id, segment_name, estimator):
Expand All@@ -163,7 +178,7 @@ def spec_for_segment(model_settings, spec_id, segment_name, estimator):
 """

 spec = read_model_spec(file_name=model_settings[spec_id])
 coefficients = read_model_coefficients(model_settings)
 coefficients = read_model_coefficients(model_settings, None)

 if len(spec.columns) > 1:
 # if spec is segmented
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/examples/example_mtc/configs/joint_tour_destination.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ SEGMENTS:
 - eatout
 - social


SAMPLE_SIZE: 30

# we can't use use household income_segment as this will also be set for non-workers
CHOOSER_SEGMENT_COLUMN_NAME: tour_type

SIMULATE_CHOOSER_COLUMNS:
 - tour_type
 - TAZ
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/examples/example_mtc/configs/non_mandatory_tour_destination_coeffs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ coef_mode_logsum,0.6755,F
coef_escort_dist_0_2,-0.1499,F
coef_eatout_dist_0_2,-0.5609,F
coef_eatout_social_0_2,-0.5609,F
coef_eatout_dist_0_2,-0.7841,F
#coef_eatout_dist_0_2,-0.7841,F
coef_othdiscr_dist_0_2,-0.1677,F
coef_escort_dist_2_5,-0.8671,F
coef_shopping_dist_2_5,-0.5655,F
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
Allow Formulas in Coefficients File#332

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

 Closed

danielsclint
wants to merge
8
commits into

from

 Closed


Allow Formulas in Coefficients File
#332
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c04fe90

Error check for COEFFICIENT files

Aug 25, 2020
4c31626

Allow coefficient files to have formulas

Aug 26, 2020
09e142b

Remove duplicate coefficient.

Aug 26, 2020
325b739

Only look for model constants in model_settings

Aug 26, 2020
37a8dc5

Clean-up whitespace

Aug 26, 2020
53d03f8

move coefficient processing up

Aug 27, 2020
b8e9ffb

Update joint_tour_destination.py

Aug 27, 2020
e8170f6

Fix reference to joint tour destination.yaml

Aug 27, 2020

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


4 changes: 2 additions & 2 deletions
activitysim/abm/models/joint_tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -326,8 +326,8 @@ def joint_tour_destination(
 person that's making the tour)
 """

 trace_label = 'non_mandatory_tour_destination'
 model_settings_file_name = 'non_mandatory_tour_destination.yaml'
 trace_label = 'joint_tour_destination'
 model_settings_file_name = 'joint_tour_destination.yaml'
 model_settings = config.read_model_settings(model_settings_file_name)

 logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
Expand Down

9 changes: 4 additions & 5 deletions
activitysim/abm/models/util/vectorize_tour_scheduling.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 locals_dict.update(constants)
 locals_dict.update(skims)

 # constrained coefficients can appear in expressions
 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 locals_dict.update(coefficients)

 # - run preprocessor to annotate choosers
 # allow specification of alternate preprocessor for nontour choosers
 preprocessor = model_settings.get('LOGSUM_PREPROCESSOR', 'preprocessor')
Expand All@@ -92,17 +96,12 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 trace_label=trace_label)

 # - compute logsums

 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 logsum_spec = simulate.read_model_spec(file_name=logsum_settings['SPEC'])
 logsum_spec = simulate.eval_coefficients(logsum_spec, coefficients, estimator=None)

 nest_spec = config.get_logit_model_settings(logsum_settings)
 nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients)

 # constrained coefficients can appear in expressions
 locals_dict.update(coefficients)

 logsums = simulate.simple_simulate_logsums(
 choosers,
 logsum_spec,
Expand Down

21 changes: 18 additions & 3 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
import numpy as np
import pandas as pd

from .assign import evaluate_constants
from .skim import SkimDictWrapper, SkimStackWrapper
from . import logit
from . import tracing
Expand DownExpand Up@@ -140,9 +141,23 @@ def read_model_coefficients(model_settings=None, file_name=None):
 file_name = model_settings['COEFFICIENTS']

 file_path = config.config_file_path(file_name)
 coefficients = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 print(file_path)
 try:
 coefficients_df = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 assert {'constrain', 'value'}.issubset(coefficients_df.columns)
 except ValueError:
 logger.exception("Coefficient File Invalid: %s" % str(file_path))
 raise

 if model_settings is not None and 'CONSTANTS' in model_settings:
 constants = model_settings['CONSTANTS']
 else:
 constants = None

 coeffs = evaluate_constants(coefficients_df['value'], constants)

 return coefficients
 return pd.concat([pd.DataFrame(coeffs.values(), index=coeffs.keys(), columns=['value']),
 coefficients_df['constrain']], axis=1)


def spec_for_segment(model_settings, spec_id, segment_name, estimator):
Expand All@@ -163,7 +178,7 @@ def spec_for_segment(model_settings, spec_id, segment_name, estimator):
 """

 spec = read_model_spec(file_name=model_settings[spec_id])
 coefficients = read_model_coefficients(model_settings)
 coefficients = read_model_coefficients(model_settings, None)

 if len(spec.columns) > 1:
 # if spec is segmented
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/examples/example_mtc/configs/joint_tour_destination.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ SEGMENTS:
 - eatout
 - social


SAMPLE_SIZE: 30

# we can't use use household income_segment as this will also be set for non-workers
CHOOSER_SEGMENT_COLUMN_NAME: tour_type

SIMULATE_CHOOSER_COLUMNS:
 - tour_type
 - TAZ
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/examples/example_mtc/configs/non_mandatory_tour_destination_coeffs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ coef_mode_logsum,0.6755,F
coef_escort_dist_0_2,-0.1499,F
coef_eatout_dist_0_2,-0.5609,F
coef_eatout_social_0_2,-0.5609,F
coef_eatout_dist_0_2,-0.7841,F
#coef_eatout_dist_0_2,-0.7841,F
coef_othdiscr_dist_0_2,-0.1677,F
coef_escort_dist_2_5,-0.8671,F
coef_shopping_dist_2_5,-0.5655,F
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
Allow Formulas in Coefficients File#332

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

 Closed

danielsclint
wants to merge
8
commits into

from

 Closed


Allow Formulas in Coefficients File
#332
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c04fe90

Error check for COEFFICIENT files

Aug 25, 2020
4c31626

Allow coefficient files to have formulas

Aug 26, 2020
09e142b

Remove duplicate coefficient.

Aug 26, 2020
325b739

Only look for model constants in model_settings

Aug 26, 2020
37a8dc5

Clean-up whitespace

Aug 26, 2020
53d03f8

move coefficient processing up

Aug 27, 2020
b8e9ffb

Update joint_tour_destination.py

Aug 27, 2020
e8170f6

Fix reference to joint tour destination.yaml

Aug 27, 2020

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


4 changes: 2 additions & 2 deletions
activitysim/abm/models/joint_tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -326,8 +326,8 @@ def joint_tour_destination(
 person that's making the tour)
 """

 trace_label = 'non_mandatory_tour_destination'
 model_settings_file_name = 'non_mandatory_tour_destination.yaml'
 trace_label = 'joint_tour_destination'
 model_settings_file_name = 'joint_tour_destination.yaml'
 model_settings = config.read_model_settings(model_settings_file_name)

 logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
Expand Down

9 changes: 4 additions & 5 deletions
activitysim/abm/models/util/vectorize_tour_scheduling.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 locals_dict.update(constants)
 locals_dict.update(skims)

 # constrained coefficients can appear in expressions
 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 locals_dict.update(coefficients)

 # - run preprocessor to annotate choosers
 # allow specification of alternate preprocessor for nontour choosers
 preprocessor = model_settings.get('LOGSUM_PREPROCESSOR', 'preprocessor')
Expand All@@ -92,17 +96,12 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 trace_label=trace_label)

 # - compute logsums

 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 logsum_spec = simulate.read_model_spec(file_name=logsum_settings['SPEC'])
 logsum_spec = simulate.eval_coefficients(logsum_spec, coefficients, estimator=None)

 nest_spec = config.get_logit_model_settings(logsum_settings)
 nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients)

 # constrained coefficients can appear in expressions
 locals_dict.update(coefficients)

 logsums = simulate.simple_simulate_logsums(
 choosers,
 logsum_spec,
Expand Down

21 changes: 18 additions & 3 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
import numpy as np
import pandas as pd

from .assign import evaluate_constants
from .skim import SkimDictWrapper, SkimStackWrapper
from . import logit
from . import tracing
Expand DownExpand Up@@ -140,9 +141,23 @@ def read_model_coefficients(model_settings=None, file_name=None):
 file_name = model_settings['COEFFICIENTS']

 file_path = config.config_file_path(file_name)
 coefficients = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 print(file_path)
 try:
 coefficients_df = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 assert {'constrain', 'value'}.issubset(coefficients_df.columns)
 except ValueError:
 logger.exception("Coefficient File Invalid: %s" % str(file_path))
 raise

 if model_settings is not None and 'CONSTANTS' in model_settings:
 constants = model_settings['CONSTANTS']
 else:
 constants = None

 coeffs = evaluate_constants(coefficients_df['value'], constants)

 return coefficients
 return pd.concat([pd.DataFrame(coeffs.values(), index=coeffs.keys(), columns=['value']),
 coefficients_df['constrain']], axis=1)


def spec_for_segment(model_settings, spec_id, segment_name, estimator):
Expand All@@ -163,7 +178,7 @@ def spec_for_segment(model_settings, spec_id, segment_name, estimator):
 """

 spec = read_model_spec(file_name=model_settings[spec_id])
 coefficients = read_model_coefficients(model_settings)
 coefficients = read_model_coefficients(model_settings, None)

 if len(spec.columns) > 1:
 # if spec is segmented
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/examples/example_mtc/configs/joint_tour_destination.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ SEGMENTS:
 - eatout
 - social


SAMPLE_SIZE: 30

# we can't use use household income_segment as this will also be set for non-workers
CHOOSER_SEGMENT_COLUMN_NAME: tour_type

SIMULATE_CHOOSER_COLUMNS:
 - tour_type
 - TAZ
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/examples/example_mtc/configs/non_mandatory_tour_destination_coeffs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ coef_mode_logsum,0.6755,F
coef_escort_dist_0_2,-0.1499,F
coef_eatout_dist_0_2,-0.5609,F
coef_eatout_social_0_2,-0.5609,F
coef_eatout_dist_0_2,-0.7841,F
#coef_eatout_dist_0_2,-0.7841,F
coef_othdiscr_dist_0_2,-0.1677,F
coef_escort_dist_2_5,-0.8671,F
coef_shopping_dist_2_5,-0.5655,F
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
Allow Formulas in Coefficients File#332

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

 Closed

danielsclint
wants to merge
8
commits into

from

 Closed


Allow Formulas in Coefficients File
#332
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c04fe90

Error check for COEFFICIENT files

Aug 25, 2020
4c31626

Allow coefficient files to have formulas

Aug 26, 2020
09e142b

Remove duplicate coefficient.

Aug 26, 2020
325b739

Only look for model constants in model_settings

Aug 26, 2020
37a8dc5

Clean-up whitespace

Aug 26, 2020
53d03f8

move coefficient processing up

Aug 27, 2020
b8e9ffb

Update joint_tour_destination.py

Aug 27, 2020
e8170f6

Fix reference to joint tour destination.yaml

Aug 27, 2020

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


4 changes: 2 additions & 2 deletions
activitysim/abm/models/joint_tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -326,8 +326,8 @@ def joint_tour_destination(
 person that's making the tour)
 """

 trace_label = 'non_mandatory_tour_destination'
 model_settings_file_name = 'non_mandatory_tour_destination.yaml'
 trace_label = 'joint_tour_destination'
 model_settings_file_name = 'joint_tour_destination.yaml'
 model_settings = config.read_model_settings(model_settings_file_name)

 logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
Expand Down

9 changes: 4 additions & 5 deletions
activitysim/abm/models/util/vectorize_tour_scheduling.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 locals_dict.update(constants)
 locals_dict.update(skims)

 # constrained coefficients can appear in expressions
 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 locals_dict.update(coefficients)

 # - run preprocessor to annotate choosers
 # allow specification of alternate preprocessor for nontour choosers
 preprocessor = model_settings.get('LOGSUM_PREPROCESSOR', 'preprocessor')
Expand All@@ -92,17 +96,12 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 trace_label=trace_label)

 # - compute logsums

 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 logsum_spec = simulate.read_model_spec(file_name=logsum_settings['SPEC'])
 logsum_spec = simulate.eval_coefficients(logsum_spec, coefficients, estimator=None)

 nest_spec = config.get_logit_model_settings(logsum_settings)
 nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients)

 # constrained coefficients can appear in expressions
 locals_dict.update(coefficients)

 logsums = simulate.simple_simulate_logsums(
 choosers,
 logsum_spec,
Expand Down

21 changes: 18 additions & 3 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
import numpy as np
import pandas as pd

from .assign import evaluate_constants
from .skim import SkimDictWrapper, SkimStackWrapper
from . import logit
from . import tracing
Expand DownExpand Up@@ -140,9 +141,23 @@ def read_model_coefficients(model_settings=None, file_name=None):
 file_name = model_settings['COEFFICIENTS']

 file_path = config.config_file_path(file_name)
 coefficients = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 print(file_path)
 try:
 coefficients_df = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 assert {'constrain', 'value'}.issubset(coefficients_df.columns)
 except ValueError:
 logger.exception("Coefficient File Invalid: %s" % str(file_path))
 raise

 if model_settings is not None and 'CONSTANTS' in model_settings:
 constants = model_settings['CONSTANTS']
 else:
 constants = None

 coeffs = evaluate_constants(coefficients_df['value'], constants)

 return coefficients
 return pd.concat([pd.DataFrame(coeffs.values(), index=coeffs.keys(), columns=['value']),
 coefficients_df['constrain']], axis=1)


def spec_for_segment(model_settings, spec_id, segment_name, estimator):
Expand All@@ -163,7 +178,7 @@ def spec_for_segment(model_settings, spec_id, segment_name, estimator):
 """

 spec = read_model_spec(file_name=model_settings[spec_id])
 coefficients = read_model_coefficients(model_settings)
 coefficients = read_model_coefficients(model_settings, None)

 if len(spec.columns) > 1:
 # if spec is segmented
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/examples/example_mtc/configs/joint_tour_destination.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ SEGMENTS:
 - eatout
 - social


SAMPLE_SIZE: 30

# we can't use use household income_segment as this will also be set for non-workers
CHOOSER_SEGMENT_COLUMN_NAME: tour_type

SIMULATE_CHOOSER_COLUMNS:
 - tour_type
 - TAZ
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/examples/example_mtc/configs/non_mandatory_tour_destination_coeffs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ coef_mode_logsum,0.6755,F
coef_escort_dist_0_2,-0.1499,F
coef_eatout_dist_0_2,-0.5609,F
coef_eatout_social_0_2,-0.5609,F
coef_eatout_dist_0_2,-0.7841,F
#coef_eatout_dist_0_2,-0.7841,F
coef_othdiscr_dist_0_2,-0.1677,F
coef_escort_dist_2_5,-0.8671,F
coef_shopping_dist_2_5,-0.5655,F
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
Allow Formulas in Coefficients File#332

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

 Closed

danielsclint
wants to merge
8
commits into

from

 Closed


Allow Formulas in Coefficients File
#332
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c04fe90

Error check for COEFFICIENT files

Aug 25, 2020
4c31626

Allow coefficient files to have formulas

Aug 26, 2020
09e142b

Remove duplicate coefficient.

Aug 26, 2020
325b739

Only look for model constants in model_settings

Aug 26, 2020
37a8dc5

Clean-up whitespace

Aug 26, 2020
53d03f8

move coefficient processing up

Aug 27, 2020
b8e9ffb

Update joint_tour_destination.py

Aug 27, 2020
e8170f6

Fix reference to joint tour destination.yaml

Aug 27, 2020

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


4 changes: 2 additions & 2 deletions
activitysim/abm/models/joint_tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -326,8 +326,8 @@ def joint_tour_destination(
 person that's making the tour)
 """

 trace_label = 'non_mandatory_tour_destination'
 model_settings_file_name = 'non_mandatory_tour_destination.yaml'
 trace_label = 'joint_tour_destination'
 model_settings_file_name = 'joint_tour_destination.yaml'
 model_settings = config.read_model_settings(model_settings_file_name)

 logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
Expand Down

9 changes: 4 additions & 5 deletions
activitysim/abm/models/util/vectorize_tour_scheduling.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 locals_dict.update(constants)
 locals_dict.update(skims)

 # constrained coefficients can appear in expressions
 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 locals_dict.update(coefficients)

 # - run preprocessor to annotate choosers
 # allow specification of alternate preprocessor for nontour choosers
 preprocessor = model_settings.get('LOGSUM_PREPROCESSOR', 'preprocessor')
Expand All@@ -92,17 +96,12 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 trace_label=trace_label)

 # - compute logsums

 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 logsum_spec = simulate.read_model_spec(file_name=logsum_settings['SPEC'])
 logsum_spec = simulate.eval_coefficients(logsum_spec, coefficients, estimator=None)

 nest_spec = config.get_logit_model_settings(logsum_settings)
 nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients)

 # constrained coefficients can appear in expressions
 locals_dict.update(coefficients)

 logsums = simulate.simple_simulate_logsums(
 choosers,
 logsum_spec,
Expand Down

21 changes: 18 additions & 3 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
import numpy as np
import pandas as pd

from .assign import evaluate_constants
from .skim import SkimDictWrapper, SkimStackWrapper
from . import logit
from . import tracing
Expand DownExpand Up@@ -140,9 +141,23 @@ def read_model_coefficients(model_settings=None, file_name=None):
 file_name = model_settings['COEFFICIENTS']

 file_path = config.config_file_path(file_name)
 coefficients = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 print(file_path)
 try:
 coefficients_df = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 assert {'constrain', 'value'}.issubset(coefficients_df.columns)
 except ValueError:
 logger.exception("Coefficient File Invalid: %s" % str(file_path))
 raise

 if model_settings is not None and 'CONSTANTS' in model_settings:
 constants = model_settings['CONSTANTS']
 else:
 constants = None

 coeffs = evaluate_constants(coefficients_df['value'], constants)

 return coefficients
 return pd.concat([pd.DataFrame(coeffs.values(), index=coeffs.keys(), columns=['value']),
 coefficients_df['constrain']], axis=1)


def spec_for_segment(model_settings, spec_id, segment_name, estimator):
Expand All@@ -163,7 +178,7 @@ def spec_for_segment(model_settings, spec_id, segment_name, estimator):
 """

 spec = read_model_spec(file_name=model_settings[spec_id])
 coefficients = read_model_coefficients(model_settings)
 coefficients = read_model_coefficients(model_settings, None)

 if len(spec.columns) > 1:
 # if spec is segmented
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/examples/example_mtc/configs/joint_tour_destination.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ SEGMENTS:
 - eatout
 - social


SAMPLE_SIZE: 30

# we can't use use household income_segment as this will also be set for non-workers
CHOOSER_SEGMENT_COLUMN_NAME: tour_type

SIMULATE_CHOOSER_COLUMNS:
 - tour_type
 - TAZ
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/examples/example_mtc/configs/non_mandatory_tour_destination_coeffs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ coef_mode_logsum,0.6755,F
coef_escort_dist_0_2,-0.1499,F
coef_eatout_dist_0_2,-0.5609,F
coef_eatout_social_0_2,-0.5609,F
coef_eatout_dist_0_2,-0.7841,F
#coef_eatout_dist_0_2,-0.7841,F
coef_othdiscr_dist_0_2,-0.1677,F
coef_escort_dist_2_5,-0.8671,F
coef_shopping_dist_2_5,-0.5655,F
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
Allow Formulas in Coefficients File#332

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

 Closed

danielsclint
wants to merge
8
commits into

from

 Closed


Allow Formulas in Coefficients File
#332
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
c04fe90

Error check for COEFFICIENT files

Aug 25, 2020
4c31626

Allow coefficient files to have formulas

Aug 26, 2020
09e142b

Remove duplicate coefficient.

Aug 26, 2020
325b739

Only look for model constants in model_settings

Aug 26, 2020
37a8dc5

Clean-up whitespace

Aug 26, 2020
53d03f8

move coefficient processing up

Aug 27, 2020
b8e9ffb

Update joint_tour_destination.py

Aug 27, 2020
e8170f6

Fix reference to joint tour destination.yaml

Aug 27, 2020

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


4 changes: 2 additions & 2 deletions
activitysim/abm/models/joint_tour_destination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -326,8 +326,8 @@ def joint_tour_destination(
 person that's making the tour)
 """

 trace_label = 'non_mandatory_tour_destination'
 model_settings_file_name = 'non_mandatory_tour_destination.yaml'
 trace_label = 'joint_tour_destination'
 model_settings_file_name = 'joint_tour_destination.yaml'
 model_settings = config.read_model_settings(model_settings_file_name)

 logsum_column_name = model_settings.get('DEST_CHOICE_LOGSUM_COLUMN_NAME')
Expand Down

9 changes: 4 additions & 5 deletions
activitysim/abm/models/util/vectorize_tour_scheduling.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,10 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 locals_dict.update(constants)
 locals_dict.update(skims)

 # constrained coefficients can appear in expressions
 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 locals_dict.update(coefficients)

 # - run preprocessor to annotate choosers
 # allow specification of alternate preprocessor for nontour choosers
 preprocessor = model_settings.get('LOGSUM_PREPROCESSOR', 'preprocessor')
Expand All@@ -92,17 +96,12 @@ def _compute_logsums(alt_tdd, tours_merged, tour_purpose, model_settings, trace_
 trace_label=trace_label)

 # - compute logsums

 coefficients = simulate.get_segment_coefficients(logsum_settings, tour_purpose)
 logsum_spec = simulate.read_model_spec(file_name=logsum_settings['SPEC'])
 logsum_spec = simulate.eval_coefficients(logsum_spec, coefficients, estimator=None)

 nest_spec = config.get_logit_model_settings(logsum_settings)
 nest_spec = simulate.eval_nest_coefficients(nest_spec, coefficients)

 # constrained coefficients can appear in expressions
 locals_dict.update(coefficients)

 logsums = simulate.simple_simulate_logsums(
 choosers,
 logsum_spec,
Expand Down

21 changes: 18 additions & 3 deletions
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
import numpy as np
import pandas as pd

from .assign import evaluate_constants
from .skim import SkimDictWrapper, SkimStackWrapper
from . import logit
from . import tracing
Expand DownExpand Up@@ -140,9 +141,23 @@ def read_model_coefficients(model_settings=None, file_name=None):
 file_name = model_settings['COEFFICIENTS']

 file_path = config.config_file_path(file_name)
 coefficients = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 print(file_path)
 try:
 coefficients_df = pd.read_csv(file_path, comment='#', index_col='coefficient_name')
 assert {'constrain', 'value'}.issubset(coefficients_df.columns)
 except ValueError:
 logger.exception("Coefficient File Invalid: %s" % str(file_path))
 raise

 if model_settings is not None and 'CONSTANTS' in model_settings:
 constants = model_settings['CONSTANTS']
 else:
 constants = None

 coeffs = evaluate_constants(coefficients_df['value'], constants)

 return coefficients
 return pd.concat([pd.DataFrame(coeffs.values(), index=coeffs.keys(), columns=['value']),
 coefficients_df['constrain']], axis=1)


def spec_for_segment(model_settings, spec_id, segment_name, estimator):
Expand All@@ -163,7 +178,7 @@ def spec_for_segment(model_settings, spec_id, segment_name, estimator):
 """

 spec = read_model_spec(file_name=model_settings[spec_id])
 coefficients = read_model_coefficients(model_settings)
 coefficients = read_model_coefficients(model_settings, None)

 if len(spec.columns) > 1:
 # if spec is segmented
Expand Down

4 changes: 3 additions & 1 deletion
activitysim/examples/example_mtc/configs/joint_tour_destination.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ SEGMENTS:
 - eatout
 - social


SAMPLE_SIZE: 30

# we can't use use household income_segment as this will also be set for non-workers
CHOOSER_SEGMENT_COLUMN_NAME: tour_type

SIMULATE_CHOOSER_COLUMNS:
 - tour_type
 - TAZ
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/examples/example_mtc/configs/non_mandatory_tour_destination_coeffs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ coef_mode_logsum,0.6755,F
coef_escort_dist_0_2,-0.1499,F
coef_eatout_dist_0_2,-0.5609,F
coef_eatout_social_0_2,-0.5609,F
coef_eatout_dist_0_2,-0.7841,F
#coef_eatout_dist_0_2,-0.7841,F
coef_othdiscr_dist_0_2,-0.1677,F
coef_escort_dist_2_5,-0.8671,F
coef_shopping_dist_2_5,-0.5655,F
Expand Down