CDAP and Duplicate Time Labels

activitysim/abm/models/cdap.py

@@ -32,7 +32,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
@@ -80,6 +80,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,

activitysim/abm/models/util/cdap.py

@@ -35,9 +35,6 @@
 
 MAX_INTERACTION_CARDINALITY = 3
 
-WORKER_PTYPES = [1, 2]
-CHILD_PTYPES = [6, 7, 8]
-
 
 def set_hh_index(df):
 
@@ -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)
 
@@ -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
@@ -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
@@ -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,
@@ -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)
 
     # Calculate CDAP utilities for each individual, ignoring interactions
     # ind_utils has index of 'person_id' and a column for each alternative
@@ -892,6 +890,7 @@ def calc_rows_per_chunk(chunk_size, choosers, trace_label=None):
 
 def run_cdap(
         persons,
+        person_type_map,
         cdap_indiv_spec,
         cdap_interaction_coefficients,
         cdap_fixed_relative_proportions,
@@ -950,6 +949,7 @@ def run_cdap(
 
         cdap_results = \
             _run_cdap(persons_chunk,
+                      person_type_map,
                       cdap_indiv_spec,
                       cdap_interaction_coefficients,
                       cdap_fixed_relative_proportions,

activitysim/abm/models/util/expressions.py

@@ -205,7 +205,7 @@ def skim_time_period_label(time_period):
         return skim_time_periods['labels'][bin]
 
     return pd.cut(time_period, skim_time_periods[period_label],
-                  labels=skim_time_periods['labels'], right=True).astype(str)
+                  labels=skim_time_periods['labels'], ordered=False).astype(str)
 
 
 def annotate_preprocessors(

activitysim/abm/models/util/test/configs/cdap.yaml

@@ -0,0 +1,8 @@
+PERSON_TYPE_MAP:
+  WORKER:
+    - 1
+    - 2
+  CHILD:
+    - 6
+    - 7
+    - 8

activitysim/abm/models/util/test/test_cdap.py

@@ -2,6 +2,7 @@
 # See full license in LICENSE.txt.
 
 import os.path
+import yaml
 
 import pandas as pd
 import pandas.testing as pdt
@@ -29,6 +30,14 @@ def people(data_dir):
         index_col='id')
 
 
+@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 cdap_indiv_and_hhsize1(configs_dir):
     return simulate.read_model_spec(file_name='cdap_indiv_and_hhsize1.csv', spec_dir=configs_dir)
@@ -60,9 +69,11 @@ def test_bad_coefficients(configs_dir):
     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],
@@ -72,9 +83,10 @@ 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, cdap_indiv_and_hhsize1):
+def test_individual_utilities(people, cdap_indiv_and_hhsize1, model_settings):
 
-    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']]
 
@@ -105,11 +117,12 @@ def test_individual_utilities(people, cdap_indiv_and_hhsize1):
         individual_utils, expected, check_dtype=False, check_names=False)
 
 
-def test_build_cdap_spec_hhsize2(people, cdap_indiv_and_hhsize1, cdap_interaction_coefficients):
+def test_build_cdap_spec_hhsize2(people, cdap_indiv_and_hhsize1, cdap_interaction_coefficients, model_settings):
 
     hhsize = 2
 
-    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)

activitysim/examples/example_mtc/configs/cdap.yaml

@@ -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

activitysim/examples/example_mtc/configs/settings.yaml

@@ -175,12 +175,14 @@ skim_time_periods:
     period_minutes: 60
     periods:
         - 0
+        - 3
         - 6
         - 11
         - 16
         - 20
         - 24
     labels:
+        - EA
         - EA
         - AM
         - MD