#359#364

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 7 commits into from
Dec 23, 2020
Merged

#359 #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
003742b
updates for CDAP person type mapping
Nov 11, 2020
1a5a264
allow duplicate time labels
Nov 11, 2020
bb0deaf
Merge danielsclint/ft_cdap_schedule into develop
bstabler Dec 22, 2020
4eff144
fix a copy small items for #359
bstabler Dec 22, 2020
c14e5e4
test updates
bstabler Dec 22, 2020
0c32ecf
pycodestyle
bstabler Dec 23, 2020
e588ea8
3 zone test fix
bstabler Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion activitysim/abm/models/cdap.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ def cdap_simulate(persons_merged, persons, households,

trace_label = 'cdap'
model_settings = config.read_model_settings('cdap.yaml')

person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
cdap_indiv_spec = simulate.read_model_spec(file_name=model_settings['INDIV_AND_HHSIZE1_SPEC'])

# Rules and coefficients for generating interaction specs for different household sizes
Expand DownExpand Up@@ -88,6 +88,7 @@ def cdap_simulate(persons_merged, persons, households,

choices = cdap.run_cdap(
persons=persons_merged,
person_type_map=person_type_map,
cdap_indiv_spec=cdap_indiv_spec,
cdap_interaction_coefficients=cdap_interaction_coefficients,
cdap_fixed_relative_proportions=cdap_fixed_relative_proportions,
Expand Down
14 changes: 7 additions & 7 deletions activitysim/abm/models/util/cdap.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,6 @@

MAX_INTERACTION_CARDINALITY = 3

WORKER_PTYPES = [1, 2]
CHILD_PTYPES = [6, 7, 8]


def set_hh_index(df):

Expand All@@ -61,7 +58,7 @@ def add_pn(col, pnum):
raise RuntimeError("add_pn col not list or str")


def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):
def assign_cdap_rank(persons, person_type_map, trace_hh_id=None, trace_label=None):
"""
Assign an integer index, cdap_rank, to each household member. (Starting with 1, not 0)

Expand DownExpand Up@@ -109,7 +106,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

# choose up to 2 workers, preferring full over part, older over younger
workers = \
persons.loc[persons[_ptype_].isin(WORKER_PTYPES), [_hh_id_, _ptype_]]\
persons.loc[persons[_ptype_].isin(person_type_map['WORKER']), [_hh_id_, _ptype_]]\
.sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
.groupby(_hh_id_).head(2)
# tag the selected workers
Expand All@@ -118,7 +115,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

# choose up to 3, preferring youngest
children = \
persons.loc[persons[_ptype_].isin(CHILD_PTYPES), [_hh_id_, _ptype_, _age_]]\
persons.loc[persons[_ptype_].isin(person_type_map['CHILD']), [_hh_id_, _ptype_, _age_]]\
.sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
.groupby(_hh_id_).head(3)
# tag the selected children
Expand DownExpand Up@@ -795,6 +792,7 @@ def extra_hh_member_choices(persons, cdap_fixed_relative_proportions, locals_d,

def _run_cdap(
persons,
person_type_map,
cdap_indiv_spec,
interaction_coefficients,
cdap_fixed_relative_proportions,
Expand All@@ -815,7 +813,7 @@ def _run_cdap(
# assign integer cdap_rank to each household member
# persons with cdap_rank 1..MAX_HHSIZE will be have their activities chose by CDAP model
# extra household members, will have activities assigned by in fixed proportions
assign_cdap_rank(persons, trace_hh_id, trace_label)
assign_cdap_rank(persons, person_type_map, trace_hh_id, trace_label)
chunk.log_df(trace_label, 'persons', persons)

# Calculate CDAP utilities for each individual, ignoring interactions
Expand DownExpand Up@@ -904,6 +902,7 @@ def cdap_calc_row_size(choosers, cdap_indiv_spec, trace_label):

def run_cdap(
persons,
person_type_map,
cdap_indiv_spec,
cdap_interaction_coefficients,
cdap_fixed_relative_proportions,
Expand DownExpand Up@@ -956,6 +955,7 @@ def run_cdap(

cdap_results = \
_run_cdap(persons_chunk,
person_type_map,
cdap_indiv_spec,
cdap_interaction_coefficients,
cdap_fixed_relative_proportions,
Expand Down
8 changes: 8 additions & 0 deletions activitysim/abm/models/util/test/configs/cdap.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
PERSON_TYPE_MAP:
WORKER:
- 1
- 2
CHILD:
- 6
- 7
- 8
30 changes: 24 additions & 6 deletions activitysim/abm/models/util/test/test_cdap.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# See full license in LICENSE.txt.

import os.path
import yaml

import pandas as pd
import pandas.testing as pdt
Expand DownExpand Up@@ -31,6 +32,19 @@ def teardown_function(func):
inject.reinject_decorated_tables()


@pytest.fixture(scope='module')
def model_settings(configs_dir):
yml_file = os.path.join(configs_dir, 'cdap.yaml')
with open(yml_file) as f:
model_settings = yaml.load(f, Loader=yaml.loader.SafeLoader)
return model_settings


@pytest.fixture(scope='module')
def configs_dir():
return os.path.join(os.path.dirname(__file__), 'configs')


def setup_function():
configs_dir = os.path.join(os.path.dirname(__file__), 'configs')
inject.add_injectable("configs_dir", configs_dir)
Expand All@@ -48,9 +62,11 @@ def test_bad_coefficients():
assert "Expect only M, N, or H" in str(excinfo.value)


def test_assign_cdap_rank(people):
def test_assign_cdap_rank(people, model_settings):

person_type_map = model_settings.get('PERSON_TYPE_MAP', {})

cdap.assign_cdap_rank(people)
cdap.assign_cdap_rank(people, person_type_map)

expected = pd.Series(
[1, 1, 1, 2, 2, 1, 3, 1, 2, 1, 3, 2, 1, 3, 2, 4, 1, 3, 4, 2],
Expand All@@ -60,11 +76,12 @@ def test_assign_cdap_rank(people):
pdt.assert_series_equal(people['cdap_rank'], expected, check_dtype=False, check_names=False)


def test_individual_utilities(people):
def test_individual_utilities(people, model_settings):

cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

cdap.assign_cdap_rank(people)
person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
cdap.assign_cdap_rank(people, person_type_map)
individual_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

individual_utils = individual_utils[['M', 'N', 'H']]
Expand DownExpand Up@@ -96,15 +113,16 @@ def test_individual_utilities(people):
individual_utils, expected, check_dtype=False, check_names=False)


def test_build_cdap_spec_hhsize2(people):
def test_build_cdap_spec_hhsize2(people, model_settings):

hhsize = 2
cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

interaction_coefficients = pd.read_csv(config.config_file_path('cdap_interaction_coefficients.csv'), comment='#')
interaction_coefficients = cdap.preprocess_interaction_coefficients(interaction_coefficients)

cdap.assign_cdap_rank(people)
person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
cdap.assign_cdap_rank(people, person_type_map)
indiv_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

choosers = cdap.hh_choosers(indiv_utils, hhsize=hhsize)
Expand Down
16 changes: 10 additions & 6 deletions activitysim/abm/test/test_multi_zone.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@

# 3-zone is currently big and slow - so set this way low
HOUSEHOLDS_SAMPLE_SIZE_3_ZONE = 10
EXPECT_3_ZONE_TOUR_COUNT = 26
EXPECT_3_ZONE_TOUR_COUNT = 30


# household with mandatory, non mandatory, atwork_subtours, and joint tours
Expand DownExpand Up@@ -85,9 +85,12 @@ def close_handlers():

def inject_settings(**kwargs):

settings = config.read_settings_file('settings.yaml', mandatory=True)

for k in kwargs:
if k == "two_zone":
if kwargs[k]:
settings = config.read_settings_file('settings.yaml', mandatory=True)
else:
settings = config.read_settings_file('settings_static.yaml', mandatory=True)
settings[k] = kwargs[k]

inject.add_injectable("settings", settings)
Expand All@@ -98,11 +101,12 @@ def inject_settings(**kwargs):
def full_run(configs_dir, data_dir,
resume_after=None, chunk_size=0,
households_sample_size=HOUSEHOLDS_SAMPLE_SIZE,
trace_hh_id=None, trace_od=None, check_for_variability=None):
trace_hh_id=None, trace_od=None, check_for_variability=None, two_zone=True):

setup_dirs(configs_dir, data_dir)

settings = inject_settings(
two_zone=two_zone,
households_sample_size=households_sample_size,
chunk_size=chunk_size,
trace_hh_id=trace_hh_id,
Expand DownExpand Up@@ -164,7 +168,7 @@ def test_full_run_2_zone():
tour_count = full_run(configs_dir=[example_path('configs_2_zone'), mtc_example_path('configs')],
data_dir=example_path('data_2'),
trace_hh_id=HH_ID, check_for_variability=True,
households_sample_size=HOUSEHOLDS_SAMPLE_SIZE)
households_sample_size=HOUSEHOLDS_SAMPLE_SIZE, two_zone=True)

print("tour_count", tour_count)

Expand All@@ -181,7 +185,7 @@ def test_full_run_3_zone():
tour_count = full_run(configs_dir=[example_path('configs_3_zone'), mtc_example_path('configs')],
data_dir=example_path('data_3'),
trace_hh_id=HH_ID_3_ZONE, check_for_variability=True,
households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE)
households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE, two_zone=False)

print("tour_count", tour_count)

Expand Down
4 changes: 3 additions & 1 deletion activitysim/cli/test/test_cli.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,9 @@ def test_create_copy():
assert 'copying configs ...' in str(cp.stdout)
assert 'copying configs_mp ...' in str(cp.stdout)
assert 'copying output ...' in str(cp.stdout)
assert str(target) in str(cp.stdout)

# replace slashes on windows
assert str(target).replace("\\\\", "\\") in str(cp.stdout).replace("\\\\", "\\")

assert os.path.exists(target)
for folder in ['configs', 'configs_mp', 'data', 'output']:
Expand Down
44 changes: 44 additions & 0 deletions activitysim/core/expressions.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,50 @@ def assign_columns(df, model_settings, locals_dict={}, trace_label=None):
# helpers
# ##################################################################################################

def skim_time_period_label(time_period):
"""
convert time period times to skim time period labels (e.g. 9 -> 'AM')
Parameters
----------
time_period : pandas Series
Returns
-------
pandas Series
string time period labels
"""

skim_time_periods = config.setting('skim_time_periods')

# Default to 60 minute time periods
period_minutes = 60
if 'period_minutes' in skim_time_periods.keys():
period_minutes = skim_time_periods['period_minutes']

# Default to a day
model_time_window_min = 1440
if ('time_window') in skim_time_periods.keys():
model_time_window_min = skim_time_periods['time_window']

# Check to make sure the intervals result in no remainder time throught 24 hour day
assert 0 == model_time_window_min % period_minutes
total_periods = model_time_window_min / period_minutes

# FIXME - eventually test and use np version always?
period_label = 'periods'
if 'hours' in skim_time_periods.keys():
period_label = 'hours'
warnings.warn('`skim_time_periods` key `hours` in settings.yml will be removed in '
'future verions. Use `periods` instead',
FutureWarning)

if np.isscalar(time_period):
bin = np.digitize([time_period % total_periods],
skim_time_periods[period_label], right=True)[0] - 1
return skim_time_periods['labels'][bin]

return pd.cut(time_period, skim_time_periods[period_label],
labels=skim_time_periods['labels'], ordered=False).astype(str)


def annotate_preprocessors(
tours_df, locals_dict, skims,
Expand Down
2 changes: 1 addition & 1 deletion activitysim/core/los.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -597,4 +597,4 @@ def skim_time_period_label(self, time_period):
return self.skim_time_periods['labels'][bin]

return pd.cut(time_period, self.skim_time_periods['periods'],
labels=self.skim_time_periods['labels'], right=True).astype(str)
labels=self.skim_time_periods['labels'], ordered=False).astype(str)
6 changes: 4 additions & 2 deletions activitysim/core/pathbuilder.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -548,7 +548,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

access_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.access')
egress_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.egress')
paths_nest_nesting_coefficient = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}').get('paths_nest_nesting_coefficient', 1)
path_types_settings = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}')
paths_nest_nesting_coefficient = path_types_settings.get('paths_nest_nesting_coefficient', 1)

# maz od pairs requested
with memo("#TVPB build_virtual_path maz_od_df"):
Expand DownExpand Up@@ -640,7 +641,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

chunk.log_df(trace_label, "utilities_df", utilities_df)

logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient), axis=1)), UNAVAILABLE)
logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient),
axis=1)), UNAVAILABLE)

if want_choices:

Expand Down
2 changes: 1 addition & 1 deletion activitysim/core/test/test_timetable.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -183,4 +183,4 @@ def test_basic(persons, tdd_alts):
starts = pd.Series([9, 6, 9, 5])
ends = pd.Series([10, 10, 10, 9])
periods_available = timetable.remaining_periods_available(person_ids, starts, ends)
pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]))
pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]), check_dtype=False)
9 changes: 9 additions & 0 deletions activitysim/examples/example_mtc/configs/cdap.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,15 @@ CONSTANTS:
SCHOOL: 7
PRESCHOOL: 8

PERSON_TYPE_MAP:
WORKER:
- 1
- 2
CHILD:
- 6
- 7
- 8

annotate_persons:
SPEC: annotate_persons_cdap
DF: persons
Expand Down
4 changes: 2 additions & 2 deletions activitysim/examples/example_mtc/configs/network_los.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@ taz_skims: skims.omx
skim_time_periods:
time_window: 1440
period_minutes: 60
periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
labels: ['EA', 'AM', 'MD', 'PM', 'EV']
periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']
2 changes: 1 addition & 1 deletion activitysim/examples/example_multiple_zone/configs_3_zone/network_los.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ skim_dict_factory: NumpyArraySkimFactory
#skim_dict_factory: MemMapSkimFactory

# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
read_skim_cache: True
read_skim_cache: False
# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
write_skim_cache: True

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@
'pyarrow >= 2.0',
'numpy >= 1.16.1',
'openmatrix >= 0.3.4.1',
'pandas >= 1.0.1',
'pandas >= 1.1.0',
'pyyaml >= 5.1',
'tables >= 3.5.1',
'toolz >= 0.8.1',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
#359#364

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

from

Dec 23, 2020
 Merged


#359
#364
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
003742b

updates for CDAP person type mapping

Nov 11, 2020
1a5a264

allow duplicate time labels

Nov 11, 2020
bb0deaf

Merge danielsclint/ft_cdap_schedule into develop


bstabler Dec 22, 2020
4eff144

fix a copy small items for #359


bstabler Dec 22, 2020
c14e5e4

test updates


bstabler Dec 22, 2020
0c32ecf

pycodestyle


bstabler Dec 23, 2020
e588ea8

3 zone test fix


bstabler Dec 23, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
activitysim/abm/models/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ def cdap_simulate(persons_merged, persons, households,

 trace_label = 'cdap'
 model_settings = config.read_model_settings('cdap.yaml')

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap_indiv_spec = simulate.read_model_spec(file_name=model_settings['INDIV_AND_HHSIZE1_SPEC'])

 # Rules and coefficients for generating interaction specs for different household sizes
Expand DownExpand Up@@ -88,6 +88,7 @@ def cdap_simulate(persons_merged, persons, households,

 choices = cdap.run_cdap(
 persons=persons_merged,
 person_type_map=person_type_map,
 cdap_indiv_spec=cdap_indiv_spec,
 cdap_interaction_coefficients=cdap_interaction_coefficients,
 cdap_fixed_relative_proportions=cdap_fixed_relative_proportions,
Expand Down

14 changes: 7 additions & 7 deletions
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,6 @@

MAX_INTERACTION_CARDINALITY = 3

WORKER_PTYPES = [1, 2]
CHILD_PTYPES = [6, 7, 8]


def set_hh_index(df):

Expand All@@ -61,7 +58,7 @@ def add_pn(col, pnum):
 raise RuntimeError("add_pn col not list or str")


def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):
def assign_cdap_rank(persons, person_type_map, trace_hh_id=None, trace_label=None):
 """
 Assign an integer index, cdap_rank, to each household member. (Starting with 1, not 0)

Expand DownExpand Up@@ -109,7 +106,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 2 workers, preferring full over part, older over younger
 workers = \
 persons.loc[persons[_ptype_].isin(WORKER_PTYPES), [_hh_id_, _ptype_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['WORKER']), [_hh_id_, _ptype_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(2)
 # tag the selected workers
Expand All@@ -118,7 +115,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 3, preferring youngest
 children = \
 persons.loc[persons[_ptype_].isin(CHILD_PTYPES), [_hh_id_, _ptype_, _age_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['CHILD']), [_hh_id_, _ptype_, _age_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(3)
 # tag the selected children
Expand DownExpand Up@@ -795,6 +792,7 @@ def extra_hh_member_choices(persons, cdap_fixed_relative_proportions, locals_d,

def _run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand All@@ -815,7 +813,7 @@ def _run_cdap(
 # assign integer cdap_rank to each household member
 # persons with cdap_rank 1..MAX_HHSIZE will be have their activities chose by CDAP model
 # extra household members, will have activities assigned by in fixed proportions
 assign_cdap_rank(persons, trace_hh_id, trace_label)
 assign_cdap_rank(persons, person_type_map, trace_hh_id, trace_label)
 chunk.log_df(trace_label, 'persons', persons)

 # Calculate CDAP utilities for each individual, ignoring interactions
Expand DownExpand Up@@ -904,6 +902,7 @@ def cdap_calc_row_size(choosers, cdap_indiv_spec, trace_label):

def run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand DownExpand Up@@ -956,6 +955,7 @@ def run_cdap(

 cdap_results = \
 _run_cdap(persons_chunk,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand Down

8 changes: 8 additions & 0 deletions
activitysim/abm/models/util/test/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

30 changes: 24 additions & 6 deletions
activitysim/abm/models/util/test/test_cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# See full license in LICENSE.txt.

import os.path
import yaml

import pandas as pd
import pandas.testing as pdt
Expand DownExpand Up@@ -31,6 +32,19 @@ def teardown_function(func):
 inject.reinject_decorated_tables()


@pytest.fixture(scope='module')
def model_settings(configs_dir):
 yml_file = os.path.join(configs_dir, 'cdap.yaml')
 with open(yml_file) as f:
 model_settings = yaml.load(f, Loader=yaml.loader.SafeLoader)
 return model_settings


@pytest.fixture(scope='module')
def configs_dir():
 return os.path.join(os.path.dirname(__file__), 'configs')


def setup_function():
 configs_dir = os.path.join(os.path.dirname(__file__), 'configs')
 inject.add_injectable("configs_dir", configs_dir)
Expand All@@ -48,9 +62,11 @@ def test_bad_coefficients():
 assert "Expect only M, N, or H" in str(excinfo.value)


def test_assign_cdap_rank(people):
def test_assign_cdap_rank(people, model_settings):

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})

 cdap.assign_cdap_rank(people)
 cdap.assign_cdap_rank(people, person_type_map)

 expected = pd.Series(
 [1, 1, 1, 2, 2, 1, 3, 1, 2, 1, 3, 2, 1, 3, 2, 4, 1, 3, 4, 2],
Expand All@@ -60,11 +76,12 @@ def test_assign_cdap_rank(people):
 pdt.assert_series_equal(people['cdap_rank'], expected, check_dtype=False, check_names=False)


def test_individual_utilities(people):
def test_individual_utilities(people, model_settings):

 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 individual_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 individual_utils = individual_utils[['M', 'N', 'H']]
Expand DownExpand Up@@ -96,15 +113,16 @@ def test_individual_utilities(people):
 individual_utils, expected, check_dtype=False, check_names=False)


def test_build_cdap_spec_hhsize2(people):
def test_build_cdap_spec_hhsize2(people, model_settings):

 hhsize = 2
 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 interaction_coefficients = pd.read_csv(config.config_file_path('cdap_interaction_coefficients.csv'), comment='#')
 interaction_coefficients = cdap.preprocess_interaction_coefficients(interaction_coefficients)

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 indiv_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 choosers = cdap.hh_choosers(indiv_utils, hhsize=hhsize)
Expand Down

16 changes: 10 additions & 6 deletions
activitysim/abm/test/test_multi_zone.py

View file


Open in desktop

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

# 3-zone is currently big and slow - so set this way low
HOUSEHOLDS_SAMPLE_SIZE_3_ZONE = 10
EXPECT_3_ZONE_TOUR_COUNT = 26
EXPECT_3_ZONE_TOUR_COUNT = 30


# household with mandatory, non mandatory, atwork_subtours, and joint tours
Expand DownExpand Up@@ -85,9 +85,12 @@ def close_handlers():

def inject_settings(**kwargs):

 settings = config.read_settings_file('settings.yaml', mandatory=True)

 for k in kwargs:
 if k == "two_zone":
 if kwargs[k]:
 settings = config.read_settings_file('settings.yaml', mandatory=True)
 else:
 settings = config.read_settings_file('settings_static.yaml', mandatory=True)
 settings[k] = kwargs[k]

 inject.add_injectable("settings", settings)
Expand All@@ -98,11 +101,12 @@ def inject_settings(**kwargs):
def full_run(configs_dir, data_dir,
 resume_after=None, chunk_size=0,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE,
 trace_hh_id=None, trace_od=None, check_for_variability=None):
 trace_hh_id=None, trace_od=None, check_for_variability=None, two_zone=True):

 setup_dirs(configs_dir, data_dir)

 settings = inject_settings(
 two_zone=two_zone,
 households_sample_size=households_sample_size,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
Expand DownExpand Up@@ -164,7 +168,7 @@ def test_full_run_2_zone():
 tour_count = full_run(configs_dir=[example_path('configs_2_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_2'),
 trace_hh_id=HH_ID, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE, two_zone=True)

 print("tour_count", tour_count)

Expand All@@ -181,7 +185,7 @@ def test_full_run_3_zone():
 tour_count = full_run(configs_dir=[example_path('configs_3_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_3'),
 trace_hh_id=HH_ID_3_ZONE, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE, two_zone=False)

 print("tour_count", tour_count)

Expand Down

4 changes: 3 additions & 1 deletion
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,9 @@ def test_create_copy():
 assert 'copying configs ...' in str(cp.stdout)
 assert 'copying configs_mp ...' in str(cp.stdout)
 assert 'copying output ...' in str(cp.stdout)
 assert str(target) in str(cp.stdout)

 # replace slashes on windows
 assert str(target).replace("\\\\", "\\") in str(cp.stdout).replace("\\\\", "\\")

 assert os.path.exists(target)
 for folder in ['configs', 'configs_mp', 'data', 'output']:
Expand Down

44 changes: 44 additions & 0 deletions
activitysim/core/expressions.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,50 @@ def assign_columns(df, model_settings, locals_dict={}, trace_label=None):
# helpers
# ##################################################################################################

def skim_time_period_label(time_period):
 """
 convert time period times to skim time period labels (e.g. 9 -> 'AM')
 Parameters
 ----------
 time_period : pandas Series
 Returns
 -------
 pandas Series
 string time period labels
 """

 skim_time_periods = config.setting('skim_time_periods')

 # Default to 60 minute time periods
 period_minutes = 60
 if 'period_minutes' in skim_time_periods.keys():
 period_minutes = skim_time_periods['period_minutes']

 # Default to a day
 model_time_window_min = 1440
 if ('time_window') in skim_time_periods.keys():
 model_time_window_min = skim_time_periods['time_window']

 # Check to make sure the intervals result in no remainder time throught 24 hour day
 assert 0 == model_time_window_min % period_minutes
 total_periods = model_time_window_min / period_minutes

 # FIXME - eventually test and use np version always?
 period_label = 'periods'
 if 'hours' in skim_time_periods.keys():
 period_label = 'hours'
 warnings.warn('`skim_time_periods` key `hours` in settings.yml will be removed in '
 'future verions. Use `periods` instead',
 FutureWarning)

 if np.isscalar(time_period):
 bin = np.digitize([time_period % total_periods],
 skim_time_periods[period_label], right=True)[0] - 1
 return skim_time_periods['labels'][bin]

 return pd.cut(time_period, skim_time_periods[period_label],
 labels=skim_time_periods['labels'], ordered=False).astype(str)


def annotate_preprocessors(
 tours_df, locals_dict, skims,
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/los.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,4 +597,4 @@ def skim_time_period_label(self, time_period):
 return self.skim_time_periods['labels'][bin]

 return pd.cut(time_period, self.skim_time_periods['periods'],
 labels=self.skim_time_periods['labels'], right=True).astype(str)
 labels=self.skim_time_periods['labels'], ordered=False).astype(str)

6 changes: 4 additions & 2 deletions
activitysim/core/pathbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -548,7 +548,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 access_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.access')
 egress_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.egress')
 paths_nest_nesting_coefficient = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}').get('paths_nest_nesting_coefficient', 1)
 path_types_settings = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}')
 paths_nest_nesting_coefficient = path_types_settings.get('paths_nest_nesting_coefficient', 1)

 # maz od pairs requested
 with memo("#TVPB build_virtual_path maz_od_df"):
Expand DownExpand Up@@ -640,7 +641,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 chunk.log_df(trace_label, "utilities_df", utilities_df)

 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient), axis=1)), UNAVAILABLE)
 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient),
 axis=1)), UNAVAILABLE)

 if want_choices:

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/test/test_timetable.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,4 +183,4 @@ def test_basic(persons, tdd_alts):
 starts = pd.Series([9, 6, 9, 5])
 ends = pd.Series([10, 10, 10, 9])
 periods_available = timetable.remaining_periods_available(person_ids, starts, ends)
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]))
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]), check_dtype=False)

