... | ... |
@@ -212,54 +212,49 @@ |
212 | 212 |
void checkMcf( const MCF& mcf, bool mcf_result, |
213 | 213 |
const GR& gr, const LM& lower, const UM& upper, |
214 | 214 |
const CM& cost, const SM& supply, |
215 | 215 |
bool result, typename CM::Value total, |
216 | 216 |
const std::string &test_id = "", |
217 | 217 |
ProblemType type = EQ ) |
218 | 218 |
{ |
219 | 219 |
check(mcf_result == result, "Wrong result " + test_id); |
220 | 220 |
if (result) { |
221 | 221 |
check(checkFlow(gr, lower, upper, supply, mcf.flowMap(), type), |
222 | 222 |
"The flow is not feasible " + test_id); |
223 | 223 |
check(mcf.totalCost() == total, "The flow is not optimal " + test_id); |
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); |
254 | 249 |
ConstMap<Arc, int> cc(1), cu(std::numeric_limits<int>::max()); |
255 | 250 |
Node v, w; |
256 | 251 |
|
257 | 252 |
std::istringstream input(test_lgf); |
258 | 253 |
DigraphReader<Digraph>(gr, input) |
259 | 254 |
.arcMap("cost", c) |
260 | 255 |
.arcMap("cap", u) |
261 | 256 |
.arcMap("low1", l1) |
262 | 257 |
.arcMap("low2", l2) |
263 | 258 |
.nodeMap("sup1", s1) |
264 | 259 |
.nodeMap("sup2", s2) |
265 | 260 |
.nodeMap("sup3", s3) |
0 comments (0 inline)