... | ... |
@@ -224,30 +224,25 @@ |
224 | 224 |
check(checkPotential(gr, lower, upper, cost, supply, mcf.flowMap(), |
225 | 225 |
mcf.potentialMap()), |
226 | 226 |
"Wrong potentials " + test_id); |
227 | 227 |
} |
228 | 228 |
} |
229 | 229 |
|
230 | 230 |
int main() |
231 | 231 |
{ |
232 | 232 |
// Check the interfaces |
233 | 233 |
{ |
234 | 234 |
typedef int Flow; |
235 | 235 |
typedef int Cost; |
236 |
// TODO: This typedef should be enabled if the standard maps are |
|
237 |
// reference maps in the graph concepts (See #190). |
|
238 |
/**/ |
|
239 |
//typedef concepts::Digraph GR; |
|
240 |
typedef ListDigraph GR; |
|
241 |
/**/ |
|
236 |
typedef concepts::Digraph GR; |
|
242 | 237 |
checkConcept< McfClassConcept<GR, Flow, Cost>, |
243 | 238 |
NetworkSimplex<GR, Flow, Cost> >(); |
244 | 239 |
} |
245 | 240 |
|
246 | 241 |
// Run various MCF tests |
247 | 242 |
typedef ListDigraph Digraph; |
248 | 243 |
DIGRAPH_TYPEDEFS(ListDigraph); |
249 | 244 |
|
250 | 245 |
// Read the test digraph |
251 | 246 |
Digraph gr; |
252 | 247 |
Digraph::ArcMap<int> c(gr), l1(gr), l2(gr), u(gr); |
253 | 248 |
Digraph::NodeMap<int> s1(gr), s2(gr), s3(gr), s4(gr), s5(gr); |
0 comments (0 inline)