diff -r 89c6e4687fcc -r dcace15b1874 src/work/edmonds_karp.hh --- a/src/work/edmonds_karp.hh Tue Feb 24 16:36:02 2004 +0000 +++ b/src/work/edmonds_karp.hh Tue Feb 24 18:22:53 2004 +0000 @@ -12,8 +12,10 @@ template class ResGraph { + public: typedef typename Graph::NodeIt NodeIt; typedef typename Graph::EachNodeIt EachNodeIt; + private: typedef typename Graph::SymEdgeIt OldSymEdgeIt; const Graph& G; FlowMap& flow; @@ -118,8 +120,10 @@ template class ResGraph2 { + public: typedef typename Graph::NodeIt NodeIt; typedef typename Graph::EachNodeIt EachNodeIt; + private: //typedef typename Graph::SymEdgeIt OldSymEdgeIt; typedef typename Graph::OutEdgeIt OldOutEdgeIt; typedef typename Graph::InEdgeIt OldInEdgeIt; @@ -243,14 +247,14 @@ template class ResGraph3 { -public: + public: typedef typename Graph::NodeIt NodeIt; typedef typename Graph::EachNodeIt EachNodeIt; + + private: //typedef typename Graph::SymEdgeIt OldSymEdgeIt; typedef typename Graph::OutEdgeIt OldOutEdgeIt; typedef typename Graph::InEdgeIt OldInEdgeIt; - -private: const Graph& G; FlowMap& flow; const CapacityMap& capacity; @@ -377,11 +381,14 @@ template class MaxFlow { + public: typedef typename Graph::NodeIt NodeIt; typedef typename Graph::EdgeIt EdgeIt; typedef typename Graph::EachEdgeIt EachEdgeIt; typedef typename Graph::OutEdgeIt OutEdgeIt; typedef typename Graph::InEdgeIt InEdgeIt; + + private: const Graph& G; NodeIt s; NodeIt t; @@ -548,11 +555,13 @@ template class MaxFlow2 { + public: typedef typename Graph::NodeIt NodeIt; typedef typename Graph::EdgeIt EdgeIt; typedef typename Graph::EachEdgeIt EachEdgeIt; typedef typename Graph::OutEdgeIt OutEdgeIt; typedef typename Graph::InEdgeIt InEdgeIt; + private: const Graph& G; std::list& S; std::list& T;