Repair tests and examples#594

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 8 commits into from
Sep 2, 2022
Merged

Repair tests and examples #594

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
8fb416d
point to data not copy it
jpn-- Aug 29, 2022
35586ff
sort dependencies
jpn-- Aug 29, 2022
5fd488f
req sh 2.2.4
jpn-- Aug 29, 2022
f51c609
account for variance across platforms in trip dest est
jpn-- Aug 29, 2022
236072e
copy bike skims for sandag test
jpn-- Aug 29, 2022
156c771
param on rtol
jpn-- Aug 31, 2022
7455375
fix sandag_2 test files
jpn-- Sep 1, 2022
f14c078
fix test file names
jpn-- Sep 1, 2022
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
33 changes: 21 additions & 12 deletions activitysim/estimation/test/test_larch_estimation.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,18 @@ def est_data():
os.chdir(cwd)


def _regression_check(dataframe_regression, df, basename=None):
def _regression_check(dataframe_regression, df, basename=None, rtol=None):
if rtol is None:
rtol = 0.1
dataframe_regression.check(
df.select_dtypes("number")
.drop(columns=["holdfast"], errors="ignore")
.clip(-9e9, 9e9),
# pandas 1.3 handles int8 dtypes as actual numbers, so holdfast needs to be dropped manually
# we're dropping it not adding to the regression check so older pandas will also work.
basename=basename,
default_tolerance=dict(atol=1e-6, rtol=0.1)
# set a little loose, as there is sometimes a little variance in these
default_tolerance=dict(atol=1e-6, rtol=rtol)
# can set a little loose, as there is sometimes a little variance in these
# results when switching backend implementations. We're checking all
# the parameters and the log likelihood, so modest variance in individual
# parameters, especially those with high std errors, is not problematic.
Expand DownExpand Up@@ -89,16 +91,23 @@ def test_simple_simulate(est_data, num_regression, dataframe_regression, name, m


@pytest.mark.parametrize(
"name,method",
"name,method,rtol",
[
("workplace_location", "SLSQP"),
("school_location", "SLSQP"),
("non_mandatory_tour_destination", "SLSQP"),
("atwork_subtour_destination", "BHHH"),
("trip_destination", "SLSQP"),
("workplace_location", "SLSQP", None),
("school_location", "SLSQP", None),
("non_mandatory_tour_destination", "SLSQP", None),
("atwork_subtour_destination", "BHHH", None),
("trip_destination", "SLSQP", 0.12),
# trip_destination model has unusual parameter variance on a couple
# parameters when switching platforms, possibly related to default data
# types and high standard errors. Most parameters and the overall
# log likelihoods behave fine, suggesting it is just a numerical
# precision issue.
],
)
def test_location_model(est_data, num_regression, dataframe_regression, name, method):
def test_location_model(
est_data, num_regression, dataframe_regression, name, method, rtol
):
from activitysim.estimation.larch import component_model, update_size_spec

m, data = component_model(name, return_data=True)
Expand All@@ -109,7 +118,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
{"loglike_prior": loglike_prior, "loglike_converge": r.loglike},
basename=f"test_loc_{name}_loglike",
)
_regression_check(dataframe_regression, m.pf)
_regression_check(dataframe_regression, m.pf, rtol=rtol)
size_spec = update_size_spec(
m,
data,
Expand All@@ -136,7 +145,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
],
)
def test_scheduling_model(est_data, num_regression, dataframe_regression, name, method):
from activitysim.estimation.larch import component_model, update_size_spec
from activitysim.estimation.larch import component_model

m, data = component_model(name, return_data=True)
m.load_data()
Expand Down
0 ...odel_atwork_subtour_destination_BHHH_.csv → ...atwork_subtour_destination_BHHH_None_.csv
View file
Open in desktop
File renamed without changes.
0 ...non_mandatory_tour_destination_SLSQP_.csv → ...andatory_tour_destination_SLSQP_None_.csv
View file
Open in desktop
File renamed without changes.
0 ...location_model_school_location_SLSQP_.csv → ...ion_model_school_location_SLSQP_None_.csv
View file
Open in desktop
File renamed without changes.
0 ...ocation_model_trip_destination_SLSQP_.csv → ...on_model_trip_destination_SLSQP_0_12_.csv
View file
Open in desktop
File renamed without changes.
0 ...ation_model_workplace_location_SLSQP_.csv → ..._model_workplace_location_SLSQP_None_.csv
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion activitysim/examples/example_manifest.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -693,6 +693,9 @@
placeholder_psrc
- placeholder_sandag/configs_2_zone
- placeholder_sandag/data_2
- placeholder_sandag/data_3/maz_to_maz_bike.csv
data_2/maz_to_maz_bike.csv
# the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
- placeholder_sandag/output_2

- name: placeholder_sandag_2_zone_full
Expand DownExpand Up@@ -870,7 +873,7 @@
2d481ec20f69204fc02a259d2d7c4e3d955d6a83b13d7bae920c9c7f8e28c517
- prototype_sandag_xborder/data/persons_xborder.csv # this matches the local tours_xborder, see below
- https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/tap_lines.csv
data/tap_lines.csv
data/tap_lines.csv
750745a33f39963f0c3e4efa6135ff89fb7dd49f58f17cdbd90d62e7057fea01
- https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/taps.csv
data/taps.csv
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Repair tests and examples#594

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

from

