Skip to content

Commit d524898

Browse files
committed
..
1 parent f01dfb0 commit d524898

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

petab/v2/converters.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def _convert_experiment(self, experiment: Experiment) -> None:
221221
# Collect values for initial assignments for the different experiments.
222222
# All expressions must be combined into a single initial assignment
223223
# per target.
224-
# target_id -> (experiment_indicator, target_value)
224+
# target_id -> [(experiment_indicator, target_value), ...]
225225
period0_assignments: dict[str, list[tuple[str, sp.Basic]]] = {}
226226

227227
for i_period, period in enumerate(experiment.sorted_periods):
@@ -330,7 +330,14 @@ def _convert_experiment(self, experiment: Experiment) -> None:
330330

331331
@staticmethod
332332
def _initial_value_from_element(target: libsbml.SBase) -> sp.Basic:
333-
# use the initial value of the target as default
333+
"""Get the initial value of an SBML element.
334+
335+
The value to the size attribute of compartments,
336+
the initial concentration or amount of species (amount for
337+
`hasOnlySubstanceUnits=true`, concentration otherwise), and
338+
the value of parameters, not considering any initial assignment
339+
constructs.
340+
"""
334341
if target is None:
335342
raise ValueError("`target` is None.")
336343

tests/v2/test_converters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def test_experiments_to_events_converter():
2626
assert isinstance(converted.model, SbmlModel)
2727
sbml_model = converted.model.sbml_model
2828

29-
assert sbml_model.getNumEvents() == 2
29+
# one event -- the initial period is handled via initial assignments
30+
assert sbml_model.getNumEvents() == 1
3031
assert converted.conditions == [
3132
Condition(
3233
id="_petab_preequilibration_on",
@@ -211,7 +212,6 @@ def test_simulate_experiment_to_events():
211212
"_petab_experiment_indicator_e1"
212213
).setValue(1)
213214
sbml_actual = converted.model.to_sbml_str()
214-
print(converted.model.to_antimony())
215215
basico.load_model(sbml_actual)
216216
df_actual = basico.run_time_course(values=timepoints)
217217

0 commit comments

Comments
 (0)