Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to recent amici/petab changes #47

Merged
merged 1 commit into from
Oct 8, 2024
Merged

Adapt to recent amici/petab changes #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/extensions/amici/test_amici.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
from pathlib import Path

import amici
import amici.petab_import
import amici.petab_objective
import amici.petab.petab_import
import amici.petab.simulations
import numpy as np
import petab
import petab.v1 as petab
import pytest

from fiddy import MethodId, Type, get_derivative
Expand Down Expand Up @@ -54,7 +54,7 @@ def simple() -> petab.Problem:
def test_run_amici_simulation_to_functions(problem_generator):
petab_problem, point = problem_generator()
timepoints = sorted(set(petab_problem.measurement_df.time))
amici_model = amici.petab_import.import_petab_problem(petab_problem)
amici_model = amici.petab.petab_import.import_petab_problem(petab_problem)
amici_model.setTimepoints(timepoints)
amici_solver = amici_model.getSolver()

Expand Down Expand Up @@ -120,7 +120,7 @@ def test_run_amici_simulation_to_functions(problem_generator):
@pytest.mark.parametrize("scaled_parameters", (False, True))
def test_simulate_petab_to_functions(problem_generator, scaled_parameters):
petab_problem, point = problem_generator()
amici_model = amici.petab_import.import_petab_problem(petab_problem)
amici_model = amici.petab.petab_import.import_petab_problem(petab_problem)
amici_solver = amici_model.getSolver()

if amici_model.getName() == "simple":
Expand Down
Loading