Sep 2, 2022
 Merged


Repair tests and examples
#594
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
8fb416d

point to data not copy it


jpn-- Aug 29, 2022
35586ff

sort dependencies


jpn-- Aug 29, 2022
5fd488f

req sh 2.2.4


jpn-- Aug 29, 2022
f51c609

account for variance across platforms in trip dest est


jpn-- Aug 29, 2022
236072e

copy bike skims for sandag test


jpn-- Aug 29, 2022
156c771

param on rtol


jpn-- Aug 31, 2022
7455375

fix sandag_2 test files


jpn-- Sep 1, 2022
f14c078

fix test file names


jpn-- Sep 1, 2022

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


33 changes: 21 additions & 12 deletions
activitysim/estimation/test/test_larch_estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,18 @@ def est_data():
 os.chdir(cwd)


def _regression_check(dataframe_regression, df, basename=None):
def _regression_check(dataframe_regression, df, basename=None, rtol=None):
 if rtol is None:
 rtol = 0.1
 dataframe_regression.check(
 df.select_dtypes("number")
 .drop(columns=["holdfast"], errors="ignore")
 .clip(-9e9, 9e9),
 # pandas 1.3 handles int8 dtypes as actual numbers, so holdfast needs to be dropped manually
 # we're dropping it not adding to the regression check so older pandas will also work.
 basename=basename,
 default_tolerance=dict(atol=1e-6, rtol=0.1)
 # set a little loose, as there is sometimes a little variance in these
 default_tolerance=dict(atol=1e-6, rtol=rtol)
 # can set a little loose, as there is sometimes a little variance in these
 # results when switching backend implementations. We're checking all
 # the parameters and the log likelihood, so modest variance in individual
 # parameters, especially those with high std errors, is not problematic.
Expand DownExpand Up@@ -89,16 +91,23 @@ def test_simple_simulate(est_data, num_regression, dataframe_regression, name, m


@pytest.mark.parametrize(
 "name,method",
 "name,method,rtol",
 [
 ("workplace_location", "SLSQP"),
 ("school_location", "SLSQP"),
 ("non_mandatory_tour_destination", "SLSQP"),
 ("atwork_subtour_destination", "BHHH"),
 ("trip_destination", "SLSQP"),
 ("workplace_location", "SLSQP", None),
 ("school_location", "SLSQP", None),
 ("non_mandatory_tour_destination", "SLSQP", None),
 ("atwork_subtour_destination", "BHHH", None),
 ("trip_destination", "SLSQP", 0.12),
 # trip_destination model has unusual parameter variance on a couple
 # parameters when switching platforms, possibly related to default data
 # types and high standard errors. Most parameters and the overall
 # log likelihoods behave fine, suggesting it is just a numerical
 # precision issue.
 ],
)
def test_location_model(est_data, num_regression, dataframe_regression, name, method):
def test_location_model(
 est_data, num_regression, dataframe_regression, name, method, rtol
):
 from activitysim.estimation.larch import component_model, update_size_spec

 m, data = component_model(name, return_data=True)
Expand All@@ -109,7 +118,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 {"loglike_prior": loglike_prior, "loglike_converge": r.loglike},
 basename=f"test_loc_{name}_loglike",
 )
 _regression_check(dataframe_regression, m.pf)
 _regression_check(dataframe_regression, m.pf, rtol=rtol)
 size_spec = update_size_spec(
 m,
 data,
Expand All@@ -136,7 +145,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 ],
)
def test_scheduling_model(est_data, num_regression, dataframe_regression, name, method):
 from activitysim.estimation.larch import component_model, update_size_spec
 from activitysim.estimation.larch import component_model

 m, data = component_model(name, return_data=True)
 m.load_data()
Expand Down

0
...odel_atwork_subtour_destination_BHHH_.csv → ...atwork_subtour_destination_BHHH_None_.csv

View file


Open in desktop


File renamed without changes.


0
...non_mandatory_tour_destination_SLSQP_.csv → ...andatory_tour_destination_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...location_model_school_location_SLSQP_.csv → ...ion_model_school_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...ocation_model_trip_destination_SLSQP_.csv → ...on_model_trip_destination_SLSQP_0_12_.csv

View file


Open in desktop


File renamed without changes.


0
...ation_model_workplace_location_SLSQP_.csv → ..._model_workplace_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


5 changes: 4 additions & 1 deletion
activitysim/examples/example_manifest.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -693,6 +693,9 @@
 placeholder_psrc
 - placeholder_sandag/configs_2_zone
 - placeholder_sandag/data_2
 - placeholder_sandag/data_3/maz_to_maz_bike.csv
 data_2/maz_to_maz_bike.csv
 # the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
 - placeholder_sandag/output_2

- name: placeholder_sandag_2_zone_full
Expand DownExpand Up@@ -870,7 +873,7 @@
 2d481ec20f69204fc02a259d2d7c4e3d955d6a83b13d7bae920c9c7f8e28c517
 - prototype_sandag_xborder/data/persons_xborder.csv # this matches the local tours_xborder, see below
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/tap_lines.csv
 data/tap_lines.csv
 data/tap_lines.csv
 750745a33f39963f0c3e4efa6135ff89fb7dd49f58f17cdbd90d62e7057fea01
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/taps.csv
 data/taps.csv
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Repair tests and examples#594

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

from

Sep 2, 2022
 Merged