9 changes: 9 additions & 0 deletions
activitysim/examples/example_mtc/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,15 @@ CONSTANTS:
 SCHOOL: 7
 PRESCHOOL: 8

PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

annotate_persons:
 SPEC: annotate_persons_cdap
 DF: persons
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/examples/example_mtc/configs/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@ taz_skims: skims.omx
skim_time_periods:
 time_window: 1440
 period_minutes: 60
 periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'AM', 'MD', 'PM', 'EV']
 periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']

2 changes: 1 addition & 1 deletion
activitysim/examples/example_multiple_zone/configs_3_zone/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ skim_dict_factory: NumpyArraySkimFactory
#skim_dict_factory: MemMapSkimFactory

# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
read_skim_cache: True
read_skim_cache: False
# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
write_skim_cache: True

Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@
 'pyarrow >= 2.0',
 'numpy >= 1.16.1',
 'openmatrix >= 0.3.4.1',
 'pandas >= 1.0.1',
 'pandas >= 1.1.0',
 'pyyaml >= 5.1',
 'tables >= 3.5.1',
 'toolz >= 0.8.1',
Expand Down

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

Skip to content
#359#364

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

from

Dec 23, 2020
 Merged


#359
#364
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
003742b

updates for CDAP person type mapping

Nov 11, 2020
1a5a264

