pass through kwargs for location choice model estimation

activitysim/estimation/larch/location_choice.py

@@ -287,46 +287,53 @@ def update_size_spec(model, data, result_dir=Path('.'), output_file=None):
     return master_size_spec
 
 
-def workplace_location_model(return_data=False):
+def workplace_location_model(**kwargs):
+    unused = kwargs.pop('name', None)
     return location_choice_model(
         name="workplace_location",
-        return_data=return_data,
+        **kwargs,
     )
 
 
-def school_location_model(return_data=False):
+def school_location_model(**kwargs):
+    unused = kwargs.pop('name', None)
     return location_choice_model(
         name="school_location",
-        return_data=return_data,
+        **kwargs,
     )
 
 
-def atwork_subtour_destination_model(return_data=False):
+def atwork_subtour_destination_model(**kwargs):
+    unused = kwargs.pop('name', None)
     return location_choice_model(
         name="atwork_subtour_destination",
-        return_data=return_data,
+        **kwargs,
     )
 
 
-def joint_tour_destination_model(return_data=False):
+def joint_tour_destination_model(**kwargs):
     # goes with non_mandatory_tour_destination
+    unused = kwargs.pop('name', None)
+    if 'coefficients_file' not in kwargs:
+        kwargs['coefficients_file'] = "non_mandatory_tour_destination_coefficients.csv"
     return location_choice_model(
         name="joint_tour_destination",
-        coefficients_file="non_mandatory_tour_destination_coefficients.csv",
-        return_data=return_data,
+        **kwargs,
     )
 
 
-def non_mandatory_tour_destination_model(return_data=False):
+def non_mandatory_tour_destination_model(**kwargs):
     # goes with joint_tour_destination
+    unused = kwargs.pop('name', None)
     return location_choice_model(
         name="non_mandatory_tour_destination",
-        return_data=return_data,
+        **kwargs,
     )
 
 
-def trip_destination_model(return_data=False):
+def trip_destination_model(**kwargs):
+    unused = kwargs.pop('name', None)
     return location_choice_model(
         name="trip_destination",
-        return_data=return_data,
+        **kwargs,
     )

conda-environments/activitysim-dev.yml

@@ -5,7 +5,7 @@ channels:
 dependencies:
 - python=3.9
 - pip
-- numpy >= 1.16.1
+- numpy >= 1.16.1,<=1.21
 - pandas >= 1.1.0
 - pyarrow >= 2.0
 - openmatrix >= 0.3.4.1

conda-environments/activitysim-test-larch.yml

@@ -6,7 +6,7 @@ channels:
 dependencies:
 - python=${TRAVIS_PYTHON_VERSION}
 - pip
-- numpy >= 1.16.1
+- numpy >= 1.16.1,<=1.21
 - pandas >= 1.1.0
 - pyarrow >= 2.0
 - openmatrix >= 0.3.4.1
@@ -23,3 +23,5 @@ dependencies:
 - coveralls
 - pycodestyle
 - pytest-regressions
+- xarray
+- sharrow

conda-environments/activitysim-test.yml

@@ -6,7 +6,7 @@ channels:
 dependencies:
 - python=${TRAVIS_PYTHON_VERSION}
 - pip
-- numpy >= 1.16.1
+- numpy >= 1.16.1,<=1.21
 - pandas >= 1.1.0
 - pyarrow >= 2.0
 - openmatrix >= 0.3.4.1