1.1 --- a/src/work/athos/mincostflow.h	Sat Nov 13 12:53:28 2004 +0000
     1.2 +++ b/src/work/athos/mincostflow.h	Sat Nov 13 17:07:10 2004 +0000
     1.3 @@ -43,10 +43,10 @@
     1.4    template <typename Graph, typename CostMap, typename SupplyDemandMap>
     1.5    class MinCostFlow {
     1.6  
     1.7 -    typedef typename CostMap::ValueType Cost;
     1.8 +    typedef typename CostMap::Value Cost;
     1.9  
    1.10  
    1.11 -    typedef typename SupplyDemandMap::ValueType SupplyDemand;
    1.12 +    typedef typename SupplyDemandMap::Value SupplyDemand;
    1.13      
    1.14      typedef typename Graph::Node Node;
    1.15      typedef typename Graph::NodeIt NodeIt;
    1.16 @@ -68,10 +68,10 @@
    1.17        const CostMap &ol;
    1.18        const NodeMap &pot;
    1.19      public :
    1.20 -      typedef typename CostMap::KeyType KeyType;
    1.21 -      typedef typename CostMap::ValueType ValueType;
    1.22 +      typedef typename CostMap::Key Key;
    1.23 +      typedef typename CostMap::Value Value;
    1.24  	
    1.25 -      ValueType operator[](typename ResGraph::Edge e) const {     
    1.26 +      Value operator[](typename ResGraph::Edge e) const {     
    1.27  	if (res_graph.forward(e))
    1.28  	  return  ol[e]-(pot[res_graph.target(e)]-pot[res_graph.source(e)]);   
    1.29  	else