allow duplicate time labels

Nov 11, 2020
bb0deaf

Merge danielsclint/ft_cdap_schedule into develop


bstabler Dec 22, 2020
4eff144

fix a copy small items for #359


bstabler Dec 22, 2020
c14e5e4

test updates


bstabler Dec 22, 2020
0c32ecf

pycodestyle


bstabler Dec 23, 2020
e588ea8

3 zone test fix


bstabler Dec 23, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
activitysim/abm/models/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ def cdap_simulate(persons_merged, persons, households,

 trace_label = 'cdap'
 model_settings = config.read_model_settings('cdap.yaml')

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap_indiv_spec = simulate.read_model_spec(file_name=model_settings['INDIV_AND_HHSIZE1_SPEC'])

 # Rules and coefficients for generating interaction specs for different household sizes
Expand DownExpand Up@@ -88,6 +88,7 @@ def cdap_simulate(persons_merged, persons, households,

 choices = cdap.run_cdap(
 persons=persons_merged,
 person_type_map=person_type_map,
 cdap_indiv_spec=cdap_indiv_spec,
 cdap_interaction_coefficients=cdap_interaction_coefficients,
 cdap_fixed_relative_proportions=cdap_fixed_relative_proportions,
Expand Down

14 changes: 7 additions & 7 deletions
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,6 @@

MAX_INTERACTION_CARDINALITY = 3

WORKER_PTYPES = [1, 2]
CHILD_PTYPES = [6, 7, 8]


def set_hh_index(df):

Expand All@@ -61,7 +58,7 @@ def add_pn(col, pnum):
 raise RuntimeError("add_pn col not list or str")


def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):
def assign_cdap_rank(persons, person_type_map, trace_hh_id=None, trace_label=None):
 """
 Assign an integer index, cdap_rank, to each household member. (Starting with 1, not 0)

Expand DownExpand Up@@ -109,7 +106,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 2 workers, preferring full over part, older over younger
 workers = \
 persons.loc[persons[_ptype_].isin(WORKER_PTYPES), [_hh_id_, _ptype_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['WORKER']), [_hh_id_, _ptype_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(2)
 # tag the selected workers
Expand All@@ -118,7 +115,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 3, preferring youngest
 children = \
 persons.loc[persons[_ptype_].isin(CHILD_PTYPES), [_hh_id_, _ptype_, _age_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['CHILD']), [_hh_id_, _ptype_, _age_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(3)
 # tag the selected children
Expand DownExpand Up@@ -795,6 +792,7 @@ def extra_hh_member_choices(persons, cdap_fixed_relative_proportions, locals_d,

def _run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand All@@ -815,7 +813,7 @@ def _run_cdap(
 # assign integer cdap_rank to each household member
 # persons with cdap_rank 1..MAX_HHSIZE will be have their activities chose by CDAP model
 # extra household members, will have activities assigned by in fixed proportions
 assign_cdap_rank(persons, trace_hh_id, trace_label)
 assign_cdap_rank(persons, person_type_map, trace_hh_id, trace_label)
 chunk.log_df(trace_label, 'persons', persons)

 # Calculate CDAP utilities for each individual, ignoring interactions
Expand DownExpand Up@@ -904,6 +902,7 @@ def cdap_calc_row_size(choosers, cdap_indiv_spec, trace_label):

def run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand DownExpand Up@@ -956,6 +955,7 @@ def run_cdap(

 cdap_results = \
 _run_cdap(persons_chunk,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand Down

8 changes: 8 additions & 0 deletions
activitysim/abm/models/util/test/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

30 changes: 24 additions & 6 deletions
activitysim/abm/models/util/test/test_cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# See full license in LICENSE.txt.

import os.path
import yaml

import pandas as pd
import pandas.testing as pdt
Expand DownExpand Up@@ -31,6 +32,19 @@ def teardown_function(func):
 inject.reinject_decorated_tables()


@pytest.fixture(scope='module')
def model_settings(configs_dir):
 yml_file = os.path.join(configs_dir, 'cdap.yaml')
 with open(yml_file) as f:
 model_settings = yaml.load(f, Loader=yaml.loader.SafeLoader)
 return model_settings


@pytest.fixture(scope='module')
def configs_dir():
 return os.path.join(os.path.dirname(__file__), 'configs')


def setup_function():
 configs_dir = os.path.join(os.path.dirname(__file__), 'configs')
 inject.add_injectable("configs_dir", configs_dir)
Expand All@@ -48,9 +62,11 @@ def test_bad_coefficients():
 assert "Expect only M, N, or H" in str(excinfo.value)


def test_assign_cdap_rank(people):
def test_assign_cdap_rank(people, model_settings):

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})

 cdap.assign_cdap_rank(people)
 cdap.assign_cdap_rank(people, person_type_map)

 expected = pd.Series(
 [1, 1, 1, 2, 2, 1, 3, 1, 2, 1, 3, 2, 1, 3, 2, 4, 1, 3, 4, 2],
Expand All@@ -60,11 +76,12 @@ def test_assign_cdap_rank(people):
 pdt.assert_series_equal(people['cdap_rank'], expected, check_dtype=False, check_names=False)


def test_individual_utilities(people):
def test_individual_utilities(people, model_settings):

 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 individual_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 individual_utils = individual_utils[['M', 'N', 'H']]
Expand DownExpand Up@@ -96,15 +113,16 @@ def test_individual_utilities(people):
 individual_utils, expected, check_dtype=False, check_names=False)


def test_build_cdap_spec_hhsize2(people):
def test_build_cdap_spec_hhsize2(people, model_settings):

 hhsize = 2
 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 interaction_coefficients = pd.read_csv(config.config_file_path('cdap_interaction_coefficients.csv'), comment='#')
 interaction_coefficients = cdap.preprocess_interaction_coefficients(interaction_coefficients)

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 indiv_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 choosers = cdap.hh_choosers(indiv_utils, hhsize=hhsize)
Expand Down

16 changes: 10 additions & 6 deletions
activitysim/abm/test/test_multi_zone.py

View file


Open in desktop

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

# 3-zone is currently big and slow - so set this way low
HOUSEHOLDS_SAMPLE_SIZE_3_ZONE = 10
EXPECT_3_ZONE_TOUR_COUNT = 26
EXPECT_3_ZONE_TOUR_COUNT = 30


# household with mandatory, non mandatory, atwork_subtours, and joint tours
Expand DownExpand Up@@ -85,9 +85,12 @@ def close_handlers():

def inject_settings(**kwargs):

 settings = config.read_settings_file('settings.yaml', mandatory=True)

 for k in kwargs:
 if k == "two_zone":
 if kwargs[k]:
 settings = config.read_settings_file('settings.yaml', mandatory=True)
 else:
 settings = config.read_settings_file('settings_static.yaml', mandatory=True)
 settings[k] = kwargs[k]

 inject.add_injectable("settings", settings)
Expand All@@ -98,11 +101,12 @@ def inject_settings(**kwargs):
def full_run(configs_dir, data_dir,
 resume_after=None, chunk_size=0,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE,
 trace_hh_id=None, trace_od=None, check_for_variability=None):
 trace_hh_id=None, trace_od=None, check_for_variability=None, two_zone=True):

 setup_dirs(configs_dir, data_dir)

 settings = inject_settings(
 two_zone=two_zone,
 households_sample_size=households_sample_size,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
Expand DownExpand Up@@ -164,7 +168,7 @@ def test_full_run_2_zone():
 tour_count = full_run(configs_dir=[example_path('configs_2_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_2'),
 trace_hh_id=HH_ID, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE, two_zone=True)

 print("tour_count", tour_count)

Expand All@@ -181,7 +185,7 @@ def test_full_run_3_zone():
 tour_count = full_run(configs_dir=[example_path('configs_3_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_3'),
 trace_hh_id=HH_ID_3_ZONE, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE, two_zone=False)

 print("tour_count", tour_count)

Expand Down

4 changes: 3 additions & 1 deletion
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,9 @@ def test_create_copy():
 assert 'copying configs ...' in str(cp.stdout)
 assert 'copying configs_mp ...' in str(cp.stdout)
 assert 'copying output ...' in str(cp.stdout)
 assert str(target) in str(cp.stdout)

 # replace slashes on windows
 assert str(target).replace("\\\\", "\\") in str(cp.stdout).replace("\\\\", "\\")

 assert os.path.exists(target)
 for folder in ['configs', 'configs_mp', 'data', 'output']:
Expand Down

44 changes: 44 additions & 0 deletions
activitysim/core/expressions.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,50 @@ def assign_columns(df, model_settings, locals_dict={}, trace_label=None):
# helpers
# ##################################################################################################

def skim_time_period_label(time_period):
 """
 convert time period times to skim time period labels (e.g. 9 -> 'AM')
 Parameters
 ----------
 time_period : pandas Series
 Returns
 -------
 pandas Series
 string time period labels
 """

 skim_time_periods = config.setting('skim_time_periods')

 # Default to 60 minute time periods
 period_minutes = 60
 if 'period_minutes' in skim_time_periods.keys():
 period_minutes = skim_time_periods['period_minutes']

 # Default to a day
 model_time_window_min = 1440
 if ('time_window') in skim_time_periods.keys():
 model_time_window_min = skim_time_periods['time_window']

 # Check to make sure the intervals result in no remainder time throught 24 hour day
 assert 0 == model_time_window_min % period_minutes
 total_periods = model_time_window_min / period_minutes

 # FIXME - eventually test and use np version always?
 period_label = 'periods'
 if 'hours' in skim_time_periods.keys():
 period_label = 'hours'
 warnings.warn('`skim_time_periods` key `hours` in settings.yml will be removed in '
 'future verions. Use `periods` instead',
 FutureWarning)

 if np.isscalar(time_period):
 bin = np.digitize([time_period % total_periods],
 skim_time_periods[period_label], right=True)[0] - 1
 return skim_time_periods['labels'][bin]

 return pd.cut(time_period, skim_time_periods[period_label],
 labels=skim_time_periods['labels'], ordered=False).astype(str)


def annotate_preprocessors(
 tours_df, locals_dict, skims,
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/los.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,4 +597,4 @@ def skim_time_period_label(self, time_period):
 return self.skim_time_periods['labels'][bin]

 return pd.cut(time_period, self.skim_time_periods['periods'],
 labels=self.skim_time_periods['labels'], right=True).astype(str)
 labels=self.skim_time_periods['labels'], ordered=False).astype(str)

6 changes: 4 additions & 2 deletions
activitysim/core/pathbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -548,7 +548,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 access_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.access')
 egress_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.egress')
 paths_nest_nesting_coefficient = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}').get('paths_nest_nesting_coefficient', 1)
 path_types_settings = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}')
 paths_nest_nesting_coefficient = path_types_settings.get('paths_nest_nesting_coefficient', 1)

 # maz od pairs requested
 with memo("#TVPB build_virtual_path maz_od_df"):
Expand DownExpand Up@@ -640,7 +641,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 chunk.log_df(trace_label, "utilities_df", utilities_df)

 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient), axis=1)), UNAVAILABLE)
 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient),
 axis=1)), UNAVAILABLE)

 if want_choices:

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/test/test_timetable.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,4 +183,4 @@ def test_basic(persons, tdd_alts):
 starts = pd.Series([9, 6, 9, 5])
 ends = pd.Series([10, 10, 10, 9])
 periods_available = timetable.remaining_periods_available(person_ids, starts, ends)
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]))
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]), check_dtype=False)

9 changes: 9 additions & 0 deletions
activitysim/examples/example_mtc/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,15 @@ CONSTANTS:
 SCHOOL: 7
 PRESCHOOL: 8

PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

annotate_persons:
 SPEC: annotate_persons_cdap
 DF: persons
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/examples/example_mtc/configs/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@ taz_skims: skims.omx
skim_time_periods:
 time_window: 1440
 period_minutes: 60
 periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'AM', 'MD', 'PM', 'EV']
 periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']

2 changes: 1 addition & 1 deletion
activitysim/examples/example_multiple_zone/configs_3_zone/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ skim_dict_factory: NumpyArraySkimFactory
#skim_dict_factory: MemMapSkimFactory

# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
read_skim_cache: True
read_skim_cache: False
# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
write_skim_cache: True

Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@
 'pyarrow >= 2.0',
 'numpy >= 1.16.1',
 'openmatrix >= 0.3.4.1',
 'pandas >= 1.0.1',
 'pandas >= 1.1.0',
 'pyyaml >= 5.1',
 'tables >= 3.5.1',
 'toolz >= 0.8.1',
Expand Down

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

Skip to content
#359#364

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

from

Dec 23, 2020
 Merged


#359
#364
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
003742b

updates for CDAP person type mapping

Nov 11, 2020
1a5a264

allow duplicate time labels

Nov 11, 2020
bb0deaf

Merge danielsclint/ft_cdap_schedule into develop


bstabler Dec 22, 2020
4eff144

fix a copy small items for #359


bstabler Dec 22, 2020
c14e5e4

test updates


bstabler Dec 22, 2020
0c32ecf

pycodestyle


bstabler Dec 23, 2020
e588ea8

3 zone test fix


bstabler Dec 23, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
activitysim/abm/models/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ def cdap_simulate(persons_merged, persons, households,

 trace_label = 'cdap'
 model_settings = config.read_model_settings('cdap.yaml')

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap_indiv_spec = simulate.read_model_spec(file_name=model_settings['INDIV_AND_HHSIZE1_SPEC'])

 # Rules and coefficients for generating interaction specs for different household sizes
Expand DownExpand Up@@ -88,6 +88,7 @@ def cdap_simulate(persons_merged, persons, households,

 choices = cdap.run_cdap(
 persons=persons_merged,
 person_type_map=person_type_map,
 cdap_indiv_spec=cdap_indiv_spec,
 cdap_interaction_coefficients=cdap_interaction_coefficients,
 cdap_fixed_relative_proportions=cdap_fixed_relative_proportions,
Expand Down

14 changes: 7 additions & 7 deletions
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,6 @@

MAX_INTERACTION_CARDINALITY = 3

WORKER_PTYPES = [1, 2]
CHILD_PTYPES = [6, 7, 8]


def set_hh_index(df):

Expand All@@ -61,7 +58,7 @@ def add_pn(col, pnum):
 raise RuntimeError("add_pn col not list or str")


def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):
def assign_cdap_rank(persons, person_type_map, trace_hh_id=None, trace_label=None):
 """
 Assign an integer index, cdap_rank, to each household member. (Starting with 1, not 0)

Expand DownExpand Up@@ -109,7 +106,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 2 workers, preferring full over part, older over younger
 workers = \
 persons.loc[persons[_ptype_].isin(WORKER_PTYPES), [_hh_id_, _ptype_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['WORKER']), [_hh_id_, _ptype_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(2)
 # tag the selected workers
Expand All@@ -118,7 +115,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 3, preferring youngest
 children = \
 persons.loc[persons[_ptype_].isin(CHILD_PTYPES), [_hh_id_, _ptype_, _age_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['CHILD']), [_hh_id_, _ptype_, _age_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(3)
 # tag the selected children
Expand DownExpand Up@@ -795,6 +792,7 @@ def extra_hh_member_choices(persons, cdap_fixed_relative_proportions, locals_d,

def _run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand All@@ -815,7 +813,7 @@ def _run_cdap(
 # assign integer cdap_rank to each household member
 # persons with cdap_rank 1..MAX_HHSIZE will be have their activities chose by CDAP model
 # extra household members, will have activities assigned by in fixed proportions
 assign_cdap_rank(persons, trace_hh_id, trace_label)
 assign_cdap_rank(persons, person_type_map, trace_hh_id, trace_label)
 chunk.log_df(trace_label, 'persons', persons)

 # Calculate CDAP utilities for each individual, ignoring interactions
Expand DownExpand Up@@ -904,6 +902,7 @@ def cdap_calc_row_size(choosers, cdap_indiv_spec, trace_label):

def run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand DownExpand Up@@ -956,6 +955,7 @@ def run_cdap(

 cdap_results = \
 _run_cdap(persons_chunk,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand Down

8 changes: 8 additions & 0 deletions
activitysim/abm/models/util/test/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

30 changes: 24 additions & 6 deletions
activitysim/abm/models/util/test/test_cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# See full license in LICENSE.txt.

import os.path
import yaml

import pandas as pd
import pandas.testing as pdt
Expand DownExpand Up@@ -31,6 +32,19 @@ def teardown_function(func):
 inject.reinject_decorated_tables()


@pytest.fixture(scope='module')
def model_settings(configs_dir):
 yml_file = os.path.join(configs_dir, 'cdap.yaml')
 with open(yml_file) as f:
 model_settings = yaml.load(f, Loader=yaml.loader.SafeLoader)
 return model_settings


@pytest.fixture(scope='module')
def configs_dir():
 return os.path.join(os.path.dirname(__file__), 'configs')


def setup_function():
 configs_dir = os.path.join(os.path.dirname(__file__), 'configs')
 inject.add_injectable("configs_dir", configs_dir)
Expand All@@ -48,9 +62,11 @@ def test_bad_coefficients():
 assert "Expect only M, N, or H" in str(excinfo.value)


def test_assign_cdap_rank(people):
def test_assign_cdap_rank(people, model_settings):

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})

 cdap.assign_cdap_rank(people)
 cdap.assign_cdap_rank(people, person_type_map)

 expected = pd.Series(
 [1, 1, 1, 2, 2, 1, 3, 1, 2, 1, 3, 2, 1, 3, 2, 4, 1, 3, 4, 2],
Expand All@@ -60,11 +76,12 @@ def test_assign_cdap_rank(people):
 pdt.assert_series_equal(people['cdap_rank'], expected, check_dtype=False, check_names=False)


def test_individual_utilities(people):
def test_individual_utilities(people, model_settings):

 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 individual_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 individual_utils = individual_utils[['M', 'N', 'H']]
Expand DownExpand Up@@ -96,15 +113,16 @@ def test_individual_utilities(people):
 individual_utils, expected, check_dtype=False, check_names=False)


def test_build_cdap_spec_hhsize2(people):
def test_build_cdap_spec_hhsize2(people, model_settings):

 hhsize = 2
 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 interaction_coefficients = pd.read_csv(config.config_file_path('cdap_interaction_coefficients.csv'), comment='#')
 interaction_coefficients = cdap.preprocess_interaction_coefficients(interaction_coefficients)

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 indiv_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 choosers = cdap.hh_choosers(indiv_utils, hhsize=hhsize)
Expand Down

16 changes: 10 additions & 6 deletions
activitysim/abm/test/test_multi_zone.py

View file


Open in desktop

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

# 3-zone is currently big and slow - so set this way low
HOUSEHOLDS_SAMPLE_SIZE_3_ZONE = 10
EXPECT_3_ZONE_TOUR_COUNT = 26
EXPECT_3_ZONE_TOUR_COUNT = 30


# household with mandatory, non mandatory, atwork_subtours, and joint tours
Expand DownExpand Up@@ -85,9 +85,12 @@ def close_handlers():

def inject_settings(**kwargs):

 settings = config.read_settings_file('settings.yaml', mandatory=True)

 for k in kwargs:
 if k == "two_zone":
 if kwargs[k]:
 settings = config.read_settings_file('settings.yaml', mandatory=True)
 else:
 settings = config.read_settings_file('settings_static.yaml', mandatory=True)
 settings[k] = kwargs[k]

 inject.add_injectable("settings", settings)
Expand All@@ -98,11 +101,12 @@ def inject_settings(**kwargs):
def full_run(configs_dir, data_dir,
 resume_after=None, chunk_size=0,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE,
 trace_hh_id=None, trace_od=None, check_for_variability=None):
 trace_hh_id=None, trace_od=None, check_for_variability=None, two_zone=True):

 setup_dirs(configs_dir, data_dir)

 settings = inject_settings(
 two_zone=two_zone,
 households_sample_size=households_sample_size,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
Expand DownExpand Up@@ -164,7 +168,7 @@ def test_full_run_2_zone():
 tour_count = full_run(configs_dir=[example_path('configs_2_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_2'),
 trace_hh_id=HH_ID, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE, two_zone=True)

 print("tour_count", tour_count)

Expand All@@ -181,7 +185,7 @@ def test_full_run_3_zone():
 tour_count = full_run(configs_dir=[example_path('configs_3_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_3'),
 trace_hh_id=HH_ID_3_ZONE, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE, two_zone=False)

 print("tour_count", tour_count)

Expand Down

4 changes: 3 additions & 1 deletion
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,9 @@ def test_create_copy():
 assert 'copying configs ...' in str(cp.stdout)
 assert 'copying configs_mp ...' in str(cp.stdout)
 assert 'copying output ...' in str(cp.stdout)
 assert str(target) in str(cp.stdout)

 # replace slashes on windows
 assert str(target).replace("\\\\", "\\") in str(cp.stdout).replace("\\\\", "\\")

 assert os.path.exists(target)
 for folder in ['configs', 'configs_mp', 'data', 'output']:
Expand Down

44 changes: 44 additions & 0 deletions
activitysim/core/expressions.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,50 @@ def assign_columns(df, model_settings, locals_dict={}, trace_label=None):
# helpers
# ##################################################################################################

def skim_time_period_label(time_period):
 """
 convert time period times to skim time period labels (e.g. 9 -> 'AM')
 Parameters
 ----------
 time_period : pandas Series
 Returns
 -------
 pandas Series
 string time period labels
 """

 skim_time_periods = config.setting('skim_time_periods')

 # Default to 60 minute time periods
 period_minutes = 60
 if 'period_minutes' in skim_time_periods.keys():
 period_minutes = skim_time_periods['period_minutes']

 # Default to a day
 model_time_window_min = 1440
 if ('time_window') in skim_time_periods.keys():
 model_time_window_min = skim_time_periods['time_window']

 # Check to make sure the intervals result in no remainder time throught 24 hour day
 assert 0 == model_time_window_min % period_minutes
 total_periods = model_time_window_min / period_minutes

 # FIXME - eventually test and use np version always?
 period_label = 'periods'
 if 'hours' in skim_time_periods.keys():
 period_label = 'hours'
 warnings.warn('`skim_time_periods` key `hours` in settings.yml will be removed in '
 'future verions. Use `periods` instead',
 FutureWarning)

 if np.isscalar(time_period):
 bin = np.digitize([time_period % total_periods],
 skim_time_periods[period_label], right=True)[0] - 1
 return skim_time_periods['labels'][bin]

 return pd.cut(time_period, skim_time_periods[period_label],
 labels=skim_time_periods['labels'], ordered=False).astype(str)


def annotate_preprocessors(
 tours_df, locals_dict, skims,
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/los.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,4 +597,4 @@ def skim_time_period_label(self, time_period):
 return self.skim_time_periods['labels'][bin]

 return pd.cut(time_period, self.skim_time_periods['periods'],
 labels=self.skim_time_periods['labels'], right=True).astype(str)
 labels=self.skim_time_periods['labels'], ordered=False).astype(str)

6 changes: 4 additions & 2 deletions
activitysim/core/pathbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -548,7 +548,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 access_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.access')
 egress_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.egress')
 paths_nest_nesting_coefficient = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}').get('paths_nest_nesting_coefficient', 1)
 path_types_settings = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}')
 paths_nest_nesting_coefficient = path_types_settings.get('paths_nest_nesting_coefficient', 1)

 # maz od pairs requested
 with memo("#TVPB build_virtual_path maz_od_df"):
Expand DownExpand Up@@ -640,7 +641,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 chunk.log_df(trace_label, "utilities_df", utilities_df)

 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient), axis=1)), UNAVAILABLE)
 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient),
 axis=1)), UNAVAILABLE)

 if want_choices:

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/test/test_timetable.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,4 +183,4 @@ def test_basic(persons, tdd_alts):
 starts = pd.Series([9, 6, 9, 5])
 ends = pd.Series([10, 10, 10, 9])
 periods_available = timetable.remaining_periods_available(person_ids, starts, ends)
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]))
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]), check_dtype=False)

