Differentiate examples between quality and validity of example models#571

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 23 commits into from
Aug 3, 2022
Merged

Differentiate examples between quality and validity of example models #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a74a15e
change examples that are no longer tied to an agency to fictional pla…
jpn-- Jun 7, 2022
73a9f77
change name of full example also
jpn-- Jun 7, 2022
a73da91
add back missing output dir
jpn-- Jun 8, 2022
ff2ad49
restore test output dir also
jpn-- Jun 8, 2022
b24be28
more empty dirs that got lost
jpn-- Jun 8, 2022
3f0b644
clean up docs
jpn-- Jun 8, 2022
2a5b1e7
example_mtc -> prototype_mtc
jpn-- Jun 22, 2022
0884f7e
Prototype MTC extended
jpn-- Jun 22, 2022
f81985b
add all the ignored files
jpn-- Jun 22, 2022
af04b0a
add test output dirs
jpn-- Jun 22, 2022
e016ce3
remove superfluous example_test
jpn-- Jun 22, 2022
dc488ce
prototype_sf
jpn-- Jun 22, 2022
5450e46
prototype_arc
jpn-- Jul 30, 2022
1a98856
prototype_marin
jpn-- Jul 30, 2022
a592133
move dirs
jpn-- Jul 30, 2022
44c771d
psrc
jpn-- Jul 30, 2022
8d67d23
semcog
jpn-- Jul 30, 2022
60713b1
sandag_xborder
jpn-- Jul 30, 2022
0cb61eb
placeholder_sandag
jpn-- Jul 30, 2022
79f4d60
placeholder_multiple_zone
jpn-- Jul 30, 2022
d36ca88
no more coveralls
jpn-- Jul 30, 2022
ffa8c04
repair docs
jpn-- Jul 30, 2022
1370b30
clean up example names
jpn-- Jul 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
32 changes: 16 additions & 16 deletions .travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,24 @@ jobs:
- env: TEST_SUITE=activitysim/core

- stage: Examples
name: "MTC Example"
env: TEST_SUITE=activitysim/examples/example_mtc/test
- name: "MTC Extended Example"
env: TEST_SUITE=activitysim/examples/example_mtc_extended/test
name: "Prototype MTC"
env: TEST_SUITE=activitysim/examples/prototype_mtc/test
- name: "Prototype MTC (Extended)"
env: TEST_SUITE=activitysim/examples/prototype_mtc_extended/test
- name: "Multizone Example"
env: TEST_SUITE=activitysim/examples/example_multiple_zone/test
env: TEST_SUITE=activitysim/examples/placeholder_multiple_zone/test
- name: "Marin Example"
env: TEST_SUITE=activitysim/examples/example_marin/test
env: TEST_SUITE=activitysim/examples/prototype_marin/test
- name: "ARC Example"
env: TEST_SUITE=activitysim/examples/example_arc/test
env: TEST_SUITE=activitysim/examples/prototype_arc/test
- name: "SEMCOG Example"
env: TEST_SUITE=activitysim/examples/example_semcog/test
env: TEST_SUITE=activitysim/examples/prototype_semcog/test
- name: "PSRC Example"
env: TEST_SUITE=activitysim/examples/example_psrc/test
env: TEST_SUITE=activitysim/examples/placeholder_psrc/test
- name: "SANDAG Example"
env: TEST_SUITE=activitysim/examples/example_sandag/test
env: TEST_SUITE=activitysim/examples/placeholder_sandag/test
- name: "SANDAG Cross-Border Example"
env: TEST_SUITE=activitysim/examples/example_sandag_xborder/test
env: TEST_SUITE=activitysim/examples/prototype_sandag_xborder/test

- stage: Estimation Mode
name: "Larch Test"
Expand DownExpand Up@@ -94,12 +94,12 @@ install:
script:
# This is the "default" script used for each test suite, unless overridden with a "script" in the jobs above.
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
- travis_wait 50 py.test $TEST_SUITE --cov activitysim --cov-report term-missing --durations=0
- coveralls
# coveralls # disable coveralls service, which errors frequently
6 changes: 3 additions & 3 deletions HOW_TO_RELEASE.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@
regular test suite takes some time to run, between about half an hour and
two hours depending on the specs of your machine.
```sh
python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
pytest .
```

