Export inhibitor arcs for CPNs (TAPAAL#71)

* write inhibitor arcs as well

* fix function to write inhibitor arcs

* parse inhib weight

Author: MathiasMehl

include/PetriEngine/Colored/PnmlWriter.h

@@ -90,6 +90,10 @@ namespace PetriEngine::Colored {
         void handleOtherColor(const Color *const c);
 
         void handleNumberOf(std::pair<const PetriEngine::Colored::Color *const, uint32_t> numberOff);
+
+        void inhibitorArcs();
+
+        void writeInhibitorExpressionToPnml(Colored::Arc inhibitor);
     };
 }
 

src/PetriEngine/Colored/PnmlWriter.cpp

@@ -175,6 +175,7 @@ namespace PetriEngine {
             places();
             transitions();
             arcs();
+            inhibitorArcs();
             _out << decreaseTabs() << "</page>\n";
         }
 
@@ -366,7 +367,6 @@ namespace PetriEngine {
 
         void PnmlWriter::arcs() {
             _out << getTabs() << "<!-- List of arcs -->\n";
-            uint32_t index = 0;
             for (auto &arc: _arcs) {
                 shared_const_string source;
                 shared_const_string target;
@@ -377,10 +377,11 @@ namespace PetriEngine {
                     source = _builder._transitions[arc.transition].name;
                     target = _builder._places[arc.place].name;
                 }
-                _out << getTabs() << "<arc id=\"arc" << index << "\" source=\"" << *source << "\" target=\"" << *target
-                     << "\">\n";
+                std::string id = *source + "_to_" + *target;
+                _out << getTabs() << "<arc id=\"" << id << "\" source=\"" << *source << "\" target=\"" << *target
+                     << "\" type=\"normal" << "\">\n";
                 _out << increaseTabs() << "<name>\n";
-                _out << increaseTabs() << "<text>" << index << "</text>\n";
+                _out << increaseTabs() << "<text>" << id << "</text>\n";
                 _out << decreaseTabs() << "</name>\n";
                 _out << getTabs() << "<hlinscription>\n";
                 _out << increaseTabs() << "<text>" << to_string(*arc.expr) << "</text>\n";
@@ -389,10 +390,54 @@ namespace PetriEngine {
                 _out << getTabs() << "</structure>\n";
                 _out << decreaseTabs() << "</hlinscription>\n";
                 _out << decreaseTabs() << "</arc>\n";
-                index++;
             }
         }
 
+        void PnmlWriter::inhibitorArcs() {
+            _out << getTabs() << "<!-- List of inhibitor arcs -->\n";
+            for (auto &inhibitor: _builder.inhibitors()) {
+                Place &place = _builder._places[inhibitor.place];
+                shared_const_string source = place.name;
+                shared_const_string target = _builder._transitions[inhibitor.transition].name;
+                std::string id = *source + "_to_" + *target;
+                _out << getTabs() << "<arc id=\"" << id << "\" source=\"" << *source << "\" target=\"" << *target
+                     << "\" type=\"inhibitor" << "\">\n";
+                _out << increaseTabs() << "<name>\n";
+                _out << increaseTabs() << "<text>" << id << "</text>\n";
+                _out << decreaseTabs() << "</name>\n";
+                _out << getTabs() << "<hlinscription>\n";
+
+                _out << increaseTabs() << "<text>" << inhibitor.inhib_weight << "'" << place.type->getName() << ".all"
+                     << "</text>\n";
+                _out << getTabs() << "<structure>\n";
+                writeInhibitorExpressionToPnml(inhibitor);
+                _out << decreaseTabs() << "</structure>\n";
+                _out << decreaseTabs() << "</hlinscription>\n";
+                _out << decreaseTabs() << "</arc>\n";
+            }
+        }
+
+        void PnmlWriter::writeInhibitorExpressionToPnml(Colored::Arc inhibitor) {
+            _out << increaseTabs() << "<numberof>\n";
+
+            //First subterm with the multiplicity
+            _out << increaseTabs() << "<subterm>\n";
+            _out << increaseTabs() << "<numberconstant value=\"" << inhibitor.inhib_weight << "\">\n";
+            _out << increaseTabs() << "<positive/>\n";
+            _out << decreaseTabs() << "</numberconstant>\n";
+            _out << decreaseTabs() << "</subterm>\n";
+
+            //Second subterm with the colortype
+            _out << getTabs() << "<subterm>\n";
+            _out << increaseTabs() << "<all>\n";
+            Place &place = _builder._places[inhibitor.place];
+            _out << increaseTabs() << "<usersort declaration=\"" << place.type->getName() << "\"/>\n";
+            _out << decreaseTabs() << "</all>\n";
+            _out << decreaseTabs() << "</subterm>\n";
+
+            _out << decreaseTabs() << "</numberof>\n";
+        }
+
         void PnmlWriter::metaInfoClose() {
             _out << decreaseTabs() << "</net>\n"
                  << decreaseTabs() << "</pnml>";

src/PetriParse/PNMLParser.cpp

@@ -669,9 +669,26 @@ void PNMLParser::parseArc(rapidxml::xml_node<>* element, bool inhibitor) {
 
     bool first = true;
     auto weightTag = element->first_attribute("weight");
-    if(weightTag != nullptr){
+    if(weightTag != nullptr) {
         weight = atoi(weightTag->value());
         assert(weight > 0);
+    } else if (isColored && inhibitor) {
+        auto hlin = element->first_node("hlinscription");
+        if (hlin != nullptr) {
+            auto structure = hlin->first_node("structure");
+            if (structure != nullptr) {
+                auto numberOf = structure->first_node("numberof");
+                if (numberOf != nullptr) {
+                    for (auto subterm = numberOf->first_node("subterm"); subterm; subterm = subterm->next_sibling("subterm")) {
+                        auto numberConstant = subterm->first_node("numberconstant");
+                        if (numberConstant != nullptr) {
+                            auto valueTag = numberConstant->first_attribute("value");
+                            weight = atoi(valueTag->value());
+                        }
+                    }
+                }
+            }
+        }
     } else {
         for (auto it = element->first_node("inscription"); it; it = it->next_sibling("inscription")) {
             std::string text;