Misc integers -> booleans.

UDST · Apr 29, 2014 · e60c2c0 · e60c2c0
1 parent 05312cd
commit e60c2c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/urbansim/urbanchoice/mnl.py b/urbansim/urbanchoice/mnl.py
@@ -97,8 +97,7 @@ def mnl_loglik(beta, data, chosen, numalts, weights=None, lcgrad=False,
     return -1 * loglik, -1 * gradarr
 
 
-def mnl_simulate(data, coeff, numalts, GPU=0, returnprobs=0):
-
+def mnl_simulate(data, coeff, numalts, GPU=False, returnprobs=False):
     atype = 'numpy' if not GPU else 'cuda'
 
     data = np.transpose(data)

diff --git a/urbansim/urbansim/dataset.py b/urbansim/urbansim/dataset.py
@@ -257,6 +257,6 @@ def choose(self, p, mask, alternatives, segment, new_homes, minsize=None):
             alternatives["supply"].ix[
                 alternatives.index.values[indexes]] -= minsize
         else:
-            mask[indexes] = 1
+            mask[indexes] = True
 
         return mask, new_homes