Repair tests and examples
#594
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
8fb416d

point to data not copy it


jpn-- Aug 29, 2022
35586ff

sort dependencies


jpn-- Aug 29, 2022
5fd488f

req sh 2.2.4


jpn-- Aug 29, 2022
f51c609

account for variance across platforms in trip dest est


jpn-- Aug 29, 2022
236072e

copy bike skims for sandag test


jpn-- Aug 29, 2022
156c771

param on rtol


jpn-- Aug 31, 2022
7455375

fix sandag_2 test files


jpn-- Sep 1, 2022
f14c078

fix test file names


jpn-- Sep 1, 2022

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


33 changes: 21 additions & 12 deletions
activitysim/estimation/test/test_larch_estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,18 @@ def est_data():
 os.chdir(cwd)


def _regression_check(dataframe_regression, df, basename=None):
def _regression_check(dataframe_regression, df, basename=None, rtol=None):
 if rtol is None:
 rtol = 0.1
 dataframe_regression.check(
 df.select_dtypes("number")
 .drop(columns=["holdfast"], errors="ignore")
 .clip(-9e9, 9e9),
 # pandas 1.3 handles int8 dtypes as actual numbers, so holdfast needs to be dropped manually
 # we're dropping it not adding to the regression check so older pandas will also work.
 basename=basename,
 default_tolerance=dict(atol=1e-6, rtol=0.1)
 # set a little loose, as there is sometimes a little variance in these
 default_tolerance=dict(atol=1e-6, rtol=rtol)
 # can set a little loose, as there is sometimes a little variance in these
 # results when switching backend implementations. We're checking all
 # the parameters and the log likelihood, so modest variance in individual
 # parameters, especially those with high std errors, is not problematic.
Expand DownExpand Up@@ -89,16 +91,23 @@ def test_simple_simulate(est_data, num_regression, dataframe_regression, name, m


@pytest.mark.parametrize(
 "name,method",
 "name,method,rtol",
 [
 ("workplace_location", "SLSQP"),
 ("school_location", "SLSQP"),
 ("non_mandatory_tour_destination", "SLSQP"),
 ("atwork_subtour_destination", "BHHH"),
 ("trip_destination", "SLSQP"),
 ("workplace_location", "SLSQP", None),
 ("school_location", "SLSQP", None),
 ("non_mandatory_tour_destination", "SLSQP", None),
 ("atwork_subtour_destination", "BHHH", None),
 ("trip_destination", "SLSQP", 0.12),
 # trip_destination model has unusual parameter variance on a couple
 # parameters when switching platforms, possibly related to default data
 # types and high standard errors. Most parameters and the overall
 # log likelihoods behave fine, suggesting it is just a numerical
 # precision issue.
 ],
)
def test_location_model(est_data, num_regression, dataframe_regression, name, method):
def test_location_model(
 est_data, num_regression, dataframe_regression, name, method, rtol
):
 from activitysim.estimation.larch import component_model, update_size_spec

 m, data = component_model(name, return_data=True)
Expand All@@ -109,7 +118,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 {"loglike_prior": loglike_prior, "loglike_converge": r.loglike},
 basename=f"test_loc_{name}_loglike",
 )
 _regression_check(dataframe_regression, m.pf)
 _regression_check(dataframe_regression, m.pf, rtol=rtol)
 size_spec = update_size_spec(
 m,
 data,
Expand All@@ -136,7 +145,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 ],
)
def test_scheduling_model(est_data, num_regression, dataframe_regression, name, method):
 from activitysim.estimation.larch import component_model, update_size_spec
 from activitysim.estimation.larch import component_model

 m, data = component_model(name, return_data=True)
 m.load_data()
Expand Down

0
...odel_atwork_subtour_destination_BHHH_.csv → ...atwork_subtour_destination_BHHH_None_.csv

View file


Open in desktop


File renamed without changes.


0
...non_mandatory_tour_destination_SLSQP_.csv → ...andatory_tour_destination_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...location_model_school_location_SLSQP_.csv → ...ion_model_school_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...ocation_model_trip_destination_SLSQP_.csv → ...on_model_trip_destination_SLSQP_0_12_.csv

View file


Open in desktop


File renamed without changes.


0
...ation_model_workplace_location_SLSQP_.csv → ..._model_workplace_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


5 changes: 4 additions & 1 deletion
activitysim/examples/example_manifest.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -693,6 +693,9 @@
 placeholder_psrc
 - placeholder_sandag/configs_2_zone
 - placeholder_sandag/data_2
 - placeholder_sandag/data_3/maz_to_maz_bike.csv
 data_2/maz_to_maz_bike.csv
 # the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
 - placeholder_sandag/output_2

- name: placeholder_sandag_2_zone_full
Expand DownExpand Up@@ -870,7 +873,7 @@
 2d481ec20f69204fc02a259d2d7c4e3d955d6a83b13d7bae920c9c7f8e28c517
 - prototype_sandag_xborder/data/persons_xborder.csv # this matches the local tours_xborder, see below
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/tap_lines.csv
 data/tap_lines.csv
 data/tap_lines.csv
 750745a33f39963f0c3e4efa6135ff89fb7dd49f58f17cdbd90d62e7057fea01
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/taps.csv
 data/taps.csv
Expand Down
Loading

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

Skip to content
Repair tests and examples#594

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

from

Sep 2, 2022
 Merged


