fix tests

PEtab-dev · Dec 3, 2024 · 8e799eb · 8e799eb
1 parent 74fed0b
commit 8e799eb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/petab_select/models.py b/petab_select/models.py
@@ -112,7 +112,6 @@ def __getitem__(
                 case ModelHash() | str():
                     return self._models[self._hashes.index(key)]
                 case slice():
-                    print(key)
                     return self.__class__(self._models[key])
                 case Iterable():
                     # TODO sensible to yield here?

diff --git a/petab_select/ui.py b/petab_select/ui.py
@@ -6,6 +6,7 @@
 import numpy as np
 import petab.v1 as petab
 
+from . import analyze
 from .candidate_space import CandidateSpace, FamosCandidateSpace
 from .constants import (
     CANDIDATE_SPACE,
@@ -159,9 +160,10 @@ def start_iteration(
     # by calling ui.best to find the best model to jump to if
     # this is not the first step of the search.
     if candidate_space.latest_iteration_calibrated_models:
-        predecessor_model = problem.get_best(
-            candidate_space.latest_iteration_calibrated_models,
+        predecessor_model = analyze.get_best(
+            models=candidate_space.latest_iteration_calibrated_models,
             criterion=criterion,
+            compare=problem.compare,
         )
         # If the new predecessor model isn't better than the previous one,
         # keep the previous one.
@@ -352,7 +354,9 @@ def get_best(
         The best model.
     """
     # TODO return list, when multiple models are equally "best"
-    return problem.get_best(models=models, criterion=criterion)
+    return analyze.get_best(
+        models=models, criterion=criterion, compare=problem.compare
+    )
 
 
 def write_summary_tsv(

diff --git a/test/candidate_space/test_famos.py b/test/candidate_space/test_famos.py
@@ -5,7 +5,7 @@
 from more_itertools import one
 
 import petab_select
-from petab_select import Method
+from petab_select import Method, Models
 from petab_select.constants import (
     CANDIDATE_SPACE,
     MODEL_HASH,
@@ -126,8 +126,7 @@ def parse_summary_to_progress_list(summary_tsv: str) -> tuple[Method, set]:
         return progress_list
 
     progress_list = []
-    all_calibrated_models = {}
-    calibrated_models = {}
+    all_calibrated_models = Models()
 
     candidate_space = petab_select_problem.new_candidate_space()
     candidate_space.summary_tsv.unlink(missing_ok=True)
@@ -145,7 +144,7 @@ def parse_summary_to_progress_list(summary_tsv: str) -> tuple[Method, set]:
             )
 
             # Calibrate candidate models
-            calibrated_models = {}
+            calibrated_models = Models()
             for candidate_model in iteration[UNCALIBRATED_MODELS]:
                 calibrate(candidate_model)
                 calibrated_models[candidate_model.get_hash()] = candidate_model
@@ -155,7 +154,7 @@ def parse_summary_to_progress_list(summary_tsv: str) -> tuple[Method, set]:
                 candidate_space=iteration[CANDIDATE_SPACE],
                 calibrated_models=calibrated_models,
             )
-            all_calibrated_models.update(iteration_results[MODELS])
+            all_calibrated_models += iteration_results[MODELS]
             candidate_space = iteration_results[CANDIDATE_SPACE]
 
             # Stop iteration if there are no candidate models

diff --git a/test/cli/input/models.yaml b/test/cli/input/models.yaml
@@ -1,5 +1,10 @@
 - criteria: {}
   model_id: model_1
+  model_subspace_id: M
+  model_subspace_indices:
+  - 0
+  - 1
+  - 1
   parameters:
     k1: 0.2
     k2: estimate
@@ -10,6 +15,11 @@
   petab_yaml: ../../../doc/examples/model_selection/petab_problem.yaml
 - criteria: {}
   model_id: model_2
+  model_subspace_id: M
+  model_subspace_indices:
+  - 1
+  - 1
+  - 0
   parameters:
     k1: estimate
     k2: estimate