1.1 --- a/test/min_cost_flow_test.cc Wed Mar 25 21:37:50 2009 +0100
1.2 +++ b/test/min_cost_flow_test.cc Fri Apr 03 13:46:16 2009 +0200
1.3 @@ -77,7 +77,7 @@
1.4
1.5
1.6 // Check the interface of an MCF algorithm
1.7 -template <typename GR, typename Value>
1.8 +template <typename GR, typename Flow, typename Cost>
1.9 class McfClassConcept
1.10 {
1.11 public:
1.12 @@ -116,18 +116,19 @@
1.13
1.14 typedef typename GR::Node Node;
1.15 typedef typename GR::Arc Arc;
1.16 - typedef concepts::ReadMap<Node, Value> NM;
1.17 - typedef concepts::ReadMap<Arc, Value> AM;
1.18 + typedef concepts::ReadMap<Node, Flow> NM;
1.19 + typedef concepts::ReadMap<Arc, Flow> FAM;
1.20 + typedef concepts::ReadMap<Arc, Cost> CAM;
1.21
1.22 const GR &g;
1.23 - const AM &lower;
1.24 - const AM &upper;
1.25 - const AM &cost;
1.26 + const FAM &lower;
1.27 + const FAM &upper;
1.28 + const CAM &cost;
1.29 const NM ⊃
1.30 const Node &n;
1.31 const Arc &a;
1.32 - const Value &k;
1.33 - Value v;
1.34 + const Flow &k;
1.35 + Flow v;
1.36 bool b;
1.37
1.38 typename MCF::FlowMap &flow;
1.39 @@ -206,15 +207,16 @@
1.40 {
1.41 // Check the interfaces
1.42 {
1.43 - typedef int Value;
1.44 + typedef int Flow;
1.45 + typedef int Cost;
1.46 // TODO: This typedef should be enabled if the standard maps are
1.47 // reference maps in the graph concepts (See #190).
1.48 /**/
1.49 //typedef concepts::Digraph GR;
1.50 typedef ListDigraph GR;
1.51 /**/
1.52 - checkConcept< McfClassConcept<GR, Value>,
1.53 - NetworkSimplex<GR, Value> >();
1.54 + checkConcept< McfClassConcept<GR, Flow, Cost>,
1.55 + NetworkSimplex<GR, Flow, Cost> >();
1.56 }
1.57
1.58 // Run various MCF tests