Repair tests and examples
#594
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
8fb416d

point to data not copy it


jpn-- Aug 29, 2022
35586ff

sort dependencies


jpn-- Aug 29, 2022
5fd488f

req sh 2.2.4


jpn-- Aug 29, 2022
f51c609

account for variance across platforms in trip dest est


jpn-- Aug 29, 2022
236072e

copy bike skims for sandag test


jpn-- Aug 29, 2022
156c771

param on rtol


jpn-- Aug 31, 2022
7455375

fix sandag_2 test files


jpn-- Sep 1, 2022
f14c078

fix test file names


jpn-- Sep 1, 2022

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


33 changes: 21 additions & 12 deletions
activitysim/estimation/test/test_larch_estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,18 @@ def est_data():
 os.chdir(cwd)


def _regression_check(dataframe_regression, df, basename=None):
def _regression_check(dataframe_regression, df, basename=None, rtol=None):
 if rtol is None:
 rtol = 0.1
 dataframe_regression.check(
 df.select_dtypes("number")
 .drop(columns=["holdfast"], errors="ignore")
 .clip(-9e9, 9e9),
 # pandas 1.3 handles int8 dtypes as actual numbers, so holdfast needs to be dropped manually
 # we're dropping it not adding to the regression check so older pandas will also work.
 basename=basename,
 default_tolerance=dict(atol=1e-6, rtol=0.1)
 # set a little loose, as there is sometimes a little variance in these
 default_tolerance=dict(atol=1e-6, rtol=rtol)
 # can set a little loose, as there is sometimes a little variance in these
 # results when switching backend implementations. We're checking all
 # the parameters and the log likelihood, so modest variance in individual
 # parameters, especially those with high std errors, is not problematic.
Expand DownExpand Up@@ -89,16 +91,23 @@ def test_simple_simulate(est_data, num_regression, dataframe_regression, name, m


@pytest.mark.parametrize(
 "name,method",
 "name,method,rtol",
 [
 ("workplace_location", "SLSQP"),
 ("school_location", "SLSQP"),
 ("non_mandatory_tour_destination", "SLSQP"),
 ("atwork_subtour_destination", "BHHH"),
 ("trip_destination", "SLSQP"),
 ("workplace_location", "SLSQP", None),
 ("school_location", "SLSQP", None),
 ("non_mandatory_tour_destination", "SLSQP", None),
 ("atwork_subtour_destination", "BHHH", None),
 ("trip_destination", "SLSQP", 0.12),
 # trip_destination model has unusual parameter variance on a couple
 # parameters when switching platforms, possibly related to default data
 # types and high standard errors. Most parameters and the overall
 # log likelihoods behave fine, suggesting it is just a numerical
 # precision issue.
 ],
)
def test_location_model(est_data, num_regression, dataframe_regression, name, method):
def test_location_model(
 est_data, num_regression, dataframe_regression, name, method, rtol
):
 from activitysim.estimation.larch import component_model, update_size_spec

 m, data = component_model(name, return_data=True)
Expand All@@ -109,7 +118,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 {"loglike_prior": loglike_prior, "loglike_converge": r.loglike},
 basename=f"test_loc_{name}_loglike",
 )
 _regression_check(dataframe_regression, m.pf)
 _regression_check(dataframe_regression, m.pf, rtol=rtol)
 size_spec = update_size_spec(
 m,
 data,
Expand All@@ -136,7 +145,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 ],
)
def test_scheduling_model(est_data, num_regression, dataframe_regression, name, method):
 from activitysim.estimation.larch import component_model, update_size_spec
 from activitysim.estimation.larch import component_model

 m, data = component_model(name, return_data=True)
 m.load_data()
Expand Down

0
...odel_atwork_subtour_destination_BHHH_.csv → ...atwork_subtour_destination_BHHH_None_.csv

View file


Open in desktop


File renamed without changes.


0
...non_mandatory_tour_destination_SLSQP_.csv → ...andatory_tour_destination_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...location_model_school_location_SLSQP_.csv → ...ion_model_school_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...ocation_model_trip_destination_SLSQP_.csv → ...on_model_trip_destination_SLSQP_0_12_.csv

View file


Open in desktop


File renamed without changes.


0
...ation_model_workplace_location_SLSQP_.csv → ..._model_workplace_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


5 changes: 4 additions & 1 deletion
activitysim/examples/example_manifest.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -693,6 +693,9 @@
 placeholder_psrc
 - placeholder_sandag/configs_2_zone
 - placeholder_sandag/data_2
 - placeholder_sandag/data_3/maz_to_maz_bike.csv
 data_2/maz_to_maz_bike.csv
 # the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
 - placeholder_sandag/output_2

- name: placeholder_sandag_2_zone_full
Expand DownExpand Up@@ -870,7 +873,7 @@
 2d481ec20f69204fc02a259d2d7c4e3d955d6a83b13d7bae920c9c7f8e28c517
 - prototype_sandag_xborder/data/persons_xborder.csv # this matches the local tours_xborder, see below
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/tap_lines.csv
 data/tap_lines.csv
 data/tap_lines.csv
 750745a33f39963f0c3e4efa6135ff89fb7dd49f58f17cdbd90d62e7057fea01
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/taps.csv
 data/taps.csv
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Repair tests and examples#594

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

from

Sep 2, 2022
 Merged


Repair tests and examples
#594
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
8fb416d

point to data not copy it


