start with csvs and write hdf5 outputs if desired #290

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
bstabler merged 10 commits into from
Feb 3, 2020
Merged

start with csvs and write hdf5 outputs if desired #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e48aa39
Merge pull request #1 from ActivitySim/master
bstabler Oct 31, 2019
5097ce8
Merge pull request #2 from ActivitySim/master
bstabler Oct 31, 2019
aa5caad
add h5_store option to write_tables
Dec 20, 2019
7e22097
keep csv files as the default
bstabler Dec 28, 2019
a57a3cf
Merge pull request #6 from ActivitySim/develop
bstabler Dec 28, 2019
9cbd0eb
Merge pull request #5 from RSGInc/hdf_out
bstabler Dec 28, 2019
925533d
read input tables from CSV
Dec 30, 2019
f48a530
update docs, drop scripts no longer needed, include example files in …
bstabler Dec 31, 2019
d87b081
formatting
bstabler Dec 31, 2019
6336839
Merge pull request #4 from RSGInc/task_4
bstabler Dec 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,5 @@ docs/_build/
*.cprof
*.lprof

# macOS
*.DS_Store
4 changes: 4 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,7 @@ include ez_setup.py
include README.rst
include activitysim\abm\test\data\mtc_asim.h5
include activitysim\abm\test\data\skims.omx
include activitysim\abm\test\data\households.csv
include activitysim\abm\test\data\persons.csv
include activitysim\abm\test\data\land_use.csv
include activitysim\abm\test\data\override_hh_ids.csv
28 changes: 28 additions & 0 deletions activitysim/abm/models/initialize.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,22 @@
from activitysim.abm.tables import shadow_pricing


# We are using the naming conventions in the mtc_asim.h5 example
# file for our default list. This provides backwards compatibility
# with previous versions of ActivitySim in which only 'input_store'
# is given in the settings file.
DEFAULT_TABLE_LIST = [
{'tablename': 'households',
'h5_tablename': 'households',
'index_col': 'household_id'},
{'tablename': 'persons',
'h5_tablename': 'persons',
'index_col': 'person_id'},
{'tablename': 'land_use',
'h5_tablename': 'land_use_taz',
'index_col': 'TAZ'}
]

logger = logging.getLogger(__name__)


Expand DownExpand Up@@ -109,6 +125,18 @@ def preload_injectables():
inject.add_step('write_data_dictionary', write_data_dictionary)
inject.add_step('write_tables', write_tables)

table_list = config.setting('input_table_list')

# default ActivitySim table names and indices
if table_list is None:
logger.warn(
"No 'input_table_list' found in settings. This will be a "
"required setting in upcoming versions of ActivitySim.")

new_settings = inject.get_injectable('settings')
new_settings['input_table_list'] = DEFAULT_TABLE_LIST
inject.add_injectable('settings', new_settings)

t0 = tracing.print_elapsed_time()

# FIXME - still want to do this?
Expand Down
2 changes: 0 additions & 2 deletions activitysim/abm/tables/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@

from __future__ import absolute_import

from . import input_store

from . import households
from . import persons
from . import landuse
Expand Down
4 changes: 1 addition & 3 deletions activitysim/abm/tables/households.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
from activitysim.core import pipeline
from activitysim.core import inject

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -86,8 +86,6 @@ def households(households_sample_size, override_hh_ids, trace_hh_id):

logger.info("loaded households %s" % (df.shape,))

df.index.name = 'household_id'

# FIXME - pathological knowledge of name of chunk_id column used by chunked_choosers_by_chunk_id
assert 'chunk_id' not in df.columns
df['chunk_id'] = pd.Series(list(range(len(df))), df.index)
Expand Down
39 changes: 0 additions & 39 deletions activitysim/abm/tables/input_store.py
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions activitysim/abm/tables/landuse.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,18 @@
import logging

from activitysim.core import inject
from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)


@inject.table()
def land_use():

df = read_input_table("land_use_taz")
df = read_input_table("land_use")

logger.info("loaded land_use %s" % (df.shape,))

df.index.name = 'TAZ'

# replace table function with dataframe
inject.add_table('land_use', df)

Expand Down
4 changes: 1 addition & 3 deletions activitysim/abm/tables/persons.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
from activitysim.core import inject
from activitysim.core import tracing

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand All@@ -34,8 +34,6 @@ def persons(households, trace_hh_id):

logger.info("loaded persons %s" % (df.shape,))

df.index.name = 'person_id'

# replace table function with dataframe
inject.add_table('persons', df)

Expand Down
21 changes: 19 additions & 2 deletions activitysim/abm/test/configs/settings.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
inherit_settings: True

#input data store and skims
input_store: mtc_asim.h5
# input skims
skims_file: skims.omx

# input tables
input_table_list:
- tablename: households
filename: households.csv
index_col: household_id
column_map:
HHID: household_id
- tablename: persons
filename: persons.csv
index_col: person_id
column_map:
PERID: person_id
- tablename: land_use
filename: land_use.csv
index_col: TAZ
column_map:
ZONE: TAZ

#number of households to simulate
households_sample_size: 100
# simulate all households
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
start with csvs and write hdf5 outputs if desired #290

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

bstabler
merged 10 commits into

from

Feb 3, 2020
 Merged


