Removes limits struct from input to RAT

Author: DrPaulSharp

RATapi/examples/languages/custom_bilayer.o

@@ -10,7 +10,7 @@
 import RATapi
 import RATapi.controls
 import RATapi.wrappers
-from RATapi.rat_core import Checks, Control, Limits, NameStore, ProblemDefinition
+from RATapi.rat_core import Checks, Control, NameStore, ProblemDefinition
 from RATapi.utils.enums import Calculations, Languages, LayerModels, TypeOptions
 
 parameter_field = {
@@ -113,7 +113,7 @@ def __len__(self):
         return len(self.files)
 
 
-def make_input(project: RATapi.Project, controls: RATapi.Controls) -> tuple[ProblemDefinition, Limits, Control]:
+def make_input(project: RATapi.Project, controls: RATapi.Controls) -> tuple[ProblemDefinition, Control]:
     """Construct the inputs required for the compiled RAT code using the data defined in the input project and controls.
 
     Parameters
@@ -127,28 +127,14 @@ def make_input(project: RATapi.Project, controls: RATapi.Controls) -> tuple[Prob
     -------
     problem : RAT.rat_core.ProblemDefinition
         The problem input used in the compiled RAT code.
-    limits : RAT.rat_core.Limits
-        A list of min/max values for each parameter defined in the project.
     cpp_controls : RAT.rat_core.Control
         The controls object used in the compiled RAT code.
 
     """
-    limits = Limits()
-
-    for class_list in RATapi.project.parameter_class_lists:
-        setattr(
-            limits,
-            parameter_field[class_list],
-            [[element.min, element.max] for element in getattr(project, class_list)],
-        )
-
-    if project.model == LayerModels.CustomXY:
-        controls.calcSldDuringFit = True
-
     problem = make_problem(project)
     cpp_controls = make_controls(controls)
 
-    return problem, limits, cpp_controls
+    return problem, cpp_controls
 
 
 def make_problem(project: RATapi.Project) -> ProblemDefinition:

RATapi/inputs.py

@@ -109,7 +109,7 @@ def run(project, controls):
 
     horizontal_line = "\u2500" * 107 + "\n"
     display_on = controls.display != Display.Off
-    problem_definition, limits, cpp_controls = make_input(project, controls)
+    problem_definition, cpp_controls = make_input(project, controls)
 
     if display_on:
         print("Starting RAT " + horizontal_line)
@@ -118,7 +118,6 @@ def run(project, controls):
     with ProgressBar(display=display_on), TextOutput(display=display_on):
         problem_definition, output_results, bayes_results = RATapi.rat_core.RATMain(
             problem_definition,
-            limits,
             cpp_controls,
         )
     end = time.time()

RATapi/run.py

@@ -9,7 +9,7 @@
 import RATapi
 import RATapi.wrappers
 from RATapi.inputs import FileHandles, check_indices, make_controls, make_input, make_problem
-from RATapi.rat_core import Checks, Control, Limits, NameStore, ProblemDefinition
+from RATapi.rat_core import Checks, Control, NameStore, ProblemDefinition
 from RATapi.utils.enums import (
     BackgroundActions,
     BoundHandling,
@@ -351,36 +351,6 @@ def custom_xy_problem(test_names, test_checks):
     return problem
 
 
-@pytest.fixture
-def normal_limits():
-    """The expected limits object from "standard_layers_project" and "custom_xy_project"."""
-    limits = Limits()
-    limits.params = [[1.0, 5.0], [0.0, 0.0], [0.0, 0.0], [0.0, 0.0]]
-    limits.backgroundParams = [[1e-7, 1e-5]]
-    limits.scalefactors = [[0.02, 0.25]]
-    limits.bulkIns = [[0.0, 0.0]]
-    limits.bulkOuts = [[6.2e-6, 6.35e-6]]
-    limits.resolutionParams = [[0.01, 0.05]]
-    limits.domainRatios = []
-
-    return limits
-
-
-@pytest.fixture
-def domains_limits():
-    """The expected limits object from "domains_project"."""
-    limits = Limits()
-    limits.params = [[1.0, 5.0], [0.0, 0.0], [0.0, 0.0], [0.0, 0.0]]
-    limits.backgroundParams = [[1e-7, 1e-5]]
-    limits.scalefactors = [[0.02, 0.25]]
-    limits.bulkIns = [[0.0, 0.0]]
-    limits.bulkOuts = [[6.2e-6, 6.35e-6]]
-    limits.resolutionParams = [[0.01, 0.05]]
-    limits.domainRatios = [[0.4, 0.6]]
-
-    return limits
-
-
 @pytest.fixture
 def standard_layers_controls():
     """The expected controls object for input to the compiled RAT code given the default inputs and
@@ -458,55 +428,38 @@ def custom_xy_controls():
 
 
 @pytest.mark.parametrize(
-    ["test_project", "test_problem", "test_limits", "test_controls"],
+    ["test_project", "test_problem", "test_controls"],
     [
         (
             "standard_layers_project",
             "standard_layers_problem",
-            "normal_limits",
             "standard_layers_controls",
         ),
         (
             "custom_xy_project",
             "custom_xy_problem",
-            "normal_limits",
             "custom_xy_controls",
         ),
         (
             "domains_project",
             "domains_problem",
-            "domains_limits",
             "standard_layers_controls",
         ),
     ],
 )
-def test_make_input(test_project, test_problem, test_limits, test_controls, request) -> None:
-    """When converting the "project" and "controls", we should obtain the five input objects required for the compiled
+def test_make_input(test_project, test_problem, test_controls, request) -> None:
+    """When converting the "project" and "controls", we should obtain the two input objects required for the compiled
     RAT code.
     """
     test_project = request.getfixturevalue(test_project)
     test_problem = request.getfixturevalue(test_problem)
-    test_limits = request.getfixturevalue(test_limits)
     test_controls = request.getfixturevalue(test_controls)
 
-    parameter_fields = [
-        "params",
-        "backgroundParams",
-        "scalefactors",
-        "bulkIns",
-        "bulkOuts",
-        "resolutionParams",
-        "domainRatios",
-    ]
+    problem, controls = make_input(test_project, RATapi.Controls())
 
-    problem, limits, controls = make_input(test_project, RATapi.Controls())
     problem = pickle.loads(pickle.dumps(problem))
     check_problem_equal(problem, test_problem)
 
-    limits = pickle.loads(pickle.dumps(limits))
-    for limit_field in parameter_fields:
-        assert np.all(getattr(limits, limit_field) == getattr(test_limits, limit_field))
-
     controls = pickle.loads(pickle.dumps(controls))
     check_controls_equal(controls, test_controls)