jpn-- Aug 29, 2022
35586ff

sort dependencies


jpn-- Aug 29, 2022
5fd488f

req sh 2.2.4


jpn-- Aug 29, 2022
f51c609

account for variance across platforms in trip dest est


jpn-- Aug 29, 2022
236072e

copy bike skims for sandag test


jpn-- Aug 29, 2022
156c771

param on rtol


jpn-- Aug 31, 2022
7455375

fix sandag_2 test files


jpn-- Sep 1, 2022
f14c078

fix test file names


jpn-- Sep 1, 2022

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


33 changes: 21 additions & 12 deletions
activitysim/estimation/test/test_larch_estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,18 @@ def est_data():
 os.chdir(cwd)


def _regression_check(dataframe_regression, df, basename=None):
def _regression_check(dataframe_regression, df, basename=None, rtol=None):
 if rtol is None:
 rtol = 0.1
 dataframe_regression.check(
 df.select_dtypes("number")
 .drop(columns=["holdfast"], errors="ignore")
 .clip(-9e9, 9e9),
 # pandas 1.3 handles int8 dtypes as actual numbers, so holdfast needs to be dropped manually
 # we're dropping it not adding to the regression check so older pandas will also work.
 basename=basename,
 default_tolerance=dict(atol=1e-6, rtol=0.1)
 # set a little loose, as there is sometimes a little variance in these
 default_tolerance=dict(atol=1e-6, rtol=rtol)
 # can set a little loose, as there is sometimes a little variance in these
 # results when switching backend implementations. We're checking all
 # the parameters and the log likelihood, so modest variance in individual
 # parameters, especially those with high std errors, is not problematic.
Expand DownExpand Up@@ -89,16 +91,23 @@ def test_simple_simulate(est_data, num_regression, dataframe_regression, name, m


@pytest.mark.parametrize(
 "name,method",
 "name,method,rtol",
 [
 ("workplace_location", "SLSQP"),
 ("school_location", "SLSQP"),
 ("non_mandatory_tour_destination", "SLSQP"),
 ("atwork_subtour_destination", "BHHH"),
 ("trip_destination", "SLSQP"),
 ("workplace_location", "SLSQP", None),
 ("school_location", "SLSQP", None),
 ("non_mandatory_tour_destination", "SLSQP", None),
 ("atwork_subtour_destination", "BHHH", None),
 ("trip_destination", "SLSQP", 0.12),
 # trip_destination model has unusual parameter variance on a couple
 # parameters when switching platforms, possibly related to default data
 # types and high standard errors. Most parameters and the overall
 # log likelihoods behave fine, suggesting it is just a numerical
 # precision issue.
 ],
)
def test_location_model(est_data, num_regression, dataframe_regression, name, method):
def test_location_model(
 est_data, num_regression, dataframe_regression, name, method, rtol
):
 from activitysim.estimation.larch import component_model, update_size_spec

 m, data = component_model(name, return_data=True)
Expand All@@ -109,7 +118,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 {"loglike_prior": loglike_prior, "loglike_converge": r.loglike},
 basename=f"test_loc_{name}_loglike",
 )
 _regression_check(dataframe_regression, m.pf)
 _regression_check(dataframe_regression, m.pf, rtol=rtol)
 size_spec = update_size_spec(
 m,
 data,
Expand All@@ -136,7 +145,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 ],
)
def test_scheduling_model(est_data, num_regression, dataframe_regression, name, method):
 from activitysim.estimation.larch import component_model, update_size_spec
 from activitysim.estimation.larch import component_model

 m, data = component_model(name, return_data=True)
 m.load_data()
Expand Down

0
...odel_atwork_subtour_destination_BHHH_.csv → ...atwork_subtour_destination_BHHH_None_.csv

View file


Open in desktop


File renamed without changes.


0
...non_mandatory_tour_destination_SLSQP_.csv → ...andatory_tour_destination_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...location_model_school_location_SLSQP_.csv → ...ion_model_school_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...ocation_model_trip_destination_SLSQP_.csv → ...on_model_trip_destination_SLSQP_0_12_.csv

View file


Open in desktop


File renamed without changes.


0
...ation_model_workplace_location_SLSQP_.csv → ..._model_workplace_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


5 changes: 4 additions & 1 deletion
activitysim/examples/example_manifest.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -693,6 +693,9 @@
 placeholder_psrc
 - placeholder_sandag/configs_2_zone
 - placeholder_sandag/data_2
 - placeholder_sandag/data_3/maz_to_maz_bike.csv
 data_2/maz_to_maz_bike.csv
 # the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
 - placeholder_sandag/output_2

- name: placeholder_sandag_2_zone_full
Expand DownExpand Up@@ -870,7 +873,7 @@
 2d481ec20f69204fc02a259d2d7c4e3d955d6a83b13d7bae920c9c7f8e28c517
 - prototype_sandag_xborder/data/persons_xborder.csv # this matches the local tours_xborder, see below
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/tap_lines.csv
 data/tap_lines.csv
 data/tap_lines.csv
 750745a33f39963f0c3e4efa6135ff89fb7dd49f58f17cdbd90d62e7057fea01
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/taps.csv
 data/taps.csv
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Repair tests and examples#594

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

from

Sep 2, 2022
 Merged


Repair tests and examples
#594
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
8fb416d

point to data not copy it


jpn-- Aug 29, 2022
35586ff

