Changes in / [845:06f816565bef:844:c01a98ce01fd] in lemon
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
r715 r705 19 19 20 20 IF(MSVC) 21 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4 503 /wd4800 /wd4996")21 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996") 22 22 # Suppressed warnings: 23 23 # C4250: 'class1' : inherits 'class2::member' via dominance 24 24 # C4355: 'this' : used in base member initializer list 25 # C4503: 'function' : decorated name length exceeded, name was truncated26 25 # C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) 27 26 # C4996: 'function': was declared deprecated -
lemon/Makefile.am
r714 r708 1 1 EXTRA_DIST += \ 2 2 lemon/lemon.pc.in \ 3 lemon/CMakeLists.txt \ 4 lemon/config.h.cmake 3 lemon/CMakeLists.txt 5 4 6 5 pkgconfig_DATA += lemon/lemon.pc … … 18 17 19 18 nodist_lemon_HEADERS = lemon/config.h 20 19 21 20 lemon_libemon_la_CXXFLAGS = \ 22 21 $(AM_CXXFLAGS) \ -
lemon/concepts/graph_components.h
r713 r664 72 72 GraphItem& operator=(const GraphItem&) { return *this; } 73 73 74 /// \brief Assignment operator for INVALID.75 ///76 /// This operator makes the item invalid.77 GraphItem& operator=(Invalid) { return *this; }78 79 74 /// \brief Equality operator. 80 75 /// … … 102 97 void constraints() { 103 98 _GraphItem i1; 104 i1=INVALID;105 99 _GraphItem i2 = i1; 106 100 _GraphItem i3 = INVALID; … … 228 222 /// be convertible to the represented edge. 229 223 Edge(const Arc&) {} 230 }; 224 225 /// \brief Assign an arc to an edge. 226 /// 227 /// This function assigns an arc to an edge. 228 /// Besides the core graph item functionality each arc should 229 /// be convertible to the represented edge. 230 Edge& operator=(const Arc&) { return *this; } 231 }; 231 232 232 233 /// \brief Return one end node of an edge. … … 353 354 checkConcept<Base, _Digraph >(); 354 355 typename _Digraph::Node node; 355 node=INVALID;356 356 int nid = digraph.id(node); 357 357 nid = digraph.id(node); 358 358 node = digraph.nodeFromId(nid); 359 359 typename _Digraph::Arc arc; 360 arc=INVALID;361 360 int eid = digraph.id(arc); 362 361 eid = digraph.id(arc); -
lemon/edge_set.h
r717 r707 85 85 ListArcSetBase() : first_arc(-1), first_free_arc(-1) {} 86 86 87 Node addNode() {88 LEMON_ASSERT(false,89 "This graph structure does not support node insertion");90 return INVALID; // avoid warning91 }92 93 87 Arc addArc(const Node& u, const Node& v) { 94 88 int n; … … 422 416 423 417 ListEdgeSetBase() : first_arc(-1), first_free_arc(-1) {} 424 425 Node addNode() {426 LEMON_ASSERT(false,427 "This graph structure does not support node insertion");428 return INVALID; // avoid warning429 }430 418 431 419 Edge addEdge(const Node& u, const Node& v) { … … 829 817 SmartArcSetBase() {} 830 818 831 Node addNode() {832 LEMON_ASSERT(false,833 "This graph structure does not support node insertion");834 return INVALID; // avoid warning835 }836 837 819 Arc addArc(const Node& u, const Node& v) { 838 820 int n = arcs.size(); … … 1131 1113 SmartEdgeSetBase() {} 1132 1114 1133 Node addNode() {1134 LEMON_ASSERT(false,1135 "This graph structure does not support node insertion");1136 return INVALID; // avoid warning1137 }1138 1139 1115 Edge addEdge(const Node& u, const Node& v) { 1140 1116 int n = arcs.size(); -
test/min_cost_flow_test.cc
r716 r711 94 94 void constraints() { 95 95 checkConcept<concepts::Digraph, GR>(); 96 97 const Constraints& me = *this; 98 99 MCF mcf(me.g); 96 97 MCF mcf(g); 100 98 const MCF& const_mcf = mcf; 101 99 102 100 b = mcf.reset() 103 .lowerMap( me.lower)104 .upperMap( me.upper)105 .costMap( me.cost)106 .supplyMap( me.sup)107 .stSupply( me.n, me.n, me.k)101 .lowerMap(lower) 102 .upperMap(upper) 103 .costMap(cost) 104 .supplyMap(sup) 105 .stSupply(n, n, k) 108 106 .run(); 109 107 110 108 c = const_mcf.totalCost(); 111 109 x = const_mcf.template totalCost<double>(); 112 v = const_mcf.flow( me.a);113 c = const_mcf.potential( me.n);110 v = const_mcf.flow(a); 111 c = const_mcf.potential(n); 114 112 const_mcf.flowMap(fm); 115 113 const_mcf.potentialMap(pm); … … 123 121 typedef concepts::WriteMap<Arc, Value> FlowMap; 124 122 typedef concepts::WriteMap<Node, Cost> PotMap; 125 126 GR g; 127 VAM lower; 128 VAM upper; 129 CAM cost; 130 NM sup; 131 Node n; 132 Arc a; 133 Value k; 134 123 124 const GR &g; 125 const VAM &lower; 126 const VAM &upper; 127 const CAM &cost; 128 const NM ⊃ 129 const Node &n; 130 const Arc &a; 131 const Value &k; 135 132 FlowMap fm; 136 133 PotMap pm;
Note: See TracChangeset
for help on using the changeset viewer.