9 changes: 9 additions & 0 deletions
activitysim/examples/example_mtc/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,15 @@ CONSTANTS:
 SCHOOL: 7
 PRESCHOOL: 8

PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

annotate_persons:
 SPEC: annotate_persons_cdap
 DF: persons
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/examples/example_mtc/configs/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@ taz_skims: skims.omx
skim_time_periods:
 time_window: 1440
 period_minutes: 60
 periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'AM', 'MD', 'PM', 'EV']
 periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']

2 changes: 1 addition & 1 deletion
activitysim/examples/example_multiple_zone/configs_3_zone/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ skim_dict_factory: NumpyArraySkimFactory
#skim_dict_factory: MemMapSkimFactory

# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
read_skim_cache: True
read_skim_cache: False
# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
write_skim_cache: True

Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@
 'pyarrow >= 2.0',
 'numpy >= 1.16.1',
 'openmatrix >= 0.3.4.1',
 'pandas >= 1.0.1',
 'pandas >= 1.1.0',
 'pyyaml >= 5.1',
 'tables >= 3.5.1',
 'toolz >= 0.8.1',
Expand Down

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

Skip to content
#359#364

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

from

Dec 23, 2020
 Merged


#359
#364
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
003742b

updates for CDAP person type mapping

Nov 11, 2020
1a5a264

