fixed unfolding

TAPAAL · Oct 7, 2024 · eab0339 · eab0339
1 parent 8b7b23e
commit eab0339
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 nbproject/
 cmake-build-*
 .idea/
+.vscode
 src/PetriEngine/PQL/PQLQueryParser.parser.cpp
 src/PetriEngine/PQL/PQLQueryParser.parser.hpp
 src/PetriEngine/PQL/PQLQueryTokens.lexer.cpp

diff --git a/include/PetriEngine/Colored/ArcIntervalVisitor.h b/include/PetriEngine/Colored/ArcIntervalVisitor.h
@@ -195,10 +195,12 @@ namespace PetriEngine {
                         return;
                     }
 
-                    old_intervals._intervalTupleVec.insert(
-                        old_intervals._intervalTupleVec.end(),
-                            _arcIntervals._intervalTupleVec.begin(), _arcIntervals._intervalTupleVec.end());
                 }
+
+                old_intervals._intervalTupleVec.insert(
+                    old_intervals._intervalTupleVec.end(),
+                        _arcIntervals._intervalTupleVec.begin(), _arcIntervals._intervalTupleVec.end());
+
                 std::swap(old_intervals, _arcIntervals);
             }
 

diff --git a/include/PetriEngine/Colored/ArcIntervals.h b/include/PetriEngine/Colored/ArcIntervals.h
@@ -39,7 +39,7 @@ namespace PetriEngine {
             : _varIndexModMap(std::move(varIndexModMap)), _intervalTupleVec(std::move(ranges)) {
             };
 
-            void print() {
+            void print() const {
                 std::cout << "[ ";
                 for(auto& varModifierPair : _varIndexModMap){
                     std::cout << "(" << varModifierPair.first->name << ", " << varModifierPair.first->colorType->productSize() <<  ") ";

diff --git a/src/PetriEngine/Colored/IntervalGenerator.cpp b/src/PetriEngine/Colored/IntervalGenerator.cpp
@@ -23,8 +23,7 @@ namespace PetriEngine {
 
         std::vector<interval_t> IntervalGenerator::getIntervalsFromInterval(const interval_t &interval, uint32_t varPosition, int32_t varModifier, const std::vector<const ColorType*> &varColorTypes) {
             std::vector<interval_t> varIntervals;
-            interval_t firstVarInterval;
-            varIntervals.push_back(firstVarInterval);
+            varIntervals.emplace_back();
             for(uint32_t i = varPosition; i < varPosition + varColorTypes.size(); i++){
                 auto ctSize = varColorTypes[i - varPosition]->size();
                 int32_t lower_val = ctSize + (interval[i]._lower + varModifier);
@@ -131,6 +130,8 @@ namespace PetriEngine {
                     interval_vector_t varIntervals;
                     std::vector<const ColorType*> varColorTypes;
                     pair.first->colorType->getColortypes(varColorTypes);
+
+                    assert(pair.second.size() > tuplePos);
                     getArcVarIntervals(varIntervals, pair.second[tuplePos], interval, varColorTypes);
 
                     if(arcIntervals._intervalTupleVec.size() > 1 && pair.second[tuplePos].empty()){

diff --git a/src/PetriEngine/Colored/PartitionBuilder.cpp b/src/PetriEngine/Colored/PartitionBuilder.cpp
@@ -422,8 +422,7 @@ namespace PetriEngine {
                     const VariableModifierMap &varModifierMap,
                     const EquivalenceClass& eqClass , const Arc *arc, uint32_t placeId){
             std::vector<VariableIntervalMap> varMaps;
-            VariableIntervalMap varMap;
-            varMaps.push_back(varMap);
+            varMaps.emplace_back();
             std::unordered_map<uint32_t, ArcIntervals> placeArcIntervals;
             ColorFixpoint postPlaceFixpoint;
             postPlaceFixpoint.constraints = eqClass.intervals();