0
13
0
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -554,10 +554,10 @@ |
| 554 | 554 |
(*_excess)[v] += rem; |
| 555 | 555 |
} |
| 556 | 556 |
} |
| 557 |
for (NodeIt n(_graph); n != INVALID; ++n) |
|
| 557 |
for (NodeIt n(_graph); n != INVALID; ++n) |
|
| 558 | 558 |
if(n!=_source && n!=_target && _tolerance.positive((*_excess)[n])) |
| 559 | 559 |
_level->activate(n); |
| 560 |
|
|
| 560 |
|
|
| 561 | 561 |
return true; |
| 562 | 562 |
} |
| 563 | 563 |
|
| ... | ... |
@@ -585,7 +585,7 @@ |
| 585 | 585 |
if (n == INVALID) goto first_phase_done; |
| 586 | 586 |
level = _level->highestActiveLevel(); |
| 587 | 587 |
--num; |
| 588 |
|
|
| 588 |
|
|
| 589 | 589 |
Value excess = (*_excess)[n]; |
| 590 | 590 |
int new_level = _level->maxLevel(); |
| 591 | 591 |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -219,7 +219,7 @@ |
| 219 | 219 |
Dfs<Digraph> dfs(G); |
| 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; |
| 225 | 225 |
dfs(G).predMap(myPredMap).run(s); |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -70,7 +70,7 @@ |
| 70 | 70 |
nodeRef(nr).arcRef(er). |
| 71 | 71 |
nodeCrossRef(ncr).arcCrossRef(ecr). |
| 72 | 72 |
node(fn, tn).arc(fa, ta).run(); |
| 73 |
|
|
| 73 |
|
|
| 74 | 74 |
check(countNodes(from) == countNodes(to), "Wrong copy."); |
| 75 | 75 |
check(countArcs(from) == countArcs(to), "Wrong copy."); |
| 76 | 76 |
|
| ... | ... |
@@ -98,7 +98,7 @@ |
| 98 | 98 |
|
| 99 | 99 |
// Test repeated copy |
| 100 | 100 |
digraphCopy(from, to).run(); |
| 101 |
|
|
| 101 |
|
|
| 102 | 102 |
check(countNodes(from) == countNodes(to), "Wrong copy."); |
| 103 | 103 |
check(countArcs(from) == countArcs(to), "Wrong copy."); |
| 104 | 104 |
} |
| ... | ... |
@@ -200,7 +200,7 @@ |
| 200 | 200 |
|
| 201 | 201 |
// Test repeated copy |
| 202 | 202 |
graphCopy(from, to).run(); |
| 203 |
|
|
| 203 |
|
|
| 204 | 204 |
check(countNodes(from) == countNodes(to), "Wrong copy."); |
| 205 | 205 |
check(countEdges(from) == countEdges(to), "Wrong copy."); |
| 206 | 206 |
check(countArcs(from) == countArcs(to), "Wrong copy."); |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -63,10 +63,10 @@ |
| 63 | 63 |
"0 1\n"; |
| 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); |
| 72 | 72 |
std::istringstream input(test_lgf); |
| ... | ... |
@@ -93,7 +93,7 @@ |
| 93 | 93 |
} |
| 94 | 94 |
|
| 95 | 95 |
{
|
| 96 |
ListDigraph d; |
|
| 96 |
ListDigraph d; |
|
| 97 | 97 |
std::istringstream input(test_lgf_nomap); |
| 98 | 98 |
digraphReader(d, input). |
| 99 | 99 |
run(); |
| ... | ... |
@@ -110,14 +110,14 @@ |
| 110 | 110 |
} |
| 111 | 111 |
|
| 112 | 112 |
{
|
| 113 |
ListDigraph d; |
|
| 113 |
ListDigraph d; |
|
| 114 | 114 |
std::istringstream input(test_lgf_bad1); |
| 115 | 115 |
bool ok=false; |
| 116 | 116 |
try {
|
| 117 | 117 |
digraphReader(d, input). |
| 118 | 118 |
run(); |
| 119 | 119 |
} |
| 120 |
catch (FormatError& error) |
|
| 120 |
catch (FormatError& error) |
|
| 121 | 121 |
{
|
| 122 | 122 |
ok = true; |
| 123 | 123 |
} |
| ... | ... |
@@ -139,7 +139,7 @@ |
| 139 | 139 |
} |
| 140 | 140 |
|
| 141 | 141 |
{
|
| 142 |
ListDigraph d; |
|
| 142 |
ListDigraph d; |
|
| 143 | 143 |
std::istringstream input(test_lgf_bad2); |
| 144 | 144 |
bool ok=false; |
| 145 | 145 |
try {
|
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
* |
| 3 | 3 |
* This file is a part of LEMON, a generic C++ optimization library. |
| 4 | 4 |
* |
| 5 |
* Copyright (C) 2003- |
|
| 5 |
* Copyright (C) 2003-2011 |
|
| 6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
| 7 | 7 |
* (Egervary Research Group on Combinatorial Optimization, EGRES). |
| 8 | 8 |
* |
| ... | ... |
@@ -159,7 +159,7 @@ |
| 159 | 159 |
void initFlowTest() |
| 160 | 160 |
{
|
| 161 | 161 |
DIGRAPH_TYPEDEFS(SmartDigraph); |
| 162 |
|
|
| 162 |
|
|
| 163 | 163 |
SmartDigraph g; |
| 164 | 164 |
SmartDigraph::ArcMap<int> cap(g),iflow(g); |
| 165 | 165 |
Node s=g.addNode(); Node t=g.addNode(); |
| ... | ... |
@@ -271,6 +271,6 @@ |
| 271 | 271 |
"The max flow value or the three min cut values are incorrect."); |
| 272 | 272 |
|
| 273 | 273 |
initFlowTest(); |
| 274 |
|
|
| 274 |
|
|
| 275 | 275 |
return 0; |
| 276 | 276 |
} |
0 comments (0 inline)