sort dependencies


jpn-- Aug 29, 2022
5fd488f

req sh 2.2.4


jpn-- Aug 29, 2022
f51c609

account for variance across platforms in trip dest est


jpn-- Aug 29, 2022
236072e

copy bike skims for sandag test


jpn-- Aug 29, 2022
156c771

param on rtol


jpn-- Aug 31, 2022
7455375

fix sandag_2 test files


jpn-- Sep 1, 2022
f14c078

fix test file names


jpn-- Sep 1, 2022

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


33 changes: 21 additions & 12 deletions
activitysim/estimation/test/test_larch_estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,18 @@ def est_data():
 os.chdir(cwd)


def _regression_check(dataframe_regression, df, basename=None):
def _regression_check(dataframe_regression, df, basename=None, rtol=None):
 if rtol is None:
 rtol = 0.1
 dataframe_regression.check(
 df.select_dtypes("number")
 .drop(columns=["holdfast"], errors="ignore")
 .clip(-9e9, 9e9),
 # pandas 1.3 handles int8 dtypes as actual numbers, so holdfast needs to be dropped manually
 # we're dropping it not adding to the regression check so older pandas will also work.
 basename=basename,
 default_tolerance=dict(atol=1e-6, rtol=0.1)
 # set a little loose, as there is sometimes a little variance in these
 default_tolerance=dict(atol=1e-6, rtol=rtol)
 # can set a little loose, as there is sometimes a little variance in these
 # results when switching backend implementations. We're checking all
 # the parameters and the log likelihood, so modest variance in individual
 # parameters, especially those with high std errors, is not problematic.
Expand DownExpand Up@@ -89,16 +91,23 @@ def test_simple_simulate(est_data, num_regression, dataframe_regression, name, m


@pytest.mark.parametrize(
 "name,method",
 "name,method,rtol",
 [
 ("workplace_location", "SLSQP"),
 ("school_location", "SLSQP"),
 ("non_mandatory_tour_destination", "SLSQP"),
 ("atwork_subtour_destination", "BHHH"),
 ("trip_destination", "SLSQP"),
 ("workplace_location", "SLSQP", None),
 ("school_location", "SLSQP", None),
 ("non_mandatory_tour_destination", "SLSQP", None),
 ("atwork_subtour_destination", "BHHH", None),
 ("trip_destination", "SLSQP", 0.12),
 # trip_destination model has unusual parameter variance on a couple
 # parameters when switching platforms, possibly related to default data
 # types and high standard errors. Most parameters and the overall
 # log likelihoods behave fine, suggesting it is just a numerical
 # precision issue.
 ],
)
def test_location_model(est_data, num_regression, dataframe_regression, name, method):
def test_location_model(
 est_data, num_regression, dataframe_regression, name, method, rtol
):
 from activitysim.estimation.larch import component_model, update_size_spec

 m, data = component_model(name, return_data=True)
Expand All@@ -109,7 +118,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 {"loglike_prior": loglike_prior, "loglike_converge": r.loglike},
 basename=f"test_loc_{name}_loglike",
 )
 _regression_check(dataframe_regression, m.pf)
 _regression_check(dataframe_regression, m.pf, rtol=rtol)
 size_spec = update_size_spec(
 m,
 data,
Expand All@@ -136,7 +145,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 ],
)
def test_scheduling_model(est_data, num_regression, dataframe_regression, name, method):
 from activitysim.estimation.larch import component_model, update_size_spec
 from activitysim.estimation.larch import component_model

 m, data = component_model(name, return_data=True)
 m.load_data()
Expand Down

0
...odel_atwork_subtour_destination_BHHH_.csv → ...atwork_subtour_destination_BHHH_None_.csv

View file


Open in desktop


File renamed without changes.


0
...non_mandatory_tour_destination_SLSQP_.csv → ...andatory_tour_destination_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...location_model_school_location_SLSQP_.csv → ...ion_model_school_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...ocation_model_trip_destination_SLSQP_.csv → ...on_model_trip_destination_SLSQP_0_12_.csv

View file


Open in desktop


File renamed without changes.


0
...ation_model_workplace_location_SLSQP_.csv → ..._model_workplace_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


5 changes: 4 additions & 1 deletion
activitysim/examples/example_manifest.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -693,6 +693,9 @@
 placeholder_psrc
 - placeholder_sandag/configs_2_zone
 - placeholder_sandag/data_2
 - placeholder_sandag/data_3/maz_to_maz_bike.csv
 data_2/maz_to_maz_bike.csv
 # the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
 - placeholder_sandag/output_2

- name: placeholder_sandag_2_zone_full
Expand DownExpand Up@@ -870,7 +873,7 @@
 2d481ec20f69204fc02a259d2d7c4e3d955d6a83b13d7bae920c9c7f8e28c517
 - prototype_sandag_xborder/data/persons_xborder.csv # this matches the local tours_xborder, see below
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/tap_lines.csv
 data/tap_lines.csv
 data/tap_lines.csv
 750745a33f39963f0c3e4efa6135ff89fb7dd49f58f17cdbd90d62e7057fea01
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/taps.csv
 data/taps.csv
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Repair tests and examples#594

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

from

Sep 2, 2022
 Merged


Repair tests and examples
#594
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
8fb416d

point to data not copy it


jpn-- Aug 29, 2022
35586ff

sort dependencies


