Merge branch 'master' into regression-debug

Conflicts: urbansim/models/yamlmodelrunner.py
UDST · Jun 8, 2014 · 049fe83 · 049fe83
2 parents 48e61c8 + f3214e5
commit 049fe83
Show file tree

Hide file tree

Showing 5 changed files with 624 additions and 16 deletions.
diff --git a/urbansim/models/__init__.py b/urbansim/models/__init__.py
@@ -1,5 +1,7 @@
-from .regression import RegressionModel, RegressionModelGroup, SegmentedRegressionModel
-from .lcm import MNLLocationChoiceModel
+from .regression import RegressionModel, RegressionModelGroup, \
+    SegmentedRegressionModel
+from .lcm import MNLLocationChoiceModel, MNLLocationChoiceModelGroup, \
+    SegmentedMNLLocationChoiceModel
 from .transition import (
     GrowthRateTransition, TabularGrowthRateTransition,
     TabularTotalsTransition, TransitionModel)