← Back to branch summary

~verifydtapn-contributers/verifydtapn/d3.4

« back to all changes in this revision

Viewing changes to src/DiscreteVerification/VerificationTypes/TimeDartVerification.cpp

  • Committer: Jiri Srba
  • Date: 2014-08-14 07:31:34 UTC
  • mfrom: (320.1.4 TimeDartTraceBug)
  • Revision ID: srba@cs.aau.dk-20140814073134-utvvg2tsizdo9sbl
 merged in branch fixing a minor change to the structure of the trace-generation. This will only affect livenes queries ending in delay forever or deadlocks

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/DiscreteVerification/VerificationTypes/TimeDartVerification.cpp
213
213
                        
214
214
                        if (last != NULL) {
215
215
                            last->setParent(mc);        // set the parent of the last marking
 
216
                            mc->setNumberOfChildren(1);
216
217
                        }
217
218
 
218
219
                        last = mc;
256
257
                        mc->setGeneratedBy(NULL);       // NULL indicates that it is a delay transition
257
258
                        if (last != NULL){
258
259
                            last->setParent(mc);          // set the parent of the last marking
 
260
                            mc->setNumberOfChildren(1);
259
261
                        }
260
262
                        if(!l->getParent()){
261
263
                            l->setParent(mc);
268
270
                }
269
271
                if(last != NULL){
270
272
                    last->setParent(m);
 
273
                    m->setNumberOfChildren(1);
271
274
                }
272
275
                if(!l->getParent()) {
273
276
                    l->setParent(m);
 
277
                    m->setNumberOfChildren(1);
274
278
                }
275
279
                m->cut(placeStats);
276
280
                last = m;
279
283
                upper = trace->upper;
280
284
                trace = (TraceDart*) trace->parent;
281
285
            }
 
286
            
 
287
            if(!deadlock){
 
288
                l->setNumberOfChildren(1);
 
289
            }
282
290
 
283
291
            printXMLTrace(l, traceStack, query, tapn);
284
292
        }