LEMON/LEMON-official Changeset - r1084:d303bfa8b1ed

Repositories » LEMON » LEMON-official

Changeset - r1084:d303bfa8b1ed

« 1083:7887be

1085:7340bd »

r1084:d303bfa8b1ed

Mon, 08 Aug 2011 13:13:03

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Unify sources

0 13 0

r1.2.2 1.2

13 files changed with 27 insertions and 27 deletions:

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

↑ Collapse diff ↑

0 comments (0 inline)

@@ -3,5 +3,5 @@
 		 * 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).

@@ -3,5 +3,5 @@
 		 * 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).

@@ -3,5 +3,5 @@
 		 * 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).

@@ -3,5 +3,5 @@
 		 * 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).

@@ -3,5 +3,5 @@
 		 * 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).

RhodeCode

@@ -3,5 +3,5 @@
 		 * 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).
@@ -555,8 +555,8 @@
+		        }
+		      }
-		      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;
+		    }
@@ -586,5 +586,5 @@
 		          level = _level->highestActiveLevel();
 		          --num;
 		          Value excess = (*_excess)[n];
 		          int new_level = _level->maxLevel();

...	...	@@ -3,5 +3,5 @@
3	3	* This file is a part of LEMON, a generic C++ optimization library.
4	4	*
5		* Copyright (C) 2003-~~2010~~
	5	* Copyright (C) 2003-2011
6	6	* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
7	7	* (Egervary Research Group on Combinatorial Optimization, EGRES).
...	...	@@ -220,5 +220,5 @@
220	220	check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6.");
221	221	}
222
	222
223	223	{
224	224	NullMap<Node,Arc> myPredMap;

@@ -3,5 +3,5 @@
 		 * 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).
@@ -71,5 +71,5 @@
 		    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.");
@@ -99,5 +99,5 @@
 		  // Test repeated copy
 		  digraphCopy(from, to).run();
 		  check(countNodes(from) == countNodes(to), "Wrong copy.");
 		  check(countArcs(from) == countArcs(to), "Wrong copy.");
@@ -201,5 +201,5 @@
 		  // Test repeated copy
 		  graphCopy(from, to).run();
 		  check(countNodes(from) == countNodes(to), "Wrong copy.");
 		  check(countEdges(from) == countEdges(to), "Wrong copy.");

...	...	@@ -64,8 +64,8 @@
64	64
65	65
66		int main()
	66	int main()
67	67	{
68	68	{
69		ListDigraph d;
	69	ListDigraph d;
70	70	ListDigraph::Node s,t;
71	71	ListDigraph::ArcMap<int> label(d);
...	...	@@ -94,5 +94,5 @@
94	94
95	95	{
96		ListDigraph d;
	96	ListDigraph d;
97	97	std::istringstream input(test_lgf_nomap);
98	98	digraphReader(d, input).
...	...	@@ -111,5 +111,5 @@
111	111
112	112	{
113		ListDigraph d;
	113	ListDigraph d;
114	114	std::istringstream input(test_lgf_bad1);
115	115	bool ok=false;
...	...	@@ -118,5 +118,5 @@
118	118	run();
119	119	}
120		catch (FormatError& error)
	120	catch (FormatError& error)
121	121	{
122	122	ok = true;
...	...	@@ -140,5 +140,5 @@
140	140
141	141	{
142		ListDigraph d;
	142	ListDigraph d;
143	143	std::istringstream input(test_lgf_bad2);
144	144	bool ok=false;

@@ -3,5 +3,5 @@
 		 * 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).
@@ -160,5 +160,5 @@
+		{
 		  DIGRAPH_TYPEDEFS(SmartDigraph);
 		  SmartDigraph g;
 		  SmartDigraph::ArcMap<int> cap(g),iflow(g);
@@ -272,5 +272,5 @@
 		  initFlowTest();
 		  return 0;
+		}