Merge pull request #60 from SANDAG/ABM3_baydag_merge

changes to work with new ActivitySim version

src/asim/configs/estimation/accessibility.csv

@@ -0,0 +1,49 @@
+Description,Target,Expression
+#,,
+#,, auto peak
+#,,
+#,, assume peak occurs in AM for outbound and PM for inbound
+peak round trip distance,_auPkTime,"skim_od[('SOV_TR_M_TIME', 'AM')] + skim_do[('SOV_TR_M_TIME', 'PM')]"
+decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
+auto peak retail,auPkRetail,df.emp_retail * _decay
+auto peak total,auPkTotal,df.emp_total * _decay
+#,,
+#,, auto off-peak
+#,,
+#,, assume midday occurs entirely in the midday period
+off-peak round trip distance,_auOpTime,"skim_od[('SOV_TR_M_TIME', 'MD')] + skim_do[('SOV_TR_M_TIME', 'MD')]"
+decay function,_decay, exp(_auOpTime * dispersion_parameter_automobile)
+auto off-peak retail,auOpRetail,df.emp_retail * _decay
+auto off-peak total,auOpTotal,df.emp_total * _decay
+#,,
+#,, transit peak
+#,,
+#,, FIXME - don't need WLK_TRN_WLK_WACC and WLK_TRN_WLK_WEGR as we are using walk_time?
+#,, assume peak outbound transit occurs in AM
+o-d peak transit time,_trPkTime_od,"skim_od[('WALK_MIX_TOTALIVTT', 'AM')]"
+#,, assume peak inbound transit occurs in PM
+o-d peak transit time,_trPkTime_do,"skim_do[('WALK_MIX_TOTALIVTT', 'PM')]"
+peak transit time,_trPkTime,(_trPkTime_od + _trPkTime_do).clip(0)
+round trip path is available,_rt_available,(_trPkTime_od > 0) & (_trPkTime_do > 0)
+decay function,_decay,_rt_available * exp(_trPkTime * dispersion_parameter_transit)
+transit peak retail,trPkRetail,df.emp_retail * _decay
+transit peak total,trPkTotal,df.emp_total * _decay
+####,,
+####,, transit off-peak
+####,,
+####,, assume off-peak inbound and outbound transit occurs in the MD time period
+o-d off-peak transit time,_trOpTime_od,"skim_od[('WALK_MIX_TOTALIVTT', 'MD')]"
+d-o off-peak transit time,_trOpTime_do,"skim_do[('WALK_MIX_TOTALIVTT', 'MD')]"
+off-peak transit time,_trOpTime,(_trOpTime_od + _trPkTime_do).clip(0)
+round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
+decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
+transit off-peak retail,trOpRetail,df.emp_retail * _decay
+transit off-peak total,trOpTotal,df.emp_total * _decay
+#,,
+#,, non motorized
+#,,
+non-motorized round trip distance,_nmDist,skim_od['DIST'] + skim_do['DIST']
+round trip path is available,_rt_available,_nmDist <= maximum_walk_distance
+decay function,_decay,_rt_available * exp(_nmDist * dispersion_parameter_walk)
+retail accessibility,nmRetail,df.emp_retail * _decay
+total accessibility,nmTotal,df.emp_total * _decay

src/asim/configs/estimation/network_los.yaml

@@ -0,0 +1,78 @@
+inherit_settings: True
+
+zone_system: 2
+
+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: False
+# write memmapped cached skims to output directory after reading from omx, for use in subsequent runs
+write_skim_cache: False
+
+# taz_skims:
+#   - traffic_skims_processed_EA.omx
+#   - traffic_skims_processed_AM.omx
+#   - traffic_skims_processed_MD.omx
+#   - traffic_skims_processed_PM.omx
+#   - traffic_skims_processed_EV.omx
+#   - transit_skims_EA.omx
+#   - transit_skims_AM.omx
+#   - transit_skims_MD.omx
+#   - transit_skims_PM.omx
+#   - transit_skims_EV.omx
+
+# series15
+taz_skims:
+  - traffic_skims_EA.omx
+  - traffic_skims_AM.omx
+  - traffic_skims_MD.omx
+  - traffic_skims_PM.omx
+  - traffic_skims_EV.omx
+  - transit_skims.omx
+
+maz: land_use.csv   # mgra.csv
+
+maz_to_maz:
+  tables:
+    - maz_maz_walk.csv
+    - maz_maz_bike.csv
+  # maz_to_maz blending distance (missing or 0 means no blending)
+  max_blend_distance: 0
+
+
+skim_time_periods:
+    time_window: 1440
+    period_minutes: 30
+    # periods: [0, 11, 17, 30, 37, 48]  # asim xborder
+    # periods: [0, 3, 9, 22, 29, 48]  # ctramp xborder
+    periods: [0, 6, 12, 25, 32, 48]  # time periods to match documentation
+    labels: &skim_time_period_labels ['EA', 'AM', 'MD', 'PM', 'EV']
+
+demographic_segments: &demographic_segments
+  - &low_income_segment_id 0
+  - &high_income_segment_id 1
+
+
+
+# CONSTANTS:
+#   c_ivt: -0.028
+#   c_cost: -0.0011
+#   # transit "factors" from SANDAG
+#   eb_fac: 1.0
+#   brt_fac: 0.9000
+#   lrt_fac: 0.6500
+#   cr_fac: 0.6500
+#   hyp_fac: 0.6500
+#   # coeffs used in maz_tap and tap_tap utility expressions
+#   c_walk: 1.7
+#   c_fwt: 1.5
+#   c_waux: 2.5
+#   c_xwt: 2
+#   C_UNAVAILABLE: -9999
+#   # alternative-specific constants
+#   exp_asc: 10  # express bus asc
+#   brt_asc: -10  # BRT asc
+#   lrt_asc: -20  # LRT alternative-specific constant
+#   cr_asc: 0.00  # Commuter Rail alternative-specific constant
+

src/asim/configs/resident/parking_location_choice.yaml

@@ -16,7 +16,7 @@ CHOOSER_SEGMENT_COLUMN_NAME: parking_segment
 ALTERNATIVE_FILTER_COLUMN_NAME: is_parking_zone
 ALT_DEST_COL_NAME: parking_zone
 
-TRIP_DEPARTURE_PERIOD: 'stop_period'
+TRIP_DEPARTURE_PERIOD: depart
 
 TRIP_ORIGIN: origin
 TRIP_DESTINATION: destination

src/asim/extensions/__init__.py

@@ -1,6 +1,4 @@
 from . import external_identification
 from . import external_location_choice
-from . import work_from_home
-from . import telecommute_frequency
 from . import transponder_ownership
 from . import airport_returns