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)

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2009
+		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2009
+		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2009
+		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2010
+		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2010
+		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport

RhodeCode

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2010
+		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -556,6 +556,6 @@
+		      }
-		      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;
@@ -587,3 +587,3 @@
 		          --num;
 		          Value excess = (*_excess)[n];

...	...	@@ -4,3 +4,3 @@
4	4	*
5		* Copyright (C) 2003-~~2010~~
	5	* Copyright (C) 2003-2011
6	6	* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
...	...	@@ -221,3 +221,3 @@
221	221	}
222
	222
223	223	{

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2009
+		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -72,3 +72,3 @@
 		    node(fn, tn).arc(fa, ta).run();
 		  check(countNodes(from) == countNodes(to), "Wrong copy.");
@@ -100,3 +100,3 @@
 		  digraphCopy(from, to).run();
 		  check(countNodes(from) == countNodes(to), "Wrong copy.");
@@ -202,3 +202,3 @@
 		  graphCopy(from, to).run();
 		  check(countNodes(from) == countNodes(to), "Wrong copy.");

...	...	@@ -65,6 +65,6 @@
65	65
66		int main()
	66	int main()
67	67	{
68	68	{
69		ListDigraph d;
	69	ListDigraph d;
70	70	ListDigraph::Node s,t;
...	...	@@ -95,3 +95,3 @@
95	95	{
96		ListDigraph d;
	96	ListDigraph d;
97	97	std::istringstream input(test_lgf_nomap);
...	...	@@ -112,3 +112,3 @@
112	112	{
113		ListDigraph d;
	113	ListDigraph d;
114	114	std::istringstream input(test_lgf_bad1);
...	...	@@ -119,3 +119,3 @@
119	119	}
120		catch (FormatError& error)
	120	catch (FormatError& error)
121	121	{
...	...	@@ -141,3 +141,3 @@
141	141	{
142		ListDigraph d;
	142	ListDigraph d;
143	143	std::istringstream input(test_lgf_bad2);

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2010
+		 * Copyright (C) 2003-2011
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -161,3 +161,3 @@
 		  DIGRAPH_TYPEDEFS(SmartDigraph);
 		  SmartDigraph g;
@@ -273,3 +273,3 @@
 		  initFlowTest();
 		  return 0;