equal
deleted
inserted
replaced
679 |
679 |
680 typedef typename GraphWrapperSkeleton<GraphWrapper>::Node Node; |
680 typedef typename GraphWrapperSkeleton<GraphWrapper>::Node Node; |
681 typedef typename GraphWrapperSkeleton<GraphWrapper>::NodeIt NodeIt; |
681 typedef typename GraphWrapperSkeleton<GraphWrapper>::NodeIt NodeIt; |
682 |
682 |
683 //private: |
683 //private: |
684 typedef typename GraphWrapperSkeleton<GraphWrapper>::Edge GraphEdge; |
684 //FIXME ezeknek valojaban a GraphWrapper megfelelo dolgai kellene hogy |
685 typedef typename GraphWrapperSkeleton<GraphWrapper>::OutEdgeIt GraphOutEdgeIt; |
685 //legyenek, at kell irni |
686 typedef typename GraphWrapperSkeleton<GraphWrapper>::InEdgeIt GraphInEdgeIt; |
686 typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/ |
|
687 GraphWrapper::Edge GraphEdge; |
|
688 typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/ |
|
689 GraphWrapper::OutEdgeIt GraphOutEdgeIt; |
|
690 typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/ |
|
691 GraphWrapper::InEdgeIt GraphInEdgeIt; |
687 //public: |
692 //public: |
688 |
693 |
689 //UndirGraphWrapper() : graph(0) { } |
694 //UndirGraphWrapper() : graph(0) { } |
690 UndirGraphWrapper(GraphWrapper _gw) : |
695 UndirGraphWrapper(GraphWrapper _gw) : |
691 GraphWrapperSkeleton<GraphWrapper>(_gw) { } |
696 GraphWrapperSkeleton<GraphWrapper>(_gw) { } |
939 //typedef Graph BaseGraph; |
944 //typedef Graph BaseGraph; |
940 //typedef TrivGraphWrapper<const Graph> GraphWrapper; |
945 //typedef TrivGraphWrapper<const Graph> GraphWrapper; |
941 typedef typename GraphWrapperSkeleton<GraphWrapper>::Node Node; |
946 typedef typename GraphWrapperSkeleton<GraphWrapper>::Node Node; |
942 typedef typename GraphWrapperSkeleton<GraphWrapper>::NodeIt NodeIt; |
947 typedef typename GraphWrapperSkeleton<GraphWrapper>::NodeIt NodeIt; |
943 private: |
948 private: |
944 typedef typename GraphWrapperSkeleton<GraphWrapper>::OutEdgeIt OldOutEdgeIt; |
949 typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/ |
945 typedef typename GraphWrapperSkeleton<GraphWrapper>::InEdgeIt OldInEdgeIt; |
950 GraphWrapper::OutEdgeIt OldOutEdgeIt; |
|
951 typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/ |
|
952 GraphWrapper::InEdgeIt OldInEdgeIt; |
946 protected: |
953 protected: |
947 //const Graph* graph; |
954 //const Graph* graph; |
948 //GraphWrapper gw; |
955 //GraphWrapper gw; |
949 FlowMap* flow; |
956 FlowMap* flow; |
950 const CapacityMap* capacity; |
957 const CapacityMap* capacity; |