Expand All@@ -83,7 +83,7 @@
python ../activitysim/examples/scan_examples_for_errors.py .
```

00. Test the notebooks in `activitysim/examples/example_mtc/notebooks`.
00. Test the notebooks in `activitysim/examples/prototype_mtc/notebooks`.
There are also demo notebooks for estimation, but their functionality
is completely tested in the unit tests run previously.

Expand Down
2 changes: 1 addition & 1 deletion activitysim/abm/models/util/vectorize_tour_scheduling.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ def _schedule_tours(
if not RUN_ALTS_PREPROCESSOR_BEFORE_MERGE:
# Note: Clint was running alts_preprocessor here on tdd_interaction_dataset instead of on raw (unmerged) alts
# and he was using logsum_tour_purpose as selector, although logically it should be the spec_segment
# It just happened to work for example_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
# It just happened to work for prototype_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
# logsum_tour_purpose and spec_segments are aligned (both logsums and spec are segmented on work, school, univ)
# In any case, I don't see any benefit to doing this here - at least not for any existing implementations
# but if we do, it will require passing spec_segment to schedule_tours and _schedule_tours
Expand Down
2 changes: 1 addition & 1 deletion activitysim/abm/test/test_misc/setup_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
resource = os.path.join('examples', 'example_mtc', dirname)
resource = os.path.join('examples', 'prototype_mtc', dirname)
return pkg_resources.resource_filename('activitysim', resource)


Expand Down
2 changes: 1 addition & 1 deletion activitysim/abm/test/test_misc/test_load_cached_accessibility.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@


def example_path(dirname):
resource = os.path.join('examples', 'example_mtc', dirname)
resource = os.path.join('examples', 'prototype_mtc', dirname)
return pkg_resources.resource_filename('activitysim', resource)


Expand Down
2 changes: 1 addition & 1 deletion activitysim/abm/test/test_pipeline/test_pipeline.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
resource = os.path.join('examples', 'example_mtc', dirname)
resource = os.path.join('examples', 'prototype_mtc', dirname)
return pkg_resources.resource_filename('activitysim', resource)


Expand Down
2 changes: 1 addition & 1 deletion activitysim/benchmarking/benchmarks/mtc1full.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
template_setup_cache,
)

EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
CONFIGS_DIRS = ("configs",)
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data"
Expand Down
2 changes: 1 addition & 1 deletion activitysim/benchmarking/benchmarks/mtc1mp4.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
import numpy as np

PRETTY_NAME = "MTC1_MP4"
EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
NUM_PROCESSORS = int(np.clip(multiprocessing.cpu_count() - 2, 2, 4))
CONFIGS_DIRS = ("configs_mp", "configs")
DYNAMIC_CONFIG_DIR = "bench_configs_mp"
Expand Down
4 changes: 2 additions & 2 deletions activitysim/benchmarking/benchmarks/sandag1example.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down
4 changes: 2 additions & 2 deletions activitysim/benchmarking/benchmarks/sandag1full.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down
4 changes: 2 additions & 2 deletions activitysim/benchmarking/benchmarks/sandag2example.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down
4 changes: 2 additions & 2 deletions activitysim/benchmarking/benchmarks/sandag2full.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down
4 changes: 2 additions & 2 deletions activitysim/benchmarking/benchmarks/sandag3example.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down
4 changes: 2 additions & 2 deletions activitysim/benchmarking/benchmarks/sandag3full.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down
5 changes: 2 additions & 3 deletions activitysim/cli/test/test_cli.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,15 +30,14 @@ def test_create_list():
cp = subprocess.run(['activitysim', 'create', '--list'], capture_output=True)

assert 'Available examples' in str(cp.stdout)
assert "name: example_mtc" in str(cp.stdout)
assert "name: example_test" in str(cp.stdout)
assert "name: prototype_mtc" in str(cp.stdout)


def test_create_copy():

target = os.path.join(os.path.dirname(__file__), 'test_example')
cp = subprocess.run(['activitysim', 'create',
'--example', 'example_test',
'--example', 'prototype_mtc',
'--destination', target], capture_output=True)

assert 'copying data ...' in str(cp.stdout)
Expand Down
13 changes: 4 additions & 9 deletions activitysim/examples/example_estimation/build_example_data/build_test.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,24 +4,19 @@ MTC_SF_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1_sf/data
MTC_FULL_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1/data

EXAMPLES_DIR=$ACTIVITYSIM_BASE_DIR/activitysim/examples
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/example_mtc
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/prototype_mtc
ESTIMATION_DIR=$EXAMPLES_DIR/example_estimation
BUILD_DIR=$ESTIMATION_DIR/build_example_data

# build example using example_mtc test data set (25 zones)
# build example using prototype_mtc test data set (25 zones)
# TAG=test
# BUILD_DATA=$MTC_EXAMPLE_DIR/data

# build example using example_mtc sf data set (190 zones)
# build example using prototype_mtc_sf data set (190 zones)
# data not in activitysim repo/distro
TAG=sf
BUILD_DATA=$MTC_SF_DATA_DIR

# build example using example_mtc sf data set (190 zones)
# data not in activitysim repo/distro
# TAG=full
# BUILD_DATA=$MTC_FULL_DATA_DIR

# output dirs for run to create fake survey data
BUILD_OUTPUT=$BUILD_DIR/output_build_$TAG

Expand DownExpand Up@@ -77,7 +72,7 @@ cp $BUILD_OUTPUT/trace/school_location*university*.csv $BUILD_DIR/scratch/$TAG/b
cp $BUILD_OUTPUT/log/activitysim.log $BUILD_DIR/scratch/$TAG/build

TAG=sf
python simulation.py -c override_configs -c configs -c ../example_mtc/configs -d data_$TAG -o output_$TAG
python simulation.py -c override_configs -c configs -c ../prototype_mtc/configs -d data_$TAG -o output_$TAG


EST_OUTPUT=output_$TAG
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
Differentiate examples between quality and validity of example models#571

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

from

Aug 3, 2022
 Merged


Differentiate examples between quality and validity of example models
#571
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
a74a15e

change examples that are no longer tied to an agency to fictional pla…


jpn-- Jun 7, 2022
73a9f77

change name of full example also


jpn-- Jun 7, 2022
a73da91

add back missing output dir


jpn-- Jun 8, 2022
ff2ad49

restore test output dir also


jpn-- Jun 8, 2022
b24be28

more empty dirs that got lost


jpn-- Jun 8, 2022
3f0b644

clean up docs


jpn-- Jun 8, 2022
2a5b1e7

example_mtc -> prototype_mtc


jpn-- Jun 22, 2022
0884f7e

Prototype MTC extended


jpn-- Jun 22, 2022
f81985b

add all the ignored files


jpn-- Jun 22, 2022
af04b0a

add test output dirs


jpn-- Jun 22, 2022
e016ce3

remove superfluous example_test


jpn-- Jun 22, 2022
dc488ce

prototype_sf


jpn-- Jun 22, 2022
5450e46

prototype_arc


jpn-- Jul 30, 2022
1a98856

prototype_marin


jpn-- Jul 30, 2022
a592133

move dirs


jpn-- Jul 30, 2022
44c771d

psrc


jpn-- Jul 30, 2022
8d67d23

semcog


jpn-- Jul 30, 2022
60713b1

sandag_xborder


jpn-- Jul 30, 2022
0cb61eb

placeholder_sandag


jpn-- Jul 30, 2022
79f4d60

placeholder_multiple_zone


jpn-- Jul 30, 2022
d36ca88

no more coveralls


jpn-- Jul 30, 2022
ffa8c04

repair docs


jpn-- Jul 30, 2022
1370b30

clean up example names


jpn-- Jul 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

32 changes: 16 additions & 16 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,24 @@ jobs:
 - env: TEST_SUITE=activitysim/core

 - stage: Examples
 name: "MTC Example"
 env: TEST_SUITE=activitysim/examples/example_mtc/test
 - name: "MTC Extended Example"
 env: TEST_SUITE=activitysim/examples/example_mtc_extended/test
 name: "Prototype MTC"
 env: TEST_SUITE=activitysim/examples/prototype_mtc/test
 - name: "Prototype MTC (Extended)"
 env: TEST_SUITE=activitysim/examples/prototype_mtc_extended/test
 - name: "Multizone Example"
 env: TEST_SUITE=activitysim/examples/example_multiple_zone/test
 env: TEST_SUITE=activitysim/examples/placeholder_multiple_zone/test
 - name: "Marin Example"
 env: TEST_SUITE=activitysim/examples/example_marin/test
 env: TEST_SUITE=activitysim/examples/prototype_marin/test
 - name: "ARC Example"
 env: TEST_SUITE=activitysim/examples/example_arc/test
 env: TEST_SUITE=activitysim/examples/prototype_arc/test
 - name: "SEMCOG Example"
 env: TEST_SUITE=activitysim/examples/example_semcog/test
 env: TEST_SUITE=activitysim/examples/prototype_semcog/test
 - name: "PSRC Example"
 env: TEST_SUITE=activitysim/examples/example_psrc/test
 env: TEST_SUITE=activitysim/examples/placeholder_psrc/test
 - name: "SANDAG Example"
 env: TEST_SUITE=activitysim/examples/example_sandag/test
 env: TEST_SUITE=activitysim/examples/placeholder_sandag/test
 - name: "SANDAG Cross-Border Example"
 env: TEST_SUITE=activitysim/examples/example_sandag_xborder/test
 env: TEST_SUITE=activitysim/examples/prototype_sandag_xborder/test

 - stage: Estimation Mode
 name: "Larch Test"
Expand DownExpand Up@@ -94,12 +94,12 @@ install:
script:
# This is the "default" script used for each test suite, unless overridden with a "script" in the jobs above.
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
- travis_wait 50 py.test $TEST_SUITE --cov activitysim --cov-report term-missing --durations=0
- coveralls
# coveralls # disable coveralls service, which errors frequently

6 changes: 3 additions & 3 deletions
HOW_TO_RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@
 regular test suite takes some time to run, between about half an hour and 
 two hours depending on the specs of your machine.
 ```sh
 python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
 pytest .
 ```

Expand All@@ -83,7 +83,7 @@
 python ../activitysim/examples/scan_examples_for_errors.py .
 ```

00. Test the notebooks in `activitysim/examples/example_mtc/notebooks`.
00. Test the notebooks in `activitysim/examples/prototype_mtc/notebooks`.
 There are also demo notebooks for estimation, but their functionality 
 is completely tested in the unit tests run previously.

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ def _schedule_tours(
 if not RUN_ALTS_PREPROCESSOR_BEFORE_MERGE:
 # Note: Clint was running alts_preprocessor here on tdd_interaction_dataset instead of on raw (unmerged) alts
 # and he was using logsum_tour_purpose as selector, although logically it should be the spec_segment
 # It just happened to work for example_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # It just happened to work for prototype_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # logsum_tour_purpose and spec_segments are aligned (both logsums and spec are segmented on work, school, univ)
 # In any case, I don't see any benefit to doing this here - at least not for any existing implementations
 # but if we do, it will require passing spec_segment to schedule_tours and _schedule_tours
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/setup_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_pipeline/test_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 template_setup_cache,
)

EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
CONFIGS_DIRS = ("configs",)
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data"
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1mp4.py

View file


Open in desktop

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

PRETTY_NAME = "MTC1_MP4"
EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
NUM_PROCESSORS = int(np.clip(multiprocessing.cpu_count() - 2, 2, 4))
CONFIGS_DIRS = ("configs_mp", "configs")
DYNAMIC_CONFIG_DIR = "bench_configs_mp"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

5 changes: 2 additions & 3 deletions
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,15 +30,14 @@ def test_create_list():
 cp = subprocess.run(['activitysim', 'create', '--list'], capture_output=True)

 assert 'Available examples' in str(cp.stdout)
 assert "name: example_mtc" in str(cp.stdout)
 assert "name: example_test" in str(cp.stdout)
 assert "name: prototype_mtc" in str(cp.stdout)


def test_create_copy():

 target = os.path.join(os.path.dirname(__file__), 'test_example')
 cp = subprocess.run(['activitysim', 'create',
 '--example', 'example_test',
 '--example', 'prototype_mtc',
 '--destination', target], capture_output=True)

 assert 'copying data ...' in str(cp.stdout)
Expand Down

13 changes: 4 additions & 9 deletions
activitysim/examples/example_estimation/build_example_data/build_test.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,24 +4,19 @@ MTC_SF_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1_sf/data
MTC_FULL_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1/data

EXAMPLES_DIR=$ACTIVITYSIM_BASE_DIR/activitysim/examples
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/example_mtc
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/prototype_mtc
ESTIMATION_DIR=$EXAMPLES_DIR/example_estimation
BUILD_DIR=$ESTIMATION_DIR/build_example_data

# build example using example_mtc test data set (25 zones)
# build example using prototype_mtc test data set (25 zones)
# TAG=test
# BUILD_DATA=$MTC_EXAMPLE_DIR/data

# build example using example_mtc sf data set (190 zones)
# build example using prototype_mtc_sf data set (190 zones)
# data not in activitysim repo/distro
 TAG=sf
 BUILD_DATA=$MTC_SF_DATA_DIR

