Skip to content

Commit 4a208f9

Browse files
committed
add required params check to sciml validations
1 parent cb5cef1 commit 4a208f9

3 files changed

Lines changed: 7 additions & 16 deletions

File tree

petab/v2/core.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,20 +1417,6 @@ def from_yaml(
14171417
else None
14181418
)
14191419

1420-
# sciml extension
1421-
# if config.extensions and config.extensions[C.SCIML]:
1422-
# try:
1423-
# from petab_sciml import (
1424-
# ArrayDataStandard,
1425-
# NNModel,
1426-
# NNModelStandard,
1427-
# )
1428-
# except ImportError as e:
1429-
# raise ImportError(
1430-
# "To generate a PEtab SciML problem, (petab_sciml) must"
1431-
# "be installed."
1432-
# ) from e
1433-
14341420
# Neural network classes are constructed via pytorch for now to get the
14351421
# proper inputs
14361422
neural_networks = (

petab/v2/lint.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,11 @@ def append_overrides(overrides):
11281128
}
11291129
parameter_ids -= condition_targets
11301130

1131+
hybridization_targets = {hyb.target_id for hyb in problem.hybridizations}
1132+
parameter_ids -= hybridization_targets
1133+
hybridization_target_values = {str(hyb.target_value) for hyb in problem.hybridizations}
1134+
parameter_ids -= hybridization_target_values
1135+
11311136
return parameter_ids
11321137

11331138

@@ -1199,7 +1204,7 @@ def get_placeholders(
11991204
CheckExperimentConditionsExist(),
12001205
CheckUndefinedExperiments(),
12011206
CheckObservablesDoNotShadowModelEntities(),
1202-
# CheckAllParametersPresentInParameterTable(),
1207+
CheckAllParametersPresentInParameterTable(),
12031208
CheckValidParameterInConditionOrParameterTable(),
12041209
CheckUnusedExperiments(),
12051210
CheckUnusedConditions(),

tests/v2/test_sciml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def _get_test_problem():
6363
)
6464
problem.add_hybridization("net1_input1", "A")
6565
problem.add_hybridization("net1_input2", "B")
66-
problem.add_hybridization("gamma_", "net1_output_1")
66+
problem.add_hybridization("gamma_", "net1_output1")
6767
problem.add_neural_network_from_dict(
6868
"net1",
6969
nn_dict={

0 commit comments

Comments
 (0)