allow duplicate time labels

Nov 11, 2020
bb0deaf

Merge danielsclint/ft_cdap_schedule into develop


bstabler Dec 22, 2020
4eff144

fix a copy small items for #359


bstabler Dec 22, 2020
c14e5e4

test updates


bstabler Dec 22, 2020
0c32ecf

pycodestyle


bstabler Dec 23, 2020
e588ea8

3 zone test fix


bstabler Dec 23, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
activitysim/abm/models/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ def cdap_simulate(persons_merged, persons, households,

 trace_label = 'cdap'
 model_settings = config.read_model_settings('cdap.yaml')

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap_indiv_spec = simulate.read_model_spec(file_name=model_settings['INDIV_AND_HHSIZE1_SPEC'])

 # Rules and coefficients for generating interaction specs for different household sizes
Expand DownExpand Up@@ -88,6 +88,7 @@ def cdap_simulate(persons_merged, persons, households,

 choices = cdap.run_cdap(
 persons=persons_merged,
 person_type_map=person_type_map,
 cdap_indiv_spec=cdap_indiv_spec,
 cdap_interaction_coefficients=cdap_interaction_coefficients,
 cdap_fixed_relative_proportions=cdap_fixed_relative_proportions,
Expand Down

14 changes: 7 additions & 7 deletions
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,6 @@

MAX_INTERACTION_CARDINALITY = 3

WORKER_PTYPES = [1, 2]
CHILD_PTYPES = [6, 7, 8]


def set_hh_index(df):

Expand All@@ -61,7 +58,7 @@ def add_pn(col, pnum):
 raise RuntimeError("add_pn col not list or str")


def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):
def assign_cdap_rank(persons, person_type_map, trace_hh_id=None, trace_label=None):
 """
 Assign an integer index, cdap_rank, to each household member. (Starting with 1, not 0)

Expand DownExpand Up@@ -109,7 +106,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 2 workers, preferring full over part, older over younger
 workers = \
 persons.loc[persons[_ptype_].isin(WORKER_PTYPES), [_hh_id_, _ptype_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['WORKER']), [_hh_id_, _ptype_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(2)
 # tag the selected workers
Expand All@@ -118,7 +115,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 3, preferring youngest
 children = \
 persons.loc[persons[_ptype_].isin(CHILD_PTYPES), [_hh_id_, _ptype_, _age_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['CHILD']), [_hh_id_, _ptype_, _age_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(3)
 # tag the selected children
Expand DownExpand Up@@ -795,6 +792,7 @@ def extra_hh_member_choices(persons, cdap_fixed_relative_proportions, locals_d,

def _run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand All@@ -815,7 +813,7 @@ def _run_cdap(
 # assign integer cdap_rank to each household member
 # persons with cdap_rank 1..MAX_HHSIZE will be have their activities chose by CDAP model
 # extra household members, will have activities assigned by in fixed proportions
 assign_cdap_rank(persons, trace_hh_id, trace_label)
 assign_cdap_rank(persons, person_type_map, trace_hh_id, trace_label)
 chunk.log_df(trace_label, 'persons', persons)

 # Calculate CDAP utilities for each individual, ignoring interactions
Expand DownExpand Up@@ -904,6 +902,7 @@ def cdap_calc_row_size(choosers, cdap_indiv_spec, trace_label):

def run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand DownExpand Up@@ -956,6 +955,7 @@ def run_cdap(

 cdap_results = \
 _run_cdap(persons_chunk,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand Down

8 changes: 8 additions & 0 deletions
activitysim/abm/models/util/test/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

30 changes: 24 additions & 6 deletions
activitysim/abm/models/util/test/test_cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# See full license in LICENSE.txt.

import os.path
import yaml

import pandas as pd
import pandas.testing as pdt
Expand DownExpand Up@@ -31,6 +32,19 @@ def teardown_function(func):
 inject.reinject_decorated_tables()


@pytest.fixture(scope='module')
def model_settings(configs_dir):
 yml_file = os.path.join(configs_dir, 'cdap.yaml')
 with open(yml_file) as f:
 model_settings = yaml.load(f, Loader=yaml.loader.SafeLoader)
 return model_settings


@pytest.fixture(scope='module')
def configs_dir():
 return os.path.join(os.path.dirname(__file__), 'configs')


def setup_function():
 configs_dir = os.path.join(os.path.dirname(__file__), 'configs')
 inject.add_injectable("configs_dir", configs_dir)
Expand All@@ -48,9 +62,11 @@ def test_bad_coefficients():
 assert "Expect only M, N, or H" in str(excinfo.value)


def test_assign_cdap_rank(people):
def test_assign_cdap_rank(people, model_settings):

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})

 cdap.assign_cdap_rank(people)
 cdap.assign_cdap_rank(people, person_type_map)

 expected = pd.Series(
 [1, 1, 1, 2, 2, 1, 3, 1, 2, 1, 3, 2, 1, 3, 2, 4, 1, 3, 4, 2],
Expand All@@ -60,11 +76,12 @@ def test_assign_cdap_rank(people):
 pdt.assert_series_equal(people['cdap_rank'], expected, check_dtype=False, check_names=False)


def test_individual_utilities(people):
def test_individual_utilities(people, model_settings):

 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 individual_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 individual_utils = individual_utils[['M', 'N', 'H']]
Expand DownExpand Up@@ -96,15 +113,16 @@ def test_individual_utilities(people):
 individual_utils, expected, check_dtype=False, check_names=False)


def test_build_cdap_spec_hhsize2(people):
def test_build_cdap_spec_hhsize2(people, model_settings):

 hhsize = 2
 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 interaction_coefficients = pd.read_csv(config.config_file_path('cdap_interaction_coefficients.csv'), comment='#')
 interaction_coefficients = cdap.preprocess_interaction_coefficients(interaction_coefficients)

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 indiv_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 choosers = cdap.hh_choosers(indiv_utils, hhsize=hhsize)
Expand Down

16 changes: 10 additions & 6 deletions
activitysim/abm/test/test_multi_zone.py

View file


Open in desktop

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

# 3-zone is currently big and slow - so set this way low
HOUSEHOLDS_SAMPLE_SIZE_3_ZONE = 10
EXPECT_3_ZONE_TOUR_COUNT = 26
EXPECT_3_ZONE_TOUR_COUNT = 30


# household with mandatory, non mandatory, atwork_subtours, and joint tours
Expand DownExpand Up@@ -85,9 +85,12 @@ def close_handlers():

def inject_settings(**kwargs):

 settings = config.read_settings_file('settings.yaml', mandatory=True)

 for k in kwargs:
 if k == "two_zone":
 if kwargs[k]:
 settings = config.read_settings_file('settings.yaml', mandatory=True)
 else:
 settings = config.read_settings_file('settings_static.yaml', mandatory=True)
 settings[k] = kwargs[k]

 inject.add_injectable("settings", settings)
Expand All@@ -98,11 +101,12 @@ def inject_settings(**kwargs):
def full_run(configs_dir, data_dir,
 resume_after=None, chunk_size=0,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE,
 trace_hh_id=None, trace_od=None, check_for_variability=None):
 trace_hh_id=None, trace_od=None, check_for_variability=None, two_zone=True):

 setup_dirs(configs_dir, data_dir)

 settings = inject_settings(
 two_zone=two_zone,
 households_sample_size=households_sample_size,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
Expand DownExpand Up@@ -164,7 +168,7 @@ def test_full_run_2_zone():
 tour_count = full_run(configs_dir=[example_path('configs_2_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_2'),
 trace_hh_id=HH_ID, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE, two_zone=True)

 print("tour_count", tour_count)

Expand All@@ -181,7 +185,7 @@ def test_full_run_3_zone():
 tour_count = full_run(configs_dir=[example_path('configs_3_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_3'),
 trace_hh_id=HH_ID_3_ZONE, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE, two_zone=False)

 print("tour_count", tour_count)

Expand Down

4 changes: 3 additions & 1 deletion
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,9 @@ def test_create_copy():
 assert 'copying configs ...' in str(cp.stdout)
 assert 'copying configs_mp ...' in str(cp.stdout)
 assert 'copying output ...' in str(cp.stdout)
 assert str(target) in str(cp.stdout)

 # replace slashes on windows
 assert str(target).replace("\\\\", "\\") in str(cp.stdout).replace("\\\\", "\\")

 assert os.path.exists(target)
 for folder in ['configs', 'configs_mp', 'data', 'output']:
Expand Down

44 changes: 44 additions & 0 deletions
activitysim/core/expressions.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,50 @@ def assign_columns(df, model_settings, locals_dict={}, trace_label=None):
# helpers
# ##################################################################################################

def skim_time_period_label(time_period):
 """
 convert time period times to skim time period labels (e.g. 9 -> 'AM')
 Parameters
 ----------
 time_period : pandas Series
 Returns
 -------
 pandas Series
 string time period labels
 """

 skim_time_periods = config.setting('skim_time_periods')

 # Default to 60 minute time periods
 period_minutes = 60
 if 'period_minutes' in skim_time_periods.keys():
 period_minutes = skim_time_periods['period_minutes']

 # Default to a day
 model_time_window_min = 1440
 if ('time_window') in skim_time_periods.keys():
 model_time_window_min = skim_time_periods['time_window']

 # Check to make sure the intervals result in no remainder time throught 24 hour day
 assert 0 == model_time_window_min % period_minutes
 total_periods = model_time_window_min / period_minutes

 # FIXME - eventually test and use np version always?
 period_label = 'periods'
 if 'hours' in skim_time_periods.keys():
 period_label = 'hours'
 warnings.warn('`skim_time_periods` key `hours` in settings.yml will be removed in '
 'future verions. Use `periods` instead',
 FutureWarning)

 if np.isscalar(time_period):
 bin = np.digitize([time_period % total_periods],
 skim_time_periods[period_label], right=True)[0] - 1
 return skim_time_periods['labels'][bin]

 return pd.cut(time_period, skim_time_periods[period_label],
 labels=skim_time_periods['labels'], ordered=False).astype(str)


def annotate_preprocessors(
 tours_df, locals_dict, skims,
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/los.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,4 +597,4 @@ def skim_time_period_label(self, time_period):
 return self.skim_time_periods['labels'][bin]

 return pd.cut(time_period, self.skim_time_periods['periods'],
 labels=self.skim_time_periods['labels'], right=True).astype(str)
 labels=self.skim_time_periods['labels'], ordered=False).astype(str)

6 changes: 4 additions & 2 deletions
activitysim/core/pathbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -548,7 +548,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 access_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.access')
 egress_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.egress')
 paths_nest_nesting_coefficient = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}').get('paths_nest_nesting_coefficient', 1)
 path_types_settings = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}')
 paths_nest_nesting_coefficient = path_types_settings.get('paths_nest_nesting_coefficient', 1)

 # maz od pairs requested
 with memo("#TVPB build_virtual_path maz_od_df"):
Expand DownExpand Up@@ -640,7 +641,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 chunk.log_df(trace_label, "utilities_df", utilities_df)

 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient), axis=1)), UNAVAILABLE)
 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient),
 axis=1)), UNAVAILABLE)

 if want_choices:

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/test/test_timetable.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,4 +183,4 @@ def test_basic(persons, tdd_alts):
 starts = pd.Series([9, 6, 9, 5])
 ends = pd.Series([10, 10, 10, 9])
 periods_available = timetable.remaining_periods_available(person_ids, starts, ends)
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]))
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]), check_dtype=False)

9 changes: 9 additions & 0 deletions
activitysim/examples/example_mtc/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,15 @@ CONSTANTS:
 SCHOOL: 7
 PRESCHOOL: 8

PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

annotate_persons:
 SPEC: annotate_persons_cdap
 DF: persons
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/examples/example_mtc/configs/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@ taz_skims: skims.omx
skim_time_periods:
 time_window: 1440
 period_minutes: 60
 periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'AM', 'MD', 'PM', 'EV']
 periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']

2 changes: 1 addition & 1 deletion
activitysim/examples/example_multiple_zone/configs_3_zone/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ skim_dict_factory: NumpyArraySkimFactory
#skim_dict_factory: MemMapSkimFactory

# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
read_skim_cache: True
read_skim_cache: False
# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
write_skim_cache: True

Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@
 'pyarrow >= 2.0',
 'numpy >= 1.16.1',
 'openmatrix >= 0.3.4.1',
 'pandas >= 1.0.1',
 'pandas >= 1.1.0',
 'pyyaml >= 5.1',
 'tables >= 3.5.1',
 'toolz >= 0.8.1',
Expand Down

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

Skip to content
#359#364

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

from

Dec 23, 2020
 Merged


#359
#364
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
003742b

updates for CDAP person type mapping

Nov 11, 2020
1a5a264

allow duplicate time labels

Nov 11, 2020
bb0deaf

Merge danielsclint/ft_cdap_schedule into develop


bstabler Dec 22, 2020
4eff144

fix a copy small items for #359


bstabler Dec 22, 2020
c14e5e4

test updates


bstabler Dec 22, 2020
0c32ecf

pycodestyle


bstabler Dec 23, 2020
e588ea8

3 zone test fix


bstabler Dec 23, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
activitysim/abm/models/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ def cdap_simulate(persons_merged, persons, households,

 trace_label = 'cdap'
 model_settings = config.read_model_settings('cdap.yaml')

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap_indiv_spec = simulate.read_model_spec(file_name=model_settings['INDIV_AND_HHSIZE1_SPEC'])

 # Rules and coefficients for generating interaction specs for different household sizes
Expand DownExpand Up@@ -88,6 +88,7 @@ def cdap_simulate(persons_merged, persons, households,

 choices = cdap.run_cdap(
 persons=persons_merged,
 person_type_map=person_type_map,
 cdap_indiv_spec=cdap_indiv_spec,
 cdap_interaction_coefficients=cdap_interaction_coefficients,
 cdap_fixed_relative_proportions=cdap_fixed_relative_proportions,
Expand Down

14 changes: 7 additions & 7 deletions
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,6 @@

MAX_INTERACTION_CARDINALITY = 3

WORKER_PTYPES = [1, 2]
CHILD_PTYPES = [6, 7, 8]


def set_hh_index(df):

Expand All@@ -61,7 +58,7 @@ def add_pn(col, pnum):
 raise RuntimeError("add_pn col not list or str")


def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):
def assign_cdap_rank(persons, person_type_map, trace_hh_id=None, trace_label=None):
 """
 Assign an integer index, cdap_rank, to each household member. (Starting with 1, not 0)

Expand DownExpand Up@@ -109,7 +106,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 2 workers, preferring full over part, older over younger
 workers = \
 persons.loc[persons[_ptype_].isin(WORKER_PTYPES), [_hh_id_, _ptype_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['WORKER']), [_hh_id_, _ptype_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(2)
 # tag the selected workers
Expand All@@ -118,7 +115,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 3, preferring youngest
 children = \
 persons.loc[persons[_ptype_].isin(CHILD_PTYPES), [_hh_id_, _ptype_, _age_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['CHILD']), [_hh_id_, _ptype_, _age_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(3)
 # tag the selected children
Expand DownExpand Up@@ -795,6 +792,7 @@ def extra_hh_member_choices(persons, cdap_fixed_relative_proportions, locals_d,

def _run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand All@@ -815,7 +813,7 @@ def _run_cdap(
 # assign integer cdap_rank to each household member
 # persons with cdap_rank 1..MAX_HHSIZE will be have their activities chose by CDAP model
 # extra household members, will have activities assigned by in fixed proportions
 assign_cdap_rank(persons, trace_hh_id, trace_label)
 assign_cdap_rank(persons, person_type_map, trace_hh_id, trace_label)
 chunk.log_df(trace_label, 'persons', persons)

 # Calculate CDAP utilities for each individual, ignoring interactions
Expand DownExpand Up@@ -904,6 +902,7 @@ def cdap_calc_row_size(choosers, cdap_indiv_spec, trace_label):

def run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand DownExpand Up@@ -956,6 +955,7 @@ def run_cdap(

 cdap_results = \
 _run_cdap(persons_chunk,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand Down

8 changes: 8 additions & 0 deletions
activitysim/abm/models/util/test/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

30 changes: 24 additions & 6 deletions
activitysim/abm/models/util/test/test_cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# See full license in LICENSE.txt.

import os.path
import yaml

import pandas as pd
import pandas.testing as pdt
Expand DownExpand Up@@ -31,6 +32,19 @@ def teardown_function(func):
 inject.reinject_decorated_tables()


@pytest.fixture(scope='module')
def model_settings(configs_dir):
 yml_file = os.path.join(configs_dir, 'cdap.yaml')
 with open(yml_file) as f:
 model_settings = yaml.load(f, Loader=yaml.loader.SafeLoader)
 return model_settings


@pytest.fixture(scope='module')
def configs_dir():
 return os.path.join(os.path.dirname(__file__), 'configs')


def setup_function():
 configs_dir = os.path.join(os.path.dirname(__file__), 'configs')
 inject.add_injectable("configs_dir", configs_dir)
Expand All@@ -48,9 +62,11 @@ def test_bad_coefficients():
 assert "Expect only M, N, or H" in str(excinfo.value)


def test_assign_cdap_rank(people):
def test_assign_cdap_rank(people, model_settings):

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})

 cdap.assign_cdap_rank(people)
 cdap.assign_cdap_rank(people, person_type_map)

 expected = pd.Series(
 [1, 1, 1, 2, 2, 1, 3, 1, 2, 1, 3, 2, 1, 3, 2, 4, 1, 3, 4, 2],
Expand All@@ -60,11 +76,12 @@ def test_assign_cdap_rank(people):
 pdt.assert_series_equal(people['cdap_rank'], expected, check_dtype=False, check_names=False)


def test_individual_utilities(people):
def test_individual_utilities(people, model_settings):

 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 individual_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 individual_utils = individual_utils[['M', 'N', 'H']]
Expand DownExpand Up@@ -96,15 +113,16 @@ def test_individual_utilities(people):
 individual_utils, expected, check_dtype=False, check_names=False)


def test_build_cdap_spec_hhsize2(people):
def test_build_cdap_spec_hhsize2(people, model_settings):

 hhsize = 2
 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 interaction_coefficients = pd.read_csv(config.config_file_path('cdap_interaction_coefficients.csv'), comment='#')
 interaction_coefficients = cdap.preprocess_interaction_coefficients(interaction_coefficients)

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 indiv_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 choosers = cdap.hh_choosers(indiv_utils, hhsize=hhsize)
Expand Down

16 changes: 10 additions & 6 deletions
activitysim/abm/test/test_multi_zone.py

View file


Open in desktop

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

# 3-zone is currently big and slow - so set this way low
HOUSEHOLDS_SAMPLE_SIZE_3_ZONE = 10
EXPECT_3_ZONE_TOUR_COUNT = 26
EXPECT_3_ZONE_TOUR_COUNT = 30


# household with mandatory, non mandatory, atwork_subtours, and joint tours
Expand DownExpand Up@@ -85,9 +85,12 @@ def close_handlers():

def inject_settings(**kwargs):

 settings = config.read_settings_file('settings.yaml', mandatory=True)

 for k in kwargs:
 if k == "two_zone":
 if kwargs[k]:
 settings = config.read_settings_file('settings.yaml', mandatory=True)
 else:
 settings = config.read_settings_file('settings_static.yaml', mandatory=True)
 settings[k] = kwargs[k]

 inject.add_injectable("settings", settings)
Expand All@@ -98,11 +101,12 @@ def inject_settings(**kwargs):
def full_run(configs_dir, data_dir,
 resume_after=None, chunk_size=0,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE,
 trace_hh_id=None, trace_od=None, check_for_variability=None):
 trace_hh_id=None, trace_od=None, check_for_variability=None, two_zone=True):

 setup_dirs(configs_dir, data_dir)

 settings = inject_settings(
 two_zone=two_zone,
 households_sample_size=households_sample_size,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
Expand DownExpand Up@@ -164,7 +168,7 @@ def test_full_run_2_zone():
 tour_count = full_run(configs_dir=[example_path('configs_2_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_2'),
 trace_hh_id=HH_ID, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE, two_zone=True)

 print("tour_count", tour_count)

Expand All@@ -181,7 +185,7 @@ def test_full_run_3_zone():
 tour_count = full_run(configs_dir=[example_path('configs_3_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_3'),
 trace_hh_id=HH_ID_3_ZONE, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE, two_zone=False)

 print("tour_count", tour_count)

Expand Down

4 changes: 3 additions & 1 deletion
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,9 @@ def test_create_copy():
 assert 'copying configs ...' in str(cp.stdout)
 assert 'copying configs_mp ...' in str(cp.stdout)
 assert 'copying output ...' in str(cp.stdout)
 assert str(target) in str(cp.stdout)

 # replace slashes on windows
 assert str(target).replace("\\\\", "\\") in str(cp.stdout).replace("\\\\", "\\")

 assert os.path.exists(target)
 for folder in ['configs', 'configs_mp', 'data', 'output']:
Expand Down

44 changes: 44 additions & 0 deletions
activitysim/core/expressions.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,50 @@ def assign_columns(df, model_settings, locals_dict={}, trace_label=None):
# helpers
# ##################################################################################################

def skim_time_period_label(time_period):
 """
 convert time period times to skim time period labels (e.g. 9 -> 'AM')
 Parameters
 ----------
 time_period : pandas Series
 Returns
 -------
 pandas Series
 string time period labels
 """

 skim_time_periods = config.setting('skim_time_periods')

 # Default to 60 minute time periods
 period_minutes = 60
 if 'period_minutes' in skim_time_periods.keys():
 period_minutes = skim_time_periods['period_minutes']

 # Default to a day
 model_time_window_min = 1440
 if ('time_window') in skim_time_periods.keys():
 model_time_window_min = skim_time_periods['time_window']

 # Check to make sure the intervals result in no remainder time throught 24 hour day
 assert 0 == model_time_window_min % period_minutes
 total_periods = model_time_window_min / period_minutes

 # FIXME - eventually test and use np version always?
 period_label = 'periods'
 if 'hours' in skim_time_periods.keys():
 period_label = 'hours'
 warnings.warn('`skim_time_periods` key `hours` in settings.yml will be removed in '
 'future verions. Use `periods` instead',
 FutureWarning)

 if np.isscalar(time_period):
 bin = np.digitize([time_period % total_periods],
 skim_time_periods[period_label], right=True)[0] - 1
 return skim_time_periods['labels'][bin]

 return pd.cut(time_period, skim_time_periods[period_label],
 labels=skim_time_periods['labels'], ordered=False).astype(str)


def annotate_preprocessors(
 tours_df, locals_dict, skims,
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/los.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,4 +597,4 @@ def skim_time_period_label(self, time_period):
 return self.skim_time_periods['labels'][bin]

 return pd.cut(time_period, self.skim_time_periods['periods'],
 labels=self.skim_time_periods['labels'], right=True).astype(str)
 labels=self.skim_time_periods['labels'], ordered=False).astype(str)

6 changes: 4 additions & 2 deletions
activitysim/core/pathbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -548,7 +548,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 access_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.access')
 egress_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.egress')
 paths_nest_nesting_coefficient = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}').get('paths_nest_nesting_coefficient', 1)
 path_types_settings = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}')
 paths_nest_nesting_coefficient = path_types_settings.get('paths_nest_nesting_coefficient', 1)

 # maz od pairs requested
 with memo("#TVPB build_virtual_path maz_od_df"):
Expand DownExpand Up@@ -640,7 +641,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 chunk.log_df(trace_label, "utilities_df", utilities_df)

 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient), axis=1)), UNAVAILABLE)
 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient),
 axis=1)), UNAVAILABLE)

 if want_choices:

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/test/test_timetable.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,4 +183,4 @@ def test_basic(persons, tdd_alts):
 starts = pd.Series([9, 6, 9, 5])
 ends = pd.Series([10, 10, 10, 9])
 periods_available = timetable.remaining_periods_available(person_ids, starts, ends)
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]))
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]), check_dtype=False)

