@@ -410,14 +410,6 @@ def standard_layers_controls():
410410 controls .pUnitGamma = 0.2
411411 controls .boundHandling = BoundHandling .Reflect
412412 controls .adaptPCR = True
413- # controls.checks.fitParam = [1, 0, 0, 0]
414- # controls.checks.fitBackgroundParam = [0]
415- # controls.checks.fitQzshift = []
416- # controls.checks.fitScalefactor = [0]
417- # controls.checks.fitBulkIn = [0]
418- # controls.checks.fitBulkOut = [0]
419- # controls.checks.fitResolutionParam = [0]
420- # controls.checks.fitDomainRatio = []
421413
422414 return controls
423415
@@ -456,14 +448,6 @@ def custom_xy_controls():
456448 controls .pUnitGamma = 0.2
457449 controls .boundHandling = BoundHandling .Reflect
458450 controls .adaptPCR = True
459- # controls.checks.fitParam = [1, 0, 0, 0]
460- # controls.checks.fitBackgroundParam = [0]
461- # controls.checks.fitQzshift = []
462- # controls.checks.fitScalefactor = [0]
463- # controls.checks.fitBulkIn = [0]
464- # controls.checks.fitBulkOut = [0]
465- # controls.checks.fitResolutionParam = [0]
466- # controls.checks.fitDomainRatio = []
467451
468452 return controls
469453
@@ -706,48 +690,6 @@ def check_problem_equal(actual_problem, expected_problem) -> None:
706690 ] == ["NaN" if np .isnan (el ) else el for el in expected_problem .contrastCustomFiles ]
707691
708692
709- # def check_cells_equal(actual_cells, expected_cells) -> None:
710- # """Compare two instances of the "cells" object for equality."""
711- # assert actual_cells.f1 == expected_cells.f1
712-
713- # # Need to test equality of the numpy arrays separately
714- # for a, b in zip(actual_cells.f2, expected_cells.f2):
715- # assert (a == b).all()
716-
717- # # f6 may contain "NaN" values, so consider separately
718- # assert actual_cells.f6 == expected_cells.f6 or [
719- # "NaN" if np.isnan(el) else el for entry in actual_cells.f6 for el in entry
720- # ] == ["NaN" if np.isnan(el) else el for entry in expected_cells.f6 for el in entry]
721-
722- # mocked_matlab_future = mock.MagicMock()
723- # mocked_engine = mock.MagicMock()
724- # mocked_matlab_future.result.return_value = mocked_engine
725- # with (
726- # mock.patch.object(
727- # RATapi.wrappers.MatlabWrapper,
728- # "loader",
729- # mocked_matlab_future,
730- # ),
731- # mock.patch.object(RATapi.rat_core, "DylibEngine", mock.MagicMock()),
732- # mock.patch.object(
733- # RATapi.inputs,
734- # "get_python_handle",
735- # mock.MagicMock(return_value=dummy_function),
736- # ),
737- # mock.patch.object(
738- # RATapi.wrappers.MatlabWrapper,
739- # "getHandle",
740- # mock.MagicMock(return_value=dummy_function),
741- # ),
742- # mock.patch.object(RATapi.wrappers.DylibWrapper, "getHandle", mock.MagicMock(return_value=dummy_function)),
743- # ):
744- # assert list(actual_cells.f14) == expected_cells.f14
745-
746- # for index in chain(range(3, 6), range(7, 14), range(15, 21)):
747- # field = f"f{index}"
748- # assert getattr(actual_cells, field) == getattr(expected_cells, field)
749-
750-
751693def check_controls_equal (actual_controls , expected_controls ) -> None :
752694 """Compare two instances of the "controls" object used as input for the compiled RAT code for equality."""
753695 controls_fields = [
0 commit comments