# build example using example_mtc sf data set (190 zones)
# data not in activitysim repo/distro
# TAG=full
# BUILD_DATA=$MTC_FULL_DATA_DIR

# output dirs for run to create fake survey data
BUILD_OUTPUT=$BUILD_DIR/output_build_$TAG

Expand DownExpand Up@@ -77,7 +72,7 @@ cp $BUILD_OUTPUT/trace/school_location*university*.csv $BUILD_DIR/scratch/$TAG/b
cp $BUILD_OUTPUT/log/activitysim.log $BUILD_DIR/scratch/$TAG/build

TAG=sf
python simulation.py -c override_configs -c configs -c ../example_mtc/configs -d data_$TAG -o output_$TAG
python simulation.py -c override_configs -c configs -c ../prototype_mtc/configs -d data_$TAG -o output_$TAG


EST_OUTPUT=output_$TAG
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
Differentiate examples between quality and validity of example models#571

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

from

Aug 3, 2022
 Merged


Differentiate examples between quality and validity of example models
#571
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
a74a15e

change examples that are no longer tied to an agency to fictional pla…


jpn-- Jun 7, 2022
73a9f77

change name of full example also


jpn-- Jun 7, 2022
a73da91

add back missing output dir


jpn-- Jun 8, 2022
ff2ad49

restore test output dir also


jpn-- Jun 8, 2022
b24be28

more empty dirs that got lost


jpn-- Jun 8, 2022
3f0b644

clean up docs


jpn-- Jun 8, 2022
2a5b1e7

example_mtc -> prototype_mtc


jpn-- Jun 22, 2022
0884f7e

Prototype MTC extended


jpn-- Jun 22, 2022
f81985b

add all the ignored files


jpn-- Jun 22, 2022
af04b0a

add test output dirs


jpn-- Jun 22, 2022
e016ce3

remove superfluous example_test


jpn-- Jun 22, 2022
dc488ce

prototype_sf


jpn-- Jun 22, 2022
5450e46

prototype_arc


jpn-- Jul 30, 2022
1a98856

prototype_marin


jpn-- Jul 30, 2022
a592133

move dirs


jpn-- Jul 30, 2022
44c771d

psrc


jpn-- Jul 30, 2022
8d67d23

semcog


jpn-- Jul 30, 2022
60713b1

sandag_xborder


jpn-- Jul 30, 2022
0cb61eb

placeholder_sandag


jpn-- Jul 30, 2022
79f4d60

placeholder_multiple_zone


jpn-- Jul 30, 2022
d36ca88

no more coveralls


jpn-- Jul 30, 2022
ffa8c04

repair docs


jpn-- Jul 30, 2022
1370b30

clean up example names


jpn-- Jul 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

32 changes: 16 additions & 16 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,24 @@ jobs:
 - env: TEST_SUITE=activitysim/core

 - stage: Examples
 name: "MTC Example"
 env: TEST_SUITE=activitysim/examples/example_mtc/test
 - name: "MTC Extended Example"
 env: TEST_SUITE=activitysim/examples/example_mtc_extended/test
 name: "Prototype MTC"
 env: TEST_SUITE=activitysim/examples/prototype_mtc/test
 - name: "Prototype MTC (Extended)"
 env: TEST_SUITE=activitysim/examples/prototype_mtc_extended/test
 - name: "Multizone Example"
 env: TEST_SUITE=activitysim/examples/example_multiple_zone/test
 env: TEST_SUITE=activitysim/examples/placeholder_multiple_zone/test
 - name: "Marin Example"
 env: TEST_SUITE=activitysim/examples/example_marin/test
 env: TEST_SUITE=activitysim/examples/prototype_marin/test
 - name: "ARC Example"
 env: TEST_SUITE=activitysim/examples/example_arc/test
 env: TEST_SUITE=activitysim/examples/prototype_arc/test
 - name: "SEMCOG Example"
 env: TEST_SUITE=activitysim/examples/example_semcog/test
 env: TEST_SUITE=activitysim/examples/prototype_semcog/test
 - name: "PSRC Example"
 env: TEST_SUITE=activitysim/examples/example_psrc/test
 env: TEST_SUITE=activitysim/examples/placeholder_psrc/test
 - name: "SANDAG Example"
 env: TEST_SUITE=activitysim/examples/example_sandag/test
 env: TEST_SUITE=activitysim/examples/placeholder_sandag/test
 - name: "SANDAG Cross-Border Example"
 env: TEST_SUITE=activitysim/examples/example_sandag_xborder/test
 env: TEST_SUITE=activitysim/examples/prototype_sandag_xborder/test

 - stage: Estimation Mode
 name: "Larch Test"
Expand DownExpand Up@@ -94,12 +94,12 @@ install:
script:
# This is the "default" script used for each test suite, unless overridden with a "script" in the jobs above.
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
- travis_wait 50 py.test $TEST_SUITE --cov activitysim --cov-report term-missing --durations=0
- coveralls
# coveralls # disable coveralls service, which errors frequently

6 changes: 3 additions & 3 deletions
HOW_TO_RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@
 regular test suite takes some time to run, between about half an hour and 
 two hours depending on the specs of your machine.
 ```sh
 python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
 pytest .
 ```