9 changes: 9 additions & 0 deletions
activitysim/examples/example_mtc/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,15 @@ CONSTANTS:
 SCHOOL: 7
 PRESCHOOL: 8

PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

annotate_persons:
 SPEC: annotate_persons_cdap
 DF: persons
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/examples/example_mtc/configs/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@ taz_skims: skims.omx
skim_time_periods:
 time_window: 1440
 period_minutes: 60
 periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'AM', 'MD', 'PM', 'EV']
 periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']

2 changes: 1 addition & 1 deletion
activitysim/examples/example_multiple_zone/configs_3_zone/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ skim_dict_factory: NumpyArraySkimFactory
#skim_dict_factory: MemMapSkimFactory

# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
read_skim_cache: True
read_skim_cache: False
# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
write_skim_cache: True

Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@
 'pyarrow >= 2.0',
 'numpy >= 1.16.1',
 'openmatrix >= 0.3.4.1',
 'pandas >= 1.0.1',
 'pandas >= 1.1.0',
 'pyyaml >= 5.1',
 'tables >= 3.5.1',
 'toolz >= 0.8.1',
Expand Down

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

Skip to content
#359#364

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

from

Dec 23, 2020
 Merged


#359
#364
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
003742b

updates for CDAP person type mapping

Nov 11, 2020
1a5a264

allow duplicate time labels

Nov 11, 2020
bb0deaf

Merge danielsclint/ft_cdap_schedule into develop


bstabler Dec 22, 2020
4eff144

fix a copy small items for #359


bstabler Dec 22, 2020
c14e5e4

test updates


bstabler Dec 22, 2020
0c32ecf

pycodestyle


bstabler Dec 23, 2020
e588ea8

3 zone test fix


