tests of mnl_estimate compared to R's mlogit

UDST · Nov 21, 2014 · e4ed2a4 · e4ed2a4
1 parent d5f9c82
commit e4ed2a4
Show file tree

Hide file tree

Showing 6 changed files with 5,698 additions and 2 deletions.
diff --git a/urbansim/urbanchoice/mnl.py b/urbansim/urbanchoice/mnl.py
@@ -4,6 +4,8 @@
 ``urbansim.models.lcm``.
 
 """
+from __future__ import print_function
+
 import logging
 
 import numpy as np
@@ -190,15 +192,15 @@ def mnl_estimate(data, chosen, numalts, GPU=False, coeffrange=(-3, 3),
 
     if beta is None:
         beta = np.zeros(numvars)
-    bounds = np.array([coeffrange for i in range(numvars)])
+    bounds = [coeffrange] * numvars
 
     with log_start_finish('scipy optimization for MNL fit', logger):
         args = (data, chosen, numalts, weights, lcgrad)
         bfgs_result = scipy.optimize.fmin_l_bfgs_b(mnl_loglik,
                                                    beta,
                                                    args=args,
                                                    fprime=None,
-                                                   factr=1e5,
+                                                   factr=10,
                                                    approx_grad=False,
                                                    bounds=bounds
                                                    )

diff --git a/urbansim/urbanchoice/tests/__init__.py b/urbansim/urbanchoice/tests/__init__.py