From b767ccf8327def14bf19f4cb1f9da5877b877cca Mon Sep 17 00:00:00 2001 From: Tim Mensinger Date: Tue, 10 Sep 2024 18:05:28 +0200 Subject: [PATCH] Rename model module -> user_model --- src/lcm/__init__.py | 2 +- src/lcm/entry_point.py | 2 +- src/lcm/input_processing/create_params_template.py | 2 +- src/lcm/input_processing/process_model.py | 2 +- src/lcm/input_processing/util.py | 2 +- src/lcm/{model.py => user_model.py} | 0 tests/test_model.py | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename src/lcm/{model.py => user_model.py} (100%) diff --git a/src/lcm/__init__.py b/src/lcm/__init__.py index c36ec67..8d1a197 100644 --- a/src/lcm/__init__.py +++ b/src/lcm/__init__.py @@ -7,6 +7,6 @@ from lcm import mark from lcm.grids import DiscreteGrid, LinspaceGrid, LogspaceGrid -from lcm.model import Model +from lcm.user_model import Model __all__ = ["mark", "Model", "LinspaceGrid", "LogspaceGrid", "DiscreteGrid"] diff --git a/src/lcm/entry_point.py b/src/lcm/entry_point.py index 6af3f6a..2ccf514 100644 --- a/src/lcm/entry_point.py +++ b/src/lcm/entry_point.py @@ -11,7 +11,6 @@ from lcm.dispatchers import productmap from lcm.input_processing import process_model from lcm.logging import get_logger -from lcm.model import Model from lcm.model_functions import ( get_utility_and_feasibility_function, ) @@ -21,6 +20,7 @@ from lcm.solve_brute import solve from lcm.state_space import create_state_choice_space from lcm.typing import ParamsDict +from lcm.user_model import Model def get_lcm_function( diff --git a/src/lcm/input_processing/create_params_template.py b/src/lcm/input_processing/create_params_template.py index 10b13c9..7c55052 100644 --- a/src/lcm/input_processing/create_params_template.py +++ b/src/lcm/input_processing/create_params_template.py @@ -7,8 +7,8 @@ from jax import Array from lcm.input_processing.util import get_grids, get_variable_info -from lcm.model import Model from lcm.typing import ParamsDict +from lcm.user_model import Model def create_params_template( diff --git a/src/lcm/input_processing/process_model.py b/src/lcm/input_processing/process_model.py index b7b80c5..179c626 100644 --- a/src/lcm/input_processing/process_model.py +++ b/src/lcm/input_processing/process_model.py @@ -16,8 +16,8 @@ get_variable_info, ) from lcm.interfaces import InternalModel -from lcm.model import Model from lcm.typing import ParamsDict, ShockType +from lcm.user_model import Model def process_model(model: Model) -> InternalModel: diff --git a/src/lcm/input_processing/util.py b/src/lcm/input_processing/util.py index 6692944..70a1a30 100644 --- a/src/lcm/input_processing/util.py +++ b/src/lcm/input_processing/util.py @@ -4,8 +4,8 @@ from dags import get_ancestors from lcm.grids import ContinuousGrid, Grid -from lcm.model import Model from lcm.typing import Array +from lcm.user_model import Model def get_function_info(model: Model) -> pd.DataFrame: diff --git a/src/lcm/model.py b/src/lcm/user_model.py similarity index 100% rename from src/lcm/model.py rename to src/lcm/user_model.py diff --git a/tests/test_model.py b/tests/test_model.py index b0851c5..547a776 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -2,7 +2,7 @@ from lcm.exceptions import ModelInitilizationError from lcm.grids import DiscreteGrid -from lcm.model import Model +from lcm.user_model import Model def test_model_invalid_states():