bstabler Dec 23, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
activitysim/abm/models/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ def cdap_simulate(persons_merged, persons, households,

 trace_label = 'cdap'
 model_settings = config.read_model_settings('cdap.yaml')

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap_indiv_spec = simulate.read_model_spec(file_name=model_settings['INDIV_AND_HHSIZE1_SPEC'])

 # Rules and coefficients for generating interaction specs for different household sizes
Expand DownExpand Up@@ -88,6 +88,7 @@ def cdap_simulate(persons_merged, persons, households,

 choices = cdap.run_cdap(
 persons=persons_merged,
 person_type_map=person_type_map,
 cdap_indiv_spec=cdap_indiv_spec,
 cdap_interaction_coefficients=cdap_interaction_coefficients,
 cdap_fixed_relative_proportions=cdap_fixed_relative_proportions,
Expand Down

14 changes: 7 additions & 7 deletions
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,6 @@

MAX_INTERACTION_CARDINALITY = 3

WORKER_PTYPES = [1, 2]
CHILD_PTYPES = [6, 7, 8]


def set_hh_index(df):

Expand All@@ -61,7 +58,7 @@ def add_pn(col, pnum):
 raise RuntimeError("add_pn col not list or str")


def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):
def assign_cdap_rank(persons, person_type_map, trace_hh_id=None, trace_label=None):
 """
 Assign an integer index, cdap_rank, to each household member. (Starting with 1, not 0)

Expand DownExpand Up@@ -109,7 +106,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 2 workers, preferring full over part, older over younger
 workers = \
 persons.loc[persons[_ptype_].isin(WORKER_PTYPES), [_hh_id_, _ptype_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['WORKER']), [_hh_id_, _ptype_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(2)
 # tag the selected workers
Expand All@@ -118,7 +115,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 3, preferring youngest
 children = \
 persons.loc[persons[_ptype_].isin(CHILD_PTYPES), [_hh_id_, _ptype_, _age_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['CHILD']), [_hh_id_, _ptype_, _age_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(3)
 # tag the selected children
Expand DownExpand Up@@ -795,6 +792,7 @@ def extra_hh_member_choices(persons, cdap_fixed_relative_proportions, locals_d,

def _run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand All@@ -815,7 +813,7 @@ def _run_cdap(
 # assign integer cdap_rank to each household member
 # persons with cdap_rank 1..MAX_HHSIZE will be have their activities chose by CDAP model
 # extra household members, will have activities assigned by in fixed proportions
 assign_cdap_rank(persons, trace_hh_id, trace_label)
 assign_cdap_rank(persons, person_type_map, trace_hh_id, trace_label)
 chunk.log_df(trace_label, 'persons', persons)

 # Calculate CDAP utilities for each individual, ignoring interactions
Expand DownExpand Up@@ -904,6 +902,7 @@ def cdap_calc_row_size(choosers, cdap_indiv_spec, trace_label):

def run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand DownExpand Up@@ -956,6 +955,7 @@ def run_cdap(

 cdap_results = \
 _run_cdap(persons_chunk,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand Down

8 changes: 8 additions & 0 deletions
activitysim/abm/models/util/test/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

30 changes: 24 additions & 6 deletions
activitysim/abm/models/util/test/test_cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# See full license in LICENSE.txt.

import os.path
import yaml

import pandas as pd
import pandas.testing as pdt
Expand DownExpand Up@@ -31,6 +32,19 @@ def teardown_function(func):
 inject.reinject_decorated_tables()


@pytest.fixture(scope='module')
def model_settings(configs_dir):
 yml_file = os.path.join(configs_dir, 'cdap.yaml')
 with open(yml_file) as f:
 model_settings = yaml.load(f, Loader=yaml.loader.SafeLoader)
 return model_settings


@pytest.fixture(scope='module')
def configs_dir():
 return os.path.join(os.path.dirname(__file__), 'configs')


def setup_function():
 configs_dir = os.path.join(os.path.dirname(__file__), 'configs')
 inject.add_injectable("configs_dir", configs_dir)
Expand All@@ -48,9 +62,11 @@ def test_bad_coefficients():
 assert "Expect only M, N, or H" in str(excinfo.value)


def test_assign_cdap_rank(people):
def test_assign_cdap_rank(people, model_settings):

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})

 cdap.assign_cdap_rank(people)
 cdap.assign_cdap_rank(people, person_type_map)

 expected = pd.Series(
 [1, 1, 1, 2, 2, 1, 3, 1, 2, 1, 3, 2, 1, 3, 2, 4, 1, 3, 4, 2],
Expand All@@ -60,11 +76,12 @@ def test_assign_cdap_rank(people):
 pdt.assert_series_equal(people['cdap_rank'], expected, check_dtype=False, check_names=False)


def test_individual_utilities(people):
def test_individual_utilities(people, model_settings):

 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 individual_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 individual_utils = individual_utils[['M', 'N', 'H']]
Expand DownExpand Up@@ -96,15 +113,16 @@ def test_individual_utilities(people):
 individual_utils, expected, check_dtype=False, check_names=False)


def test_build_cdap_spec_hhsize2(people):
def test_build_cdap_spec_hhsize2(people, model_settings):

 hhsize = 2
 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 interaction_coefficients = pd.read_csv(config.config_file_path('cdap_interaction_coefficients.csv'), comment='#')
 interaction_coefficients = cdap.preprocess_interaction_coefficients(interaction_coefficients)

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 indiv_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 choosers = cdap.hh_choosers(indiv_utils, hhsize=hhsize)
Expand Down

16 changes: 10 additions & 6 deletions
activitysim/abm/test/test_multi_zone.py

View file


Open in desktop

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

# 3-zone is currently big and slow - so set this way low
HOUSEHOLDS_SAMPLE_SIZE_3_ZONE = 10
EXPECT_3_ZONE_TOUR_COUNT = 26
EXPECT_3_ZONE_TOUR_COUNT = 30


# household with mandatory, non mandatory, atwork_subtours, and joint tours
Expand DownExpand Up@@ -85,9 +85,12 @@ def close_handlers():

def inject_settings(**kwargs):

 settings = config.read_settings_file('settings.yaml', mandatory=True)

 for k in kwargs:
 if k == "two_zone":
 if kwargs[k]:
 settings = config.read_settings_file('settings.yaml', mandatory=True)
 else:
 settings = config.read_settings_file('settings_static.yaml', mandatory=True)
 settings[k] = kwargs[k]

 inject.add_injectable("settings", settings)
Expand All@@ -98,11 +101,12 @@ def inject_settings(**kwargs):
def full_run(configs_dir, data_dir,
 resume_after=None, chunk_size=0,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE,
 trace_hh_id=None, trace_od=None, check_for_variability=None):
 trace_hh_id=None, trace_od=None, check_for_variability=None, two_zone=True):

 setup_dirs(configs_dir, data_dir)

 settings = inject_settings(
 two_zone=two_zone,
 households_sample_size=households_sample_size,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
Expand DownExpand Up@@ -164,7 +168,7 @@ def test_full_run_2_zone():
 tour_count = full_run(configs_dir=[example_path('configs_2_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_2'),
 trace_hh_id=HH_ID, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE, two_zone=True)

 print("tour_count", tour_count)

Expand All@@ -181,7 +185,7 @@ def test_full_run_3_zone():
 tour_count = full_run(configs_dir=[example_path('configs_3_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_3'),
 trace_hh_id=HH_ID_3_ZONE, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE, two_zone=False)

 print("tour_count", tour_count)

Expand Down

4 changes: 3 additions & 1 deletion
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,9 @@ def test_create_copy():
 assert 'copying configs ...' in str(cp.stdout)
 assert 'copying configs_mp ...' in str(cp.stdout)
 assert 'copying output ...' in str(cp.stdout)
 assert str(target) in str(cp.stdout)

 # replace slashes on windows
 assert str(target).replace("\\\\", "\\") in str(cp.stdout).replace("\\\\", "\\")

 assert os.path.exists(target)
 for folder in ['configs', 'configs_mp', 'data', 'output']:
Expand Down

44 changes: 44 additions & 0 deletions
activitysim/core/expressions.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,50 @@ def assign_columns(df, model_settings, locals_dict={}, trace_label=None):
# helpers
# ##################################################################################################

def skim_time_period_label(time_period):
 """
 convert time period times to skim time period labels (e.g. 9 -> 'AM')
 Parameters
 ----------
 time_period : pandas Series
 Returns
 -------
 pandas Series
 string time period labels
 """

 skim_time_periods = config.setting('skim_time_periods')

 # Default to 60 minute time periods
 period_minutes = 60
 if 'period_minutes' in skim_time_periods.keys():
 period_minutes = skim_time_periods['period_minutes']

 # Default to a day
 model_time_window_min = 1440
 if ('time_window') in skim_time_periods.keys():
 model_time_window_min = skim_time_periods['time_window']

 # Check to make sure the intervals result in no remainder time throught 24 hour day
 assert 0 == model_time_window_min % period_minutes
 total_periods = model_time_window_min / period_minutes

 # FIXME - eventually test and use np version always?
 period_label = 'periods'
 if 'hours' in skim_time_periods.keys():
 period_label = 'hours'
 warnings.warn('`skim_time_periods` key `hours` in settings.yml will be removed in '
 'future verions. Use `periods` instead',
 FutureWarning)

 if np.isscalar(time_period):
 bin = np.digitize([time_period % total_periods],
 skim_time_periods[period_label], right=True)[0] - 1
 return skim_time_periods['labels'][bin]

 return pd.cut(time_period, skim_time_periods[period_label],
 labels=skim_time_periods['labels'], ordered=False).astype(str)


def annotate_preprocessors(
 tours_df, locals_dict, skims,
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/los.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,4 +597,4 @@ def skim_time_period_label(self, time_period):
 return self.skim_time_periods['labels'][bin]

 return pd.cut(time_period, self.skim_time_periods['periods'],
 labels=self.skim_time_periods['labels'], right=True).astype(str)
 labels=self.skim_time_periods['labels'], ordered=False).astype(str)

6 changes: 4 additions & 2 deletions
activitysim/core/pathbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -548,7 +548,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 access_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.access')
 egress_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.egress')
 paths_nest_nesting_coefficient = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}').get('paths_nest_nesting_coefficient', 1)
 path_types_settings = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}')
 paths_nest_nesting_coefficient = path_types_settings.get('paths_nest_nesting_coefficient', 1)

 # maz od pairs requested
 with memo("#TVPB build_virtual_path maz_od_df"):
Expand DownExpand Up@@ -640,7 +641,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 chunk.log_df(trace_label, "utilities_df", utilities_df)

 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient), axis=1)), UNAVAILABLE)
 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient),
 axis=1)), UNAVAILABLE)

 if want_choices:

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/test/test_timetable.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,4 +183,4 @@ def test_basic(persons, tdd_alts):
 starts = pd.Series([9, 6, 9, 5])
 ends = pd.Series([10, 10, 10, 9])
 periods_available = timetable.remaining_periods_available(person_ids, starts, ends)
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]))
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]), check_dtype=False)

9 changes: 9 additions & 0 deletions
activitysim/examples/example_mtc/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,15 @@ CONSTANTS:
 SCHOOL: 7
 PRESCHOOL: 8

PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

annotate_persons:
 SPEC: annotate_persons_cdap
 DF: persons
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/examples/example_mtc/configs/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@ taz_skims: skims.omx
skim_time_periods:
 time_window: 1440
 period_minutes: 60
 periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'AM', 'MD', 'PM', 'EV']
 periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']

2 changes: 1 addition & 1 deletion
activitysim/examples/example_multiple_zone/configs_3_zone/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ skim_dict_factory: NumpyArraySkimFactory
#skim_dict_factory: MemMapSkimFactory

# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
read_skim_cache: True
read_skim_cache: False
# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
write_skim_cache: True

Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@
 'pyarrow >= 2.0',
 'numpy >= 1.16.1',
 'openmatrix >= 0.3.4.1',
 'pandas >= 1.0.1',
 'pandas >= 1.1.0',
 'pyyaml >= 5.1',
 'tables >= 3.5.1',
 'toolz >= 0.8.1',
Expand Down

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

Skip to content
#359#364

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

from

Dec 23, 2020
 Merged


#359
#364
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
003742b

updates for CDAP person type mapping

Nov 11, 2020
1a5a264

allow duplicate time labels

Nov 11, 2020
bb0deaf

Merge danielsclint/ft_cdap_schedule into develop


bstabler Dec 22, 2020
4eff144

fix a copy small items for #359


bstabler Dec 22, 2020
c14e5e4

test updates


bstabler Dec 22, 2020
0c32ecf

pycodestyle


bstabler Dec 23, 2020
e588ea8

3 zone test fix


bstabler Dec 23, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
activitysim/abm/models/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@ def cdap_simulate(persons_merged, persons, households,

 trace_label = 'cdap'
 model_settings = config.read_model_settings('cdap.yaml')

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap_indiv_spec = simulate.read_model_spec(file_name=model_settings['INDIV_AND_HHSIZE1_SPEC'])

 # Rules and coefficients for generating interaction specs for different household sizes
Expand DownExpand Up@@ -88,6 +88,7 @@ def cdap_simulate(persons_merged, persons, households,

 choices = cdap.run_cdap(
 persons=persons_merged,
 person_type_map=person_type_map,
 cdap_indiv_spec=cdap_indiv_spec,
 cdap_interaction_coefficients=cdap_interaction_coefficients,
 cdap_fixed_relative_proportions=cdap_fixed_relative_proportions,
Expand Down

14 changes: 7 additions & 7 deletions
activitysim/abm/models/util/cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,6 @@

MAX_INTERACTION_CARDINALITY = 3

WORKER_PTYPES = [1, 2]
CHILD_PTYPES = [6, 7, 8]


def set_hh_index(df):

Expand All@@ -61,7 +58,7 @@ def add_pn(col, pnum):
 raise RuntimeError("add_pn col not list or str")


def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):
def assign_cdap_rank(persons, person_type_map, trace_hh_id=None, trace_label=None):
 """
 Assign an integer index, cdap_rank, to each household member. (Starting with 1, not 0)

Expand DownExpand Up@@ -109,7 +106,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 2 workers, preferring full over part, older over younger
 workers = \
 persons.loc[persons[_ptype_].isin(WORKER_PTYPES), [_hh_id_, _ptype_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['WORKER']), [_hh_id_, _ptype_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(2)
 # tag the selected workers
Expand All@@ -118,7 +115,7 @@ def assign_cdap_rank(persons, trace_hh_id=None, trace_label=None):

 # choose up to 3, preferring youngest
 children = \
 persons.loc[persons[_ptype_].isin(CHILD_PTYPES), [_hh_id_, _ptype_, _age_]]\
 persons.loc[persons[_ptype_].isin(person_type_map['CHILD']), [_hh_id_, _ptype_, _age_]]\
 .sort_values(by=[_hh_id_, _ptype_], ascending=[True, True])\
 .groupby(_hh_id_).head(3)
 # tag the selected children
Expand DownExpand Up@@ -795,6 +792,7 @@ def extra_hh_member_choices(persons, cdap_fixed_relative_proportions, locals_d,

def _run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand All@@ -815,7 +813,7 @@ def _run_cdap(
 # assign integer cdap_rank to each household member
 # persons with cdap_rank 1..MAX_HHSIZE will be have their activities chose by CDAP model
 # extra household members, will have activities assigned by in fixed proportions
 assign_cdap_rank(persons, trace_hh_id, trace_label)
 assign_cdap_rank(persons, person_type_map, trace_hh_id, trace_label)
 chunk.log_df(trace_label, 'persons', persons)

 # Calculate CDAP utilities for each individual, ignoring interactions
Expand DownExpand Up@@ -904,6 +902,7 @@ def cdap_calc_row_size(choosers, cdap_indiv_spec, trace_label):

def run_cdap(
 persons,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand DownExpand Up@@ -956,6 +955,7 @@ def run_cdap(

 cdap_results = \
 _run_cdap(persons_chunk,
 person_type_map,
 cdap_indiv_spec,
 cdap_interaction_coefficients,
 cdap_fixed_relative_proportions,
Expand Down

8 changes: 8 additions & 0 deletions
activitysim/abm/models/util/test/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

30 changes: 24 additions & 6 deletions
activitysim/abm/models/util/test/test_cdap.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# See full license in LICENSE.txt.

import os.path
import yaml

import pandas as pd
import pandas.testing as pdt
Expand DownExpand Up@@ -31,6 +32,19 @@ def teardown_function(func):
 inject.reinject_decorated_tables()


@pytest.fixture(scope='module')
def model_settings(configs_dir):
 yml_file = os.path.join(configs_dir, 'cdap.yaml')
 with open(yml_file) as f:
 model_settings = yaml.load(f, Loader=yaml.loader.SafeLoader)
 return model_settings


@pytest.fixture(scope='module')
def configs_dir():
 return os.path.join(os.path.dirname(__file__), 'configs')


def setup_function():
 configs_dir = os.path.join(os.path.dirname(__file__), 'configs')
 inject.add_injectable("configs_dir", configs_dir)
Expand All@@ -48,9 +62,11 @@ def test_bad_coefficients():
 assert "Expect only M, N, or H" in str(excinfo.value)


def test_assign_cdap_rank(people):
def test_assign_cdap_rank(people, model_settings):

 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})

 cdap.assign_cdap_rank(people)
 cdap.assign_cdap_rank(people, person_type_map)

 expected = pd.Series(
 [1, 1, 1, 2, 2, 1, 3, 1, 2, 1, 3, 2, 1, 3, 2, 4, 1, 3, 4, 2],
Expand All@@ -60,11 +76,12 @@ def test_assign_cdap_rank(people):
 pdt.assert_series_equal(people['cdap_rank'], expected, check_dtype=False, check_names=False)


def test_individual_utilities(people):
def test_individual_utilities(people, model_settings):

 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 individual_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 individual_utils = individual_utils[['M', 'N', 'H']]
Expand DownExpand Up@@ -96,15 +113,16 @@ def test_individual_utilities(people):
 individual_utils, expected, check_dtype=False, check_names=False)


def test_build_cdap_spec_hhsize2(people):
def test_build_cdap_spec_hhsize2(people, model_settings):

 hhsize = 2
 cdap_indiv_and_hhsize1 = simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv')

 interaction_coefficients = pd.read_csv(config.config_file_path('cdap_interaction_coefficients.csv'), comment='#')
 interaction_coefficients = cdap.preprocess_interaction_coefficients(interaction_coefficients)

 cdap.assign_cdap_rank(people)
 person_type_map = model_settings.get('PERSON_TYPE_MAP', {})
 cdap.assign_cdap_rank(people, person_type_map)
 indiv_utils = cdap.individual_utilities(people, cdap_indiv_and_hhsize1, locals_d=None)

 choosers = cdap.hh_choosers(indiv_utils, hhsize=hhsize)
Expand Down

16 changes: 10 additions & 6 deletions
activitysim/abm/test/test_multi_zone.py

View file


Open in desktop

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

# 3-zone is currently big and slow - so set this way low
HOUSEHOLDS_SAMPLE_SIZE_3_ZONE = 10
EXPECT_3_ZONE_TOUR_COUNT = 26
EXPECT_3_ZONE_TOUR_COUNT = 30


# household with mandatory, non mandatory, atwork_subtours, and joint tours
Expand DownExpand Up@@ -85,9 +85,12 @@ def close_handlers():

def inject_settings(**kwargs):

 settings = config.read_settings_file('settings.yaml', mandatory=True)

 for k in kwargs:
 if k == "two_zone":
 if kwargs[k]:
 settings = config.read_settings_file('settings.yaml', mandatory=True)
 else:
 settings = config.read_settings_file('settings_static.yaml', mandatory=True)
 settings[k] = kwargs[k]

 inject.add_injectable("settings", settings)
Expand All@@ -98,11 +101,12 @@ def inject_settings(**kwargs):
def full_run(configs_dir, data_dir,
 resume_after=None, chunk_size=0,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE,
 trace_hh_id=None, trace_od=None, check_for_variability=None):
 trace_hh_id=None, trace_od=None, check_for_variability=None, two_zone=True):

 setup_dirs(configs_dir, data_dir)

 settings = inject_settings(
 two_zone=two_zone,
 households_sample_size=households_sample_size,
 chunk_size=chunk_size,
 trace_hh_id=trace_hh_id,
Expand DownExpand Up@@ -164,7 +168,7 @@ def test_full_run_2_zone():
 tour_count = full_run(configs_dir=[example_path('configs_2_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_2'),
 trace_hh_id=HH_ID, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE, two_zone=True)

 print("tour_count", tour_count)

Expand All@@ -181,7 +185,7 @@ def test_full_run_3_zone():
 tour_count = full_run(configs_dir=[example_path('configs_3_zone'), mtc_example_path('configs')],
 data_dir=example_path('data_3'),
 trace_hh_id=HH_ID_3_ZONE, check_for_variability=True,
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE)
 households_sample_size=HOUSEHOLDS_SAMPLE_SIZE_3_ZONE, two_zone=False)

 print("tour_count", tour_count)

Expand Down

4 changes: 3 additions & 1 deletion
activitysim/cli/test/test_cli.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,9 @@ def test_create_copy():
 assert 'copying configs ...' in str(cp.stdout)
 assert 'copying configs_mp ...' in str(cp.stdout)
 assert 'copying output ...' in str(cp.stdout)
 assert str(target) in str(cp.stdout)

 # replace slashes on windows
 assert str(target).replace("\\\\", "\\") in str(cp.stdout).replace("\\\\", "\\")

 assert os.path.exists(target)
 for folder in ['configs', 'configs_mp', 'data', 'output']:
Expand Down

44 changes: 44 additions & 0 deletions
activitysim/core/expressions.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,50 @@ def assign_columns(df, model_settings, locals_dict={}, trace_label=None):
# helpers
# ##################################################################################################

def skim_time_period_label(time_period):
 """
 convert time period times to skim time period labels (e.g. 9 -> 'AM')
 Parameters
 ----------
 time_period : pandas Series
 Returns
 -------
 pandas Series
 string time period labels
 """

 skim_time_periods = config.setting('skim_time_periods')

 # Default to 60 minute time periods
 period_minutes = 60
 if 'period_minutes' in skim_time_periods.keys():
 period_minutes = skim_time_periods['period_minutes']

 # Default to a day
 model_time_window_min = 1440
 if ('time_window') in skim_time_periods.keys():
 model_time_window_min = skim_time_periods['time_window']

 # Check to make sure the intervals result in no remainder time throught 24 hour day
 assert 0 == model_time_window_min % period_minutes
 total_periods = model_time_window_min / period_minutes

 # FIXME - eventually test and use np version always?
 period_label = 'periods'
 if 'hours' in skim_time_periods.keys():
 period_label = 'hours'
 warnings.warn('`skim_time_periods` key `hours` in settings.yml will be removed in '
 'future verions. Use `periods` instead',
 FutureWarning)

 if np.isscalar(time_period):
 bin = np.digitize([time_period % total_periods],
 skim_time_periods[period_label], right=True)[0] - 1
 return skim_time_periods['labels'][bin]

 return pd.cut(time_period, skim_time_periods[period_label],
 labels=skim_time_periods['labels'], ordered=False).astype(str)


def annotate_preprocessors(
 tours_df, locals_dict, skims,
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/los.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,4 +597,4 @@ def skim_time_period_label(self, time_period):
 return self.skim_time_periods['labels'][bin]

 return pd.cut(time_period, self.skim_time_periods['periods'],
 labels=self.skim_time_periods['labels'], right=True).astype(str)
 labels=self.skim_time_periods['labels'], ordered=False).astype(str)

6 changes: 4 additions & 2 deletions
activitysim/core/pathbuilder.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -548,7 +548,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 access_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.access')
 egress_mode = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}.egress')
 paths_nest_nesting_coefficient = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}').get('paths_nest_nesting_coefficient', 1)
 path_types_settings = self.network_los.setting(f'TVPB_SETTINGS.{recipe}.path_types.{path_type}')
 paths_nest_nesting_coefficient = path_types_settings.get('paths_nest_nesting_coefficient', 1)

 # maz od pairs requested
 with memo("#TVPB build_virtual_path maz_od_df"):
Expand DownExpand Up@@ -640,7 +641,8 @@ def build_virtual_path(self, recipe, path_type, orig, dest, tod, demographic_seg

 chunk.log_df(trace_label, "utilities_df", utilities_df)

 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient), axis=1)), UNAVAILABLE)
 logsums = np.maximum(np.log(np.nansum(np.exp(utilities_df.values/paths_nest_nesting_coefficient),
 axis=1)), UNAVAILABLE)

 if want_choices:

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/test/test_timetable.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,4 +183,4 @@ def test_basic(persons, tdd_alts):
 starts = pd.Series([9, 6, 9, 5])
 ends = pd.Series([10, 10, 10, 9])
 periods_available = timetable.remaining_periods_available(person_ids, starts, ends)
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]))
 pdt.assert_series_equal(periods_available, pd.Series([6, 3, 4, 3]), check_dtype=False)