start with csvs and write hdf5 outputs if desired #290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
e48aa39

Merge pull request #1 from ActivitySim/master


bstabler Oct 31, 2019
5097ce8

Merge pull request #2 from ActivitySim/master


bstabler Oct 31, 2019
aa5caad

add h5_store option to write_tables

Dec 20, 2019
7e22097

keep csv files as the default


bstabler Dec 28, 2019
a57a3cf

Merge pull request #6 from ActivitySim/develop


bstabler Dec 28, 2019
9cbd0eb

Merge pull request #5 from RSGInc/hdf_out


bstabler Dec 28, 2019
925533d

read input tables from CSV

Dec 30, 2019
f48a530

update docs, drop scripts no longer needed, include example files in …


bstabler Dec 31, 2019
d87b081

formatting


bstabler Dec 31, 2019
6336839

Merge pull request #4 from RSGInc/task_4


bstabler Dec 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,5 @@ docs/_build/
*.cprof
*.lprof

# macOS
*.DS_Store

4 changes: 4 additions & 0 deletions
MANIFEST.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,7 @@ include ez_setup.py
include README.rst
include activitysim\abm\test\data\mtc_asim.h5
include activitysim\abm\test\data\skims.omx
include activitysim\abm\test\data\households.csv
include activitysim\abm\test\data\persons.csv
include activitysim\abm\test\data\land_use.csv
include activitysim\abm\test\data\override_hh_ids.csv

28 changes: 28 additions & 0 deletions
activitysim/abm/models/initialize.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,22 @@
from activitysim.abm.tables import shadow_pricing


# We are using the naming conventions in the mtc_asim.h5 example
# file for our default list. This provides backwards compatibility
# with previous versions of ActivitySim in which only 'input_store'
# is given in the settings file.
DEFAULT_TABLE_LIST = [
 {'tablename': 'households',
 'h5_tablename': 'households',
 'index_col': 'household_id'},
 {'tablename': 'persons',
 'h5_tablename': 'persons',
 'index_col': 'person_id'},
 {'tablename': 'land_use',
 'h5_tablename': 'land_use_taz',
 'index_col': 'TAZ'}
]

logger = logging.getLogger(__name__)


Expand DownExpand Up@@ -109,6 +125,18 @@ def preload_injectables():
 inject.add_step('write_data_dictionary', write_data_dictionary)
 inject.add_step('write_tables', write_tables)

 table_list = config.setting('input_table_list')

 # default ActivitySim table names and indices
 if table_list is None:
 logger.warn(
 "No 'input_table_list' found in settings. This will be a "
 "required setting in upcoming versions of ActivitySim.")

 new_settings = inject.get_injectable('settings')
 new_settings['input_table_list'] = DEFAULT_TABLE_LIST
 inject.add_injectable('settings', new_settings)

 t0 = tracing.print_elapsed_time()

 # FIXME - still want to do this?
Expand Down

2 changes: 0 additions & 2 deletions
activitysim/abm/tables/__init__.py

View file


Open in desktop

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

from __future__ import absolute_import

from . import input_store

from . import households
from . import persons
from . import landuse
Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/households.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
from activitysim.core import pipeline
from activitysim.core import inject

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -86,8 +86,6 @@ def households(households_sample_size, override_hh_ids, trace_hh_id):

 logger.info("loaded households %s" % (df.shape,))

 df.index.name = 'household_id'

 # FIXME - pathological knowledge of name of chunk_id column used by chunked_choosers_by_chunk_id
 assert 'chunk_id' not in df.columns
 df['chunk_id'] = pd.Series(list(range(len(df))), df.index)
Expand Down

39 changes: 0 additions & 39 deletions
activitysim/abm/tables/input_store.py

View file


Open in desktop


This file was deleted.


6 changes: 2 additions & 4 deletions
activitysim/abm/tables/landuse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,18 @@
import logging

from activitysim.core import inject
from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)


@inject.table()
def land_use():

 df = read_input_table("land_use_taz")
 df = read_input_table("land_use")

 logger.info("loaded land_use %s" % (df.shape,))

 df.index.name = 'TAZ'

 # replace table function with dataframe
 inject.add_table('land_use', df)

Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
from activitysim.core import inject
from activitysim.core import tracing

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand All@@ -34,8 +34,6 @@ def persons(households, trace_hh_id):

 logger.info("loaded persons %s" % (df.shape,))

 df.index.name = 'person_id'

 # replace table function with dataframe
 inject.add_table('persons', df)

Expand Down

21 changes: 19 additions & 2 deletions
activitysim/abm/test/configs/settings.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
inherit_settings: True

#input data store and skims
input_store: mtc_asim.h5
# input skims
skims_file: skims.omx

# input tables
input_table_list:
 - tablename: households
 filename: households.csv
 index_col: household_id
 column_map:
 HHID: household_id
 - tablename: persons
 filename: persons.csv
 index_col: person_id
 column_map:
 PERID: person_id
 - tablename: land_use
 filename: land_use.csv
 index_col: TAZ
 column_map:
 ZONE: TAZ

#number of households to simulate
households_sample_size: 100
# simulate all households
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
start with csvs and write hdf5 outputs if desired #290

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

bstabler
merged 10 commits into

from

Feb 3, 2020
 Merged


