[Lemon-commits] Alpar Juttner: Unify sources
Lemon HG
hg at lemon.cs.elte.hu
Mon Aug 8 15:01:34 CEST 2011
details: http://lemon.cs.elte.hu/hg/lemon/rev/d303bfa8b1ed
changeset: 1084:d303bfa8b1ed
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Mon Aug 08 13:13:03 2011 +0200
description:
Unify sources
diffstat:
doc/lgf.dox | 2 +-
lemon/bits/graph_adaptor_extender.h | 2 +-
lemon/bits/path_dump.h | 2 +-
lemon/bits/windows.cc | 2 +-
lemon/cost_scaling.h | 2 +-
lemon/maps.h | 2 +-
lemon/preflow.h | 8 ++++----
test/dfs_test.cc | 4 ++--
test/graph_copy_test.cc | 8 ++++----
test/heap_test.cc | 2 +-
test/lgf_test.cc | 12 ++++++------
test/maps_test.cc | 2 +-
test/preflow_test.cc | 6 +++---
13 files changed, 27 insertions(+), 27 deletions(-)
diffs (270 lines):
diff --git a/doc/lgf.dox b/doc/lgf.dox
--- a/doc/lgf.dox
+++ b/doc/lgf.dox
@@ -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 --git a/lemon/bits/graph_adaptor_extender.h b/lemon/bits/graph_adaptor_extender.h
--- a/lemon/bits/graph_adaptor_extender.h
+++ b/lemon/bits/graph_adaptor_extender.h
@@ -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 --git a/lemon/bits/path_dump.h b/lemon/bits/path_dump.h
--- a/lemon/bits/path_dump.h
+++ b/lemon/bits/path_dump.h
@@ -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 --git a/lemon/bits/windows.cc b/lemon/bits/windows.cc
--- a/lemon/bits/windows.cc
+++ b/lemon/bits/windows.cc
@@ -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 --git a/lemon/cost_scaling.h b/lemon/cost_scaling.h
--- a/lemon/cost_scaling.h
+++ b/lemon/cost_scaling.h
@@ -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 --git a/lemon/maps.h b/lemon/maps.h
--- a/lemon/maps.h
+++ b/lemon/maps.h
@@ -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 --git a/lemon/preflow.h b/lemon/preflow.h
--- a/lemon/preflow.h
+++ b/lemon/preflow.h
@@ -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 --git a/test/dfs_test.cc b/test/dfs_test.cc
--- a/test/dfs_test.cc
+++ b/test/dfs_test.cc
@@ -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 --git a/test/graph_copy_test.cc b/test/graph_copy_test.cc
--- a/test/graph_copy_test.cc
+++ b/test/graph_copy_test.cc
@@ -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 --git a/test/heap_test.cc b/test/heap_test.cc
--- a/test/heap_test.cc
+++ b/test/heap_test.cc
@@ -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 --git a/test/lgf_test.cc b/test/lgf_test.cc
--- a/test/lgf_test.cc
+++ b/test/lgf_test.cc
@@ -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 --git a/test/maps_test.cc b/test/maps_test.cc
--- a/test/maps_test.cc
+++ b/test/maps_test.cc
@@ -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 --git a/test/preflow_test.cc b/test/preflow_test.cc
--- a/test/preflow_test.cc
+++ b/test/preflow_test.cc
@@ -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;
}
More information about the Lemon-commits
mailing list