From 3c9e0d393c64223d49f668763beb2d40175e4973 Mon Sep 17 00:00:00 2001 From: yuqi Date: Tue, 24 Nov 2020 17:54:30 -0800 Subject: [PATCH 1/3] fill na in emp_density and move density calculations to after pop/emp adjustment based on regional control totals --- baus/summaries.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/baus/summaries.py b/baus/summaries.py index 18f640f85..97620e37e 100644 --- a/baus/summaries.py +++ b/baus/summaries.py @@ -1486,13 +1486,6 @@ def gethhcounts(filter): taz_df["totacre"] = zone_forecast_inputs.totacre_abag # total population = group quarters plus households population taz_df["totpop"] = (taz_df.hhpop + taz_df.gqpop).fillna(0) - taz_df["density"] = \ - (taz_df.totpop + (2.5 * taz_df.totemp)) / taz_df.totacre - taz_df["areatype"] = pd.cut( - taz_df.density, - bins=[0, 6, 30, 55, 100, 300, np.inf], - labels=[5, 4, 3, 2, 1, 0] - ) buildings_df = buildings.to_frame(['zone_id', 'building_type', @@ -1531,6 +1524,24 @@ def count_acres_with_mask(mask): taz_df = add_population(taz_df, year, rc) taz_df.totpop = taz_df.hhpop + taz_df.gqpop taz_df = add_employment(taz_df, year, rc) + taz_df_pop_na = taz_df.loc[taz_df.totpop.isnull()] + print(taz_df_pop_na) + taz_df_emp_na = taz_df.loc[taz_df.totemp.isnull()] + print(taz_df_emp_na) + taz_df_acre_na = taz_df.loc[taz_df.totacre.isnull()] + print(taz_df_acre_na) + taz_df_zero_emp = taz_df.loc[taz_df.totemp == 0] + print(taz_df_zero_emp) + taz_df["density_pop"] = taz_df.totpop / taz_df.totacre + taz_df["density_pop"] = taz_df["density_pop"].fillna(0) + taz_df["density_emp"] = (2.5 * taz_df.totemp) / taz_df.totacre + taz_df["density_emp"] = taz_df["density_emp"].fillna(0) + taz_df["density"] = taz_df["density_pop"] + taz_df["density_emp"] + taz_df["areatype"] = pd.cut( + taz_df.density, + bins=[0, 6, 30, 55, 100, 300, np.inf], + labels=[5, 4, 3, 2, 1, 0] + ) taz_df = add_age_categories(taz_df, year, rc) orca.add_table('taz_summary_1', taz_df) From 60fa396ccb3c93300fe73432c5e46fd6dc3ca4c2 Mon Sep 17 00:00:00 2001 From: yuqi Date: Tue, 24 Nov 2020 17:56:40 -0800 Subject: [PATCH 2/3] add to gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 851af5318..36645dc7a 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,7 @@ data/2020_10_27_parcels_geography.csv data/2020_11_05_zoning_lookup_hybrid_pba50.csv data/2020_11_05_zoning_parcels_hybrid_pba50.csv data/2020_11_10_parcels_geography.csv +data/2020_10_20_zoning_lookup_hybrid_pba50.csv +data/2020_10_20_zoning_parcels_hybrid_pba50.csv +data/2020_10_27_zoning_parcels_hybrid_pba50.csv +data/2020_10_27_zoning_lookup_hybrid_pba50.csv From 3f5d0b5b5f1e0ec5868956f589c85e6da35902bb Mon Sep 17 00:00:00 2001 From: yuqi Date: Tue, 24 Nov 2020 17:57:36 -0800 Subject: [PATCH 3/3] remove testing print --- baus/summaries.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/baus/summaries.py b/baus/summaries.py index 97620e37e..d4db9abc2 100644 --- a/baus/summaries.py +++ b/baus/summaries.py @@ -1524,14 +1524,6 @@ def count_acres_with_mask(mask): taz_df = add_population(taz_df, year, rc) taz_df.totpop = taz_df.hhpop + taz_df.gqpop taz_df = add_employment(taz_df, year, rc) - taz_df_pop_na = taz_df.loc[taz_df.totpop.isnull()] - print(taz_df_pop_na) - taz_df_emp_na = taz_df.loc[taz_df.totemp.isnull()] - print(taz_df_emp_na) - taz_df_acre_na = taz_df.loc[taz_df.totacre.isnull()] - print(taz_df_acre_na) - taz_df_zero_emp = taz_df.loc[taz_df.totemp == 0] - print(taz_df_zero_emp) taz_df["density_pop"] = taz_df.totpop / taz_df.totacre taz_df["density_pop"] = taz_df["density_pop"].fillna(0) taz_df["density_emp"] = (2.5 * taz_df.totemp) / taz_df.totacre