Expand All@@ -83,7 +83,7 @@
 python ../activitysim/examples/scan_examples_for_errors.py .
 ```

00. Test the notebooks in `activitysim/examples/example_mtc/notebooks`.
00. Test the notebooks in `activitysim/examples/prototype_mtc/notebooks`.
 There are also demo notebooks for estimation, but their functionality 
 is completely tested in the unit tests run previously.

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ def _schedule_tours(
 if not RUN_ALTS_PREPROCESSOR_BEFORE_MERGE:
 # Note: Clint was running alts_preprocessor here on tdd_interaction_dataset instead of on raw (unmerged) alts
 # and he was using logsum_tour_purpose as selector, although logically it should be the spec_segment
 # It just happened to work for example_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # It just happened to work for prototype_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # logsum_tour_purpose and spec_segments are aligned (both logsums and spec are segmented on work, school, univ)
 # In any case, I don't see any benefit to doing this here - at least not for any existing implementations
 # but if we do, it will require passing spec_segment to schedule_tours and _schedule_tours
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/setup_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_pipeline/test_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 template_setup_cache,
)

EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
CONFIGS_DIRS = ("configs",)
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data"
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1mp4.py

View file


Open in desktop

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

PRETTY_NAME = "MTC1_MP4"
EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
NUM_PROCESSORS = int(np.clip(multiprocessing.cpu_count() - 2, 2, 4))
CONFIGS_DIRS = ("configs_mp", "configs")
DYNAMIC_CONFIG_DIR = "bench_configs_mp"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

5 changes: 2 additions & 3 deletions
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,15 +30,14 @@ def test_create_list():
 cp = subprocess.run(['activitysim', 'create', '--list'], capture_output=True)

 assert 'Available examples' in str(cp.stdout)
 assert "name: example_mtc" in str(cp.stdout)
 assert "name: example_test" in str(cp.stdout)
 assert "name: prototype_mtc" in str(cp.stdout)


def test_create_copy():

 target = os.path.join(os.path.dirname(__file__), 'test_example')
 cp = subprocess.run(['activitysim', 'create',
 '--example', 'example_test',
 '--example', 'prototype_mtc',
 '--destination', target], capture_output=True)

 assert 'copying data ...' in str(cp.stdout)
Expand Down

13 changes: 4 additions & 9 deletions
activitysim/examples/example_estimation/build_example_data/build_test.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,24 +4,19 @@ MTC_SF_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1_sf/data
MTC_FULL_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1/data

EXAMPLES_DIR=$ACTIVITYSIM_BASE_DIR/activitysim/examples
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/example_mtc
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/prototype_mtc
ESTIMATION_DIR=$EXAMPLES_DIR/example_estimation
BUILD_DIR=$ESTIMATION_DIR/build_example_data

# build example using example_mtc test data set (25 zones)
# build example using prototype_mtc test data set (25 zones)
# TAG=test
# BUILD_DATA=$MTC_EXAMPLE_DIR/data

# build example using example_mtc sf data set (190 zones)
# build example using prototype_mtc_sf data set (190 zones)
# data not in activitysim repo/distro
 TAG=sf
 BUILD_DATA=$MTC_SF_DATA_DIR

# build example using example_mtc sf data set (190 zones)
# data not in activitysim repo/distro
# TAG=full
# BUILD_DATA=$MTC_FULL_DATA_DIR

# output dirs for run to create fake survey data
BUILD_OUTPUT=$BUILD_DIR/output_build_$TAG

Expand DownExpand Up@@ -77,7 +72,7 @@ cp $BUILD_OUTPUT/trace/school_location*university*.csv $BUILD_DIR/scratch/$TAG/b
cp $BUILD_OUTPUT/log/activitysim.log $BUILD_DIR/scratch/$TAG/build

TAG=sf
python simulation.py -c override_configs -c configs -c ../example_mtc/configs -d data_$TAG -o output_$TAG
python simulation.py -c override_configs -c configs -c ../prototype_mtc/configs -d data_$TAG -o output_$TAG


EST_OUTPUT=output_$TAG
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
Differentiate examples between quality and validity of example models#571

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

from

Aug 3, 2022
 Merged


Differentiate examples between quality and validity of example models
#571
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
a74a15e

change examples that are no longer tied to an agency to fictional pla…


jpn-- Jun 7, 2022
73a9f77

change name of full example also


jpn-- Jun 7, 2022
a73da91

add back missing output dir


jpn-- Jun 8, 2022
ff2ad49

restore test output dir also


jpn-- Jun 8, 2022
b24be28

more empty dirs that got lost


jpn-- Jun 8, 2022
3f0b644

clean up docs


jpn-- Jun 8, 2022
2a5b1e7

example_mtc -> prototype_mtc


jpn-- Jun 22, 2022
0884f7e

Prototype MTC extended


jpn-- Jun 22, 2022
f81985b

add all the ignored files


jpn-- Jun 22, 2022
af04b0a

add test output dirs


jpn-- Jun 22, 2022
e016ce3

remove superfluous example_test


jpn-- Jun 22, 2022
dc488ce

prototype_sf


jpn-- Jun 22, 2022
5450e46

prototype_arc


jpn-- Jul 30, 2022
1a98856

prototype_marin


jpn-- Jul 30, 2022
a592133

move dirs


jpn-- Jul 30, 2022
44c771d

psrc


jpn-- Jul 30, 2022
8d67d23

semcog


jpn-- Jul 30, 2022
60713b1

sandag_xborder


jpn-- Jul 30, 2022
0cb61eb

placeholder_sandag


jpn-- Jul 30, 2022
79f4d60

placeholder_multiple_zone


jpn-- Jul 30, 2022
d36ca88

no more coveralls


jpn-- Jul 30, 2022
ffa8c04

repair docs


jpn-- Jul 30, 2022
1370b30

clean up example names


jpn-- Jul 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

32 changes: 16 additions & 16 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,24 @@ jobs:
 - env: TEST_SUITE=activitysim/core

 - stage: Examples
 name: "MTC Example"
 env: TEST_SUITE=activitysim/examples/example_mtc/test
 - name: "MTC Extended Example"
 env: TEST_SUITE=activitysim/examples/example_mtc_extended/test
 name: "Prototype MTC"
 env: TEST_SUITE=activitysim/examples/prototype_mtc/test
 - name: "Prototype MTC (Extended)"
 env: TEST_SUITE=activitysim/examples/prototype_mtc_extended/test
 - name: "Multizone Example"
 env: TEST_SUITE=activitysim/examples/example_multiple_zone/test
 env: TEST_SUITE=activitysim/examples/placeholder_multiple_zone/test
 - name: "Marin Example"
 env: TEST_SUITE=activitysim/examples/example_marin/test
 env: TEST_SUITE=activitysim/examples/prototype_marin/test
 - name: "ARC Example"
 env: TEST_SUITE=activitysim/examples/example_arc/test
 env: TEST_SUITE=activitysim/examples/prototype_arc/test
 - name: "SEMCOG Example"
 env: TEST_SUITE=activitysim/examples/example_semcog/test
 env: TEST_SUITE=activitysim/examples/prototype_semcog/test
 - name: "PSRC Example"
 env: TEST_SUITE=activitysim/examples/example_psrc/test
 env: TEST_SUITE=activitysim/examples/placeholder_psrc/test
 - name: "SANDAG Example"
 env: TEST_SUITE=activitysim/examples/example_sandag/test
 env: TEST_SUITE=activitysim/examples/placeholder_sandag/test
 - name: "SANDAG Cross-Border Example"
 env: TEST_SUITE=activitysim/examples/example_sandag_xborder/test
 env: TEST_SUITE=activitysim/examples/prototype_sandag_xborder/test

 - stage: Estimation Mode
 name: "Larch Test"
Expand DownExpand Up@@ -94,12 +94,12 @@ install:
script:
# This is the "default" script used for each test suite, unless overridden with a "script" in the jobs above.
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
- travis_wait 50 py.test $TEST_SUITE --cov activitysim --cov-report term-missing --durations=0
- coveralls
# coveralls # disable coveralls service, which errors frequently

6 changes: 3 additions & 3 deletions
HOW_TO_RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@
 regular test suite takes some time to run, between about half an hour and 
 two hours depending on the specs of your machine.
 ```sh
 python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
 pytest .
 ```

Expand All@@ -83,7 +83,7 @@
 python ../activitysim/examples/scan_examples_for_errors.py .
 ```

00. Test the notebooks in `activitysim/examples/example_mtc/notebooks`.
00. Test the notebooks in `activitysim/examples/prototype_mtc/notebooks`.
 There are also demo notebooks for estimation, but their functionality 
 is completely tested in the unit tests run previously.

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ def _schedule_tours(
 if not RUN_ALTS_PREPROCESSOR_BEFORE_MERGE:
 # Note: Clint was running alts_preprocessor here on tdd_interaction_dataset instead of on raw (unmerged) alts
 # and he was using logsum_tour_purpose as selector, although logically it should be the spec_segment
 # It just happened to work for example_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # It just happened to work for prototype_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # logsum_tour_purpose and spec_segments are aligned (both logsums and spec are segmented on work, school, univ)
 # In any case, I don't see any benefit to doing this here - at least not for any existing implementations
 # but if we do, it will require passing spec_segment to schedule_tours and _schedule_tours
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/setup_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_pipeline/test_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 template_setup_cache,
)

EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
CONFIGS_DIRS = ("configs",)
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data"
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1mp4.py

View file


Open in desktop

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

PRETTY_NAME = "MTC1_MP4"
EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
NUM_PROCESSORS = int(np.clip(multiprocessing.cpu_count() - 2, 2, 4))
CONFIGS_DIRS = ("configs_mp", "configs")
DYNAMIC_CONFIG_DIR = "bench_configs_mp"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

5 changes: 2 additions & 3 deletions
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,15 +30,14 @@ def test_create_list():
 cp = subprocess.run(['activitysim', 'create', '--list'], capture_output=True)

 assert 'Available examples' in str(cp.stdout)
 assert "name: example_mtc" in str(cp.stdout)
 assert "name: example_test" in str(cp.stdout)
 assert "name: prototype_mtc" in str(cp.stdout)


def test_create_copy():

 target = os.path.join(os.path.dirname(__file__), 'test_example')
 cp = subprocess.run(['activitysim', 'create',
 '--example', 'example_test',
 '--example', 'prototype_mtc',
 '--destination', target], capture_output=True)

 assert 'copying data ...' in str(cp.stdout)
Expand Down

13 changes: 4 additions & 9 deletions
activitysim/examples/example_estimation/build_example_data/build_test.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,24 +4,19 @@ MTC_SF_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1_sf/data
MTC_FULL_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1/data

EXAMPLES_DIR=$ACTIVITYSIM_BASE_DIR/activitysim/examples
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/example_mtc
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/prototype_mtc
ESTIMATION_DIR=$EXAMPLES_DIR/example_estimation
BUILD_DIR=$ESTIMATION_DIR/build_example_data

# build example using example_mtc test data set (25 zones)
# build example using prototype_mtc test data set (25 zones)
# TAG=test
# BUILD_DATA=$MTC_EXAMPLE_DIR/data

# build example using example_mtc sf data set (190 zones)
# build example using prototype_mtc_sf data set (190 zones)
# data not in activitysim repo/distro
 TAG=sf
 BUILD_DATA=$MTC_SF_DATA_DIR

# build example using example_mtc sf data set (190 zones)
# data not in activitysim repo/distro
# TAG=full
# BUILD_DATA=$MTC_FULL_DATA_DIR

# output dirs for run to create fake survey data
BUILD_OUTPUT=$BUILD_DIR/output_build_$TAG

Expand DownExpand Up@@ -77,7 +72,7 @@ cp $BUILD_OUTPUT/trace/school_location*university*.csv $BUILD_DIR/scratch/$TAG/b
cp $BUILD_OUTPUT/log/activitysim.log $BUILD_DIR/scratch/$TAG/build

TAG=sf
python simulation.py -c override_configs -c configs -c ../example_mtc/configs -d data_$TAG -o output_$TAG
python simulation.py -c override_configs -c configs -c ../prototype_mtc/configs -d data_$TAG -o output_$TAG


EST_OUTPUT=output_$TAG
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
Differentiate examples between quality and validity of example models#571

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

from

Aug 3, 2022
 Merged


Differentiate examples between quality and validity of example models
#571
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
a74a15e

