Skip to content

Use correct time in event triggers and re-enable SBML time-based event tests #104

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

Open
dyrpsf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use correct time in event triggers and re-enable SBML time-based event tests #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/main/java/org/simulator/sbml/SBMLinterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ public EventInProgress getNextEventAssignments(double t, double previousTime, do
System.arraycopy(Y, 0, this.Y, 0, Y.length);
currentTime = t;
Double priority, execTime = 0d;
astNodeTime += 0.01;
// Use the actual current time when evaluating triggers, priorities, delays and rules
astNodeTime = currentTime;
Double[] triggerTimeValues;
Event ev;
int i = 0, index;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/simulator/sbml/SBMLTestSuiteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ public void testModel() throws IOException {
"01287", "01592",
// failing due to delay in rateOf (see issue #46)
"01400", "01401", "01403", "01406", "01409",
// failing due to event triggers before mentioned condition (see issue #44)
"01444", "01445", "01446", "01447", "01448",
// previously failing due to event triggers before mentioned condition (see issue #44)
// (re-enabled after fix in SBMLinterpreter.getNextEventAssignments)
"01456",
"01480",
"01481", // model below sbml l3v1
Expand Down