start with csvs and write hdf5 outputs if desired #290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
e48aa39

Merge pull request #1 from ActivitySim/master


bstabler Oct 31, 2019
5097ce8

Merge pull request #2 from ActivitySim/master


bstabler Oct 31, 2019
aa5caad

add h5_store option to write_tables

Dec 20, 2019
7e22097

keep csv files as the default


bstabler Dec 28, 2019
a57a3cf

Merge pull request #6 from ActivitySim/develop


bstabler Dec 28, 2019
9cbd0eb

Merge pull request #5 from RSGInc/hdf_out


bstabler Dec 28, 2019
925533d

read input tables from CSV

Dec 30, 2019
f48a530

update docs, drop scripts no longer needed, include example files in …


bstabler Dec 31, 2019
d87b081

formatting


bstabler Dec 31, 2019
6336839

Merge pull request #4 from RSGInc/task_4


bstabler Dec 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,5 @@ docs/_build/
*.cprof
*.lprof

# macOS
*.DS_Store

4 changes: 4 additions & 0 deletions
MANIFEST.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,7 @@ include ez_setup.py
include README.rst
include activitysim\abm\test\data\mtc_asim.h5
include activitysim\abm\test\data\skims.omx
include activitysim\abm\test\data\households.csv
include activitysim\abm\test\data\persons.csv
include activitysim\abm\test\data\land_use.csv
include activitysim\abm\test\data\override_hh_ids.csv

28 changes: 28 additions & 0 deletions
activitysim/abm/models/initialize.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,22 @@
from activitysim.abm.tables import shadow_pricing


# We are using the naming conventions in the mtc_asim.h5 example
# file for our default list. This provides backwards compatibility
# with previous versions of ActivitySim in which only 'input_store'
# is given in the settings file.
DEFAULT_TABLE_LIST = [
 {'tablename': 'households',
 'h5_tablename': 'households',
 'index_col': 'household_id'},
 {'tablename': 'persons',
 'h5_tablename': 'persons',
 'index_col': 'person_id'},
 {'tablename': 'land_use',
 'h5_tablename': 'land_use_taz',
 'index_col': 'TAZ'}
]

logger = logging.getLogger(__name__)


Expand DownExpand Up@@ -109,6 +125,18 @@ def preload_injectables():
 inject.add_step('write_data_dictionary', write_data_dictionary)
 inject.add_step('write_tables', write_tables)

 table_list = config.setting('input_table_list')

 # default ActivitySim table names and indices
 if table_list is None:
 logger.warn(
 "No 'input_table_list' found in settings. This will be a "
 "required setting in upcoming versions of ActivitySim.")

 new_settings = inject.get_injectable('settings')
 new_settings['input_table_list'] = DEFAULT_TABLE_LIST
 inject.add_injectable('settings', new_settings)

 t0 = tracing.print_elapsed_time()

 # FIXME - still want to do this?
Expand Down

2 changes: 0 additions & 2 deletions
activitysim/abm/tables/__init__.py

View file


Open in desktop

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

from __future__ import absolute_import

from . import input_store

from . import households
from . import persons
from . import landuse
Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/households.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
from activitysim.core import pipeline
from activitysim.core import inject

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -86,8 +86,6 @@ def households(households_sample_size, override_hh_ids, trace_hh_id):

 logger.info("loaded households %s" % (df.shape,))

 df.index.name = 'household_id'

 # FIXME - pathological knowledge of name of chunk_id column used by chunked_choosers_by_chunk_id
 assert 'chunk_id' not in df.columns
 df['chunk_id'] = pd.Series(list(range(len(df))), df.index)
Expand Down

39 changes: 0 additions & 39 deletions
activitysim/abm/tables/input_store.py

View file


Open in desktop


This file was deleted.


6 changes: 2 additions & 4 deletions
activitysim/abm/tables/landuse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,18 @@
import logging

from activitysim.core import inject
from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)


@inject.table()
def land_use():

 df = read_input_table("land_use_taz")
 df = read_input_table("land_use")

 logger.info("loaded land_use %s" % (df.shape,))

 df.index.name = 'TAZ'

 # replace table function with dataframe
 inject.add_table('land_use', df)

Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
from activitysim.core import inject
from activitysim.core import tracing

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand All@@ -34,8 +34,6 @@ def persons(households, trace_hh_id):

 logger.info("loaded persons %s" % (df.shape,))

 df.index.name = 'person_id'

 # replace table function with dataframe
 inject.add_table('persons', df)

Expand Down

21 changes: 19 additions & 2 deletions
activitysim/abm/test/configs/settings.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
inherit_settings: True

#input data store and skims
input_store: mtc_asim.h5
# input skims
skims_file: skims.omx

# input tables
input_table_list:
 - tablename: households
 filename: households.csv
 index_col: household_id
 column_map:
 HHID: household_id
 - tablename: persons
 filename: persons.csv
 index_col: person_id
 column_map:
 PERID: person_id
 - tablename: land_use
 filename: land_use.csv
 index_col: TAZ
 column_map:
 ZONE: TAZ

#number of households to simulate
households_sample_size: 100
# simulate all households
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
start with csvs and write hdf5 outputs if desired #290

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

bstabler
merged 10 commits into

from

Feb 3, 2020
 Merged


start with csvs and write hdf5 outputs if desired #290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
e48aa39

