# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1312801983 -7200
# Node ID d303bfa8b1edf141856665fb73fddcc6abc33fef
# Parent  7887be87f4a0b4eefcc50cc612c0f3f2077ae2e2
Unify sources

diff -r 7887be87f4a0 -r d303bfa8b1ed doc/lgf.dox
--- a/doc/lgf.dox	Mon Aug 08 13:02:26 2011 +0200
+++ b/doc/lgf.dox	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
diff -r 7887be87f4a0 -r d303bfa8b1ed lemon/bits/graph_adaptor_extender.h
--- a/lemon/bits/graph_adaptor_extender.h	Mon Aug 08 13:02:26 2011 +0200
+++ b/lemon/bits/graph_adaptor_extender.h	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
diff -r 7887be87f4a0 -r d303bfa8b1ed lemon/bits/path_dump.h
--- a/lemon/bits/path_dump.h	Mon Aug 08 13:02:26 2011 +0200
+++ b/lemon/bits/path_dump.h	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
diff -r 7887be87f4a0 -r d303bfa8b1ed lemon/bits/windows.cc
--- a/lemon/bits/windows.cc	Mon Aug 08 13:02:26 2011 +0200
+++ b/lemon/bits/windows.cc	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
diff -r 7887be87f4a0 -r d303bfa8b1ed lemon/cost_scaling.h
--- a/lemon/cost_scaling.h	Mon Aug 08 13:02:26 2011 +0200
+++ b/lemon/cost_scaling.h	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
diff -r 7887be87f4a0 -r d303bfa8b1ed lemon/maps.h
--- a/lemon/maps.h	Mon Aug 08 13:02:26 2011 +0200
+++ b/lemon/maps.h	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
diff -r 7887be87f4a0 -r d303bfa8b1ed lemon/preflow.h
--- a/lemon/preflow.h	Mon Aug 08 13:02:26 2011 +0200
+++ b/lemon/preflow.h	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
@@ -554,10 +554,10 @@
           (*_excess)[v] += rem;
         }
       }
-      for (NodeIt n(_graph); n != INVALID; ++n) 
+      for (NodeIt n(_graph); n != INVALID; ++n)
         if(n!=_source && n!=_target && _tolerance.positive((*_excess)[n]))
           _level->activate(n);
-          
+
       return true;
     }
 
@@ -585,7 +585,7 @@
           if (n == INVALID) goto first_phase_done;
           level = _level->highestActiveLevel();
           --num;
-          
+
           Value excess = (*_excess)[n];
           int new_level = _level->maxLevel();
 
diff -r 7887be87f4a0 -r d303bfa8b1ed test/dfs_test.cc
--- a/test/dfs_test.cc	Mon Aug 08 13:02:26 2011 +0200
+++ b/test/dfs_test.cc	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
@@ -219,7 +219,7 @@
   Dfs<Digraph> dfs(G);
   check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6.");
   }
-  
+
   {
     NullMap<Node,Arc> myPredMap;
     dfs(G).predMap(myPredMap).run(s);
diff -r 7887be87f4a0 -r d303bfa8b1ed test/graph_copy_test.cc
--- a/test/graph_copy_test.cc	Mon Aug 08 13:02:26 2011 +0200
+++ b/test/graph_copy_test.cc	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
@@ -70,7 +70,7 @@
     nodeRef(nr).arcRef(er).
     nodeCrossRef(ncr).arcCrossRef(ecr).
     node(fn, tn).arc(fa, ta).run();
-  
+
   check(countNodes(from) == countNodes(to), "Wrong copy.");
   check(countArcs(from) == countArcs(to), "Wrong copy.");
 
@@ -98,7 +98,7 @@
 
   // Test repeated copy
   digraphCopy(from, to).run();
-  
+
   check(countNodes(from) == countNodes(to), "Wrong copy.");
   check(countArcs(from) == countArcs(to), "Wrong copy.");
 }
@@ -200,7 +200,7 @@
 
   // Test repeated copy
   graphCopy(from, to).run();
-  
+
   check(countNodes(from) == countNodes(to), "Wrong copy.");
   check(countEdges(from) == countEdges(to), "Wrong copy.");
   check(countArcs(from) == countArcs(to), "Wrong copy.");
diff -r 7887be87f4a0 -r d303bfa8b1ed test/heap_test.cc
--- a/test/heap_test.cc	Mon Aug 08 13:02:26 2011 +0200
+++ b/test/heap_test.cc	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
diff -r 7887be87f4a0 -r d303bfa8b1ed test/lgf_test.cc
--- a/test/lgf_test.cc	Mon Aug 08 13:02:26 2011 +0200
+++ b/test/lgf_test.cc	Mon Aug 08 13:13:03 2011 +0200
@@ -63,10 +63,10 @@
   "0 1\n";
 
 
-int main() 
+int main()
 {
   {
-    ListDigraph d; 
+    ListDigraph d;
     ListDigraph::Node s,t;
     ListDigraph::ArcMap<int> label(d);
     std::istringstream input(test_lgf);
@@ -93,7 +93,7 @@
   }
 
   {
-    ListDigraph d; 
+    ListDigraph d;
     std::istringstream input(test_lgf_nomap);
     digraphReader(d, input).
       run();
@@ -110,14 +110,14 @@
   }
 
   {
-    ListDigraph d; 
+    ListDigraph d;
     std::istringstream input(test_lgf_bad1);
     bool ok=false;
     try {
       digraphReader(d, input).
         run();
     }
-    catch (FormatError& error) 
+    catch (FormatError& error)
       {
         ok = true;
       }
@@ -139,7 +139,7 @@
   }
 
   {
-    ListDigraph d; 
+    ListDigraph d;
     std::istringstream input(test_lgf_bad2);
     bool ok=false;
     try {
diff -r 7887be87f4a0 -r d303bfa8b1ed test/maps_test.cc
--- a/test/maps_test.cc	Mon Aug 08 13:02:26 2011 +0200
+++ b/test/maps_test.cc	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
diff -r 7887be87f4a0 -r d303bfa8b1ed test/preflow_test.cc
--- a/test/preflow_test.cc	Mon Aug 08 13:02:26 2011 +0200
+++ b/test/preflow_test.cc	Mon Aug 08 13:13:03 2011 +0200
@@ -2,7 +2,7 @@
  *
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
  *
@@ -159,7 +159,7 @@
 void initFlowTest()
 {
   DIGRAPH_TYPEDEFS(SmartDigraph);
-  
+
   SmartDigraph g;
   SmartDigraph::ArcMap<int> cap(g),iflow(g);
   Node s=g.addNode(); Node t=g.addNode();
@@ -271,6 +271,6 @@
         "The max flow value or the three min cut values are incorrect.");
 
   initFlowTest();
-  
+
   return 0;
 }