From c74bab4c0a8a709d0bc689e4d92323d00f1cf77a Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Tue, 2 Jul 2024 13:15:31 +0200 Subject: [PATCH] .. --- petabtests/cases/v1.0.0/sbml/0005/0005.py | 24 ++++++- petabtests/cases/v1.0.0/sbml/0005/_model.xml | 69 ++++++-------------- 2 files changed, 41 insertions(+), 52 deletions(-) diff --git a/petabtests/cases/v1.0.0/sbml/0005/0005.py b/petabtests/cases/v1.0.0/sbml/0005/0005.py index 5676c9a..aae1ea4 100644 --- a/petabtests/cases/v1.0.0/sbml/0005/0005.py +++ b/petabtests/cases/v1.0.0/sbml/0005/0005.py @@ -4,7 +4,7 @@ import pandas as pd from petab.v1.C import * -from petabtests import PetabTestCase, analytical_a +from petabtests import PetabTestCase, analytical_a, antimony_to_sbml_str DESCRIPTION = cleandoc(""" ## Objective @@ -23,6 +23,26 @@ """) # problem -------------------------------------------------------------------- +ant_model = """ +model *petab_test_0011() + compartment compartment_ = 1; + species A in compartment_, B in compartment_; + + fwd: A => B; compartment_ * k1 * A; + rev: B => A; compartment_ * k2 * B; + + A = a0; + B = b0; + B = 1; + a0 = 1; + b0 = 1; + k1 = 0; + k2 = 0; + offset_A = 0; +end +""" +model_file = sbml_file = Path(__file__).parent / "_model.xml" +model_file.write_text(antimony_to_sbml_str(ant_model)) condition_df = pd.DataFrame( data={ @@ -73,7 +93,7 @@ brief="Simulation. Condition-specific parameters only defined in " "parameter table.", description=DESCRIPTION, - model=Path("conversion_modified.xml"), + model=model_file, condition_dfs=[condition_df], observable_dfs=[observable_df], measurement_dfs=[measurement_df], diff --git a/petabtests/cases/v1.0.0/sbml/0005/_model.xml b/petabtests/cases/v1.0.0/sbml/0005/_model.xml index 95e0fcb..5e9270a 100644 --- a/petabtests/cases/v1.0.0/sbml/0005/_model.xml +++ b/petabtests/cases/v1.0.0/sbml/0005/_model.xml @@ -1,89 +1,59 @@ - - - - - - - - - - - - - - - - + + + - - + - - - - - + + - - - - - - - - - - - + + + + + - a0 - - - b0 - - - - + - + - + - compartment + compartment_ k1 A - + - + - + - compartment + compartment_ k2 B @@ -91,6 +61,5 @@ -