change examples that are no longer tied to an agency to fictional pla…


jpn-- Jun 7, 2022
73a9f77

change name of full example also


jpn-- Jun 7, 2022
a73da91

add back missing output dir


jpn-- Jun 8, 2022
ff2ad49

restore test output dir also


jpn-- Jun 8, 2022
b24be28

more empty dirs that got lost


jpn-- Jun 8, 2022
3f0b644

clean up docs


jpn-- Jun 8, 2022
2a5b1e7

example_mtc -> prototype_mtc


jpn-- Jun 22, 2022
0884f7e

Prototype MTC extended


jpn-- Jun 22, 2022
f81985b

add all the ignored files


jpn-- Jun 22, 2022
af04b0a

add test output dirs


jpn-- Jun 22, 2022
e016ce3

remove superfluous example_test


jpn-- Jun 22, 2022
dc488ce

prototype_sf


jpn-- Jun 22, 2022
5450e46

prototype_arc


jpn-- Jul 30, 2022
1a98856

prototype_marin


jpn-- Jul 30, 2022
a592133

move dirs


jpn-- Jul 30, 2022
44c771d

psrc


jpn-- Jul 30, 2022
8d67d23

semcog


jpn-- Jul 30, 2022
60713b1

sandag_xborder


jpn-- Jul 30, 2022
0cb61eb

placeholder_sandag


jpn-- Jul 30, 2022
79f4d60

placeholder_multiple_zone


jpn-- Jul 30, 2022
d36ca88

no more coveralls


jpn-- Jul 30, 2022
ffa8c04

repair docs


jpn-- Jul 30, 2022
1370b30

clean up example names


jpn-- Jul 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

32 changes: 16 additions & 16 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,24 @@ jobs:
 - env: TEST_SUITE=activitysim/core

 - stage: Examples
 name: "MTC Example"
 env: TEST_SUITE=activitysim/examples/example_mtc/test
 - name: "MTC Extended Example"
 env: TEST_SUITE=activitysim/examples/example_mtc_extended/test
 name: "Prototype MTC"
 env: TEST_SUITE=activitysim/examples/prototype_mtc/test
 - name: "Prototype MTC (Extended)"
 env: TEST_SUITE=activitysim/examples/prototype_mtc_extended/test
 - name: "Multizone Example"
 env: TEST_SUITE=activitysim/examples/example_multiple_zone/test
 env: TEST_SUITE=activitysim/examples/placeholder_multiple_zone/test
 - name: "Marin Example"
 env: TEST_SUITE=activitysim/examples/example_marin/test
 env: TEST_SUITE=activitysim/examples/prototype_marin/test
 - name: "ARC Example"
 env: TEST_SUITE=activitysim/examples/example_arc/test
 env: TEST_SUITE=activitysim/examples/prototype_arc/test
 - name: "SEMCOG Example"
 env: TEST_SUITE=activitysim/examples/example_semcog/test
 env: TEST_SUITE=activitysim/examples/prototype_semcog/test
 - name: "PSRC Example"
 env: TEST_SUITE=activitysim/examples/example_psrc/test
 env: TEST_SUITE=activitysim/examples/placeholder_psrc/test
 - name: "SANDAG Example"
 env: TEST_SUITE=activitysim/examples/example_sandag/test
 env: TEST_SUITE=activitysim/examples/placeholder_sandag/test
 - name: "SANDAG Cross-Border Example"
 env: TEST_SUITE=activitysim/examples/example_sandag_xborder/test
 env: TEST_SUITE=activitysim/examples/prototype_sandag_xborder/test

 - stage: Estimation Mode
 name: "Larch Test"
Expand DownExpand Up@@ -94,12 +94,12 @@ install:
script:
# This is the "default" script used for each test suite, unless overridden with a "script" in the jobs above.
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
- travis_wait 50 py.test $TEST_SUITE --cov activitysim --cov-report term-missing --durations=0
- coveralls
# coveralls # disable coveralls service, which errors frequently

6 changes: 3 additions & 3 deletions
HOW_TO_RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@
 regular test suite takes some time to run, between about half an hour and 
 two hours depending on the specs of your machine.
 ```sh
 python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
 pytest .
 ```

Expand All@@ -83,7 +83,7 @@
 python ../activitysim/examples/scan_examples_for_errors.py .
 ```

00. Test the notebooks in `activitysim/examples/example_mtc/notebooks`.
00. Test the notebooks in `activitysim/examples/prototype_mtc/notebooks`.
 There are also demo notebooks for estimation, but their functionality 
 is completely tested in the unit tests run previously.

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ def _schedule_tours(
 if not RUN_ALTS_PREPROCESSOR_BEFORE_MERGE:
 # Note: Clint was running alts_preprocessor here on tdd_interaction_dataset instead of on raw (unmerged) alts
 # and he was using logsum_tour_purpose as selector, although logically it should be the spec_segment
 # It just happened to work for example_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # It just happened to work for prototype_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # logsum_tour_purpose and spec_segments are aligned (both logsums and spec are segmented on work, school, univ)
 # In any case, I don't see any benefit to doing this here - at least not for any existing implementations
 # but if we do, it will require passing spec_segment to schedule_tours and _schedule_tours
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/setup_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_pipeline/test_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 template_setup_cache,
)

EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
CONFIGS_DIRS = ("configs",)
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data"
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1mp4.py

View file


Open in desktop

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

PRETTY_NAME = "MTC1_MP4"
EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
NUM_PROCESSORS = int(np.clip(multiprocessing.cpu_count() - 2, 2, 4))
CONFIGS_DIRS = ("configs_mp", "configs")
DYNAMIC_CONFIG_DIR = "bench_configs_mp"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

5 changes: 2 additions & 3 deletions
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,15 +30,14 @@ def test_create_list():
 cp = subprocess.run(['activitysim', 'create', '--list'], capture_output=True)

 assert 'Available examples' in str(cp.stdout)
 assert "name: example_mtc" in str(cp.stdout)
 assert "name: example_test" in str(cp.stdout)
 assert "name: prototype_mtc" in str(cp.stdout)


def test_create_copy():

 target = os.path.join(os.path.dirname(__file__), 'test_example')
 cp = subprocess.run(['activitysim', 'create',
 '--example', 'example_test',
 '--example', 'prototype_mtc',
 '--destination', target], capture_output=True)

 assert 'copying data ...' in str(cp.stdout)
Expand Down

13 changes: 4 additions & 9 deletions
activitysim/examples/example_estimation/build_example_data/build_test.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,24 +4,19 @@ MTC_SF_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1_sf/data
MTC_FULL_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1/data

EXAMPLES_DIR=$ACTIVITYSIM_BASE_DIR/activitysim/examples
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/example_mtc
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/prototype_mtc
ESTIMATION_DIR=$EXAMPLES_DIR/example_estimation
BUILD_DIR=$ESTIMATION_DIR/build_example_data

# build example using example_mtc test data set (25 zones)
# build example using prototype_mtc test data set (25 zones)
# TAG=test
# BUILD_DATA=$MTC_EXAMPLE_DIR/data

# build example using example_mtc sf data set (190 zones)
# build example using prototype_mtc_sf data set (190 zones)
# data not in activitysim repo/distro
 TAG=sf
 BUILD_DATA=$MTC_SF_DATA_DIR

# build example using example_mtc sf data set (190 zones)
# data not in activitysim repo/distro
# TAG=full
# BUILD_DATA=$MTC_FULL_DATA_DIR

# output dirs for run to create fake survey data
BUILD_OUTPUT=$BUILD_DIR/output_build_$TAG

Expand DownExpand Up@@ -77,7 +72,7 @@ cp $BUILD_OUTPUT/trace/school_location*university*.csv $BUILD_DIR/scratch/$TAG/b
cp $BUILD_OUTPUT/log/activitysim.log $BUILD_DIR/scratch/$TAG/build

TAG=sf
python simulation.py -c override_configs -c configs -c ../example_mtc/configs -d data_$TAG -o output_$TAG
python simulation.py -c override_configs -c configs -c ../prototype_mtc/configs -d data_$TAG -o output_$TAG


EST_OUTPUT=output_$TAG
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
Differentiate examples between quality and validity of example models#571

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

from

Aug 3, 2022
 Merged


Differentiate examples between quality and validity of example models
#571
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
a74a15e

change examples that are no longer tied to an agency to fictional pla…


jpn-- Jun 7, 2022
73a9f77

change name of full example also


jpn-- Jun 7, 2022
a73da91

add back missing output dir


jpn-- Jun 8, 2022
ff2ad49

restore test output dir also


jpn-- Jun 8, 2022
b24be28

more empty dirs that got lost


jpn-- Jun 8, 2022
3f0b644

clean up docs


jpn-- Jun 8, 2022
2a5b1e7

example_mtc -> prototype_mtc


jpn-- Jun 22, 2022
0884f7e

Prototype MTC extended


jpn-- Jun 22, 2022
f81985b

add all the ignored files


jpn-- Jun 22, 2022
af04b0a

add test output dirs


jpn-- Jun 22, 2022
e016ce3

remove superfluous example_test


jpn-- Jun 22, 2022
dc488ce

prototype_sf


jpn-- Jun 22, 2022
5450e46

prototype_arc


jpn-- Jul 30, 2022
1a98856

prototype_marin


jpn-- Jul 30, 2022
a592133

move dirs


jpn-- Jul 30, 2022
44c771d

psrc


jpn-- Jul 30, 2022
8d67d23

semcog


jpn-- Jul 30, 2022
60713b1

sandag_xborder


jpn-- Jul 30, 2022
0cb61eb

placeholder_sandag


jpn-- Jul 30, 2022
79f4d60

placeholder_multiple_zone


jpn-- Jul 30, 2022
d36ca88

no more coveralls


jpn-- Jul 30, 2022
ffa8c04

repair docs


jpn-- Jul 30, 2022
1370b30

clean up example names


jpn-- Jul 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

32 changes: 16 additions & 16 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,24 @@ jobs:
 - env: TEST_SUITE=activitysim/core

 - stage: Examples
 name: "MTC Example"
 env: TEST_SUITE=activitysim/examples/example_mtc/test
 - name: "MTC Extended Example"
 env: TEST_SUITE=activitysim/examples/example_mtc_extended/test
 name: "Prototype MTC"
 env: TEST_SUITE=activitysim/examples/prototype_mtc/test
 - name: "Prototype MTC (Extended)"
 env: TEST_SUITE=activitysim/examples/prototype_mtc_extended/test
 - name: "Multizone Example"
 env: TEST_SUITE=activitysim/examples/example_multiple_zone/test
 env: TEST_SUITE=activitysim/examples/placeholder_multiple_zone/test
 - name: "Marin Example"
 env: TEST_SUITE=activitysim/examples/example_marin/test
 env: TEST_SUITE=activitysim/examples/prototype_marin/test
 - name: "ARC Example"
 env: TEST_SUITE=activitysim/examples/example_arc/test
 env: TEST_SUITE=activitysim/examples/prototype_arc/test
 - name: "SEMCOG Example"
 env: TEST_SUITE=activitysim/examples/example_semcog/test
 env: TEST_SUITE=activitysim/examples/prototype_semcog/test
 - name: "PSRC Example"
 env: TEST_SUITE=activitysim/examples/example_psrc/test
 env: TEST_SUITE=activitysim/examples/placeholder_psrc/test
 - name: "SANDAG Example"
 env: TEST_SUITE=activitysim/examples/example_sandag/test
 env: TEST_SUITE=activitysim/examples/placeholder_sandag/test
 - name: "SANDAG Cross-Border Example"
 env: TEST_SUITE=activitysim/examples/example_sandag_xborder/test
 env: TEST_SUITE=activitysim/examples/prototype_sandag_xborder/test

 - stage: Estimation Mode
 name: "Larch Test"
Expand DownExpand Up@@ -94,12 +94,12 @@ install:
script:
# This is the "default" script used for each test suite, unless overridden with a "script" in the jobs above.
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
- travis_wait 50 py.test $TEST_SUITE --cov activitysim --cov-report term-missing --durations=0
- coveralls
# coveralls # disable coveralls service, which errors frequently

6 changes: 3 additions & 3 deletions
HOW_TO_RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@
 regular test suite takes some time to run, between about half an hour and 
 two hours depending on the specs of your machine.
 ```sh
 python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
 pytest .
 ```

Expand All@@ -83,7 +83,7 @@
 python ../activitysim/examples/scan_examples_for_errors.py .
 ```

