Updating TM2.1 branch with changes on Master

.gitignore

@@ -2,8 +2,8 @@
 core/build/
 core/release/
 /bin/
-*.log
 *.bak
 *.exe
+*.Rhistory
 model-files/runtime/config/pskill.exe
 utilities/vta_expresslane_feed_saver/vta_expresslanes_2018*

README.md

@@ -1,4 +1,9 @@
 travel-model-two
 ================
 
-Placeholder for all things related to MTC's Travel Model Two (currently in development)
+Development plan:
+
+* [**TM2.0**](https://github.com/BayAreaMetro/travel-model-two/releases/tag/TM2.0): Initial TM2 with Cube, CTRAMP core, 3-zone system. In use by TAM.
+* **TM2.1**: TM2 with transit CCR (capacity, crowding, reliability) implemented in Emme (uses Cube _and_ Emme), CTRAMP core.  Anticipated release: Fall/Winter 2021. This work is being performed in the branch [develop](https://github.com/BayAreaMetro/travel-model-two/tree/develop)
+* **TM2.2**: TM2 with Emme only (not Cube). CTRAMP core.  This work is being performed in [the tm2py repository](https://github.com/BayAreaMetro/tm2py)
+* **TM2.3**: TM2 with Emme only and ActivitySim core. This work is also in progress in [ActivitySim / BayDAG](https://github.com/BayAreaMetro/activitysim/tree/BayDAG)

maz_taz/crosswalks/ACS_2017_MAZ_TAZ_Crosswalk.log

@@ -0,0 +1,9 @@
+INFO [2021-09-30 14:27:57] Create Census 2010 MAZ and TAZ shares of blockgroups.R
+INFO [2021-09-30 14:27:57] Bringing in Census 2010 block-level total households and then summing to block group.
+INFO [2021-09-30 14:28:19] There are 109228 blocks and 4756 block groups in 2010.
+INFO [2021-09-30 14:28:19] Calculate 2010 household block share of block groups for later summing at MAZ/TAZ2 level.
+INFO [2021-09-30 14:28:21] BG(s) with no hhs in Census 2010, yet some in ACS 2017: Blockgroup 60855050082 with 2 blocks
+INFO [2021-09-30 14:28:21] Any such block groups will be apportioned to constituent blocks proportionately by number of blocks.
+INFO [2021-09-30 14:28:21] Sum block shares to MAZ and TAZ2, respectively.
+INFO [2021-09-30 14:28:21] Output maz crosswalk: Census 2010 hhs maz share of blockgroups_ACS2017.csv
+INFO [2021-09-30 14:28:21] Output taz crosswalk: Census 2010 hhs taz share of blockgroups_ACS2017.csv