Unify sources 1.2 r1.2.2
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 08 Aug 2011 13:13:03 +0200
branch1.2
changeset 927d303bfa8b1ed
parent 926 7887be87f4a0
child 928 7340bd3e008c
Unify sources
doc/lgf.dox
lemon/bits/graph_adaptor_extender.h
lemon/bits/path_dump.h
lemon/bits/windows.cc
lemon/cost_scaling.h
lemon/maps.h
lemon/preflow.h
test/dfs_test.cc
test/graph_copy_test.cc
test/heap_test.cc
test/lgf_test.cc
test/maps_test.cc
test/preflow_test.cc
     1.1 --- a/doc/lgf.dox	Mon Aug 08 13:02:26 2011 +0200
     1.2 +++ b/doc/lgf.dox	Mon Aug 08 13:13:03 2011 +0200
     1.3 @@ -2,7 +2,7 @@
     1.4   *
     1.5   * This file is a part of LEMON, a generic C++ optimization library.
     1.6   *
     1.7 - * Copyright (C) 2003-2009
     1.8 + * Copyright (C) 2003-2011
     1.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    1.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    1.11   *
     2.1 --- a/lemon/bits/graph_adaptor_extender.h	Mon Aug 08 13:02:26 2011 +0200
     2.2 +++ b/lemon/bits/graph_adaptor_extender.h	Mon Aug 08 13:13:03 2011 +0200
     2.3 @@ -2,7 +2,7 @@
     2.4   *
     2.5   * This file is a part of LEMON, a generic C++ optimization library.
     2.6   *
     2.7 - * Copyright (C) 2003-2009
     2.8 + * Copyright (C) 2003-2011
     2.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    2.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    2.11   *
     3.1 --- a/lemon/bits/path_dump.h	Mon Aug 08 13:02:26 2011 +0200
     3.2 +++ b/lemon/bits/path_dump.h	Mon Aug 08 13:13:03 2011 +0200
     3.3 @@ -2,7 +2,7 @@
     3.4   *
     3.5   * This file is a part of LEMON, a generic C++ optimization library.
     3.6   *
     3.7 - * Copyright (C) 2003-2009
     3.8 + * Copyright (C) 2003-2011
     3.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    3.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    3.11   *
     4.1 --- a/lemon/bits/windows.cc	Mon Aug 08 13:02:26 2011 +0200
     4.2 +++ b/lemon/bits/windows.cc	Mon Aug 08 13:13:03 2011 +0200
     4.3 @@ -2,7 +2,7 @@
     4.4   *
     4.5   * This file is a part of LEMON, a generic C++ optimization library.
     4.6   *
     4.7 - * Copyright (C) 2003-2010
     4.8 + * Copyright (C) 2003-2011
     4.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    4.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    4.11   *
     5.1 --- a/lemon/cost_scaling.h	Mon Aug 08 13:02:26 2011 +0200
     5.2 +++ b/lemon/cost_scaling.h	Mon Aug 08 13:13:03 2011 +0200
     5.3 @@ -2,7 +2,7 @@
     5.4   *
     5.5   * This file is a part of LEMON, a generic C++ optimization library.
     5.6   *
     5.7 - * Copyright (C) 2003-2010
     5.8 + * Copyright (C) 2003-2011
     5.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    5.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    5.11   *
     6.1 --- a/lemon/maps.h	Mon Aug 08 13:02:26 2011 +0200
     6.2 +++ b/lemon/maps.h	Mon Aug 08 13:13:03 2011 +0200
     6.3 @@ -2,7 +2,7 @@
     6.4   *
     6.5   * This file is a part of LEMON, a generic C++ optimization library.
     6.6   *
     6.7 - * Copyright (C) 2003-2010
     6.8 + * Copyright (C) 2003-2011
     6.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    6.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    6.11   *
     7.1 --- a/lemon/preflow.h	Mon Aug 08 13:02:26 2011 +0200
     7.2 +++ b/lemon/preflow.h	Mon Aug 08 13:13:03 2011 +0200
     7.3 @@ -2,7 +2,7 @@
     7.4   *
     7.5   * This file is a part of LEMON, a generic C++ optimization library.
     7.6   *
     7.7 - * Copyright (C) 2003-2010
     7.8 + * Copyright (C) 2003-2011
     7.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    7.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    7.11   *
    7.12 @@ -554,10 +554,10 @@
    7.13            (*_excess)[v] += rem;
    7.14          }
    7.15        }
    7.16 -      for (NodeIt n(_graph); n != INVALID; ++n) 
    7.17 +      for (NodeIt n(_graph); n != INVALID; ++n)
    7.18          if(n!=_source && n!=_target && _tolerance.positive((*_excess)[n]))
    7.19            _level->activate(n);
    7.20 -          
    7.21 +
    7.22        return true;
    7.23      }
    7.24  
    7.25 @@ -585,7 +585,7 @@
    7.26            if (n == INVALID) goto first_phase_done;
    7.27            level = _level->highestActiveLevel();
    7.28            --num;
    7.29 -          
    7.30 +
    7.31            Value excess = (*_excess)[n];
    7.32            int new_level = _level->maxLevel();
    7.33  
     8.1 --- a/test/dfs_test.cc	Mon Aug 08 13:02:26 2011 +0200
     8.2 +++ b/test/dfs_test.cc	Mon Aug 08 13:13:03 2011 +0200
     8.3 @@ -2,7 +2,7 @@
     8.4   *
     8.5   * This file is a part of LEMON, a generic C++ optimization library.
     8.6   *
     8.7 - * Copyright (C) 2003-2010
     8.8 + * Copyright (C) 2003-2011
     8.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    8.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    8.11   *
    8.12 @@ -219,7 +219,7 @@
    8.13    Dfs<Digraph> dfs(G);
    8.14    check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6.");
    8.15    }
    8.16 -  
    8.17 +
    8.18    {
    8.19      NullMap<Node,Arc> myPredMap;
    8.20      dfs(G).predMap(myPredMap).run(s);
     9.1 --- a/test/graph_copy_test.cc	Mon Aug 08 13:02:26 2011 +0200
     9.2 +++ b/test/graph_copy_test.cc	Mon Aug 08 13:13:03 2011 +0200
     9.3 @@ -2,7 +2,7 @@
     9.4   *
     9.5   * This file is a part of LEMON, a generic C++ optimization library.
     9.6   *
     9.7 - * Copyright (C) 2003-2009
     9.8 + * Copyright (C) 2003-2011
     9.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    9.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    9.11   *
    9.12 @@ -70,7 +70,7 @@
    9.13      nodeRef(nr).arcRef(er).
    9.14      nodeCrossRef(ncr).arcCrossRef(ecr).
    9.15      node(fn, tn).arc(fa, ta).run();
    9.16 -  
    9.17 +
    9.18    check(countNodes(from) == countNodes(to), "Wrong copy.");
    9.19    check(countArcs(from) == countArcs(to), "Wrong copy.");
    9.20  
    9.21 @@ -98,7 +98,7 @@
    9.22  
    9.23    // Test repeated copy
    9.24    digraphCopy(from, to).run();
    9.25 -  
    9.26 +
    9.27    check(countNodes(from) == countNodes(to), "Wrong copy.");
    9.28    check(countArcs(from) == countArcs(to), "Wrong copy.");
    9.29  }
    9.30 @@ -200,7 +200,7 @@
    9.31  
    9.32    // Test repeated copy
    9.33    graphCopy(from, to).run();
    9.34 -  
    9.35 +
    9.36    check(countNodes(from) == countNodes(to), "Wrong copy.");
    9.37    check(countEdges(from) == countEdges(to), "Wrong copy.");
    9.38    check(countArcs(from) == countArcs(to), "Wrong copy.");
    10.1 --- a/test/heap_test.cc	Mon Aug 08 13:02:26 2011 +0200
    10.2 +++ b/test/heap_test.cc	Mon Aug 08 13:13:03 2011 +0200
    10.3 @@ -2,7 +2,7 @@
    10.4   *
    10.5   * This file is a part of LEMON, a generic C++ optimization library.
    10.6   *
    10.7 - * Copyright (C) 2003-2009
    10.8 + * Copyright (C) 2003-2011
    10.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   10.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   10.11   *
    11.1 --- a/test/lgf_test.cc	Mon Aug 08 13:02:26 2011 +0200
    11.2 +++ b/test/lgf_test.cc	Mon Aug 08 13:13:03 2011 +0200
    11.3 @@ -63,10 +63,10 @@
    11.4    "0 1\n";
    11.5  
    11.6  
    11.7 -int main() 
    11.8 +int main()
    11.9  {
   11.10    {
   11.11 -    ListDigraph d; 
   11.12 +    ListDigraph d;
   11.13      ListDigraph::Node s,t;
   11.14      ListDigraph::ArcMap<int> label(d);
   11.15      std::istringstream input(test_lgf);
   11.16 @@ -93,7 +93,7 @@
   11.17    }
   11.18  
   11.19    {
   11.20 -    ListDigraph d; 
   11.21 +    ListDigraph d;
   11.22      std::istringstream input(test_lgf_nomap);
   11.23      digraphReader(d, input).
   11.24        run();
   11.25 @@ -110,14 +110,14 @@
   11.26    }
   11.27  
   11.28    {
   11.29 -    ListDigraph d; 
   11.30 +    ListDigraph d;
   11.31      std::istringstream input(test_lgf_bad1);
   11.32      bool ok=false;
   11.33      try {
   11.34        digraphReader(d, input).
   11.35          run();
   11.36      }
   11.37 -    catch (FormatError& error) 
   11.38 +    catch (FormatError& error)
   11.39        {
   11.40          ok = true;
   11.41        }
   11.42 @@ -139,7 +139,7 @@
   11.43    }
   11.44  
   11.45    {
   11.46 -    ListDigraph d; 
   11.47 +    ListDigraph d;
   11.48      std::istringstream input(test_lgf_bad2);
   11.49      bool ok=false;
   11.50      try {
    12.1 --- a/test/maps_test.cc	Mon Aug 08 13:02:26 2011 +0200
    12.2 +++ b/test/maps_test.cc	Mon Aug 08 13:13:03 2011 +0200
    12.3 @@ -2,7 +2,7 @@
    12.4   *
    12.5   * This file is a part of LEMON, a generic C++ optimization library.
    12.6   *
    12.7 - * Copyright (C) 2003-2010
    12.8 + * Copyright (C) 2003-2011
    12.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   12.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   12.11   *
    13.1 --- a/test/preflow_test.cc	Mon Aug 08 13:02:26 2011 +0200
    13.2 +++ b/test/preflow_test.cc	Mon Aug 08 13:13:03 2011 +0200
    13.3 @@ -2,7 +2,7 @@
    13.4   *
    13.5   * This file is a part of LEMON, a generic C++ optimization library.
    13.6   *
    13.7 - * Copyright (C) 2003-2010
    13.8 + * Copyright (C) 2003-2011
    13.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   13.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   13.11   *
   13.12 @@ -159,7 +159,7 @@
   13.13  void initFlowTest()
   13.14  {
   13.15    DIGRAPH_TYPEDEFS(SmartDigraph);
   13.16 -  
   13.17 +
   13.18    SmartDigraph g;
   13.19    SmartDigraph::ArcMap<int> cap(g),iflow(g);
   13.20    Node s=g.addNode(); Node t=g.addNode();
   13.21 @@ -271,6 +271,6 @@
   13.22          "The max flow value or the three min cut values are incorrect.");
   13.23  
   13.24    initFlowTest();
   13.25 -  
   13.26 +
   13.27    return 0;
   13.28  }