Merge pull request #1 from ActivitySim/master


bstabler Oct 31, 2019
5097ce8

Merge pull request #2 from ActivitySim/master


bstabler Oct 31, 2019
aa5caad

add h5_store option to write_tables

Dec 20, 2019
7e22097

keep csv files as the default


bstabler Dec 28, 2019
a57a3cf

Merge pull request #6 from ActivitySim/develop


bstabler Dec 28, 2019
9cbd0eb

Merge pull request #5 from RSGInc/hdf_out


bstabler Dec 28, 2019
925533d

read input tables from CSV

Dec 30, 2019
f48a530

update docs, drop scripts no longer needed, include example files in …


bstabler Dec 31, 2019
d87b081

formatting


bstabler Dec 31, 2019
6336839

Merge pull request #4 from RSGInc/task_4


bstabler Dec 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,5 @@ docs/_build/
*.cprof
*.lprof

# macOS
*.DS_Store

4 changes: 4 additions & 0 deletions
MANIFEST.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,7 @@ include ez_setup.py
include README.rst
include activitysim\abm\test\data\mtc_asim.h5
include activitysim\abm\test\data\skims.omx
include activitysim\abm\test\data\households.csv
include activitysim\abm\test\data\persons.csv
include activitysim\abm\test\data\land_use.csv
include activitysim\abm\test\data\override_hh_ids.csv

28 changes: 28 additions & 0 deletions
activitysim/abm/models/initialize.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,22 @@
from activitysim.abm.tables import shadow_pricing


# We are using the naming conventions in the mtc_asim.h5 example
# file for our default list. This provides backwards compatibility
# with previous versions of ActivitySim in which only 'input_store'
# is given in the settings file.
DEFAULT_TABLE_LIST = [
 {'tablename': 'households',
 'h5_tablename': 'households',
 'index_col': 'household_id'},
 {'tablename': 'persons',
 'h5_tablename': 'persons',
 'index_col': 'person_id'},
 {'tablename': 'land_use',
 'h5_tablename': 'land_use_taz',
 'index_col': 'TAZ'}
]

logger = logging.getLogger(__name__)


Expand DownExpand Up@@ -109,6 +125,18 @@ def preload_injectables():
 inject.add_step('write_data_dictionary', write_data_dictionary)
 inject.add_step('write_tables', write_tables)

 table_list = config.setting('input_table_list')

 # default ActivitySim table names and indices
 if table_list is None:
 logger.warn(
 "No 'input_table_list' found in settings. This will be a "
 "required setting in upcoming versions of ActivitySim.")

 new_settings = inject.get_injectable('settings')
 new_settings['input_table_list'] = DEFAULT_TABLE_LIST
 inject.add_injectable('settings', new_settings)

 t0 = tracing.print_elapsed_time()

 # FIXME - still want to do this?
Expand Down

2 changes: 0 additions & 2 deletions
activitysim/abm/tables/__init__.py

View file


Open in desktop

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

from __future__ import absolute_import

from . import input_store

from . import households
from . import persons
from . import landuse
Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/households.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
from activitysim.core import pipeline
from activitysim.core import inject

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -86,8 +86,6 @@ def households(households_sample_size, override_hh_ids, trace_hh_id):

 logger.info("loaded households %s" % (df.shape,))

 df.index.name = 'household_id'

 # FIXME - pathological knowledge of name of chunk_id column used by chunked_choosers_by_chunk_id
 assert 'chunk_id' not in df.columns
 df['chunk_id'] = pd.Series(list(range(len(df))), df.index)
Expand Down

39 changes: 0 additions & 39 deletions
activitysim/abm/tables/input_store.py

View file


Open in desktop


This file was deleted.


6 changes: 2 additions & 4 deletions
activitysim/abm/tables/landuse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,18 @@
import logging

from activitysim.core import inject
from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)


@inject.table()
def land_use():

 df = read_input_table("land_use_taz")
 df = read_input_table("land_use")

 logger.info("loaded land_use %s" % (df.shape,))

 df.index.name = 'TAZ'

 # replace table function with dataframe
 inject.add_table('land_use', df)

Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
from activitysim.core import inject
from activitysim.core import tracing

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand All@@ -34,8 +34,6 @@ def persons(households, trace_hh_id):

 logger.info("loaded persons %s" % (df.shape,))

 df.index.name = 'person_id'

 # replace table function with dataframe
 inject.add_table('persons', df)

Expand Down

21 changes: 19 additions & 2 deletions
activitysim/abm/test/configs/settings.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
inherit_settings: True

#input data store and skims
input_store: mtc_asim.h5
# input skims
skims_file: skims.omx

# input tables
input_table_list:
 - tablename: households
 filename: households.csv
 index_col: household_id
 column_map:
 HHID: household_id
 - tablename: persons
 filename: persons.csv
 index_col: person_id
 column_map:
 PERID: person_id
 - tablename: land_use
 filename: land_use.csv
 index_col: TAZ
 column_map:
 ZONE: TAZ

#number of households to simulate
households_sample_size: 100
# simulate all households
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
start with csvs and write hdf5 outputs if desired #290

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

bstabler
merged 10 commits into

from

Feb 3, 2020
 Merged


start with csvs and write hdf5 outputs if desired #290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
e48aa39

