some minor bug fixes 1) the geo_ids were filtered for testing purposes - that was fixed to include all chosen geos, 2) documentation files were updated, 3) small change made to the configuration file because the all_geos configuration element when selecting a subset of geos to synthesize was no longer needed

Author: karthikcharan83

AUTHORS.rst

@@ -10,4 +10,4 @@ Development Lead
 Contributors
 ------------
 
-None yet. Why not be the first?
+* Daehyun You

HISTORY.rst

@@ -3,7 +3,7 @@
 History
 -------
 
-2.0 (2014-12-12)
+2.0.b1 (June 4, 2015)
 ++++++++++++++++++
 
-* First release on PyPI.
+* This is the first non-production release of PopGen 2.0

README.rst

@@ -18,4 +18,9 @@ Synthetic Population Generator 2.0
 Features
 --------
 
-* TODO
+For PopGen 2.1
+* Automatic data validator
+* Census data importer
+
+For PopGen 2.2
+* Output Data Analyzer with charting and table generation capabilities

popgen/draw.py

@@ -29,7 +29,7 @@ def __init__(self, scenario_config, geo_ids, geo_row_idx, geo_frequencies,
     def draw_population(self):
         np.random.seed(self.seed)
         # print "Drawing Households"
-        for geo_id in self.geo_ids[:20]:
+        for geo_id in self.geo_ids:
             # print "For geo:", geo_id
             geo_sample_weights = self.region_sample_weights.loc[:, geo_id]
             geo_cumulative_weights = (self._return_cumulative_probability(

popgen/reweighting.py

@@ -140,7 +140,7 @@ def run_reweighting(self, region_constraints, geo_constraints):
                                       region_constraints.loc[region_id]))
                 # print "After region:", sample_weights[:, :4]
                 # raw_input("region_done")
-                for index, geo_id in enumerate(geo_ids[:20]):
+                for index, geo_id in enumerate(geo_ids):
                     # print ("Geo: %s " % geo_id)
                     sample_weights[:, index] = (self._adjust_sample_weights(
                                                 sample_weights[:, index],

tutorials/1_basic_popgen_setup/configuration.yaml

@@ -58,7 +58,6 @@ project:
     geos_to_synthesize:
      region:
       ids: [1]
-      all_ids: True
     outputs:
      performance: [ipf, reweighting, drawing]
      weights: