Merge remote-tracking branch 'refs/remotes/origin/master' into multi-objective-lra

src/storm/storage/jani/EdgeContainer.cpp

@@ -67,9 +67,12 @@ namespace storm {
                     e.setTemplateEdge(map[e.getTemplateEdge()]);
                 }
             }
+        }
         
-
-
+        EdgeContainer& EdgeContainer::operator=(EdgeContainer const& other) {
+            EdgeContainer otherCpy(other);
+            this->templates = std::move(other.templates);
+            this->edges = std::move(other.edges);
         }
 
         void EdgeContainer::finalize(Model const& containingModel) {

src/storm/storage/jani/EdgeContainer.h

@@ -91,6 +91,7 @@ namespace storm {
 
             EdgeContainer() = default;
             EdgeContainer(EdgeContainer const& other);
+            EdgeContainer& operator=(EdgeContainer const& other);
 
             void clearConcreteEdges();
             std::vector<Edge> const& getConcreteEdges() const;

src/storm/storage/jani/TemplateEdgeContainer.cpp

@@ -3,10 +3,18 @@
 
 namespace storm {
     namespace jani {
-        TemplateEdgeContainer::TemplateEdgeContainer(TemplateEdgeContainer const &other) {
+        TemplateEdgeContainer::TemplateEdgeContainer(TemplateEdgeContainer const &other) : std::unordered_set<std::shared_ptr<TemplateEdge>>() {
             for (auto const& te : other) {
                 this->insert(std::make_shared<TemplateEdge>(*te));
             }
         }
+        
+        TemplateEdgeContainer& TemplateEdgeContainer::operator=(const TemplateEdgeContainer& other) {
+            this->clear();
+            for (auto const& te : other) {
+                this->insert(std::make_shared<TemplateEdge>(*te));
+            }
+            return *this;
+        }
     }
 }

src/storm/storage/jani/TemplateEdgeContainer.h

@@ -11,6 +11,7 @@ namespace storm {
         struct TemplateEdgeContainer : public std::unordered_set<std::shared_ptr<TemplateEdge>>   {
             TemplateEdgeContainer() = default;
             TemplateEdgeContainer(TemplateEdgeContainer const& other);
+            TemplateEdgeContainer& operator=(TemplateEdgeContainer const& other);
         };
     }
 }

src/storm/utility/shortestPaths.h

@@ -47,7 +47,7 @@ namespace storm {
                     if (predecessorNode != rhs.predecessorNode) {
                         return predecessorNode < rhs.predecessorNode;
                     }
-                    return predecessorK < predecessorK;
+                    return predecessorK < rhs.predecessorK;
                 }
 
                 bool operator==(const Path<T>& rhs) const {