00. Test the notebooks in `activitysim/examples/example_mtc/notebooks`.
00. Test the notebooks in `activitysim/examples/prototype_mtc/notebooks`.
 There are also demo notebooks for estimation, but their functionality 
 is completely tested in the unit tests run previously.

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ def _schedule_tours(
 if not RUN_ALTS_PREPROCESSOR_BEFORE_MERGE:
 # Note: Clint was running alts_preprocessor here on tdd_interaction_dataset instead of on raw (unmerged) alts
 # and he was using logsum_tour_purpose as selector, although logically it should be the spec_segment
 # It just happened to work for example_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # It just happened to work for prototype_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # logsum_tour_purpose and spec_segments are aligned (both logsums and spec are segmented on work, school, univ)
 # In any case, I don't see any benefit to doing this here - at least not for any existing implementations
 # but if we do, it will require passing spec_segment to schedule_tours and _schedule_tours
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/setup_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_pipeline/test_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 template_setup_cache,
)

EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
CONFIGS_DIRS = ("configs",)
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data"
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1mp4.py

View file


Open in desktop

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

PRETTY_NAME = "MTC1_MP4"
EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
NUM_PROCESSORS = int(np.clip(multiprocessing.cpu_count() - 2, 2, 4))
CONFIGS_DIRS = ("configs_mp", "configs")
DYNAMIC_CONFIG_DIR = "bench_configs_mp"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

5 changes: 2 additions & 3 deletions
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,15 +30,14 @@ def test_create_list():
 cp = subprocess.run(['activitysim', 'create', '--list'], capture_output=True)

 assert 'Available examples' in str(cp.stdout)
 assert "name: example_mtc" in str(cp.stdout)
 assert "name: example_test" in str(cp.stdout)
 assert "name: prototype_mtc" in str(cp.stdout)


def test_create_copy():

 target = os.path.join(os.path.dirname(__file__), 'test_example')
 cp = subprocess.run(['activitysim', 'create',
 '--example', 'example_test',
 '--example', 'prototype_mtc',
 '--destination', target], capture_output=True)

 assert 'copying data ...' in str(cp.stdout)
Expand Down

13 changes: 4 additions & 9 deletions
activitysim/examples/example_estimation/build_example_data/build_test.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,24 +4,19 @@ MTC_SF_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1_sf/data
MTC_FULL_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1/data

EXAMPLES_DIR=$ACTIVITYSIM_BASE_DIR/activitysim/examples
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/example_mtc
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/prototype_mtc
ESTIMATION_DIR=$EXAMPLES_DIR/example_estimation
BUILD_DIR=$ESTIMATION_DIR/build_example_data

# build example using example_mtc test data set (25 zones)
# build example using prototype_mtc test data set (25 zones)
# TAG=test
# BUILD_DATA=$MTC_EXAMPLE_DIR/data

# build example using example_mtc sf data set (190 zones)
# build example using prototype_mtc_sf data set (190 zones)
# data not in activitysim repo/distro
 TAG=sf
 BUILD_DATA=$MTC_SF_DATA_DIR

# build example using example_mtc sf data set (190 zones)
# data not in activitysim repo/distro
# TAG=full
# BUILD_DATA=$MTC_FULL_DATA_DIR

# output dirs for run to create fake survey data
BUILD_OUTPUT=$BUILD_DIR/output_build_$TAG

Expand DownExpand Up@@ -77,7 +72,7 @@ cp $BUILD_OUTPUT/trace/school_location*university*.csv $BUILD_DIR/scratch/$TAG/b
cp $BUILD_OUTPUT/log/activitysim.log $BUILD_DIR/scratch/$TAG/build

TAG=sf
python simulation.py -c override_configs -c configs -c ../example_mtc/configs -d data_$TAG -o output_$TAG
python simulation.py -c override_configs -c configs -c ../prototype_mtc/configs -d data_$TAG -o output_$TAG


EST_OUTPUT=output_$TAG
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
Differentiate examples between quality and validity of example models#571

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

from

Aug 3, 2022
 Merged


Differentiate examples between quality and validity of example models
#571
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
a74a15e

change examples that are no longer tied to an agency to fictional pla…


jpn-- Jun 7, 2022
73a9f77

change name of full example also


jpn-- Jun 7, 2022
a73da91

add back missing output dir


jpn-- Jun 8, 2022
ff2ad49

restore test output dir also


jpn-- Jun 8, 2022
b24be28

more empty dirs that got lost


jpn-- Jun 8, 2022
3f0b644

clean up docs


jpn-- Jun 8, 2022
2a5b1e7

example_mtc -> prototype_mtc


jpn-- Jun 22, 2022
0884f7e

Prototype MTC extended


jpn-- Jun 22, 2022
f81985b

add all the ignored files


jpn-- Jun 22, 2022
af04b0a

add test output dirs


jpn-- Jun 22, 2022
e016ce3

remove superfluous example_test


jpn-- Jun 22, 2022
dc488ce

prototype_sf


jpn-- Jun 22, 2022
5450e46

prototype_arc


jpn-- Jul 30, 2022
1a98856

prototype_marin