jpn-- Aug 29, 2022
5fd488f

req sh 2.2.4


jpn-- Aug 29, 2022
f51c609

account for variance across platforms in trip dest est


jpn-- Aug 29, 2022
236072e

copy bike skims for sandag test


jpn-- Aug 29, 2022
156c771

param on rtol


jpn-- Aug 31, 2022
7455375

fix sandag_2 test files


jpn-- Sep 1, 2022
f14c078

fix test file names


jpn-- Sep 1, 2022

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


33 changes: 21 additions & 12 deletions
activitysim/estimation/test/test_larch_estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,18 @@ def est_data():
 os.chdir(cwd)


def _regression_check(dataframe_regression, df, basename=None):
def _regression_check(dataframe_regression, df, basename=None, rtol=None):
 if rtol is None:
 rtol = 0.1
 dataframe_regression.check(
 df.select_dtypes("number")
 .drop(columns=["holdfast"], errors="ignore")
 .clip(-9e9, 9e9),
 # pandas 1.3 handles int8 dtypes as actual numbers, so holdfast needs to be dropped manually
 # we're dropping it not adding to the regression check so older pandas will also work.
 basename=basename,
 default_tolerance=dict(atol=1e-6, rtol=0.1)
 # set a little loose, as there is sometimes a little variance in these
 default_tolerance=dict(atol=1e-6, rtol=rtol)
 # can set a little loose, as there is sometimes a little variance in these
 # results when switching backend implementations. We're checking all
 # the parameters and the log likelihood, so modest variance in individual
 # parameters, especially those with high std errors, is not problematic.
Expand DownExpand Up@@ -89,16 +91,23 @@ def test_simple_simulate(est_data, num_regression, dataframe_regression, name, m


@pytest.mark.parametrize(
 "name,method",
 "name,method,rtol",
 [
 ("workplace_location", "SLSQP"),
 ("school_location", "SLSQP"),
 ("non_mandatory_tour_destination", "SLSQP"),
 ("atwork_subtour_destination", "BHHH"),
 ("trip_destination", "SLSQP"),
 ("workplace_location", "SLSQP", None),
 ("school_location", "SLSQP", None),
 ("non_mandatory_tour_destination", "SLSQP", None),
 ("atwork_subtour_destination", "BHHH", None),
 ("trip_destination", "SLSQP", 0.12),
 # trip_destination model has unusual parameter variance on a couple
 # parameters when switching platforms, possibly related to default data
 # types and high standard errors. Most parameters and the overall
 # log likelihoods behave fine, suggesting it is just a numerical
 # precision issue.
 ],
)
def test_location_model(est_data, num_regression, dataframe_regression, name, method):
def test_location_model(
 est_data, num_regression, dataframe_regression, name, method, rtol
):
 from activitysim.estimation.larch import component_model, update_size_spec

 m, data = component_model(name, return_data=True)
Expand All@@ -109,7 +118,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 {"loglike_prior": loglike_prior, "loglike_converge": r.loglike},
 basename=f"test_loc_{name}_loglike",
 )
 _regression_check(dataframe_regression, m.pf)
 _regression_check(dataframe_regression, m.pf, rtol=rtol)
 size_spec = update_size_spec(
 m,
 data,
Expand All@@ -136,7 +145,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 ],
)
def test_scheduling_model(est_data, num_regression, dataframe_regression, name, method):
 from activitysim.estimation.larch import component_model, update_size_spec
 from activitysim.estimation.larch import component_model

 m, data = component_model(name, return_data=True)
 m.load_data()
Expand Down

0
...odel_atwork_subtour_destination_BHHH_.csv → ...atwork_subtour_destination_BHHH_None_.csv

View file


Open in desktop


File renamed without changes.


0
...non_mandatory_tour_destination_SLSQP_.csv → ...andatory_tour_destination_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...location_model_school_location_SLSQP_.csv → ...ion_model_school_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...ocation_model_trip_destination_SLSQP_.csv → ...on_model_trip_destination_SLSQP_0_12_.csv

View file


Open in desktop


File renamed without changes.


0
...ation_model_workplace_location_SLSQP_.csv → ..._model_workplace_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


5 changes: 4 additions & 1 deletion
activitysim/examples/example_manifest.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -693,6 +693,9 @@
 placeholder_psrc
 - placeholder_sandag/configs_2_zone
 - placeholder_sandag/data_2
 - placeholder_sandag/data_3/maz_to_maz_bike.csv
 data_2/maz_to_maz_bike.csv
 # the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
 - placeholder_sandag/output_2

- name: placeholder_sandag_2_zone_full
Expand DownExpand Up@@ -870,7 +873,7 @@
 2d481ec20f69204fc02a259d2d7c4e3d955d6a83b13d7bae920c9c7f8e28c517
 - prototype_sandag_xborder/data/persons_xborder.csv # this matches the local tours_xborder, see below
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/tap_lines.csv
 data/tap_lines.csv
 data/tap_lines.csv
 750745a33f39963f0c3e4efa6135ff89fb7dd49f58f17cdbd90d62e7057fea01
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/taps.csv
 data/taps.csv
Expand Down
Loading

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

Skip to content
Repair tests and examples#594

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

from

Sep 2, 2022
 Merged


Repair tests and examples
#594
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
8fb416d

point to data not copy it


jpn-- Aug 29, 2022
35586ff

sort dependencies


