← Back to branch summary

~verifydtapn-contributers/verifydtapn/CutOptimization

« back to all changes in this revision

Viewing changes to src/DiscreteVerification/DataStructures/NonStrictMarkingBase.cpp

  • Committer: Peter Gjøl Jensen
  • Date: 2013-04-08 14:17:59 UTC
  • Revision ID: peter.gjoel@gmail.com-20130408141759-q267x9lag7v08u4c
moved dead-token removal inside loop

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/DiscreteVerification/DataStructures/NonStrictMarkingBase.cpp
263
263
        std::cout << "Before cut: " << *this << std::endl;
264
264
#endif
265
265
        for(PlaceList::iterator place_iter = this->places.begin(); place_iter != this->places.end(); place_iter++){
266
 
                //remove dead tokens
267
 
                if (place_iter->place->GetType() ==  TAPN::Dead) {
268
 
                        for(TokenList::iterator token_iter = place_iter->tokens.begin(); token_iter != place_iter->tokens.end(); token_iter++){
269
 
                                if(token_iter->getAge() > place_iter->place->GetMaxConstant()){
270
 
                                        token_iter->remove(token_iter->getCount());
271
 
                                }
272
 
                        }
273
 
                }
274
266
                //set age of too old tokens to max age
275
267
                int count = 0;
276
 
                for(TokenList::iterator token_iter = place_iter->tokens.begin(); token_iter != place_iter->tokens.end(); token_iter++){
 
268
                for(TokenList::iterator token_iter = place_iter->tokens.begin(); token_iter != place_iter->tokens.end(); token_iter++) {
 
269
                        //remove dead tokens
 
270
                        if (place_iter->place->GetType() == TAPN::Dead) {
 
271
                            if (token_iter->getAge() > place_iter->place->GetMaxConstant()) {
 
272
                                token_iter->remove(token_iter->getCount());
 
273
                            }
 
274
                        }
277
275
                        if(token_iter->getAge() > place_iter->place->GetMaxConstant()){
278
276
                                TokenList::iterator beginDelete = token_iter;
279
277
                                if(place_iter->place->GetType() == TAPN::Std){