Merge pull request #1 from ActivitySim/master


bstabler Oct 31, 2019
5097ce8

Merge pull request #2 from ActivitySim/master


bstabler Oct 31, 2019
aa5caad

add h5_store option to write_tables

Dec 20, 2019
7e22097

keep csv files as the default


bstabler Dec 28, 2019
a57a3cf

Merge pull request #6 from ActivitySim/develop


bstabler Dec 28, 2019
9cbd0eb

Merge pull request #5 from RSGInc/hdf_out


bstabler Dec 28, 2019
925533d

read input tables from CSV

Dec 30, 2019
f48a530

update docs, drop scripts no longer needed, include example files in …


bstabler Dec 31, 2019
d87b081

formatting


bstabler Dec 31, 2019
6336839

Merge pull request #4 from RSGInc/task_4


bstabler Dec 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,5 @@ docs/_build/
*.cprof
*.lprof

# macOS
*.DS_Store

4 changes: 4 additions & 0 deletions
MANIFEST.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,7 @@ include ez_setup.py
include README.rst
include activitysim\abm\test\data\mtc_asim.h5
include activitysim\abm\test\data\skims.omx
include activitysim\abm\test\data\households.csv
include activitysim\abm\test\data\persons.csv
include activitysim\abm\test\data\land_use.csv
include activitysim\abm\test\data\override_hh_ids.csv

28 changes: 28 additions & 0 deletions
activitysim/abm/models/initialize.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,22 @@
from activitysim.abm.tables import shadow_pricing


# We are using the naming conventions in the mtc_asim.h5 example
# file for our default list. This provides backwards compatibility
# with previous versions of ActivitySim in which only 'input_store'
# is given in the settings file.
DEFAULT_TABLE_LIST = [
 {'tablename': 'households',
 'h5_tablename': 'households',
 'index_col': 'household_id'},
 {'tablename': 'persons',
 'h5_tablename': 'persons',
 'index_col': 'person_id'},
 {'tablename': 'land_use',
 'h5_tablename': 'land_use_taz',
 'index_col': 'TAZ'}
]

logger = logging.getLogger(__name__)


Expand DownExpand Up@@ -109,6 +125,18 @@ def preload_injectables():
 inject.add_step('write_data_dictionary', write_data_dictionary)
 inject.add_step('write_tables', write_tables)

 table_list = config.setting('input_table_list')

 # default ActivitySim table names and indices
 if table_list is None:
 logger.warn(
 "No 'input_table_list' found in settings. This will be a "
 "required setting in upcoming versions of ActivitySim.")

 new_settings = inject.get_injectable('settings')
 new_settings['input_table_list'] = DEFAULT_TABLE_LIST
 inject.add_injectable('settings', new_settings)

 t0 = tracing.print_elapsed_time()

 # FIXME - still want to do this?
Expand Down

2 changes: 0 additions & 2 deletions
activitysim/abm/tables/__init__.py

View file


Open in desktop

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

from __future__ import absolute_import

from . import input_store

from . import households
from . import persons
from . import landuse
Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/households.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
from activitysim.core import pipeline
from activitysim.core import inject

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -86,8 +86,6 @@ def households(households_sample_size, override_hh_ids, trace_hh_id):

 logger.info("loaded households %s" % (df.shape,))

 df.index.name = 'household_id'

 # FIXME - pathological knowledge of name of chunk_id column used by chunked_choosers_by_chunk_id
 assert 'chunk_id' not in df.columns
 df['chunk_id'] = pd.Series(list(range(len(df))), df.index)
Expand Down

39 changes: 0 additions & 39 deletions
activitysim/abm/tables/input_store.py

View file


Open in desktop


This file was deleted.


6 changes: 2 additions & 4 deletions
activitysim/abm/tables/landuse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,18 @@
import logging

from activitysim.core import inject
from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)


@inject.table()
def land_use():

 df = read_input_table("land_use_taz")
 df = read_input_table("land_use")

 logger.info("loaded land_use %s" % (df.shape,))

 df.index.name = 'TAZ'

 # replace table function with dataframe
 inject.add_table('land_use', df)

Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
from activitysim.core import inject
from activitysim.core import tracing

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand All@@ -34,8 +34,6 @@ def persons(households, trace_hh_id):

 logger.info("loaded persons %s" % (df.shape,))

 df.index.name = 'person_id'

 # replace table function with dataframe
 inject.add_table('persons', df)

Expand Down

21 changes: 19 additions & 2 deletions
activitysim/abm/test/configs/settings.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
inherit_settings: True

#input data store and skims
input_store: mtc_asim.h5
# input skims
skims_file: skims.omx

# input tables
input_table_list:
 - tablename: households
 filename: households.csv
 index_col: household_id
 column_map:
 HHID: household_id
 - tablename: persons
 filename: persons.csv
 index_col: person_id
 column_map:
 PERID: person_id
 - tablename: land_use
 filename: land_use.csv
 index_col: TAZ
 column_map:
 ZONE: TAZ

#number of households to simulate
households_sample_size: 100
# simulate all households
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
start with csvs and write hdf5 outputs if desired #290

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

bstabler
merged 10 commits into

from

Feb 3, 2020
 Merged


start with csvs and write hdf5 outputs if desired #290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
e48aa39

