Constraint generation fixes (including connectivity fix)

Author: assaron

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: mwcsr
 Title: Solvers for Maximum Weight Connected Subgraph Problem and Its Variants
-Version: 0.1.7
+Version: 0.1.8
 Authors@R: c(person("Alexander", "Loboda", email = "[email protected]", role = c("aut", "cre")),
     person("Nikolay", "Poperechnyi", email = "[email protected]", role = "aut"),
     person("Eduardo", "Alvarez-Miranda", email = "[email protected]", role = "aut"), 

src/sgmwcs/components.cpp

@@ -54,13 +54,17 @@ std::vector<Component> Component::get_components(mwcsr::Graph& g, std::vector<si
             }
             for (auto v: {g.edge(e).from(), g.edge(e).to()}) {
                 for (auto e: g.neighbours(v)) {
-                    if (!(visited.find(e.num()) == visited.end())) continue;
-                    visited.insert(e.num());
-                    if (solution.count(e.num())) {
-                        q.push(e.num());
-                    } else {
+                    if (!solution.count(e.num())) {
                         c.add_neighbour(e.num());
+                        continue;
+                    }
+
+                    if (!(visited.find(e.num()) == visited.end())) {
+                        continue;
                     }
+                    visited.insert(e.num());
+
+                    q.push(e.num());
                 }
             }
         }
@@ -89,4 +93,4 @@ double Component::get_revenue() const {
     return max_revenue;
 }
 
-}
+}