jpn-- Jul 30, 2022
a592133

move dirs


jpn-- Jul 30, 2022
44c771d

psrc


jpn-- Jul 30, 2022
8d67d23

semcog


jpn-- Jul 30, 2022
60713b1

sandag_xborder


jpn-- Jul 30, 2022
0cb61eb

placeholder_sandag


jpn-- Jul 30, 2022
79f4d60

placeholder_multiple_zone


jpn-- Jul 30, 2022
d36ca88

no more coveralls


jpn-- Jul 30, 2022
ffa8c04

repair docs


jpn-- Jul 30, 2022
1370b30

clean up example names


jpn-- Jul 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

32 changes: 16 additions & 16 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,24 @@ jobs:
 - env: TEST_SUITE=activitysim/core

 - stage: Examples
 name: "MTC Example"
 env: TEST_SUITE=activitysim/examples/example_mtc/test
 - name: "MTC Extended Example"
 env: TEST_SUITE=activitysim/examples/example_mtc_extended/test
 name: "Prototype MTC"
 env: TEST_SUITE=activitysim/examples/prototype_mtc/test
 - name: "Prototype MTC (Extended)"
 env: TEST_SUITE=activitysim/examples/prototype_mtc_extended/test
 - name: "Multizone Example"
 env: TEST_SUITE=activitysim/examples/example_multiple_zone/test
 env: TEST_SUITE=activitysim/examples/placeholder_multiple_zone/test
 - name: "Marin Example"
 env: TEST_SUITE=activitysim/examples/example_marin/test
 env: TEST_SUITE=activitysim/examples/prototype_marin/test
 - name: "ARC Example"
 env: TEST_SUITE=activitysim/examples/example_arc/test
 env: TEST_SUITE=activitysim/examples/prototype_arc/test
 - name: "SEMCOG Example"
 env: TEST_SUITE=activitysim/examples/example_semcog/test
 env: TEST_SUITE=activitysim/examples/prototype_semcog/test
 - name: "PSRC Example"
 env: TEST_SUITE=activitysim/examples/example_psrc/test
 env: TEST_SUITE=activitysim/examples/placeholder_psrc/test
 - name: "SANDAG Example"
 env: TEST_SUITE=activitysim/examples/example_sandag/test
 env: TEST_SUITE=activitysim/examples/placeholder_sandag/test
 - name: "SANDAG Cross-Border Example"
 env: TEST_SUITE=activitysim/examples/example_sandag_xborder/test
 env: TEST_SUITE=activitysim/examples/prototype_sandag_xborder/test

 - stage: Estimation Mode
 name: "Larch Test"
Expand DownExpand Up@@ -94,12 +94,12 @@ install:
script:
# This is the "default" script used for each test suite, unless overridden with a "script" in the jobs above.
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
- travis_wait 50 py.test $TEST_SUITE --cov activitysim --cov-report term-missing --durations=0
- coveralls
# coveralls # disable coveralls service, which errors frequently

6 changes: 3 additions & 3 deletions
HOW_TO_RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@
 regular test suite takes some time to run, between about half an hour and 
 two hours depending on the specs of your machine.
 ```sh
 python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
 pytest .
 ```

Expand All@@ -83,7 +83,7 @@
 python ../activitysim/examples/scan_examples_for_errors.py .
 ```

00. Test the notebooks in `activitysim/examples/example_mtc/notebooks`.
00. Test the notebooks in `activitysim/examples/prototype_mtc/notebooks`.
 There are also demo notebooks for estimation, but their functionality 
 is completely tested in the unit tests run previously.

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ def _schedule_tours(
 if not RUN_ALTS_PREPROCESSOR_BEFORE_MERGE:
 # Note: Clint was running alts_preprocessor here on tdd_interaction_dataset instead of on raw (unmerged) alts
 # and he was using logsum_tour_purpose as selector, although logically it should be the spec_segment
 # It just happened to work for example_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # It just happened to work for prototype_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # logsum_tour_purpose and spec_segments are aligned (both logsums and spec are segmented on work, school, univ)
 # In any case, I don't see any benefit to doing this here - at least not for any existing implementations
 # but if we do, it will require passing spec_segment to schedule_tours and _schedule_tours
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/setup_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_pipeline/test_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 template_setup_cache,
)

EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
CONFIGS_DIRS = ("configs",)
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data"
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1mp4.py

View file


Open in desktop

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

PRETTY_NAME = "MTC1_MP4"
EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
NUM_PROCESSORS = int(np.clip(multiprocessing.cpu_count() - 2, 2, 4))
CONFIGS_DIRS = ("configs_mp", "configs")
DYNAMIC_CONFIG_DIR = "bench_configs_mp"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

5 changes: 2 additions & 3 deletions
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,15 +30,14 @@ def test_create_list():
 cp = subprocess.run(['activitysim', 'create', '--list'], capture_output=True)

 assert 'Available examples' in str(cp.stdout)
 assert "name: example_mtc" in str(cp.stdout)
 assert "name: example_test" in str(cp.stdout)
 assert "name: prototype_mtc" in str(cp.stdout)


def test_create_copy():

 target = os.path.join(os.path.dirname(__file__), 'test_example')
 cp = subprocess.run(['activitysim', 'create',
 '--example', 'example_test',
 '--example', 'prototype_mtc',
 '--destination', target], capture_output=True)

 assert 'copying data ...' in str(cp.stdout)
Expand Down

13 changes: 4 additions & 9 deletions
activitysim/examples/example_estimation/build_example_data/build_test.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,24 +4,19 @@ MTC_SF_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1_sf/data
MTC_FULL_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1/data

EXAMPLES_DIR=$ACTIVITYSIM_BASE_DIR/activitysim/examples
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/example_mtc
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/prototype_mtc
ESTIMATION_DIR=$EXAMPLES_DIR/example_estimation
BUILD_DIR=$ESTIMATION_DIR/build_example_data

# build example using example_mtc test data set (25 zones)
# build example using prototype_mtc test data set (25 zones)
# TAG=test
# BUILD_DATA=$MTC_EXAMPLE_DIR/data

# build example using example_mtc sf data set (190 zones)
# build example using prototype_mtc_sf data set (190 zones)
# data not in activitysim repo/distro
 TAG=sf
 BUILD_DATA=$MTC_SF_DATA_DIR

# build example using example_mtc sf data set (190 zones)
# data not in activitysim repo/distro
# TAG=full
# BUILD_DATA=$MTC_FULL_DATA_DIR

# output dirs for run to create fake survey data
BUILD_OUTPUT=$BUILD_DIR/output_build_$TAG

Expand DownExpand Up@@ -77,7 +72,7 @@ cp $BUILD_OUTPUT/trace/school_location*university*.csv $BUILD_DIR/scratch/$TAG/b
cp $BUILD_OUTPUT/log/activitysim.log $BUILD_DIR/scratch/$TAG/build

TAG=sf
python simulation.py -c override_configs -c configs -c ../example_mtc/configs -d data_$TAG -o output_$TAG
python simulation.py -c override_configs -c configs -c ../prototype_mtc/configs -d data_$TAG -o output_$TAG


EST_OUTPUT=output_$TAG
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
Differentiate examples between quality and validity of example models#571

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

from

Aug 3, 2022
 Merged


Differentiate examples between quality and validity of example models
#571
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


23 commits


Select commit
Hold shift + click to select a range
a74a15e

change examples that are no longer tied to an agency to fictional pla…


jpn-- Jun 7, 2022
73a9f77

change name of full example also


jpn-- Jun 7, 2022
a73da91

add back missing output dir


jpn-- Jun 8, 2022
ff2ad49

restore test output dir also


jpn-- Jun 8, 2022
b24be28

more empty dirs that got lost


jpn-- Jun 8, 2022
3f0b644

clean up docs


jpn-- Jun 8, 2022
2a5b1e7

example_mtc -> prototype_mtc


jpn-- Jun 22, 2022
0884f7e

Prototype MTC extended


jpn-- Jun 22, 2022
f81985b

add all the ignored files


jpn-- Jun 22, 2022
af04b0a

add test output dirs


jpn-- Jun 22, 2022
e016ce3

remove superfluous example_test


jpn-- Jun 22, 2022
dc488ce

prototype_sf


jpn-- Jun 22, 2022
5450e46

prototype_arc


jpn-- Jul 30, 2022
1a98856

prototype_marin


jpn-- Jul 30, 2022
a592133

move dirs


jpn-- Jul 30, 2022
44c771d

psrc


jpn-- Jul 30, 2022
8d67d23

semcog


jpn-- Jul 30, 2022
60713b1

sandag_xborder


jpn-- Jul 30, 2022
0cb61eb

placeholder_sandag


jpn-- Jul 30, 2022
79f4d60

placeholder_multiple_zone


jpn-- Jul 30, 2022
d36ca88

no more coveralls


jpn-- Jul 30, 2022
ffa8c04

repair docs


jpn-- Jul 30, 2022
1370b30

clean up example names


jpn-- Jul 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

32 changes: 16 additions & 16 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,24 @@ jobs:
 - env: TEST_SUITE=activitysim/core

 - stage: Examples
 name: "MTC Example"
 env: TEST_SUITE=activitysim/examples/example_mtc/test
 - name: "MTC Extended Example"
 env: TEST_SUITE=activitysim/examples/example_mtc_extended/test
 name: "Prototype MTC"
 env: TEST_SUITE=activitysim/examples/prototype_mtc/test
 - name: "Prototype MTC (Extended)"
 env: TEST_SUITE=activitysim/examples/prototype_mtc_extended/test
 - name: "Multizone Example"
 env: TEST_SUITE=activitysim/examples/example_multiple_zone/test
 env: TEST_SUITE=activitysim/examples/placeholder_multiple_zone/test
 - name: "Marin Example"
 env: TEST_SUITE=activitysim/examples/example_marin/test
 env: TEST_SUITE=activitysim/examples/prototype_marin/test
 - name: "ARC Example"
 env: TEST_SUITE=activitysim/examples/example_arc/test
 env: TEST_SUITE=activitysim/examples/prototype_arc/test
 - name: "SEMCOG Example"
 env: TEST_SUITE=activitysim/examples/example_semcog/test
 env: TEST_SUITE=activitysim/examples/prototype_semcog/test
 - name: "PSRC Example"
 env: TEST_SUITE=activitysim/examples/example_psrc/test
 env: TEST_SUITE=activitysim/examples/placeholder_psrc/test
 - name: "SANDAG Example"
 env: TEST_SUITE=activitysim/examples/example_sandag/test
 env: TEST_SUITE=activitysim/examples/placeholder_sandag/test
 - name: "SANDAG Cross-Border Example"
 env: TEST_SUITE=activitysim/examples/example_sandag_xborder/test
 env: TEST_SUITE=activitysim/examples/prototype_sandag_xborder/test

 - stage: Estimation Mode
 name: "Larch Test"
Expand DownExpand Up@@ -94,12 +94,12 @@ install:
script:
# This is the "default" script used for each test suite, unless overridden with a "script" in the jobs above.
# build 2 and 3 zone test data twice since the Python test code on Linux sees these as different locations
- python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
- python /home/travis/miniconda/envs/asimtest/lib/python$TRAVIS_PYTHON_VERSION/site-packages/activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
# pycodestyle
- pycodestyle activitysim
# run specific TEST_SUITE job on travis to avoid job max time
- travis_wait 50 py.test $TEST_SUITE --cov activitysim --cov-report term-missing --durations=0
- coveralls
# coveralls # disable coveralls service, which errors frequently

6 changes: 3 additions & 3 deletions
HOW_TO_RELEASE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@
 regular test suite takes some time to run, between about half an hour and 
 two hours depending on the specs of your machine.
 ```sh
 python activitysim/examples/example_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/example_multiple_zone/scripts/three_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/two_zone_example_data.py
 python activitysim/examples/placeholder_multiple_zone/scripts/three_zone_example_data.py
 pytest .
 ```

Expand All@@ -83,7 +83,7 @@
 python ../activitysim/examples/scan_examples_for_errors.py .
 ```