Merge pull request #1 from ActivitySim/master


bstabler Oct 31, 2019
5097ce8

Merge pull request #2 from ActivitySim/master


bstabler Oct 31, 2019
aa5caad

add h5_store option to write_tables

Dec 20, 2019
7e22097

keep csv files as the default


bstabler Dec 28, 2019
a57a3cf

Merge pull request #6 from ActivitySim/develop


bstabler Dec 28, 2019
9cbd0eb

Merge pull request #5 from RSGInc/hdf_out


bstabler Dec 28, 2019
925533d

read input tables from CSV

Dec 30, 2019
f48a530

update docs, drop scripts no longer needed, include example files in …


bstabler Dec 31, 2019
d87b081

formatting


bstabler Dec 31, 2019
6336839

Merge pull request #4 from RSGInc/task_4


bstabler Dec 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,5 @@ docs/_build/
*.cprof
*.lprof

# macOS
*.DS_Store

4 changes: 4 additions & 0 deletions
MANIFEST.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,7 @@ include ez_setup.py
include README.rst
include activitysim\abm\test\data\mtc_asim.h5
include activitysim\abm\test\data\skims.omx
include activitysim\abm\test\data\households.csv
include activitysim\abm\test\data\persons.csv
include activitysim\abm\test\data\land_use.csv
include activitysim\abm\test\data\override_hh_ids.csv

28 changes: 28 additions & 0 deletions
activitysim/abm/models/initialize.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,22 @@
from activitysim.abm.tables import shadow_pricing


# We are using the naming conventions in the mtc_asim.h5 example
# file for our default list. This provides backwards compatibility
# with previous versions of ActivitySim in which only 'input_store'
# is given in the settings file.
DEFAULT_TABLE_LIST = [
 {'tablename': 'households',
 'h5_tablename': 'households',
 'index_col': 'household_id'},
 {'tablename': 'persons',
 'h5_tablename': 'persons',
 'index_col': 'person_id'},
 {'tablename': 'land_use',
 'h5_tablename': 'land_use_taz',
 'index_col': 'TAZ'}
]

logger = logging.getLogger(__name__)


Expand DownExpand Up@@ -109,6 +125,18 @@ def preload_injectables():
 inject.add_step('write_data_dictionary', write_data_dictionary)
 inject.add_step('write_tables', write_tables)

 table_list = config.setting('input_table_list')

 # default ActivitySim table names and indices
 if table_list is None:
 logger.warn(
 "No 'input_table_list' found in settings. This will be a "
 "required setting in upcoming versions of ActivitySim.")

 new_settings = inject.get_injectable('settings')
 new_settings['input_table_list'] = DEFAULT_TABLE_LIST
 inject.add_injectable('settings', new_settings)

 t0 = tracing.print_elapsed_time()

 # FIXME - still want to do this?
Expand Down

2 changes: 0 additions & 2 deletions
activitysim/abm/tables/__init__.py

View file


Open in desktop

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

from __future__ import absolute_import

from . import input_store

from . import households
from . import persons
from . import landuse
Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/households.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
from activitysim.core import pipeline
from activitysim.core import inject

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -86,8 +86,6 @@ def households(households_sample_size, override_hh_ids, trace_hh_id):

 logger.info("loaded households %s" % (df.shape,))

 df.index.name = 'household_id'

 # FIXME - pathological knowledge of name of chunk_id column used by chunked_choosers_by_chunk_id
 assert 'chunk_id' not in df.columns
 df['chunk_id'] = pd.Series(list(range(len(df))), df.index)
Expand Down

39 changes: 0 additions & 39 deletions
activitysim/abm/tables/input_store.py

View file


Open in desktop


This file was deleted.


6 changes: 2 additions & 4 deletions
activitysim/abm/tables/landuse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,18 @@
import logging

from activitysim.core import inject
from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)


@inject.table()
def land_use():

 df = read_input_table("land_use_taz")
 df = read_input_table("land_use")

 logger.info("loaded land_use %s" % (df.shape,))

 df.index.name = 'TAZ'

 # replace table function with dataframe
 inject.add_table('land_use', df)

Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
from activitysim.core import inject
from activitysim.core import tracing

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand All@@ -34,8 +34,6 @@ def persons(households, trace_hh_id):

 logger.info("loaded persons %s" % (df.shape,))

 df.index.name = 'person_id'

 # replace table function with dataframe
 inject.add_table('persons', df)

Expand Down

21 changes: 19 additions & 2 deletions
activitysim/abm/test/configs/settings.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
inherit_settings: True

#input data store and skims
input_store: mtc_asim.h5
# input skims
skims_file: skims.omx

# input tables
input_table_list:
 - tablename: households
 filename: households.csv
 index_col: household_id
 column_map:
 HHID: household_id
 - tablename: persons
 filename: persons.csv
 index_col: person_id
 column_map:
 PERID: person_id
 - tablename: land_use
 filename: land_use.csv
 index_col: TAZ
 column_map:
 ZONE: TAZ

#number of households to simulate
households_sample_size: 100
# simulate all households
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
start with csvs and write hdf5 outputs if desired #290

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

bstabler
merged 10 commits into

from

Feb 3, 2020
 Merged


start with csvs and write hdf5 outputs if desired #290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
e48aa39

