Skip to content

Commit

Permalink
Select: support version 0.1.8 (#1070)
Browse files Browse the repository at this point in the history
* set predecessor manually in multistart selection
  • Loading branch information
dilpath authored May 31, 2023
1 parent 7d49422 commit 7b27ccd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 0 additions & 4 deletions pypesto/select/method.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,10 +364,6 @@ def __call__(
calibrated_models=self.calibrated_models,
newly_calibrated_models=newly_calibrated_models,
excluded_model_hashes=self.calibrated_models.keys(),
# FIXME meaning changes here, i.e. predecessor model is used as previous
# predecessor model, since PEtab Select now gets the next predecessor
# model if the candidate space has models.
previous_predecessor_model=predecessor_model,
criterion=self.criterion,
)
predecessor_model = self.candidate_space.predecessor_model
Expand Down
3 changes: 3 additions & 0 deletions pypesto/select/problem.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@ def multistart_select(

method_caller = self.create_method_caller(**kwargs)
for start_index, predecessor_model in enumerate(predecessor_models):
method_caller.candidate_space.previous_predecessor_model = (
predecessor_model
)
(
best_model,
newly_calibrated_models_list[start_index],
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ select =
# Remove when vis is moved to PEtab Select version
networkx >= 2.5.1
# End remove
petab-select >= 0.1.1
petab-select >= 0.1.8
test =
pytest >= 5.4.3
pytest-cov >= 2.10.0
Expand Down

0 comments on commit 7b27ccd

Please sign in to comment.