Move Inputs definition to parameter.py

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):

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:

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):

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):

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

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):

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:

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):

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:

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):

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):