Merge pull request #1 from ActivitySim/master


bstabler Oct 31, 2019
5097ce8

Merge pull request #2 from ActivitySim/master


bstabler Oct 31, 2019
aa5caad

add h5_store option to write_tables

Dec 20, 2019
7e22097

keep csv files as the default


bstabler Dec 28, 2019
a57a3cf

Merge pull request #6 from ActivitySim/develop


bstabler Dec 28, 2019
9cbd0eb

Merge pull request #5 from RSGInc/hdf_out


bstabler Dec 28, 2019
925533d

read input tables from CSV

Dec 30, 2019
f48a530

update docs, drop scripts no longer needed, include example files in …


bstabler Dec 31, 2019
d87b081

formatting


bstabler Dec 31, 2019
6336839

Merge pull request #4 from RSGInc/task_4


bstabler Dec 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,5 @@ docs/_build/
*.cprof
*.lprof

# macOS
*.DS_Store

4 changes: 4 additions & 0 deletions
MANIFEST.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,7 @@ include ez_setup.py
include README.rst
include activitysim\abm\test\data\mtc_asim.h5
include activitysim\abm\test\data\skims.omx
include activitysim\abm\test\data\households.csv
include activitysim\abm\test\data\persons.csv
include activitysim\abm\test\data\land_use.csv
include activitysim\abm\test\data\override_hh_ids.csv

28 changes: 28 additions & 0 deletions
activitysim/abm/models/initialize.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,22 @@
from activitysim.abm.tables import shadow_pricing


# We are using the naming conventions in the mtc_asim.h5 example
# file for our default list. This provides backwards compatibility
# with previous versions of ActivitySim in which only 'input_store'
# is given in the settings file.
DEFAULT_TABLE_LIST = [
 {'tablename': 'households',
 'h5_tablename': 'households',
 'index_col': 'household_id'},
 {'tablename': 'persons',
 'h5_tablename': 'persons',
 'index_col': 'person_id'},
 {'tablename': 'land_use',
 'h5_tablename': 'land_use_taz',
 'index_col': 'TAZ'}
]

logger = logging.getLogger(__name__)


Expand DownExpand Up@@ -109,6 +125,18 @@ def preload_injectables():
 inject.add_step('write_data_dictionary', write_data_dictionary)
 inject.add_step('write_tables', write_tables)

 table_list = config.setting('input_table_list')

 # default ActivitySim table names and indices
 if table_list is None:
 logger.warn(
 "No 'input_table_list' found in settings. This will be a "
 "required setting in upcoming versions of ActivitySim.")

 new_settings = inject.get_injectable('settings')
 new_settings['input_table_list'] = DEFAULT_TABLE_LIST
 inject.add_injectable('settings', new_settings)

 t0 = tracing.print_elapsed_time()

 # FIXME - still want to do this?
Expand Down

2 changes: 0 additions & 2 deletions
activitysim/abm/tables/__init__.py

View file


Open in desktop

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

from __future__ import absolute_import

from . import input_store

from . import households
from . import persons
from . import landuse
Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/households.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
from activitysim.core import pipeline
from activitysim.core import inject

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -86,8 +86,6 @@ def households(households_sample_size, override_hh_ids, trace_hh_id):

 logger.info("loaded households %s" % (df.shape,))

 df.index.name = 'household_id'

 # FIXME - pathological knowledge of name of chunk_id column used by chunked_choosers_by_chunk_id
 assert 'chunk_id' not in df.columns
 df['chunk_id'] = pd.Series(list(range(len(df))), df.index)
Expand Down

39 changes: 0 additions & 39 deletions
activitysim/abm/tables/input_store.py

View file


Open in desktop


This file was deleted.


6 changes: 2 additions & 4 deletions
activitysim/abm/tables/landuse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,18 @@
import logging

from activitysim.core import inject
from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)


@inject.table()
def land_use():

 df = read_input_table("land_use_taz")
 df = read_input_table("land_use")

 logger.info("loaded land_use %s" % (df.shape,))

 df.index.name = 'TAZ'

 # replace table function with dataframe
 inject.add_table('land_use', df)

Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
from activitysim.core import inject
from activitysim.core import tracing

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand All@@ -34,8 +34,6 @@ def persons(households, trace_hh_id):

 logger.info("loaded persons %s" % (df.shape,))

 df.index.name = 'person_id'

 # replace table function with dataframe
 inject.add_table('persons', df)

Expand Down

21 changes: 19 additions & 2 deletions
activitysim/abm/test/configs/settings.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
inherit_settings: True

#input data store and skims
input_store: mtc_asim.h5
# input skims
skims_file: skims.omx

# input tables
input_table_list:
 - tablename: households
 filename: households.csv
 index_col: household_id
 column_map:
 HHID: household_id
 - tablename: persons
 filename: persons.csv
 index_col: person_id
 column_map:
 PERID: person_id
 - tablename: land_use
 filename: land_use.csv
 index_col: TAZ
 column_map:
 ZONE: TAZ

#number of households to simulate
households_sample_size: 100
# simulate all households
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
start with csvs and write hdf5 outputs if desired #290

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

bstabler
merged 10 commits into

from

Feb 3, 2020
 Merged


start with csvs and write hdf5 outputs if desired #290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
e48aa39

