Merge lp:~peter-gjoel/verifydtapn/ABPTraceFix into lp:verifydtapn

[Peter Gjøl Jensen]

Fixed an issue for time-dart trace generation (replacing goto * for an infinite delay with "delay forever".

Fixes minor issue in trace-generation for time-darts.

[Jiri Srba (srba)]

Manually tested on some examples and it seems to work fine. Can I merge it to trunk?

review: Approve

[Peter Gjøl Jensen (peter-gjoel)]

> Manually tested on some examples and it seems to work fine. Can I merge it to
> trunk?

Yes please.

=== modified file 'src/DiscreteVerification/VerificationTypes/TimeDartVerification.cpp'
--- src/DiscreteVerification/VerificationTypes/TimeDartVerification.cpp	2014-08-08 07:57:49 +0000
+++ src/DiscreteVerification/VerificationTypes/TimeDartVerification.cpp	2015-08-18 08:12:13 +0000
@@ -217,11 +217,12 @@
                         }
 
                         last = mc;
-                        mc->cut(placeStats);
+
                         if(l == NULL) {                  // set specific last marking to last marking in delay if deadlock
-                            l = mc;
+                            l = new NonStrictMarkingBase(*mc);
                         }
-
+                        mc->cut(placeStats);
+                        
                         traceStack.push(mc);            // add delay marking to the trace
                         mc->setParent(NULL);            // set parrent
                         diff--;