Skip to content

Commit 4a2b2f2

Browse files
committed
fix input_checker runtime
1 parent 04d64ff commit 4a2b2f2

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

activitysim/examples/prototype_mtc_extended/data_model/input_checks.py

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,26 @@
33
44
Instructions: customize these example values for your own ActivitySim implementation
55
"""
6-
from typing import List, Optional
7-
import os, sys, logging
6+
from __future__ import annotations
87

9-
from pydantic import BaseModel, validator
10-
import pandera as pa
11-
import numpy as np
12-
import pandas as pd
13-
import openmatrix as omx
8+
import csv
9+
import logging
10+
import os
1411

1512
# for skim name parsing
1613
import re
17-
import csv
18-
19-
from activitysim.core import config
14+
import sys
15+
from typing import List, Optional
2016

2117
import enums as e
18+
import numpy as np
19+
import openmatrix as omx
20+
import pandas as pd
21+
import pandera as pa
22+
from pydantic import BaseModel, validator
2223

2324
from activitysim.abm.models.input_checker import TABLE_STORE, log_info
25+
from activitysim.core import config
2426

2527
logger = logging.getLogger(__name__)
2628

@@ -225,11 +227,11 @@ def check_hh_per_zone(cls, land_use: pd.DataFrame):
225227
def check_pop_per_zone(cls, land_use: pd.DataFrame):
226228
persons = TABLE_STORE["persons"]
227229
households = TABLE_STORE["households"]
228-
pop = persons.groupby(
229-
persons.household_id.map(
230-
lambda hhid: households.set_index("household_id").home_zone_id[hhid]
231-
)
232-
).person_id.nunique()
230+
persons_per_household = persons.groupby("household_id").size()
231+
hh = households[["household_id", "home_zone_id"]].merge(
232+
persons_per_household.rename("persons_per_household"), on="household_id"
233+
)
234+
pop = hh.groupby(households.home_zone_id)["persons_per_household"].sum()
233235
return (pop == land_use.set_index("zone_id").TOTPOP).reindex(land_use.index)
234236

235237

0 commit comments

Comments
 (0)