9 changes: 9 additions & 0 deletions
activitysim/examples/example_mtc/configs/cdap.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,15 @@ CONSTANTS:
 SCHOOL: 7
 PRESCHOOL: 8

PERSON_TYPE_MAP:
 WORKER:
 - 1
 - 2
 CHILD:
 - 6
 - 7
 - 8

annotate_persons:
 SPEC: annotate_persons_cdap
 DF: persons
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/examples/example_mtc/configs/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@ taz_skims: skims.omx
skim_time_periods:
 time_window: 1440
 period_minutes: 60
 periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'AM', 'MD', 'PM', 'EV']
 periods: [0, 3, 5, 9, 14, 18, 24] # 3=3:00-3:59, 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59
 labels: ['EA', 'EA', 'AM', 'MD', 'PM', 'EV']

2 changes: 1 addition & 1 deletion
activitysim/examples/example_multiple_zone/configs_3_zone/network_los.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ skim_dict_factory: NumpyArraySkimFactory
#skim_dict_factory: MemMapSkimFactory

# read cached skims (using numpy memmap) from output directory (memmap is faster than omx )
read_skim_cache: True
read_skim_cache: False
# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
write_skim_cache: True

Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@
 'pyarrow >= 2.0',
 'numpy >= 1.16.1',
 'openmatrix >= 0.3.4.1',
 'pandas >= 1.0.1',
 'pandas >= 1.1.0',
 'pyyaml >= 5.1',
 'tables >= 3.5.1',
 'toolz >= 0.8.1',
Expand Down