1818
1919def test_assert_measured_observables_present ():
2020 # create test model
21-
2221 measurement_df = pd .DataFrame (
2322 data = {
2423 OBSERVABLE_ID : ["non-existing1" ],
@@ -255,15 +254,15 @@ def test_assert_no_leading_trailing_whitespace():
255254
256255
257256def test_assert_model_parameters_in_condition_or_parameter_table ():
258- import simplesbml
259-
260257 from petab .models .sbml_model import SbmlModel
261258
262- ss_model = simplesbml .SbmlModel ()
263- ss_model .addParameter ("parameter1" , 0.0 )
264- ss_model .addParameter ("noiseParameter1_" , 0.0 )
265- ss_model .addParameter ("observableParameter1_" , 0.0 )
266- sbml_model = SbmlModel (sbml_model = ss_model .model )
259+ ant_model = """
260+ parameter1 = 0.0
261+ noiseParameter1_ = 0.0
262+ observableParameter1_ = 0.0
263+ """
264+ sbml_model = SbmlModel .from_antimony (ant_model )
265+ assert sbml_model .is_valid ()
267266
268267 lint .assert_model_parameters_in_condition_or_parameter_table (
269268 sbml_model , pd .DataFrame (columns = ["parameter1" ]), pd .DataFrame ()
@@ -284,7 +283,10 @@ def test_assert_model_parameters_in_condition_or_parameter_table():
284283 sbml_model , pd .DataFrame (), pd .DataFrame ()
285284 )
286285
287- ss_model .addAssignmentRule ("parameter1" , "parameter2" )
286+ sbml_model = SbmlModel .from_antimony (
287+ ant_model + "\n parameter2 = 0\n parameter1 := parameter2"
288+ )
289+ assert sbml_model .is_valid ()
288290 lint .assert_model_parameters_in_condition_or_parameter_table (
289291 sbml_model , pd .DataFrame (), pd .DataFrame ()
290292 )
@@ -499,12 +501,11 @@ def test_assert_measurement_conditions_present_in_condition_table():
499501
500502def test_check_condition_df ():
501503 """Check that we correctly detect errors in condition table"""
502- import simplesbml
503504
504505 from petab .models .sbml_model import SbmlModel
505506
506- ss_model = simplesbml . SbmlModel ( )
507- model = SbmlModel ( sbml_model = ss_model . model )
507+ model = SbmlModel . from_antimony ( "" )
508+
508509 condition_df = pd .DataFrame (
509510 data = {
510511 CONDITION_ID : ["condition1" ],
@@ -527,7 +528,7 @@ def test_check_condition_df():
527528 lint .check_condition_df (condition_df , model , observable_df )
528529
529530 # fix by adding parameter
530- ss_model . addParameter ("p1" , 1.0 )
531+ model = SbmlModel . from_antimony ("p1 = 1" )
531532 lint .check_condition_df (condition_df , model )
532533
533534 # species missing in model
@@ -536,7 +537,7 @@ def test_check_condition_df():
536537 lint .check_condition_df (condition_df , model )
537538
538539 # fix:
539- ss_model . addSpecies ( "[s1]" , 1.0 )
540+ model = SbmlModel . from_antimony ( "p1 = 1; species s1 = 1" )
540541 lint .check_condition_df (condition_df , model )
541542
542543 # compartment missing in model
@@ -545,7 +546,9 @@ def test_check_condition_df():
545546 lint .check_condition_df (condition_df , model )
546547
547548 # fix:
548- ss_model .addCompartment (comp_id = "c2" , vol = 1.0 )
549+ model = SbmlModel .from_antimony (
550+ "p1 = 1; species s1 = 1; compartment c2 = 1"
551+ )
549552 lint .check_condition_df (condition_df , model )
550553
551554
0 commit comments