From 1331a8f36b4fc48d8a208cfac1331638e53eea09 Mon Sep 17 00:00:00 2001 From: NicolaCourtier <45851982+NicolaCourtier@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:02:13 +0100 Subject: [PATCH] Move Inputs definition to parameter.py --- pybop/costs/_likelihoods.py | 2 +- pybop/costs/base_cost.py | 3 +-- pybop/costs/design_costs.py | 2 +- pybop/costs/fitting_costs.py | 2 +- pybop/models/base_model.py | 3 +-- pybop/models/empirical/ecm.py | 2 +- pybop/parameters/parameter.py | 3 ++- pybop/plotting/plot_problem.py | 2 +- pybop/problems/base_problem.py | 2 +- pybop/problems/design_problem.py | 2 +- pybop/problems/fitting_problem.py | 2 +- 11 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pybop/costs/_likelihoods.py b/pybop/costs/_likelihoods.py index be99a369..9406572b 100644 --- a/pybop/costs/_likelihoods.py +++ b/pybop/costs/_likelihoods.py @@ -1,7 +1,7 @@ import numpy as np from pybop.costs.base_cost import BaseCost -from pybop.models.base_model import Inputs +from pybop.parameters.parameter import Inputs class BaseLikelihood(BaseCost): diff --git a/pybop/costs/base_cost.py b/pybop/costs/base_cost.py index a9a11b9c..659e3f7f 100644 --- a/pybop/costs/base_cost.py +++ b/pybop/costs/base_cost.py @@ -1,6 +1,5 @@ from pybop import BaseProblem -from pybop.models.base_model import Inputs -from pybop.parameters.parameter import Parameters +from pybop.parameters.parameter import Inputs, Parameters class BaseCost: diff --git a/pybop/costs/design_costs.py b/pybop/costs/design_costs.py index 76dbd5f6..85f3dee4 100644 --- a/pybop/costs/design_costs.py +++ b/pybop/costs/design_costs.py @@ -3,7 +3,7 @@ import numpy as np from pybop.costs.base_cost import BaseCost -from pybop.models.base_model import Inputs +from pybop.parameters.parameter import Inputs class DesignCost(BaseCost): diff --git a/pybop/costs/fitting_costs.py b/pybop/costs/fitting_costs.py index e5e306ef..3cb57ec9 100644 --- a/pybop/costs/fitting_costs.py +++ b/pybop/costs/fitting_costs.py @@ -2,8 +2,8 @@ from pybop.costs._likelihoods import BaseLikelihood from pybop.costs.base_cost import BaseCost -from pybop.models.base_model import Inputs from pybop.observers.observer import Observer +from pybop.parameters.parameter import Inputs class RootMeanSquaredError(BaseCost): diff --git a/pybop/models/base_model.py b/pybop/models/base_model.py index 79c56263..a016bbc6 100644 --- a/pybop/models/base_model.py +++ b/pybop/models/base_model.py @@ -7,8 +7,7 @@ import pybamm from pybop import Dataset, Experiment, Parameters, ParameterSet - -Inputs = Dict[str, float] +from pybop.parameters.parameter import Inputs @dataclass diff --git a/pybop/models/empirical/ecm.py b/pybop/models/empirical/ecm.py index 784fccb0..d2d97d6d 100644 --- a/pybop/models/empirical/ecm.py +++ b/pybop/models/empirical/ecm.py @@ -1,7 +1,7 @@ from pybamm import equivalent_circuit as pybamm_equivalent_circuit -from pybop.models.base_model import Inputs from pybop.models.empirical.base_ecm import ECircuitModel +from pybop.parameters.parameter import Inputs class Thevenin(ECircuitModel): diff --git a/pybop/parameters/parameter.py b/pybop/parameters/parameter.py index e3046ce6..e1a828af 100644 --- a/pybop/parameters/parameter.py +++ b/pybop/parameters/parameter.py @@ -4,7 +4,8 @@ import numpy as np from pybop._utils import is_numeric -from pybop.models.base_model import Inputs + +Inputs = Dict[str, float] class Parameter: diff --git a/pybop/plotting/plot_problem.py b/pybop/plotting/plot_problem.py index 65812d15..d37c62e1 100644 --- a/pybop/plotting/plot_problem.py +++ b/pybop/plotting/plot_problem.py @@ -3,7 +3,7 @@ import numpy as np from pybop import DesignProblem, FittingProblem, StandardPlot -from pybop.models.base_model import Inputs +from pybop.parameters.parameter import Inputs def quick_plot(problem, inputs: Inputs = None, show=True, **layout_kwargs): diff --git a/pybop/problems/base_problem.py b/pybop/problems/base_problem.py index 44142a68..4d9d8519 100644 --- a/pybop/problems/base_problem.py +++ b/pybop/problems/base_problem.py @@ -1,5 +1,5 @@ from pybop import BaseModel, Dataset, Parameter, Parameters -from pybop.models.base_model import Inputs +from pybop.parameters.parameter import Inputs class BaseProblem: diff --git a/pybop/problems/design_problem.py b/pybop/problems/design_problem.py index d5b5f4e9..b99a9357 100644 --- a/pybop/problems/design_problem.py +++ b/pybop/problems/design_problem.py @@ -1,7 +1,7 @@ import numpy as np from pybop import BaseProblem -from pybop.models.base_model import Inputs +from pybop.parameters.parameter import Inputs class DesignProblem(BaseProblem): diff --git a/pybop/problems/fitting_problem.py b/pybop/problems/fitting_problem.py index 07bdd3d0..1e920de6 100644 --- a/pybop/problems/fitting_problem.py +++ b/pybop/problems/fitting_problem.py @@ -1,7 +1,7 @@ import numpy as np from pybop import BaseProblem -from pybop.models.base_model import Inputs +from pybop.parameters.parameter import Inputs class FittingProblem(BaseProblem):