From e9f390526b89049b32107f8c2ee2b2baaac32cbf Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 19 Apr 2016 15:13:18 +0200 Subject: [PATCH] Make expected values of observatory functions match actual ones --- .../41_observatory_augmentation_test.out | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pg/test/expected/41_observatory_augmentation_test.out b/src/pg/test/expected/41_observatory_augmentation_test.out index c672097..5c5e303 100644 --- a/src/pg/test/expected/41_observatory_augmentation_test.out +++ b/src/pg/test/expected/41_observatory_augmentation_test.out @@ -23,12 +23,12 @@ Loading obs_d34555209878e8c4b37cf0b2b3d072ff129ec470.sql fixture file... Done. total_pop | male_pop | female_pop | median_age | white_pop | black_pop | asian_pop | hispanic_pop | amerindian_pop | other_race_pop | two_or_more_races_pop | not_hispanic_pop | households | pop_25_years_over | high_school_diploma | less_one_year_college | one_year_more_college | associates_degree | bachelors_degree | masters_degree | median_income | gini_index | income_per_capita | housing_units | vacant_housing_units | vacant_housing_units_for_rent | vacant_housing_units_for_sale | median_rent | percent_income_spent_on_rent | owner_occupied_housing_units | million_dollar_housing_units | mortgaged_housing_units | commuters_16_over | commute_less_10_mins | commute_10_14_mins | commute_15_19_mins | commute_20_24_mins | commute_25_29_mins | commute_30_34_mins | commute_35_44_mins | commute_45_59_mins | commute_60_more_mins | aggregate_travel_time_to_work | income_less_10000 | income_10000_14999 | income_15000_19999 | income_20000_24999 | income_25000_29999 | income_30000_34999 | income_35000_39999 | income_40000_44999 | income_45000_49999 | income_50000_59999 | income_60000_74999 | income_75000_99999 | income_100000_124999 | income_125000_149999 | income_150000_199999 | income_200000_or_more | land_area ------------------+------------------+------------------+------------+------------------+------------------+------------------+------------------+----------------+----------------+-----------------------+------------------+------------------+-------------------+---------------------+-----------------------+-----------------------+-------------------+------------------+------------------+---------------+------------+-------------------+------------------+----------------------+-------------------------------+-------------------------------+-------------+------------------------------+------------------------------+------------------------------+-------------------------+-------------------+----------------------+--------------------+--------------------+--------------------+--------------------+--------------------+--------------------+--------------------+----------------------+-------------------------------+-------------------+--------------------+--------------------+--------------------+--------------------+--------------------+--------------------+--------------------+--------------------+--------------------+--------------------+--------------------+----------------------+----------------------+----------------------+-----------------------+----------- - 9516.27603138953 | 6152.51682996181 | 3363.75920142772 | 28.8 | 5301.51450207924 | 149.500408952343 | 230.000629157451 | 3835.26049120049 | 0 | 0 | 0 | 5681.01554018904 | 3323.50909132517 | 7107.01944096523 | 1040.75284693747 | 69.0001887472353 | 793.502170593206 | 327.750896549367 | 2742.7575027026 | 931.502548087676 | 66304 | 0.3494 | 28291 | 3662.76001933241 | 339.25092800724 | 120.750330307662 | 0 | 1764 | 35.3 | 339.25092800724 | 0 | 224.250613428515 | 6549.26791525841 | 327.750896549367 | 28.7500786446814 | 201.25055051277 | 621.001698725117 | 373.751022380858 | 1851.50506471748 | 1414.50386931832 | 1115.50305141364 | 615.251682996181 | | 57.5001572893627 | 0 | 212.750581970642 | 408.251116754475 | 0 | 155.250424681279 | 109.250298849789 | 92.0002516629803 | 63.250173018299 | 184.000503325961 | 621.001698725117 | 552.001509977882 | 327.750896549367 | 333.500912278304 | 126.500346036598 | | + 9516.27915900609 | 6152.51885204623 | 3363.76030695986 | 28.8 | 5301.51624447348 | 149.500458087105 | 230.000704749392 | 3835.26175169611 | 0 | 0 | 0 | 5681.01740730998 | 3323.51018362871 | 7107.02177675621 | 1040.753188991 | 69.0002114248176 | 793.502431385402 | 327.751004267883 | 2742.7584041365 | 931.502854235037 | 66304 | 0.3494 | 28291 | 3662.76122313407 | 339.251039505353 | 120.750369993431 | 0 | 1764 | 35.3 | 339.251039505353 | 0 | 224.250687130657 | 6549.27006773893 | 327.751004267883 | 28.750088093674 | 201.250616655718 | 621.001902823358 | 373.751145217762 | 1851.5056732326 | 1414.50433420876 | 1115.50341803455 | 615.251885204623 | | 57.500176187348 | 0 | 212.750651893187 | 408.251250930171 | 0 | 155.25047570584 | 109.250334755961 | 92.0002818997568 | 63.2501938060828 | 184.000563799514 | 621.001902823358 | 552.001691398541 | 327.751004267883 | 333.501021886618 | 126.500387612166 | | (1 row) dimension | dimension_value ----------------------+------------------------------------- - {total_pop,male_pop} | {9516.27603138953,6152.51682996181} + {total_pop,male_pop} | {9516.27915900609,6152.51885204623} (1 row) dimension | dimension_value @@ -53,7 +53,7 @@ Done. obs_getpoints -------------------- - {4809.33380072727} + {4809.33511352425} (1 row) obs_getpoints @@ -81,14 +81,14 @@ Done. | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (1 row) - names | categories ------------+--------------------------------------------------------------- - {X10,x10} | {"Wealthy, urban without Kids","Wealthy, urban without Kids"} + names | categories +-------+--------------------------------- + {X10} | {"Wealthy, urban without Kids"} (1 row) - names | categories ------------+------------ - {X10,x10} | + names | categories +-------+------------ + {X10} | (1 row) Dropping obs_table.sql fixture table...