Fix tests.petab_test_suite.test_petab_suite.check_derivatives

AMICI-dev · Jun 12, 2024 · eba3a87 · eba3a87
1 parent 96fba45
commit eba3a87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/python/sdist/amici/petab/import_helpers.py b/python/sdist/amici/petab/import_helpers.py
@@ -229,9 +229,10 @@ def get_fixed_parameters(
         # check global parameters
         if not petab_problem.model.has_entity_with_id(fixed_parameter):
             # TODO: could still exist as an output parameter?
+            # TODO: or in the parameters table
             logger.warning(
                 f"Column '{fixed_parameter}' used in condition "
-                "table but not entity with the corresponding ID "
+                "table but no entity with the corresponding ID "
                 "exists. Ignoring."
             )
             fixed_parameters.remove(fixed_parameter)

diff --git a/tests/petab_test_suite/test_petab_suite.py b/tests/petab_test_suite/test_petab_suite.py
@@ -178,8 +178,9 @@ def check_derivatives(
         problem_parameters=problem_parameters,
     ):
         # check_derivatives does currently not support parameters in ExpData
-        model.setParameters(edata.parameters)
+        # set parameter scales before setting parameter values!
         model.setParameterScale(edata.pscale)
+        model.setParameters(edata.parameters)
         edata.parameters = []
         edata.pscale = amici.parameterScalingFromIntVector([])
         amici_check_derivatives(model, solver, edata)