Merge branch 'extended' of https://github.com/ActivitySim/activitysim-prototype-mtc into extended

Author: dhensle

README.md

@@ -28,11 +28,23 @@ for the `prototype_mtc_extended` example model.
 
 ```python
 from pathlib import Path
-from activitysim.examples.external import registered_external_example
-
-example_dir = registered_external_example(
-    name="prototype_mtc_extended", 
-    working_dir=Path.cwd()
+from activitysim.examples.external import download_external_example
+
+example_dir = download_external_example(
+  name="prototype_mtc_extended", 
+  working_dir=Path.cwd(),
+  url="https://github.com/ActivitySim/activitysim-prototype-mtc/archive/refs/heads/extended.tar.gz",
+  assets={
+    "data_full.tar.zst": {
+      "url": "https://github.com/ActivitySim/activitysim-prototype-mtc/releases/download/v1.3.4/data_full.tar.zst",
+      "sha256": "b402506a61055e2d38621416dd9a5c7e3cf7517c0a9ae5869f6d760c03284ef3",
+      "unpack": "data_full",
+    },
+    "test/prototype_mtc_reference_pipeline.zip": {
+      "url": "https://github.com/ActivitySim/activitysim-prototype-mtc/releases/download/v1.3.2/prototype_mtc_extended_reference_pipeline.zip",
+      "sha256": "4d94b6a8a83225dda17e9ca19c9110bc1df2df5b4b362effa153d1c8d31524f5",
+    }
+  }
 )
 ```
 
@@ -42,5 +54,6 @@ The `prototype_mtc` example model is run using the `activitysim` command line to
 A quick and easy way to run the model for benchmarking is to use the following command:
 
 ```shell
+cd activitysim-prototype-mtc-extended
 activitysim workflow performance-benchmarking
 ```

data_model/input_checks.py

@@ -226,12 +226,12 @@ def check_pop_per_zone(cls, land_use: pd.DataFrame):
         persons = TABLE_STORE["persons"]
         households = TABLE_STORE["households"]
         persons_per_household = persons.groupby("household_id").size()
-        hh = households[["household_id", "home_zone_id"]].merge(
-            persons_per_household.rename("persons_per_household"), on="household_id"
+        hh = households[["household_id", "home_zone_id"]].merge(persons_per_household.rename("persons_per_household"), on="household_id")
+        pop = (
+            hh.groupby(households.home_zone_id)["persons_per_household"].sum()
         )
-        pop = hh.groupby(households.home_zone_id)["persons_per_household"].sum()
         lu = land_use.set_index("zone_id")
-        return pop.reindex(lu.index) == lu.TOTPOP
+        return (pop.reindex(lu.index) == lu.TOTPOP)
 
 
 class NetworkLinks(pa.DataFrameModel):

performance-benchmarking.yaml

@@ -14,7 +14,7 @@ steps:
     defaults:
       example_name: .
       workflow_name: performance-benchmarking/mtc-extended
-      workspace: ..
+      workspace: .
       create: False
       compile: True
       sharrow: True