00. Test the notebooks in `activitysim/examples/example_mtc/notebooks`.
00. Test the notebooks in `activitysim/examples/prototype_mtc/notebooks`.
 There are also demo notebooks for estimation, but their functionality 
 is completely tested in the unit tests run previously.

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ def _schedule_tours(
 if not RUN_ALTS_PREPROCESSOR_BEFORE_MERGE:
 # Note: Clint was running alts_preprocessor here on tdd_interaction_dataset instead of on raw (unmerged) alts
 # and he was using logsum_tour_purpose as selector, although logically it should be the spec_segment
 # It just happened to work for example_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # It just happened to work for prototype_arc.mandatory_tour_scheduling because, in that model, (unlike semcog)
 # logsum_tour_purpose and spec_segments are aligned (both logsums and spec are segmented on work, school, univ)
 # In any case, I don't see any benefit to doing this here - at least not for any existing implementations
 # but if we do, it will require passing spec_segment to schedule_tours and _schedule_tours
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/setup_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_pipeline/test_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@


def example_path(dirname):
 resource = os.path.join('examples', 'example_mtc', dirname)
 resource = os.path.join('examples', 'prototype_mtc', dirname)
 return pkg_resources.resource_filename('activitysim', resource)


Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
 template_setup_cache,
)

EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
CONFIGS_DIRS = ("configs",)
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data"
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/benchmarking/benchmarks/mtc1mp4.py

View file


Open in desktop

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

PRETTY_NAME = "MTC1_MP4"
EXAMPLE_NAME = "example_mtc_full"
EXAMPLE_NAME = "prototype_mtc_full"
NUM_PROCESSORS = int(np.clip(multiprocessing.cpu_count() - 2, 2, 4))
CONFIGS_DIRS = ("configs_mp", "configs")
DYNAMIC_CONFIG_DIR = "bench_configs_mp"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone"
CONFIGS_DIRS = ("configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag1full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_1_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_1_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_1"
OUTPUT_DIR = "output_1"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone"
CONFIGS_DIRS = ("configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag2full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "example_psrc/configs")
EXAMPLE_NAME = "placeholder_sandag_2_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_2_zone", "placeholder_psrc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_2"
OUTPUT_DIR = "output_2"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3example.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_example import *

EXAMPLE_NAME = "example_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone"
CONFIGS_DIRS = ("configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/benchmarking/benchmarks/sandag3full.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@

from .sandag_full import *

EXAMPLE_NAME = "example_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "example_mtc/configs")
EXAMPLE_NAME = "placeholder_sandag_3_zone_full"
CONFIGS_DIRS = ("configs_benchmarking", "configs_3_zone", "prototype_mtc/configs")
DYNAMIC_CONFIG_DIR = "bench_configs"
DATA_DIR = "data_3"
OUTPUT_DIR = "output_3"
Expand Down

5 changes: 2 additions & 3 deletions
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,15 +30,14 @@ def test_create_list():
 cp = subprocess.run(['activitysim', 'create', '--list'], capture_output=True)

 assert 'Available examples' in str(cp.stdout)
 assert "name: example_mtc" in str(cp.stdout)
 assert "name: example_test" in str(cp.stdout)
 assert "name: prototype_mtc" in str(cp.stdout)


def test_create_copy():

 target = os.path.join(os.path.dirname(__file__), 'test_example')
 cp = subprocess.run(['activitysim', 'create',
 '--example', 'example_test',
 '--example', 'prototype_mtc',
 '--destination', target], capture_output=True)

 assert 'copying data ...' in str(cp.stdout)
Expand Down

13 changes: 4 additions & 9 deletions
activitysim/examples/example_estimation/build_example_data/build_test.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,24 +4,19 @@ MTC_SF_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1_sf/data
MTC_FULL_DATA_DIR=/Users/jeff.doyle/work/activitysim-data/mtc_tm1/data

EXAMPLES_DIR=$ACTIVITYSIM_BASE_DIR/activitysim/examples
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/example_mtc
MTC_EXAMPLE_DIR=$EXAMPLES_DIR/prototype_mtc
ESTIMATION_DIR=$EXAMPLES_DIR/example_estimation
BUILD_DIR=$ESTIMATION_DIR/build_example_data

# build example using example_mtc test data set (25 zones)
# build example using prototype_mtc test data set (25 zones)
# TAG=test
# BUILD_DATA=$MTC_EXAMPLE_DIR/data

# build example using example_mtc sf data set (190 zones)
# build example using prototype_mtc_sf data set (190 zones)
# data not in activitysim repo/distro
 TAG=sf
 BUILD_DATA=$MTC_SF_DATA_DIR

# build example using example_mtc sf data set (190 zones)
# data not in activitysim repo/distro
# TAG=full
# BUILD_DATA=$MTC_FULL_DATA_DIR

# output dirs for run to create fake survey data
BUILD_OUTPUT=$BUILD_DIR/output_build_$TAG

Expand DownExpand Up@@ -77,7 +72,7 @@ cp $BUILD_OUTPUT/trace/school_location*university*.csv $BUILD_DIR/scratch/$TAG/b
cp $BUILD_OUTPUT/log/activitysim.log $BUILD_DIR/scratch/$TAG/build

TAG=sf
python simulation.py -c override_configs -c configs -c ../example_mtc/configs -d data_$TAG -o output_$TAG
python simulation.py -c override_configs -c configs -c ../prototype_mtc/configs -d data_$TAG -o output_$TAG


EST_OUTPUT=output_$TAG
Expand Down
Loading