Changes in / [793:8d2e55fac752:791:939d747055cd] in lemon-1.1
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/adaptors.h
r793 r761 1365 1365 /// and edge filter maps. 1366 1366 SubGraph(GR& graph, NF& node_filter, EF& edge_filter) { 1367 this->initialize(graph, node_filter, edge_filter);1367 initialize(graph, node_filter, edge_filter); 1368 1368 } 1369 1369 … … 2262 2262 /// Creates an undirected graph from the given digraph. 2263 2263 Undirector(DGR& digraph) { 2264 this->initialize(digraph);2264 initialize(digraph); 2265 2265 } 2266 2266 -
lemon/bits/bezier.h
r792 r440 160 160 const Point d=(a+b)/2; 161 161 const Point e=(b+c)/2; 162 //const Point f=(d+e)/2;162 const Point f=(d+e)/2; 163 163 R f1=_f(Bezier3(p1,a,d,e),_d); 164 164 R f2=_f(Bezier3(e,d,c,p4),_d); -
lemon/bits/edge_set_extender.h
r793 r761 524 524 // Returns the base node of the iterator 525 525 Node baseNode(const IncEdgeIt &e) const { 526 return e.direction ? this->u(e) : this->v(e);526 return e.direction ? u(e) : v(e); 527 527 } 528 528 // Running node of the iterator … … 530 530 // Returns the running node of the iterator 531 531 Node runningNode(const IncEdgeIt &e) const { 532 return e.direction ? this->v(e) : this->u(e);532 return e.direction ? v(e) : u(e); 533 533 } 534 534 -
lemon/bits/graph_extender.h
r792 r686 588 588 // Returns the base node of the iterator 589 589 Node baseNode(const IncEdgeIt &edge) const { 590 return edge._direction ? this->u(edge) : this->v(edge);590 return edge._direction ? u(edge) : v(edge); 591 591 } 592 592 // Running node of the iterator … … 594 594 // Returns the running node of the iterator 595 595 Node runningNode(const IncEdgeIt &edge) const { 596 return edge._direction ? this->v(edge) : this->u(edge);596 return edge._direction ? v(edge) : u(edge); 597 597 } 598 598 -
lemon/circulation.h
r793 r761 559 559 560 560 Node act; 561 Node bact=INVALID; 562 Node last_activated=INVALID; 561 563 while((act=_level->highestActive())!=INVALID) { 562 564 int actlevel=(*_level)[act]; -
lemon/concept_check.h
r792 r440 36 36 37 37 template <class T> inline void ignore_unused_variable_warning(const T&) { } 38 template <class T1, class T2>39 inline void ignore_unused_variable_warning(const T1&, const T2&) { }40 template <class T1, class T2, class T3>41 inline void ignore_unused_variable_warning(const T1&, const T2&,42 const T3&) { }43 template <class T1, class T2, class T3, class T4>44 inline void ignore_unused_variable_warning(const T1&, const T2&,45 const T3&, const T4&) { }46 template <class T1, class T2, class T3, class T4, class T5>47 inline void ignore_unused_variable_warning(const T1&, const T2&,48 const T3&, const T4&,49 const T5&) { }50 template <class T1, class T2, class T3, class T4, class T5, class T6>51 inline void ignore_unused_variable_warning(const T1&, const T2&,52 const T3&, const T4&,53 const T5&, const T6&) { }54 38 55 39 ///\e -
lemon/concepts/graph_components.h
r793 r784 495 495 _GraphItemIt it3 = it1; 496 496 _GraphItemIt it4 = INVALID; 497 ignore_unused_variable_warning(it3);498 ignore_unused_variable_warning(it4);499 497 500 498 it2 = ++it1; … … 586 584 _GraphIncIt it3 = it1; 587 585 _GraphIncIt it4 = INVALID; 588 ignore_unused_variable_warning(it3);589 ignore_unused_variable_warning(it4);590 586 591 587 it2 = ++it1; -
lemon/concepts/maps.h
r793 r784 50 50 /// Returns the value associated with the given key. 51 51 Value operator[](const Key &) const { 52 return * (static_cast<Value *>(0)+1);52 return *static_cast<Value *>(0); 53 53 } 54 54 -
lemon/graph_to_eps.h
r793 r761 223 223 using T::_copyright; 224 224 225 using typenameT::NodeTextColorType;225 using T::NodeTextColorType; 226 226 using T::CUST_COL; 227 227 using T::DIST_COL; -
test/adaptors_test.cc
r793 r791 66 66 Digraph::Arc a2 = digraph.addArc(n1, n3); 67 67 Digraph::Arc a3 = digraph.addArc(n2, n3); 68 ignore_unused_variable_warning(a3);69 68 70 69 // Check the adaptor … … 101 100 Adaptor::Arc a7 = adaptor.addArc(n1, n4); 102 101 Adaptor::Arc a8 = adaptor.addArc(n1, n2); 103 ignore_unused_variable_warning(a6,a7,a8);104 102 105 103 adaptor.erase(a1); … … 761 759 Digraph::Arc a2 = digraph.addArc(n1, n3); 762 760 Digraph::Arc a3 = digraph.addArc(n2, n3); 763 ignore_unused_variable_warning(a1,a2,a3);764 761 765 762 checkGraphNodeList(adaptor, 6); -
test/connectivity_test.cc
r793 r761 69 69 Graph g(d); 70 70 Digraph::Node n = d.addNode(); 71 ignore_unused_variable_warning(n);72 71 73 72 check(stronglyConnected(d), "This digraph is strongly connected"); … … 247 246 Digraph::Node watch = d.addNode(); 248 247 Digraph::Node pants = d.addNode(); 249 ignore_unused_variable_warning(watch);250 248 251 249 d.addArc(socks, shoe); -
test/digraph_test.cc
r792 r440 61 61 a3 = G.addArc(n2, n3), 62 62 a4 = G.addArc(n2, n3); 63 ignore_unused_variable_warning(a2,a3,a4);64 63 65 64 checkGraphNodeList(G, 3); … … 90 89 Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1), 91 90 a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3); 92 ignore_unused_variable_warning(a1,a2,a3,a4);93 91 94 92 Node n4 = G.split(n2); … … 124 122 a3 = G.addArc(n4, n3), a4 = G.addArc(n4, n3), 125 123 a5 = G.addArc(n2, n4); 126 ignore_unused_variable_warning(a1,a2,a3,a5);127 124 128 125 checkGraphNodeList(G, 4); … … 204 201 a3 = G.addArc(n4, n3), a4 = G.addArc(n3, n1), 205 202 a5 = G.addArc(n2, n4); 206 ignore_unused_variable_warning(a2,a3,a4,a5);207 203 208 204 // Check arc deletion … … 252 248 Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1), 253 249 a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3); 254 ignore_unused_variable_warning(a1,a2,a3,a4);255 250 256 251 typename Digraph::Snapshot snapshot(G); … … 341 336 e1 = g.addArc(n1, n2), 342 337 e2 = g.addArc(n2, n3); 343 ignore_unused_variable_warning(e2);344 338 345 339 check(g.valid(n1), "Wrong validity check"); -
test/edge_set_test.cc
r793 r761 45 45 46 46 Digraph::Arc ga1 = digraph.addArc(n1, n2); 47 ignore_unused_variable_warning(ga1);48 47 49 48 ArcSet arc_set(digraph); 50 49 51 50 Digraph::Arc ga2 = digraph.addArc(n2, n1); 52 ignore_unused_variable_warning(ga2);53 51 54 52 checkGraphNodeList(arc_set, 2); … … 78 76 a3 = arc_set.addArc(n2, n3), 79 77 a4 = arc_set.addArc(n2, n3); 80 ignore_unused_variable_warning(a2,a3,a4);81 82 78 checkGraphNodeList(arc_set, 3); 83 79 checkGraphArcList(arc_set, 4); … … 115 111 116 112 Digraph::Arc ga1 = digraph.addArc(n1, n2); 117 ignore_unused_variable_warning(ga1);118 113 119 114 ArcSet arc_set(digraph); 120 115 121 116 Digraph::Arc ga2 = digraph.addArc(n2, n1); 122 ignore_unused_variable_warning(ga2);123 117 124 118 checkGraphNodeList(arc_set, 2); … … 148 142 a3 = arc_set.addArc(n2, n3), 149 143 a4 = arc_set.addArc(n2, n3); 150 ignore_unused_variable_warning(a2,a3,a4);151 152 144 checkGraphNodeList(arc_set, 3); 153 145 checkGraphArcList(arc_set, 4); … … 199 191 200 192 Digraph::Arc ga1 = digraph.addArc(n1, n2); 201 ignore_unused_variable_warning(ga1);202 193 203 194 EdgeSet edge_set(digraph); 204 195 205 196 Digraph::Arc ga2 = digraph.addArc(n2, n1); 206 ignore_unused_variable_warning(ga2);207 197 208 198 checkGraphNodeList(edge_set, 2); … … 241 231 e3 = edge_set.addEdge(n2, n3), 242 232 e4 = edge_set.addEdge(n2, n3); 243 ignore_unused_variable_warning(e2,e3,e4);244 245 233 checkGraphNodeList(edge_set, 3); 246 234 checkGraphEdgeList(edge_set, 4); … … 287 275 288 276 Digraph::Arc ga1 = digraph.addArc(n1, n2); 289 ignore_unused_variable_warning(ga1);290 277 291 278 EdgeSet edge_set(digraph); 292 279 293 280 Digraph::Arc ga2 = digraph.addArc(n2, n1); 294 ignore_unused_variable_warning(ga2);295 281 296 282 checkGraphNodeList(edge_set, 2); … … 329 315 e3 = edge_set.addEdge(n2, n3), 330 316 e4 = edge_set.addEdge(n2, n3); 331 ignore_unused_variable_warning(e2,e3,e4);332 333 317 checkGraphNodeList(edge_set, 3); 334 318 checkGraphEdgeList(edge_set, 4); -
test/euler_test.cc
r793 r761 102 102 Graph g(d); 103 103 Digraph::Node n = d.addNode(); 104 ignore_unused_variable_warning(n); 105 104 106 105 checkDiEulerIt(d); 107 106 checkDiEulerIt(g); … … 191 190 Digraph::Node n4 = d.addNode(); 192 191 Digraph::Node n5 = d.addNode(); 193 ignore_unused_variable_warning(n0,n4,n5);194 192 195 193 d.addArc(n1, n2); -
test/graph_test.cc
r792 r440 64 64 Edge e2 = G.addEdge(n2, n1), 65 65 e3 = G.addEdge(n2, n3); 66 ignore_unused_variable_warning(e2,e3);67 66 68 67 checkGraphNodeList(G, 3); … … 97 96 e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4), 98 97 e5 = G.addEdge(n4, n3); 99 ignore_unused_variable_warning(e1,e3,e4,e5);100 98 101 99 checkGraphNodeList(G, 4); … … 177 175 e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4), 178 176 e5 = G.addEdge(n4, n3); 179 ignore_unused_variable_warning(e1,e3,e4,e5);180 177 181 178 // Check edge deletion … … 218 215 Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1), 219 216 e3 = G.addEdge(n2, n3); 220 ignore_unused_variable_warning(e1,e2,e3);221 217 222 218 checkGraphNodeList(G, 3); … … 367 363 e1 = g.addEdge(n1, n2), 368 364 e2 = g.addEdge(n2, n3); 369 ignore_unused_variable_warning(e2);370 365 371 366 check(g.valid(n1), "Wrong validity check"); … … 497 492 498 493 Node n = G.nodeFromId(dim); 499 ignore_unused_variable_warning(n);500 494 501 495 for (NodeIt n(G); n != INVALID; ++n) { -
test/maps_test.cc
r793 r761 81 81 NullMap<A,B> map1; 82 82 NullMap<A,B> map2 = map1; 83 ignore_unused_variable_warning(map2);84 83 map1 = nullMap<A,B>(); 85 84 } … … 92 91 ConstMap<A,B> map2 = B(); 93 92 ConstMap<A,B> map3 = map1; 94 ignore_unused_variable_warning(map2,map3);95 96 93 map1 = constMap<A>(B()); 97 94 map1 = constMap<A,B>(); … … 99 96 ConstMap<A,C> map4(C(1)); 100 97 ConstMap<A,C> map5 = map4; 101 ignore_unused_variable_warning(map5);102 103 98 map4 = constMap<A>(C(2)); 104 99 map4.setAll(C(3)); … … 121 116 IdentityMap<A> map1; 122 117 IdentityMap<A> map2 = map1; 123 ignore_unused_variable_warning(map2);124 125 118 map1 = identityMap<A>(); 126 119 … … 182 175 checkConcept<ReadMap<B,double>, CompMap>(); 183 176 CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>()); 184 ignore_unused_variable_warning(map1);185 177 CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>()); 186 ignore_unused_variable_warning(map2);187 178 188 179 SparseMap<double, bool> m1(false); m1[3.14] = true; … … 197 188 checkConcept<ReadMap<A,double>, CombMap>(); 198 189 CombMap map1 = CombMap(DoubleMap(), DoubleMap()); 199 ignore_unused_variable_warning(map1);200 190 CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>()); 201 ignore_unused_variable_warning(map2);202 191 203 192 check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3, … … 211 200 FunctorToMap<F> map1; 212 201 FunctorToMap<F> map2 = FunctorToMap<F>(F()); 213 ignore_unused_variable_warning(map2);214 215 202 B b = functorToMap(F())[A()]; 216 ignore_unused_variable_warning(b);217 203 218 204 checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >(); 219 205 MapToFunctor<ReadMap<A,B> > map = 220 206 MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>()); 221 ignore_unused_variable_warning(map);222 207 223 208 check(functorToMap(&func)[A()] == 3, … … 237 222 ConvertMap<ReadMap<double, int>, double> >(); 238 223 ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true)); 239 ignore_unused_variable_warning(map1);240 224 ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false)); 241 ignore_unused_variable_warning(map2);242 243 225 } 244 226 -
test/time_measure_test.cc
r792 r549 18 18 19 19 #include <lemon/time_measure.h> 20 #include <lemon/concept_check.h>21 20 22 21 using namespace lemon; … … 34 33 35 34 for(int i=0;i<1000;i++) 36 { 37 TimeStamp x(T); 38 ignore_unused_variable_warning(x); 39 } 35 TimeStamp x(T); 40 36 } 41 37
Note: See TracChangeset
for help on using the changeset viewer.