Changes in / [844:c01a98ce01fd:845:06f816565bef] in lemon

Files:

• CMakeLists.txt (modified) (1 diff)
• lemon/Makefile.am (modified) (2 diffs)
• lemon/concepts/graph_components.h (modified) (4 diffs)
• lemon/edge_set.h (modified) (4 diffs)
• test/min_cost_flow_test.cc (modified) (2 diffs)

CMakeLists.txt

@@ -19 +19 @@
 
 IF(MSVC)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4503 /wd4800 /wd4996")
 # Suppressed warnings:
 # C4250: 'class1' : inherits 'class2::member' via dominance
 # C4355: 'this' : used in base member initializer list
+# C4503: 'function' : decorated name length exceeded, name was truncated
 # C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
 # C4996: 'function': was declared deprecated

lemon/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST += \
         lemon/lemon.pc.in \
-        lemon/CMakeLists.txt
+        lemon/CMakeLists.txt \
+        lemon/config.h.cmake
 
 pkgconfig_DATA += lemon/lemon.pc
@@ -17 +18 @@
 
 nodist_lemon_HEADERS = lemon/config.h   
-        
+
 lemon_libemon_la_CXXFLAGS = \
         $(AM_CXXFLAGS) \

lemon/concepts/graph_components.h

@@ -72 +72 @@
       GraphItem& operator=(const GraphItem&) { return *this; }
 
+      /// \brief Assignment operator for INVALID.
+      ///
+      /// This operator makes the item invalid.
+      GraphItem& operator=(Invalid) { return *this; }
+
       /// \brief Equality operator.
       ///
@@ -97 +102 @@
         void constraints() {
           _GraphItem i1;
+          i1=INVALID;
           _GraphItem i2 = i1;
           _GraphItem i3 = INVALID;
@@ -222 +228 @@
         /// be convertible to the represented edge.
         Edge(const Arc&) {}
-
-        /// \brief Assign an arc to an edge.
-        ///
-        /// This function assigns an arc to an edge.
-        /// Besides the core graph item functionality each arc should
-        /// be convertible to the represented edge.
-        Edge& operator=(const Arc&) { return *this; }
-      };
+     };
 
       /// \brief Return one end node of an edge.
@@ -354 +353 @@
           checkConcept<Base, _Digraph >();
           typename _Digraph::Node node;
+          node=INVALID;
           int nid = digraph.id(node);
           nid = digraph.id(node);
           node = digraph.nodeFromId(nid);
           typename _Digraph::Arc arc;
+          arc=INVALID;
           int eid = digraph.id(arc);
           eid = digraph.id(arc);

lemon/edge_set.h

@@ -85 +85 @@
     ListArcSetBase() : first_arc(-1), first_free_arc(-1) {}
 
+    Node addNode() {
+      LEMON_ASSERT(false,
+        "This graph structure does not support node insertion");
+      return INVALID; // avoid warning
+    }
+
     Arc addArc(const Node& u, const Node& v) {
       int n;
@@ -416 +422 @@
 
     ListEdgeSetBase() : first_arc(-1), first_free_arc(-1) {}
+
+    Node addNode() {
+      LEMON_ASSERT(false,
+        "This graph structure does not support node insertion");
+      return INVALID; // avoid warning
+    }
 
     Edge addEdge(const Node& u, const Node& v) {
@@ -817 +829 @@
     SmartArcSetBase() {}
 
+    Node addNode() {
+      LEMON_ASSERT(false,
+        "This graph structure does not support node insertion");
+      return INVALID; // avoid warning
+    }
+
     Arc addArc(const Node& u, const Node& v) {
       int n = arcs.size();
@@ -1113 +1131 @@
     SmartEdgeSetBase() {}
 
+    Node addNode() {
+      LEMON_ASSERT(false,
+        "This graph structure does not support node insertion");
+      return INVALID; // avoid warning
+    }
+
     Edge addEdge(const Node& u, const Node& v) {
       int n = arcs.size();

test/min_cost_flow_test.cc

@@ -94 +94 @@
     void constraints() {
       checkConcept<concepts::Digraph, GR>();
-
-      MCF mcf(g);
+      
+      const Constraints& me = *this;
+
+      MCF mcf(me.g);
       const MCF& const_mcf = mcf;
 
       b = mcf.reset()
-             .lowerMap(lower)
-             .upperMap(upper)
-             .costMap(cost)
-             .supplyMap(sup)
-             .stSupply(n, n, k)
+             .lowerMap(me.lower)
+             .upperMap(me.upper)
+             .costMap(me.cost)
+             .supplyMap(me.sup)
+             .stSupply(me.n, me.n, me.k)
              .run();
 
       c = const_mcf.totalCost();
       x = const_mcf.template totalCost<double>();
-      v = const_mcf.flow(a);
-      c = const_mcf.potential(n);
+      v = const_mcf.flow(me.a);
+      c = const_mcf.potential(me.n);
       const_mcf.flowMap(fm);
       const_mcf.potentialMap(pm);
@@ -121 +123 @@
     typedef concepts::WriteMap<Arc, Value> FlowMap;
     typedef concepts::WriteMap<Node, Cost> PotMap;
-
-    const GR &g;
-    const VAM &lower;
-    const VAM &upper;
-    const CAM &cost;
-    const NM &sup;
-    const Node &n;
-    const Arc &a;
-    const Value &k;
+  
+    GR g;
+    VAM lower;
+    VAM upper;
+    CAM cost;
+    NM sup;
+    Node n;
+    Arc a;
+    Value k;
+
     FlowMap fm;
     PotMap pm;