diff -r c7d160f73d52 -r 9ad8d2122b50 test/min_cost_flow_test.cc --- a/test/min_cost_flow_test.cc Wed Mar 25 21:37:50 2009 +0100 +++ b/test/min_cost_flow_test.cc Fri Apr 03 13:46:16 2009 +0200 @@ -77,7 +77,7 @@ // Check the interface of an MCF algorithm -template +template class McfClassConcept { public: @@ -116,18 +116,19 @@ typedef typename GR::Node Node; typedef typename GR::Arc Arc; - typedef concepts::ReadMap NM; - typedef concepts::ReadMap AM; + typedef concepts::ReadMap NM; + typedef concepts::ReadMap FAM; + typedef concepts::ReadMap CAM; const GR &g; - const AM &lower; - const AM &upper; - const AM &cost; + const FAM &lower; + const FAM &upper; + const CAM &cost; const NM ⊃ const Node &n; const Arc &a; - const Value &k; - Value v; + const Flow &k; + Flow v; bool b; typename MCF::FlowMap &flow; @@ -206,15 +207,16 @@ { // Check the interfaces { - typedef int Value; + typedef int Flow; + typedef int Cost; // TODO: This typedef should be enabled if the standard maps are // reference maps in the graph concepts (See #190). /**/ //typedef concepts::Digraph GR; typedef ListDigraph GR; /**/ - checkConcept< McfClassConcept, - NetworkSimplex >(); + checkConcept< McfClassConcept, + NetworkSimplex >(); } // Run various MCF tests