Merge lp:~tapaal-contributor/tapaal/transport-arcs-and-timed-nets into lp:tapaal

Proposed by Lena Ernstsen
Status: Merged
Approved by: Jiri Srba
Approved revision: 1076
Merged at revision: 1075
Proposed branch: lp:~tapaal-contributor/tapaal/transport-arcs-and-timed-nets
Merge into: lp:tapaal
Diff against target: 19 lines (+3/-6)
1 file modified
src/dk/aau/cs/model/tapn/TimedArcPetriNet.java (+3/-6)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/transport-arcs-and-timed-nets
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+388807@code.launchpad.net

Commit message

Added a check for the untimed nets.

Description of the change

If there is a transport arc in the net, then it is seen as timed.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/dk/aau/cs/model/tapn/TimedArcPetriNet.java'
--- src/dk/aau/cs/model/tapn/TimedArcPetriNet.java 2020-08-03 15:04:21 +0000
+++ src/dk/aau/cs/model/tapn/TimedArcPetriNet.java 2020-08-06 11:06:14 +0000
@@ -619,12 +619,9 @@
619 return false;619 return false;
620 }620 }
621 }621 }
622 622 if (transportArcs.size() > 0) {
623 for(TransportArc t : transportArcs){623 return false;
624 if(!t.interval().equals(TimeInterval.ZERO_INF)){624 }
625 return false;
626 }
627 }
628625
629 if (hasUrgentTransitions()) {626 if (hasUrgentTransitions()) {
630 return false;627 return false;

Subscribers

People subscribed via source and target branches