COIN-OR::LEMON - Graph Library

Changeset 1175:1fe3b4ad8caa in lemon


Ignore:
Timestamp:
11/28/12 12:02:36 (7 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.2
Parents:
1169:774349a16ba0 (diff), 1174:a26b90a17c81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge bugfix #453 to branch 1.2

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • lemon/concepts/graph_components.h

    r1161 r1175  
    109109
    110110          bool b;
     111          ignore_unused_variable_warning(b);
     112
    111113          b = (ia == ib) && (ia != ib);
    112114          b = (ia == INVALID) && (ib != INVALID);
  • test/dfs_test.cc

    r1110 r1175  
    6868  int l, i;
    6969  bool b;
     70  ignore_unused_variable_warning(l,i,b);
     71
    7072  DType::DistMap d(G);
    7173  DType::PredMap p(G);
     
    152154  Digraph g;
    153155  bool b;
     156  ignore_unused_variable_warning(b);
     157
    154158  dfs(g).run(Node());
    155159  b=dfs(g).run(Node(),Node());
  • test/dfs_test.cc

    r1173 r1175  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2010
     5 * Copyright (C) 2003-2011
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    224224  check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6.");
    225225  }
    226  
     226
    227227  {
    228228    NullMap<Node,Arc> myPredMap;
  • test/preflow_test.cc

    r1084 r1175  
    8787  VType v;
    8888  bool b;
     89  ignore_unused_variable_warning(v,b);
    8990
    9091  typedef Preflow<Digraph, CapMap>
  • test/preflow_test.cc

    r1173 r1175  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2010
     5 * Copyright (C) 2003-2011
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    161161{
    162162  DIGRAPH_TYPEDEFS(SmartDigraph);
    163  
     163
    164164  SmartDigraph g;
    165165  SmartDigraph::ArcMap<int> cap(g),iflow(g);
     
    273273
    274274  initFlowTest();
    275  
     275
    276276  return 0;
    277277}
Note: See TracChangeset for help on using the changeset viewer.