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

Jump to bottom

Fix tests #14

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Fix tests #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
376fb80
Fix for some biosimulators test suite tests.
luciansmith Jul 25, 2023
921449b
Update version number.
luciansmith Jul 26, 2023
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
2 changes: 1 addition & 1 deletion biosimulators_tellurium/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.34'
__version__ = '0.1.35'
10 changes: 4 additions & 6 deletions biosimulators_tellurium/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,6 @@ def preprocess_sed_task(task, variables, config=None, simulator_config=None):
error_summary='Task `{}` is invalid.'.format(task.id))
raise_errors_warnings(validation.validate_model_language(model.language, ModelLanguage.SBML),
error_summary='Language for model `{}` is not supported.'.format(model.id))
raise_errors_warnings(validation.validate_model_change_types(model.changes, (ModelAttributeChange, )),
error_summary='Changes for model `{}` are not supported.'.format(model.id))
raise_errors_warnings(*validation.validate_model_changes(subtask.model),
error_summary='Changes for model `{}` are invalid.'.format(model.id))
raise_errors_warnings(validation.validate_simulation_type(sim, (SteadyStateSimulation, UniformTimeCourseSimulation)),
Expand All @@ -381,11 +379,11 @@ def preprocess_sed_task(task, variables, config=None, simulator_config=None):
exec_alg_kisao_ids = {}
variable_target_tellurium_observable_maps = {}
solvers = {}
allchanges = model.changes
if isinstance(task, RepeatedTask):
allchanges = allchanges + task.changes
for subtasks in alltasks:
model = subtask.model
allchanges = model.changes
if isinstance(task, RepeatedTask):
allchanges = allchanges + task.changes
sim = subtask.simulation
model_etree = lxml.etree.parse(model.source)

Expand Down Expand Up @@ -738,7 +736,7 @@ def exec_sed_doc_with_tellurium(doc, working_dir, base_out_path, rel_out_path=No
data_generators[curve.y_data_generator.id] = curve.y_data_generator
labels[curve.y_data_generator.id] = curve.name or curve.y_data_generator.name or curve.y_data_generator.id

print("LS DEBUG: Labels are " + str(labels))
# print("LS DEBUG: Labels are " + str(labels))

for data_generator in data_generators.values():
report.data_sets.append(DataSet(
Expand Down