small fix in print statement in interaction

UDST · May 28, 2014 · 063e8e4 · 063e8e4
1 parent fd2ba33
commit 063e8e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/urbansim/models/yamlmodelrunner.py b/urbansim/models/yamlmodelrunner.py
@@ -38,7 +38,7 @@ def hedonic_simulate(df, cfgname, outdf, outfname):
     hm = RegressionModel.from_yaml(str_or_buffer=cfg)
     price_or_rent = hm.predict(df)
     print price_or_rent.describe()
-    outdf[outfname] = price_or_rent.reindex(outdf.index)
+    outdf.loc[price_or_rent.index.values, outfname] = price_or_rent
 
 
 def lcm_estimate(choosers, chosen_fname, alternatives, cfgname):

diff --git a/urbansim/urbanchoice/interaction.py b/urbansim/urbanchoice/interaction.py
@@ -42,7 +42,10 @@ def mnl_interaction_dataset(choosers, alternatives, SAMPLE_SIZE,
     # something that isn't in the alternatives table
     if chosenalts is not None:
         isin = chosenalts.isin(alternatives.index)
-        removing = isin.value_counts()[False]
+        try:
+            removing = isin.value_counts().loc[False]
+        except:
+            removing = None
         if removing:
             print (
                 "Removing {} choice situations because chosen "