no message

TAPAAL · Dec 30, 2023 · ccba15d · ccba15d
1 parent d6d7cd8
commit ccba15d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/include/Colored/ColoredPetriNetBuilder.h b/include/Colored/ColoredPetriNetBuilder.h
@@ -22,7 +22,7 @@ namespace unfoldtacpn {
         typedef std::unordered_map<std::string, std::vector<std::string>> PTTransitionMap;
 
     public:
-        ColoredPetriNetBuilder(const bool print_binding=false);
+        ColoredPetriNetBuilder(std::ostream* output_stream = nullptr);
         ColoredPetriNetBuilder(const ColoredPetriNetBuilder& orig);
         virtual ~ColoredPetriNetBuilder();
         void parseNet(std::istream& istream);
@@ -82,9 +82,6 @@ namespace unfoldtacpn {
             return _pttransitionnames;
         }
 
-        const bool getPrintBindingStatus() const {
-            return _print_binding;
-        }
 
         void unfold(TAPNBuilderInterface& builder);
         void clear() { _sumPlacesNames.clear(); _pttransitionnames.clear(); _ptplacenames.clear(); }
@@ -103,7 +100,7 @@ namespace unfoldtacpn {
         ColorTypeMap _colors;
         double _time;
 
-        bool _print_binding;
+        std::ostream* _output_stream;
 
         std::string arcToString(const Colored::Arc& arc) const;
         const std::string& findSumName(const std::string& id) const;

diff --git a/src/Colored/ColoredPetriNetBuilder.cpp b/src/Colored/ColoredPetriNetBuilder.cpp
@@ -13,8 +13,8 @@
 #include "errorcodes.h"
 
 namespace unfoldtacpn {
-    ColoredPetriNetBuilder::ColoredPetriNetBuilder(const bool print_binding):
-    _print_binding(print_binding) 
+    ColoredPetriNetBuilder::ColoredPetriNetBuilder(std::ostream* output_stream):
+    _output_stream(output_stream) 
     {
 
     }
@@ -196,7 +196,7 @@ namespace unfoldtacpn {
             unfoldPlace(builder, place);
         }
 
-        if (getPrintBindingStatus()) {
+        if (_output_stream)) {
             std::cout << "Printing bindings for each unfolded transition.\n";
             std::cout << "<bindings>\n";
         }
@@ -205,7 +205,7 @@ namespace unfoldtacpn {
             unfoldTransition(builder, transition);
         }
 
-        if (getPrintBindingStatus()) {
+        if (_output_stream)) {
             std::cout << "</bindings>\n";
         }
 
@@ -302,8 +302,8 @@ namespace unfoldtacpn {
             //if(!gen.isInitial())
             name += "__" + std::to_string(i++);
 
-            // Print bindings for each transition
-            if (getPrintBindingStatus()) {     
+            // Print bindings for each transition if output stream is not null
+            if (_output_stream)) {     
                 std::cout << "   <transition id=\"" << name << "\">\n";    
                 for(auto const &var: b) {
                     std::cout << "      <variable id=\"" << var.first << "\">\n";