fix failing test

UDST · Apr 21, 2016 · 9c710a0 · 9c710a0
1 parent c160591
commit 9c710a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/synthpop/recipes/starter.py b/synthpop/recipes/starter.py
@@ -69,10 +69,10 @@ def __init__(self, key, state, county, tract=None):
                                  "+ B19001_017E",
             ("cars", "none"): "B08201_002E",
             ("cars", "one"): "B08201_003E",
-            ("cars", "two or more"): "B08201_004E + B08201_005E + B08201_006E",
+            ("cars", "two or more"): "B08201_001E - (B08201_002E + B08201_003E)",
             ("workers", "none"): "B08202_002E",
             ("workers", "one"): "B08202_003E",
-            ("workers", "two or more"): "B08202_004E + B08202_005E"
+            ("workers", "two or more"): "B08201_001E - (B08202_002E + B08202_003E)"
         }, index_cols=['state', 'county', 'tract', 'block group'])
 
         population = ['B01001_001E']

diff --git a/synthpop/recipes/starter2.py b/synthpop/recipes/starter2.py
@@ -105,10 +105,10 @@ def __init__(self, key, state, county, tract=None):
             ("hh_cars", "none"): "B08201_002E",
             ("hh_cars", "one"): "B08201_003E",
             ("hh_cars", "two or more"):
-                "B08201_004E + B08201_005E + B08201_006E",
+                "B08201_001E - (B08201_002E - B08201_003E)",
             ("hh_workers", "none"): "B08202_002E",
             ("hh_workers", "one"): "B08202_003E",
-            ("hh_workers", "two or more"): "B08202_004E + B08202_005E",
+            ("hh_workers", "two or more"): "B08202_001E - (B08202_002E - B08202_003E)",
             ("tenure_mover", "own recent"): "B25038_003E",
             ("tenure_mover", "own not recent"): "B25038_002E - B25038_003E",
             ("tenure_mover", "rent recent"): "B25038_010E",