observable

Author: dweindl

petab/v2/core.py

@@ -8,7 +8,6 @@
 import tempfile
 import traceback
 from abc import abstractmethod
-from collections import OrderedDict
 from collections.abc import Sequence
 from enum import Enum
 from itertools import chain
@@ -2280,14 +2279,14 @@ def get_measurements_for_experiment(
         ]
 
     def get_output_parameters(
-        self, observables: bool = True, noise: bool = True
+        self, observable: bool = True, noise: bool = True
     ) -> list[str]:
         """Get output parameters.
 
         Returns IDs of symbols used in observable and noise formulas that are
         not observables and that are not defined in the model.
 
-        :param observables:
+        :param observable:
             Include parameters from observableFormulas
         :param noise:
             Include parameters from noiseFormulas
@@ -2297,7 +2296,7 @@ def get_output_parameters(
         # collect free symbols from observable and noise formulas,
         # skipping observable IDs
         candidates = set()
-        if observables:
+        if observable:
             candidates |= {
                 str_sym
                 for o in self.observables

tests/v1/test_petab.py

@@ -867,7 +867,7 @@ def test_get_required_parameters_for_parameter_table(petab_problem):
     noise_placeholders = petab.observables.get_output_parameters(
         petab_problem.observable_df,
         petab_problem.model,
-        observables=False,
+        observable=False,
         noise=True,
     )
     # The observable parameter (scaling) appears in the noise formula,

tests/v2/test_core.py

@@ -804,12 +804,12 @@ def test_get_output_parameters():
     )
     assert (
         petab_problem.get_output_parameters()
-        == petab_problem.get_output_parameters(observables=True, noise=True)
+        == petab_problem.get_output_parameters(observable=True, noise=True)
         == ["p1", "p3", "p4", "p5"]
     )
     assert petab_problem.get_output_parameters(
-        observables=True, noise=False
+        observable=True, noise=False
     ) == ["p1", "p3", "p4"]
     assert petab_problem.get_output_parameters(
-        observables=False, noise=True
+        observable=False, noise=True
     ) == ["p1", "p3", "p5"]