Merge pull request #1 from ActivitySim/master


bstabler Oct 31, 2019
5097ce8

Merge pull request #2 from ActivitySim/master


bstabler Oct 31, 2019
aa5caad

add h5_store option to write_tables

Dec 20, 2019
7e22097

keep csv files as the default


bstabler Dec 28, 2019
a57a3cf

Merge pull request #6 from ActivitySim/develop


bstabler Dec 28, 2019
9cbd0eb

Merge pull request #5 from RSGInc/hdf_out


bstabler Dec 28, 2019
925533d

read input tables from CSV

Dec 30, 2019
f48a530

update docs, drop scripts no longer needed, include example files in …


bstabler Dec 31, 2019
d87b081

formatting


bstabler Dec 31, 2019
6336839

Merge pull request #4 from RSGInc/task_4


bstabler Dec 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,5 @@ docs/_build/
*.cprof
*.lprof

# macOS
*.DS_Store

4 changes: 4 additions & 0 deletions
MANIFEST.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,7 @@ include ez_setup.py
include README.rst
include activitysim\abm\test\data\mtc_asim.h5
include activitysim\abm\test\data\skims.omx
include activitysim\abm\test\data\households.csv
include activitysim\abm\test\data\persons.csv
include activitysim\abm\test\data\land_use.csv
include activitysim\abm\test\data\override_hh_ids.csv

28 changes: 28 additions & 0 deletions
activitysim/abm/models/initialize.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,22 @@
from activitysim.abm.tables import shadow_pricing


# We are using the naming conventions in the mtc_asim.h5 example
# file for our default list. This provides backwards compatibility
# with previous versions of ActivitySim in which only 'input_store'
# is given in the settings file.
DEFAULT_TABLE_LIST = [
 {'tablename': 'households',
 'h5_tablename': 'households',
 'index_col': 'household_id'},
 {'tablename': 'persons',
 'h5_tablename': 'persons',
 'index_col': 'person_id'},
 {'tablename': 'land_use',
 'h5_tablename': 'land_use_taz',
 'index_col': 'TAZ'}
]

logger = logging.getLogger(__name__)


Expand DownExpand Up@@ -109,6 +125,18 @@ def preload_injectables():
 inject.add_step('write_data_dictionary', write_data_dictionary)
 inject.add_step('write_tables', write_tables)

 table_list = config.setting('input_table_list')

 # default ActivitySim table names and indices
 if table_list is None:
 logger.warn(
 "No 'input_table_list' found in settings. This will be a "
 "required setting in upcoming versions of ActivitySim.")

 new_settings = inject.get_injectable('settings')
 new_settings['input_table_list'] = DEFAULT_TABLE_LIST
 inject.add_injectable('settings', new_settings)

 t0 = tracing.print_elapsed_time()

 # FIXME - still want to do this?
Expand Down

2 changes: 0 additions & 2 deletions
activitysim/abm/tables/__init__.py

View file


Open in desktop

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

from __future__ import absolute_import

from . import input_store

from . import households
from . import persons
from . import landuse
Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/households.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
from activitysim.core import pipeline
from activitysim.core import inject

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -86,8 +86,6 @@ def households(households_sample_size, override_hh_ids, trace_hh_id):

 logger.info("loaded households %s" % (df.shape,))

 df.index.name = 'household_id'

 # FIXME - pathological knowledge of name of chunk_id column used by chunked_choosers_by_chunk_id
 assert 'chunk_id' not in df.columns
 df['chunk_id'] = pd.Series(list(range(len(df))), df.index)
Expand Down

39 changes: 0 additions & 39 deletions
activitysim/abm/tables/input_store.py

View file


Open in desktop


This file was deleted.


6 changes: 2 additions & 4 deletions
activitysim/abm/tables/landuse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,18 @@
import logging

from activitysim.core import inject
from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)


@inject.table()
def land_use():

 df = read_input_table("land_use_taz")
 df = read_input_table("land_use")

 logger.info("loaded land_use %s" % (df.shape,))

 df.index.name = 'TAZ'

 # replace table function with dataframe
 inject.add_table('land_use', df)

Expand Down

4 changes: 1 addition & 3 deletions
activitysim/abm/tables/persons.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
from activitysim.core import inject
from activitysim.core import tracing

from .input_store import read_input_table
from activitysim.core.input import read_input_table

logger = logging.getLogger(__name__)

Expand All@@ -34,8 +34,6 @@ def persons(households, trace_hh_id):

 logger.info("loaded persons %s" % (df.shape,))

 df.index.name = 'person_id'

 # replace table function with dataframe
 inject.add_table('persons', df)

Expand Down

21 changes: 19 additions & 2 deletions
activitysim/abm/test/configs/settings.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
inherit_settings: True

#input data store and skims
input_store: mtc_asim.h5
# input skims
skims_file: skims.omx

# input tables
input_table_list:
 - tablename: households
 filename: households.csv
 index_col: household_id
 column_map:
 HHID: household_id
 - tablename: persons
 filename: persons.csv
 index_col: person_id
 column_map:
 PERID: person_id
 - tablename: land_use
 filename: land_use.csv
 index_col: TAZ
 column_map:
 ZONE: TAZ

#number of households to simulate
households_sample_size: 100
# simulate all households
Expand Down
Loading