jpn-- Aug 29, 2022
5fd488f

req sh 2.2.4


jpn-- Aug 29, 2022
f51c609

account for variance across platforms in trip dest est


jpn-- Aug 29, 2022
236072e

copy bike skims for sandag test


jpn-- Aug 29, 2022
156c771

param on rtol


jpn-- Aug 31, 2022
7455375

fix sandag_2 test files


jpn-- Sep 1, 2022
f14c078

fix test file names


jpn-- Sep 1, 2022

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


33 changes: 21 additions & 12 deletions
activitysim/estimation/test/test_larch_estimation.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,18 @@ def est_data():
 os.chdir(cwd)


def _regression_check(dataframe_regression, df, basename=None):
def _regression_check(dataframe_regression, df, basename=None, rtol=None):
 if rtol is None:
 rtol = 0.1
 dataframe_regression.check(
 df.select_dtypes("number")
 .drop(columns=["holdfast"], errors="ignore")
 .clip(-9e9, 9e9),
 # pandas 1.3 handles int8 dtypes as actual numbers, so holdfast needs to be dropped manually
 # we're dropping it not adding to the regression check so older pandas will also work.
 basename=basename,
 default_tolerance=dict(atol=1e-6, rtol=0.1)
 # set a little loose, as there is sometimes a little variance in these
 default_tolerance=dict(atol=1e-6, rtol=rtol)
 # can set a little loose, as there is sometimes a little variance in these
 # results when switching backend implementations. We're checking all
 # the parameters and the log likelihood, so modest variance in individual
 # parameters, especially those with high std errors, is not problematic.
Expand DownExpand Up@@ -89,16 +91,23 @@ def test_simple_simulate(est_data, num_regression, dataframe_regression, name, m


@pytest.mark.parametrize(
 "name,method",
 "name,method,rtol",
 [
 ("workplace_location", "SLSQP"),
 ("school_location", "SLSQP"),
 ("non_mandatory_tour_destination", "SLSQP"),
 ("atwork_subtour_destination", "BHHH"),
 ("trip_destination", "SLSQP"),
 ("workplace_location", "SLSQP", None),
 ("school_location", "SLSQP", None),
 ("non_mandatory_tour_destination", "SLSQP", None),
 ("atwork_subtour_destination", "BHHH", None),
 ("trip_destination", "SLSQP", 0.12),
 # trip_destination model has unusual parameter variance on a couple
 # parameters when switching platforms, possibly related to default data
 # types and high standard errors. Most parameters and the overall
 # log likelihoods behave fine, suggesting it is just a numerical
 # precision issue.
 ],
)
def test_location_model(est_data, num_regression, dataframe_regression, name, method):
def test_location_model(
 est_data, num_regression, dataframe_regression, name, method, rtol
):
 from activitysim.estimation.larch import component_model, update_size_spec

 m, data = component_model(name, return_data=True)
Expand All@@ -109,7 +118,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 {"loglike_prior": loglike_prior, "loglike_converge": r.loglike},
 basename=f"test_loc_{name}_loglike",
 )
 _regression_check(dataframe_regression, m.pf)
 _regression_check(dataframe_regression, m.pf, rtol=rtol)
 size_spec = update_size_spec(
 m,
 data,
Expand All@@ -136,7 +145,7 @@ def test_location_model(est_data, num_regression, dataframe_regression, name, me
 ],
)
def test_scheduling_model(est_data, num_regression, dataframe_regression, name, method):
 from activitysim.estimation.larch import component_model, update_size_spec
 from activitysim.estimation.larch import component_model

 m, data = component_model(name, return_data=True)
 m.load_data()
Expand Down

0
...odel_atwork_subtour_destination_BHHH_.csv → ...atwork_subtour_destination_BHHH_None_.csv

View file


Open in desktop


File renamed without changes.


0
...non_mandatory_tour_destination_SLSQP_.csv → ...andatory_tour_destination_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...location_model_school_location_SLSQP_.csv → ...ion_model_school_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


0
...ocation_model_trip_destination_SLSQP_.csv → ...on_model_trip_destination_SLSQP_0_12_.csv

View file


Open in desktop


File renamed without changes.


0
...ation_model_workplace_location_SLSQP_.csv → ..._model_workplace_location_SLSQP_None_.csv

View file


Open in desktop


File renamed without changes.


5 changes: 4 additions & 1 deletion
activitysim/examples/example_manifest.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -693,6 +693,9 @@
 placeholder_psrc
 - placeholder_sandag/configs_2_zone
 - placeholder_sandag/data_2
 - placeholder_sandag/data_3/maz_to_maz_bike.csv
 data_2/maz_to_maz_bike.csv
 # the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
 - placeholder_sandag/output_2

- name: placeholder_sandag_2_zone_full
Expand DownExpand Up@@ -870,7 +873,7 @@
 2d481ec20f69204fc02a259d2d7c4e3d955d6a83b13d7bae920c9c7f8e28c517
 - prototype_sandag_xborder/data/persons_xborder.csv # this matches the local tours_xborder, see below
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/tap_lines.csv
 data/tap_lines.csv
 data/tap_lines.csv
 750745a33f39963f0c3e4efa6135ff89fb7dd49f58f17cdbd90d62e7057fea01
 - https://raw.githubusercontent.com/activitysim/activitysim_resources/master/sandag_xborder/taps.csv
 data/taps.csv
Expand Down
Loading