Changeset 650:588ff2ca55bd in lemon-0.x for src

Timestamp:

05/20/04 17:40:59 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@850

Message:

a

Location:

src

Files:

• hugo/graph_wrapper.h (modified) (25 diffs)
• work/jacint/max_flow.h (modified) (3 diffs)
• work/marci/bfs_dfs.h (modified) (10 diffs)
• work/marci/leda/leda_graph_wrapper.h (modified) (14 diffs)

src/hugo/graph_wrapper.h

@@ -12 +12 @@
 
 #include <hugo/invalid.h>
+#include <hugo/maps.h>
 //#include <iter_map.h>
 
@@ -104 +105 @@
       Node() { }
       Node(const typename Graph::Node& _n) : Graph::Node(_n) { }
+      // /// \bug construction throughrthr multiple levels should be 
+      // /// handled better
+      // Node(const typename ParentGraph::ParentGraph::Node& _n) : 
+      // Graph::Node(_n) { }
       Node(const Invalid& i) : Graph::Node(i) { }
     };
@@ -203 +208 @@
     void clear() const { graph->clear(); }
     
+    bool forward(const Edge& e) const { graph->forward(e); }
+    bool backward(const Edge& e) const { graph->backward(e); }
+    
+    Edge opposite(const Edge& e) const { Edge(graph->opposite(e)); }
+
     template<typename T> class NodeMap : public Graph::template NodeMap<T> { 
       typedef typename Graph::template NodeMap<T> Parent;
@@ -228 +238 @@
   template<typename Graph>
   class RevGraphWrapper : public GraphWrapper<Graph> {
+  public:
+    typedef GraphWrapper<Graph> Parent; 
   protected:
     RevGraphWrapper() : GraphWrapper<Graph>() { }
@@ -308 +320 @@
            typename EdgeFilterMap>
   class SubGraphWrapper : public GraphWrapper<Graph> {
+  public:
+    typedef GraphWrapper<Graph> Parent;
   protected:
     NodeFilterMap* node_filter_map;
@@ -322 +336 @@
     
   public:
-
     SubGraphWrapper(Graph& _graph, NodeFilterMap& _node_filter_map, 
                     EdgeFilterMap& _edge_filter_map) : 
@@ -497 +510 @@
   template<typename Graph>
   class UndirGraphWrapper : public GraphWrapper<Graph> {
+  public:
+    typedef GraphWrapper<Graph> Parent; 
   protected:
     UndirGraphWrapper() : GraphWrapper<Graph>() { }
@@ -592 +607 @@
 
 
-  ///\brief A wrapper for composing bidirected graph from a directed one. 
+
+  ///\brief A wrapper for composing a subgraph of a 
+  /// bidirected graph composed from a directed one. 
   /// experimental, for fezso's sake.
   ///
-  /// A wrapper for composing bidirected graph from a directed one. 
+  /// A wrapper for composing a subgraps of a 
+  /// bidirected graph composed from a directed one. 
   /// experimental, for fezso's sake.
   /// A bidirected graph is composed over the directed one without physical 
   /// storage. As the oppositely directed edges are logically different ones 
   /// the maps are able to attach different values for them.
-  template<typename Graph>
-  class BidirGraphWrapper : public GraphWrapper<Graph> {
+  template<typename Graph, 
+           typename ForwardFilterMap, typename BackwardFilterMap>
+  class SubBidirGraphWrapper : public GraphWrapper<Graph> {
+  public:
+    typedef GraphWrapper<Graph> Parent; 
   protected:
     //const CapacityMap* capacity;
     //FlowMap* flow;
 
-    BidirGraphWrapper() : GraphWrapper<Graph>()/*, 
+    ForwardFilterMap* forward_filter;
+    BackwardFilterMap* backward_filter;
+
+    SubBidirGraphWrapper() : GraphWrapper<Graph>()/*, 
                                                  capacity(0), flow(0)*/ { }
-//     void setCapacityMap(const CapacityMap& _capacity) {
-//       capacity=&_capacity;
-//     }
-//     void setFlowMap(FlowMap& _flow) {
-//       flow=&_flow;
-//     }
-
-  public:
-
-    BidirGraphWrapper(Graph& _graph/*, const CapacityMap& _capacity, 
-                                     FlowMap& _flow*/) : 
-      GraphWrapper<Graph>(_graph)/*, capacity(&_capacity), flow(&_flow)*/ { }
+    void setForwardFilterMap(ForwardFilterMap& _forward_filter) {
+      forward_filter=&_forward_filter;
+    }
+    void setBackwardFilterMap(BackwardFilterMap& _backward_filter) {
+      backward_filter=&_backward_filter;
+    }
+
+  public:
+
+    SubBidirGraphWrapper(Graph& _graph, ForwardFilterMap& _forward_filter, 
+                         BackwardFilterMap& _backward_filter) : 
+      GraphWrapper<Graph>(_graph), 
+      forward_filter(&_forward_filter), backward_filter(&_backward_filter) { }
 
     class Edge; 
@@ -633 +658 @@
 
     class Edge : public Graph::Edge {
-      friend class BidirGraphWrapper<Graph>;
+      friend class SubBidirGraphWrapper<Graph, 
+                                        ForwardFilterMap, BackwardFilterMap>;
       ///\bug ez nem is kell
       //template<typename T> friend class NodeMap;
@@ -660 +686 @@
 
     class OutEdgeIt {
-      friend class BidirGraphWrapper<Graph>;
+      friend class SubBidirGraphWrapper<Graph, 
+                                        ForwardFilterMap, BackwardFilterMap>;
     protected:
       typename Graph::OutEdgeIt out;
@@ -671 +698 @@
       OutEdgeIt(const Invalid& i) : out(i), in(i), backward(true) { }
 //the unique invalid iterator
-      OutEdgeIt(const BidirGraphWrapper<Graph>& _G, Node v) { 
+      OutEdgeIt(const SubBidirGraphWrapper<Graph, 
+                ForwardFilterMap, BackwardFilterMap>& _G, Node v) { 
         backward=false;
         _G.graph->first(out, v);
-        while(_G.graph->valid(out) && !_G.enabled(*this)) { _G.graph->next(out); }
+        while(_G.graph->valid(out) && !(*_G.forward_filter)[*this]) { _G.graph->next(out); }
         if (!_G.graph->valid(out)) {
           backward=true;
           _G.graph->first(in, v);
-          while(_G.graph->valid(in) && !_G.enabled(*this)) { _G.graph->next(in); }
+          while(_G.graph->valid(in) && !(*_G.backward_filter)[*this]) { _G.graph->next(in); }
         }
       }
@@ -694 +722 @@
 
     class InEdgeIt {
-      friend class BidirGraphWrapper<Graph>;
+      friend class SubBidirGraphWrapper<Graph, 
+                                        ForwardFilterMap, BackwardFilterMap>;
     protected:
       typename Graph::OutEdgeIt out;
@@ -705 +734 @@
       InEdgeIt(const Invalid& i) : out(i), in(i), backward(true) { }
 //the unique invalid iterator
-      InEdgeIt(const BidirGraphWrapper<Graph>& _G, Node v) { 
+      InEdgeIt(const SubBidirGraphWrapper<Graph, 
+               ForwardFilterMap, BackwardFilterMap>& _G, Node v) { 
         backward=false;
         _G.graph->first(in, v);
-        while(_G.graph->valid(in) && !_G.enabled(*this)) { _G.graph->next(in); }
+        while(_G.graph->valid(in) && !(*_G.forward_filter)[*this]) { _G.graph->next(in); }
         if (!_G.graph->valid(in)) {
           backward=true;
           _G.graph->first(out, v);
-          while(_G.graph->valid(out) && !_G.enabled(*this)) { _G.graph->next(out); }
+          while(_G.graph->valid(out) && !(*_G.backward_filter)[*this]) { _G.graph->next(out); }
         }
       }
@@ -728 +758 @@
 
     class EdgeIt {
-      friend class BidirGraphWrapper<Graph>;
+      friend class SubBidirGraphWrapper<Graph, 
+                                        ForwardFilterMap, BackwardFilterMap>;
     protected:
       typename Graph::EdgeIt e;
@@ -735 +766 @@
       EdgeIt() { }
       EdgeIt(const Invalid& i) : e(i), backward(true) { }
-      EdgeIt(const BidirGraphWrapper<Graph>& _G) { 
+      EdgeIt(const SubBidirGraphWrapper<Graph, 
+             ForwardFilterMap, BackwardFilterMap>& _G) { 
         backward=false;
         _G.graph->first(e);
-        while (_G.graph->valid(e) && !_G.enabled(*this)) _G.graph->next(e);
+        while (_G.graph->valid(e) && !(*_G.forward_filter)[*this]) _G.graph->next(e);
         if (!_G.graph->valid(e)) {
           backward=true;
           _G.graph->first(e);
-          while (_G.graph->valid(e) && !_G.enabled(*this)) _G.graph->next(e);
+          while (_G.graph->valid(e) && !(*_G.backward_filter)[*this]) _G.graph->next(e);
         }
       }
@@ -771 +803 @@
         Node v=this->graph->aNode(e.out);
         this->graph->next(e.out);
-        while(this->graph->valid(e.out) && !enabled(e)) { 
+        while(this->graph->valid(e.out) && !(*forward_filter)[e]) { 
           this->graph->next(e.out); }
         if (!this->graph->valid(e.out)) {
           e.backward=true;
           this->graph->first(e.in, v); 
-          while(this->graph->valid(e.in) && !enabled(e)) { 
+          while(this->graph->valid(e.in) && !(*backward_filter)[e]) { 
             this->graph->next(e.in); }
         }
       } else {
         this->graph->next(e.in);
-        while(this->graph->valid(e.in) && !enabled(e)) { 
+        while(this->graph->valid(e.in) && !(*backward_filter)[e]) { 
           this->graph->next(e.in); } 
       }
@@ -791 +823 @@
         Node v=this->graph->aNode(e.in);
         this->graph->next(e.in);
-        while(this->graph->valid(e.in) && !enabled(e)) { 
+        while(this->graph->valid(e.in) && !(*forward_filter)[e]) { 
           this->graph->next(e.in); }
         if (!this->graph->valid(e.in)) {
           e.backward=true;
           this->graph->first(e.out, v); 
-          while(this->graph->valid(e.out) && !enabled(e)) { 
+          while(this->graph->valid(e.out) && !(*backward_filter)[e]) { 
             this->graph->next(e.out); }
         }
       } else {
         this->graph->next(e.out);
-        while(this->graph->valid(e.out) && !enabled(e)) { 
+        while(this->graph->valid(e.out) && !(*backward_filter)[e]) { 
           this->graph->next(e.out); } 
       }
@@ -809 +841 @@
       if (!e.backward) {
         this->graph->next(e.e);
-        while(this->graph->valid(e.e) && !enabled(e)) { 
+        while(this->graph->valid(e.e) && !(*forward_filter)[e]) { 
           this->graph->next(e.e); }
         if (!this->graph->valid(e.e)) {
           e.backward=true;
           this->graph->first(e.e); 
-          while(this->graph->valid(e.e) && !enabled(e)) { 
+          while(this->graph->valid(e.e) && !(*backward_filter)[e]) { 
             this->graph->next(e.e); }
         }
       } else {
         this->graph->next(e.e);
-        while(this->graph->valid(e.e) && !enabled(e)) { 
+        while(this->graph->valid(e.e) && !(*backward_filter)[e]) { 
           this->graph->next(e.e); } 
       }
@@ -877 +909 @@
 //     }
 
-    bool enabled(const Edge& e) const { 
-      if (!e.backward) 
-//      return (capacity->get(e.out)-flow->get(e.out)); 
-        //return ((*capacity)[e]-(*flow)[e]);
-        return true;
-      else 
-//      return (flow->get(e.in)); 
-        //return ((*flow)[e]); 
-        return true;
-    }
+//     bool enabled(const Edge& e) const { 
+//       if (!e.backward) 
+// //   return (capacity->get(e.out)-flow->get(e.out)); 
+//      //return ((*capacity)[e]-(*flow)[e]);
+//      return true;
+//       else 
+// //   return (flow->get(e.in)); 
+//      //return ((*flow)[e]); 
+//      return true;
+//     }
 
 //     Number enabled(typename Graph::OutEdgeIt out) const { 
@@ -904 +936 @@
       typedef T ValueType;
       typedef Edge KeyType;
-      EdgeMap(const BidirGraphWrapper<Graph>& _G) : forward_map(*(_G.graph)), backward_map(*(_G.graph)) { }
-      EdgeMap(const BidirGraphWrapper<Graph>& _G, T a) : forward_map(*(_G.graph), a), backward_map(*(_G.graph), a) { }
+      EdgeMap(const SubBidirGraphWrapper<Graph, 
+              ForwardFilterMap, BackwardFilterMap>& _G) : 
+        forward_map(*(_G.graph)), backward_map(*(_G.graph)) { }
+      EdgeMap(const SubBidirGraphWrapper<Graph, 
+              ForwardFilterMap, BackwardFilterMap>& _G, T a) : 
+        forward_map(*(_G.graph), a), backward_map(*(_G.graph), a) { }
       void set(Edge e, T a) { 
         if (!e.backward) 
@@ -930 +966 @@
     };
   };
+
+
+
+  ///\brief A wrapper for composing bidirected graph from a directed one. 
+  /// experimental, for fezso's sake.
+  ///
+  /// A wrapper for composing bidirected graph from a directed one. 
+  /// experimental, for fezso's sake.
+  /// A bidirected graph is composed over the directed one without physical 
+  /// storage. As the oppositely directed edges are logically different ones 
+  /// the maps are able to attach different values for them.
+  template<typename Graph>
+  class BidirGraphWrapper : 
+    public SubBidirGraphWrapper<
+    Graph, 
+    ConstMap<typename Graph::Edge, bool>, 
+    ConstMap<typename Graph::Edge, bool> > {
+  public:
+    typedef  SubBidirGraphWrapper<
+      Graph, 
+      ConstMap<typename Graph::Edge, bool>, 
+      ConstMap<typename Graph::Edge, bool> > Parent; 
+  protected:
+    ConstMap<typename Graph::Edge, bool> cm;
+    //const CapacityMap* capacity;
+    //FlowMap* flow;
+
+    BidirGraphWrapper() : Parent(), cm(true) { }
+//     void setCapacityMap(const CapacityMap& _capacity) {
+//       capacity=&_capacity;
+//     }
+//     void setFlowMap(FlowMap& _flow) {
+//       flow=&_flow;
+//     }
+
+  public:
+
+    BidirGraphWrapper(Graph& _graph) : Parent() { 
+      Parent::setGraph(_graph);
+      Parent::setForwardFilterMap(cm);
+      Parent::setBackwardFilterMap(cm);
+    }
+  };
+
+
+
+
+//   ///\brief A wrapper for composing bidirected graph from a directed one. 
+//   /// experimental, for fezso's sake.
+//   ///
+//   /// A wrapper for composing bidirected graph from a directed one. 
+//   /// experimental, for fezso's sake.
+//   /// A bidirected graph is composed over the directed one without physical 
+//   /// storage. As the oppositely directed edges are logically different ones 
+//   /// the maps are able to attach different values for them.
+//   template<typename Graph>
+//   class BidirGraphWrapper : public GraphWrapper<Graph> {
+//   public:
+//     typedef GraphWrapper<Graph> Parent; 
+//   protected:
+//     //const CapacityMap* capacity;
+//     //FlowMap* flow;
+
+//     BidirGraphWrapper() : GraphWrapper<Graph>()/*, 
+//                                               capacity(0), flow(0)*/ { }
+// //     void setCapacityMap(const CapacityMap& _capacity) {
+// //       capacity=&_capacity;
+// //     }
+// //     void setFlowMap(FlowMap& _flow) {
+// //       flow=&_flow;
+// //     }
+
+//   public:
+
+//     BidirGraphWrapper(Graph& _graph/*, const CapacityMap& _capacity, 
+//                                   FlowMap& _flow*/) : 
+//       GraphWrapper<Graph>(_graph)/*, capacity(&_capacity), flow(&_flow)*/ { }
+
+//     class Edge; 
+//     class OutEdgeIt; 
+//     friend class Edge; 
+//     friend class OutEdgeIt; 
+
+//     //template<typename T> class NodeMap;    
+//     template<typename T> class EdgeMap;
+
+//     typedef typename GraphWrapper<Graph>::Node Node;
+//     typedef typename GraphWrapper<Graph>::NodeIt NodeIt;
+
+//     class Edge : public Graph::Edge {
+//       friend class BidirGraphWrapper<Graph>;
+//       ///\bug ez nem is kell
+//       //template<typename T> friend class NodeMap;
+//       template<typename T> friend class EdgeMap;
+//     protected:
+//       bool backward; //true, iff backward
+// //      typename Graph::Edge e;
+//     public:
+//       Edge() { }
+//       ///\bug =false kell-e? zsoltnak kell az addEdge miatt
+//       Edge(const typename Graph::Edge& _e, bool _backward=false) : 
+//      Graph::Edge(_e), backward(_backward) { }
+//       Edge(const Invalid& i) : Graph::Edge(i), backward(true) { }
+// //the unique invalid iterator
+//       friend bool operator==(const Edge& u, const Edge& v) { 
+//      return (v.backward==u.backward && 
+//              static_cast<typename Graph::Edge>(u)==
+//              static_cast<typename Graph::Edge>(v));
+//       } 
+//       friend bool operator!=(const Edge& u, const Edge& v) { 
+//      return (v.backward!=u.backward || 
+//              static_cast<typename Graph::Edge>(u)!=
+//              static_cast<typename Graph::Edge>(v));
+//       } 
+//     };
+
+//     class OutEdgeIt {
+//       friend class BidirGraphWrapper<Graph>;
+//     protected:
+//       typename Graph::OutEdgeIt out;
+//       typename Graph::InEdgeIt in;
+//       bool backward;
+//     public:
+//       OutEdgeIt() { }
+//       //FIXME
+// //      OutEdgeIt(const Edge& e) : Edge(e) { }
+//       OutEdgeIt(const Invalid& i) : out(i), in(i), backward(true) { }
+// //the unique invalid iterator
+//       OutEdgeIt(const BidirGraphWrapper<Graph>& _G, Node v) { 
+//      backward=false;
+//      _G.graph->first(out, v);
+//      while(_G.graph->valid(out) && !_G.enabled(*this)) { _G.graph->next(out); }
+//      if (!_G.graph->valid(out)) {
+//        backward=true;
+//        _G.graph->first(in, v);
+//        while(_G.graph->valid(in) && !_G.enabled(*this)) { _G.graph->next(in); }
+//      }
+//       }
+//       operator Edge() const { 
+// //   Edge e;
+// //   e.forward=this->forward;
+// //   if (this->forward) e=out; else e=in;
+// //   return e;
+//      if (this->backward) 
+//        return Edge(in, this->backward); 
+//      else 
+//        return Edge(out, this->backward);
+//       }
+//     };
+
+//     class InEdgeIt {
+//       friend class BidirGraphWrapper<Graph>;
+//     protected:
+//       typename Graph::OutEdgeIt out;
+//       typename Graph::InEdgeIt in;
+//       bool backward;
+//     public:
+//       InEdgeIt() { }
+//       //FIXME
+// //      OutEdgeIt(const Edge& e) : Edge(e) { }
+//       InEdgeIt(const Invalid& i) : out(i), in(i), backward(true) { }
+// //the unique invalid iterator
+//       InEdgeIt(const BidirGraphWrapper<Graph>& _G, Node v) { 
+//      backward=false;
+//      _G.graph->first(in, v);
+//      while(_G.graph->valid(in) && !_G.enabled(*this)) { _G.graph->next(in); }
+//      if (!_G.graph->valid(in)) {
+//        backward=true;
+//        _G.graph->first(out, v);
+//        while(_G.graph->valid(out) && !_G.enabled(*this)) { _G.graph->next(out); }
+//      }
+//       }
+//       operator Edge() const { 
+// //   Edge e;
+// //   e.forward=this->forward;
+// //   if (this->forward) e=out; else e=in;
+// //   return e;
+//      if (this->backward) 
+//        return Edge(out, this->backward); 
+//      else 
+//        return Edge(in, this->backward);
+//       }
+//     };
+
+//     class EdgeIt {
+//       friend class BidirGraphWrapper<Graph>;
+//     protected:
+//       typename Graph::EdgeIt e;
+//       bool backward;
+//     public:
+//       EdgeIt() { }
+//       EdgeIt(const Invalid& i) : e(i), backward(true) { }
+//       EdgeIt(const BidirGraphWrapper<Graph>& _G) { 
+//      backward=false;
+//      _G.graph->first(e);
+//      while (_G.graph->valid(e) && !_G.enabled(*this)) _G.graph->next(e);
+//      if (!_G.graph->valid(e)) {
+//        backward=true;
+//        _G.graph->first(e);
+//        while (_G.graph->valid(e) && !_G.enabled(*this)) _G.graph->next(e);
+//      }
+//       }
+//       operator Edge() const { 
+//      return Edge(e, this->backward);
+//       }
+//     };
+
+//     using GraphWrapper<Graph>::first;
+// //     NodeIt& first(NodeIt& i) const { 
+// //       i=NodeIt(*this); return i;
+// //     }
+//     OutEdgeIt& first(OutEdgeIt& i, const Node& p) const { 
+//       i=OutEdgeIt(*this, p); return i;
+//     }
+// //    FIXME not tested
+//     InEdgeIt& first(InEdgeIt& i, const Node& p) const { 
+//       i=InEdgeIt(*this, p); return i;
+//     }
+//     EdgeIt& first(EdgeIt& i) const { 
+//       i=EdgeIt(*this); return i;
+//     }
+  
+//     using GraphWrapper<Graph>::next;
+// //    NodeIt& next(NodeIt& n) const { GraphWrapper<Graph>::next(n); return n; }
+//     OutEdgeIt& next(OutEdgeIt& e) const { 
+//       if (!e.backward) {
+//      Node v=this->graph->aNode(e.out);
+//      this->graph->next(e.out);
+//      while(this->graph->valid(e.out) && !enabled(e)) { 
+//        this->graph->next(e.out); }
+//      if (!this->graph->valid(e.out)) {
+//        e.backward=true;
+//        this->graph->first(e.in, v); 
+//        while(this->graph->valid(e.in) && !enabled(e)) { 
+//          this->graph->next(e.in); }
+//      }
+//       } else {
+//      this->graph->next(e.in);
+//      while(this->graph->valid(e.in) && !enabled(e)) { 
+//        this->graph->next(e.in); } 
+//       }
+//       return e;
+//     }
+// //     FIXME Not tested
+//     InEdgeIt& next(InEdgeIt& e) const { 
+//       if (!e.backward) {
+//      Node v=this->graph->aNode(e.in);
+//      this->graph->next(e.in);
+//      while(this->graph->valid(e.in) && !enabled(e)) { 
+//        this->graph->next(e.in); }
+//      if (!this->graph->valid(e.in)) {
+//        e.backward=true;
+//        this->graph->first(e.out, v); 
+//        while(this->graph->valid(e.out) && !enabled(e)) { 
+//          this->graph->next(e.out); }
+//      }
+//       } else {
+//      this->graph->next(e.out);
+//      while(this->graph->valid(e.out) && !enabled(e)) { 
+//        this->graph->next(e.out); } 
+//       }
+//       return e;
+//     }
+//     EdgeIt& next(EdgeIt& e) const {
+//       if (!e.backward) {
+//      this->graph->next(e.e);
+//      while(this->graph->valid(e.e) && !enabled(e)) { 
+//        this->graph->next(e.e); }
+//      if (!this->graph->valid(e.e)) {
+//        e.backward=true;
+//        this->graph->first(e.e); 
+//        while(this->graph->valid(e.e) && !enabled(e)) { 
+//          this->graph->next(e.e); }
+//      }
+//       } else {
+//      this->graph->next(e.e);
+//      while(this->graph->valid(e.e) && !enabled(e)) { 
+//        this->graph->next(e.e); } 
+//       }
+//       return e;
+//     }
+
+//     Node tail(Edge e) const { 
+//       return ((!e.backward) ? this->graph->tail(e) : this->graph->head(e)); }
+//     Node head(Edge e) const { 
+//       return ((!e.backward) ? this->graph->head(e) : this->graph->tail(e)); }
+
+//     Node aNode(OutEdgeIt e) const { 
+//       return ((!e.backward) ? this->graph->aNode(e.out) : 
+//            this->graph->aNode(e.in)); }
+//     Node bNode(OutEdgeIt e) const { 
+//       return ((!e.backward) ? this->graph->bNode(e.out) : 
+//            this->graph->bNode(e.in)); }
+
+//     Node aNode(InEdgeIt e) const { 
+//       return ((!e.backward) ? this->graph->aNode(e.in) : 
+//            this->graph->aNode(e.out)); }
+//     Node bNode(InEdgeIt e) const { 
+//       return ((!e.backward) ? this->graph->bNode(e.in) : 
+//            this->graph->bNode(e.out)); }
+
+//     /// Gives back the opposite edge.
+//     Edge opposite(const Edge& e) const { 
+//       Edge f=e;
+//       f.backward=!f.backward;
+//       return f;
+//     }
+
+// //    int nodeNum() const { return graph->nodeNum(); }
+//     //FIXME
+//     void edgeNum() const { }
+//     //int edgeNum() const { return graph->edgeNum(); }
+
+
+// //    int id(Node v) const { return graph->id(v); }
+
+//     bool valid(Node n) const { return GraphWrapper<Graph>::valid(n); }
+//     bool valid(Edge e) const { 
+//       return this->graph->valid(e);
+//      //return e.forward ? graph->valid(e.out) : graph->valid(e.in); 
+//     }
+
+//     bool forward(const Edge& e) const { return !e.backward; }
+//     bool backward(const Edge& e) const { return e.backward; }
+
+// //     void augment(const Edge& e, Number a) const {
+// //       if (!e.backward)  
+// // //        flow->set(e.out, flow->get(e.out)+a);
+// //   flow->set(e, (*flow)[e]+a);
+// //       else  
+// // //        flow->set(e.in, flow->get(e.in)-a);
+// //   flow->set(e, (*flow)[e]-a);
+// //     }
+
+//     bool enabled(const Edge& e) const { 
+//       if (!e.backward) 
+// //   return (capacity->get(e.out)-flow->get(e.out)); 
+//      //return ((*capacity)[e]-(*flow)[e]);
+//      return true;
+//       else 
+// //   return (flow->get(e.in)); 
+//      //return ((*flow)[e]); 
+//      return true;
+//     }
+
+// //     Number enabled(typename Graph::OutEdgeIt out) const { 
+// // //      return (capacity->get(out)-flow->get(out)); 
+// //       return ((*capacity)[out]-(*flow)[out]); 
+// //     }
+    
+// //     Number enabled(typename Graph::InEdgeIt in) const { 
+// // //      return (flow->get(in)); 
+// //       return ((*flow)[in]); 
+// //     }
+
+//     template <typename T>
+//     class EdgeMap {
+//       typename Graph::template EdgeMap<T> forward_map, backward_map; 
+//     public:
+//       typedef T ValueType;
+//       typedef Edge KeyType;
+//       EdgeMap(const BidirGraphWrapper<Graph>& _G) : forward_map(*(_G.graph)), backward_map(*(_G.graph)) { }
+//       EdgeMap(const BidirGraphWrapper<Graph>& _G, T a) : forward_map(*(_G.graph), a), backward_map(*(_G.graph), a) { }
+//       void set(Edge e, T a) { 
+//      if (!e.backward) 
+//        forward_map.set(e/*.out*/, a); 
+//      else 
+//        backward_map.set(e/*.in*/, a); 
+//       }
+//       T operator[](Edge e) const { 
+//      if (!e.backward) 
+//        return forward_map[e/*.out*/]; 
+//      else 
+//        return backward_map[e/*.in*/]; 
+//       }
+//       void update() { 
+//      forward_map.update(); 
+//      backward_map.update();
+//       }
+// //       T get(Edge e) const { 
+// //   if (e.out_or_in) 
+// //     return forward_map.get(e.out); 
+// //   else 
+// //     return backward_map.get(e.in); 
+// //       }
+//     };
+//   };
 
   /// \brief A bidirected graph template.
@@ -942 +1365 @@
   template<typename Graph>
   class BidirGraph : public BidirGraphWrapper<Graph> {
+  public:
     typedef UndirGraphWrapper<Graph> Parent;
   protected:
@@ -950 +1374 @@
     }
   };
+
+
+
+  /// An experiment for ResGraphWrapper.
+  template<typename Graph, typename Number,
+           typename CapacityMap, typename FlowMap>
+  class ForwardFilter {
+    const Graph* graph;
+    const CapacityMap* capacity;
+    const FlowMap* flow;
+  public:
+    ForwardFilter(const Graph& _graph, 
+                  const CapacityMap& _capacity, const FlowMap& _flow) :
+      graph(&_graph), capacity(&_capacity), flow(&_flow) { }
+    bool operator[](const typename Graph::Edge& e) const {
+      return ((*flow)[e] < (*capacity)[e]);
+    }
+  };
+
+  /// An experiment for ResGraphWrapper.
+  template<typename Graph, typename Number,
+           typename CapacityMap, typename FlowMap>
+  class BackwardFilter {
+    const Graph* graph;
+    const CapacityMap* capacity;
+    const FlowMap* flow;
+  public:
+    BackwardFilter(const Graph& _graph, 
+                   const CapacityMap& _capacity, const FlowMap& _flow) :
+      graph(&_graph), capacity(&_capacity), flow(&_flow) { }
+    bool operator[](const typename Graph::Edge& e) const {
+      return (0 < (*flow)[e]);
+    }
+  };
+
+
+  /// An experiment for ResGraphWrapper.
+  template<typename Graph, typename Number, 
+           typename CapacityMap, typename FlowMap>
+  class ExpResGraphWrapper : 
+    public SubBidirGraphWrapper< 
+    Graph, 
+    ForwardFilter<Graph, Number, CapacityMap, FlowMap>,  
+    BackwardFilter<Graph, Number, CapacityMap, FlowMap> > {
+  public:
+    typedef SubBidirGraphWrapper< 
+      Graph, 
+      ForwardFilter<Graph, Number, CapacityMap, FlowMap>,  
+      BackwardFilter<Graph, Number, CapacityMap, FlowMap> > Parent;
+  protected:
+    const CapacityMap* capacity;
+    FlowMap* flow;
+    ForwardFilter<Graph, Number, CapacityMap, FlowMap> forward_filter;
+    BackwardFilter<Graph, Number, CapacityMap, FlowMap> backward_filter;
+  public:
+    ExpResGraphWrapper(Graph& _graph, const CapacityMap& _capacity, 
+                       FlowMap& _flow) : 
+      Parent(), capacity(&_capacity), flow(&_flow), 
+      forward_filter(_graph, _capacity, _flow), 
+      backward_filter(_graph, _capacity, _flow) {
+      Parent::setGraph(_graph);
+      Parent::setForwardFilterMap(forward_filter);
+      Parent::setBackwardFilterMap(backward_filter);
+    }
+
+    //    bool forward(const Parent::Edge& e) const { return Parent::forward(e); }
+    //bool backward(const Edge& e) const { return e.backward; }
+
+    void augment(const typename Parent::Edge& e, Number a) const {
+      if (Parent::forward(e))  
+//      flow->set(e.out, flow->get(e.out)+a);
+        flow->set(e, (*flow)[e]+a);
+      else  
+        //flow->set(e.in, flow->get(e.in)-a);
+        flow->set(e, (*flow)[e]-a);
+    }
+
+    Number resCap(const typename Parent::Edge& e) const { 
+      if (Parent::forward(e)) 
+//      return (capacity->get(e.out)-flow->get(e.out)); 
+        return ((*capacity)[e]-(*flow)[e]); 
+      else 
+//      return (flow->get(e.in)); 
+        return ((*flow)[e]); 
+    }
+
+  };
+
+
+
+
+//   /// An experiment for ResGraphWrapper.
+//   template<typename Graph, typename Number, 
+//         typename CapacityMap, typename FlowMap>
+//   class ExpResGraphWrapper : 
+//     public SubGraphWrapper< BidirGraphWrapper<Graph>, 
+//                          ConstMap<typename BidirGraphWrapper<Graph>::Node, 
+//                                   bool>, 
+//                          EdgeFilter< BidirGraphWrapper<Graph>, 
+//                                      CapacityMap, FlowMap> > {
+//   public:
+//     typedef SubGraphWrapper< BidirGraphWrapper<Graph>, 
+//                           ConstMap<typename BidirGraphWrapper<Graph>::Node, 
+//                                    bool>, 
+//                           EdgeFilter< BidirGraphWrapper<Graph>, 
+//                                       CapacityMap, FlowMap> > Parent; 
+//   protected:
+//     const CapacityMap* capacity;
+//     FlowMap* flow;
+//     BidirGraphWrapper<Graph> bidir_graph;
+//     ConstMap<typename BidirGraphWrapper<Graph>::Node, bool> node_filter;
+//     EdgeFilter< BidirGraphWrapper<Graph>, CapacityMap, FlowMap> edge_filter;
+//   public:
+//     ExpResGraphWrapper(Graph& _graph, const CapacityMap& _capacity, 
+//                     FlowMap& _flow) : 
+//       Parent(), capacity(&_capacity), flow(&_flow), 
+//       bidir_graph(_graph), 
+//       node_filter(true),
+//       edge_filter(bidir_graph, *capacity, *flow) { 
+//       Parent::setGraph(bidir_graph);
+//       Parent::setNodeFilterMap(node_filter);
+//       Parent::setEdgeFilterMap(edge_filter);
+//     }
+
+//     //    bool forward(const Parent::Edge& e) const { return Parent::forward(e); }
+//     //bool backward(const Edge& e) const { return e.backward; }
+
+//     void augment(const typename Parent::Edge& e, Number a) const {
+//       if (Parent::forward(e))  
+// //   flow->set(e.out, flow->get(e.out)+a);
+//      flow->set(e, (*flow)[e]+a);
+//       else  
+// //   flow->set(e.in, flow->get(e.in)-a);
+//      flow->set(e, (*flow)[e]-a);
+//     }
+
+//     Number resCap(const typename Parent::Edge& e) const { 
+//       if (Parent::forward(e)) 
+// //   return (capacity->get(e.out)-flow->get(e.out)); 
+//      return ((*capacity)[e]-(*flow)[e]); 
+//       else 
+// //   return (flow->get(e.in)); 
+//      return ((*flow)[e]); 
+//     }
+
+//   };
+
 
 
@@ -958 +1529 @@
            typename CapacityMap, typename FlowMap>
   class ResGraphWrapper : public GraphWrapper<Graph> {
+  public:
+    typedef GraphWrapper<Graph> Parent; 
   protected:
     const CapacityMap* capacity;
@@ -1284 +1857 @@
   template<typename Graph, typename FirstOutEdgesMap>
   class ErasingFirstGraphWrapper : public GraphWrapper<Graph> {
+  public:
+    typedef GraphWrapper<Graph> Parent; 
   protected:
     FirstOutEdgesMap* first_out_edges;

src/work/jacint/max_flow.h

@@ -64 +64 @@
     FlowMap* flow;
     int n;      //the number of nodes of G
-    typedef ResGraphWrapper<const Graph, Num, CapMap, FlowMap> ResGW;
+    //    typedef ResGraphWrapper<const Graph, Num, CapMap, FlowMap> ResGW;   
+    typedef ExpResGraphWrapper<const Graph, Num, CapMap, FlowMap> ResGW;
     typedef typename ResGW::OutEdgeIt ResGWOutEdgeIt;
     typedef typename ResGW::Edge ResGWEdge;
@@ -140 +141 @@
         map(&_map), number_of_augmentations(&_number_of_augmentations) { }
       void set(const Node& n, bool b) {
-        map->set(n, *number_of_augmentations);
+        if (b)
+          map->set(n, *number_of_augmentations);
+        else 
+          map->set(n, *number_of_augmentations-1);
       }
       bool operator[](const Node& n) const { 
@@ -942 +946 @@
 
     if (status!=AFTER_AUGMENTING) {
-      FOR_EACH_LOC(typename Graph::NodeIt, e, *g) level.set(e, -1); 
-      number_of_augmentations=0;
+      FOR_EACH_LOC(typename Graph::NodeIt, e, *g) level.set(e, 3*n); 
+      number_of_augmentations=3*n+1;
     } else {
       ++number_of_augmentations;

src/work/marci/bfs_dfs.h

@@ -21 +21 @@
   /// Bfs searches for the nodes wich are not marked in 
   /// \c reached_map
-  /// Reached have to work as read-write bool Node-map.
+  /// Reached have to be a read-write bool node-map.
   /// \ingroup galgs
   template <typename Graph, /*typename OutEdgeIt,*/ 
@@ -37 +37 @@
   public:
     /// In that constructor \c _reached have to be a reference 
-    /// for a bool Node-map. The algorithm will search in a bfs order for 
-    /// the nodes which are \c false initially
+    /// for a bool bode-map. The algorithm will search for the 
+    /// initially \c false nodes 
+    /// in a bfs order.
     BfsIterator(const Graph& _graph, ReachedMap& _reached) : 
       graph(&_graph), reached(_reached), 
@@ -44 +45 @@
     /// The same as above, but the map storing the reached nodes 
     /// is constructed dynamically to everywhere false.
+    /// \deprecated
     BfsIterator(const Graph& _graph) : 
       graph(&_graph), reached(*(new ReachedMap(*graph /*, false*/))), 
@@ -122 +124 @@
     Node bNode() const { return graph->bNode(actual_edge); }
     /// Guess what?
+    /// \deprecated 
     const ReachedMap& getReachedMap() const { return reached; }
     /// Guess what?
+    /// \deprecated
     const std::queue<Node>& getBfsQueue() const { return bfs_queue; }
   };
@@ -130 +134 @@
   /// \c reached_map
   /// Reached have to work as a read-write bool Node-map, 
-  /// Pred is a write Edge Node-map and
-  /// Dist is a read-write Node-map of integral value, have to be. 
+  /// Pred is a write edge node-map and
+  /// Dist is a read-write node-map of integral value, have to be. 
   /// \ingroup galgs
   template <typename Graph, 
@@ -180 +184 @@
     }
     /// Guess what?
+    /// \deprecated 
     const PredMap& getPredMap() const { return pred; }
     /// Guess what?
+    /// \deprecated
     const DistMap& getDistMap() const { return dist; }
   };
@@ -204 +210 @@
   public:
     /// In that constructor \c _reached have to be a reference 
-    /// for a bool Node-map. The algorithm will search in a dfs order for 
+    /// for a bool node-map. The algorithm will search in a dfs order for 
     /// the nodes which are \c false initially
     DfsIterator(const Graph& _graph, ReachedMap& _reached) : 
@@ -266 +272 @@
     Node bNode() const { return graph->bNode(actual_edge); }
     /// Guess what?
+    /// \deprecated
     const ReachedMap& getReachedMap() const { return reached; }
     /// Guess what?
+    /// \deprecated
     const std::stack<OutEdgeIt>& getDfsStack() const { return dfs_stack; }
   };
@@ -273 +281 @@
   /// Dfs searches for the nodes wich are not marked in 
   /// \c reached_map
-  /// Reached is a read-write bool Node-map, 
-  /// Pred is a write Node-map, have to be.
+  /// Reached is a read-write bool node-map, 
+  /// Pred is a write node-map, have to be.
   /// \ingroup galgs
   template <typename Graph, 
@@ -319 +327 @@
     }
     /// Guess what?
+    /// \deprecated
     const PredMap& getPredMap() const { return pred; }
   };

src/work/marci/leda/leda_graph_wrapper.h

@@ -34 +34 @@
     void setGraph(Graph& _l_graph) { l_graph=&_l_graph; }
   public:
-   
-        //LedaGraphWrapper() { }
+
+    /// Constructor for wrapping LEDA graphs.
     LedaGraphWrapper(Graph& _l_graph) : l_graph(&_l_graph) { }
-    LedaGraphWrapper(const LedaGraphWrapper &G) : l_graph(G.l_graph) { }
+    /// Copy constructor
+    LedaGraphWrapper(const LedaGraphWrapper &g) : l_graph(g.l_graph) { }
 
     template <typename T> class NodeMap;
@@ -51 +52 @@
     class InEdgeIt;
 
-    /// The base type of the node iterators.
+    /// Trivial node-iterator
     class Node {
       friend class LedaGraphWrapper<Graph>;
@@ -66 +67 @@
       /// @warning The default constructor sets the iterator
       /// to an undefined value.
-      Node() {}   //FIXME
+      Node() { }   //FIXME
       /// Initialize the iterator to be invalid
       Node(Invalid) : l_n(0) { }
@@ -80 +81 @@
       /// @warning The default constructor sets the iterator
       /// to an undefined value.
-      NodeIt() {} //FIXME
-      /// Initialize the iterator to be invalid
-      NodeIt(Invalid i) : Node(i) {}
+      NodeIt() { } //FIXME
+      /// Initialize the iterator to be invalid
+      NodeIt(Invalid i) : Node(i) { }
       /// Sets the iterator to the first node of \c G.
       NodeIt(const LedaGraphWrapper &G) : Node(G.l_graph->first_node()) { }
@@ -88 +89 @@
     };
     
-    /// The base type of the edge iterators.
+    /// Trivial edge-iterator.
     class Edge {
       friend class LedaGraphWrapper;
@@ -99 +100 @@
       /// @warning The default constructor sets the iterator
       /// to an undefined value.
-      Edge() {}   //FIXME
-      /// Initialize the iterator to be invalid
-      Edge(Invalid) : l_e(0) {}
+      Edge() { }   //FIXME
+      /// Initialize the iterator to be invalid
+      Edge(Invalid) : l_e(0) { }
       //Edge(const Edge &) {} 
       bool operator==(Edge e) const { return l_e==e.l_e; } //FIXME
@@ -108 +109 @@
     };
     
-    /// This iterator goes trought the outgoing edges of a certain graph.
-    
+    /// This iterator goes trought the outgoing edges of a certain node.
     class OutEdgeIt : public Edge {
     public:
       /// @warning The default constructor sets the iterator
       /// to an undefined value.
-      OutEdgeIt() {}
-      /// Initialize the iterator to be invalid
-      OutEdgeIt(Invalid i) : Edge(i) {}
+      OutEdgeIt() { }
+      /// Initialize the iterator to be invalid
+      OutEdgeIt(Invalid i) : Edge(i) { }
       /// This constructor sets the iterator to first outgoing edge.
     
@@ -126 +126 @@
     };
 
+    /// This iterator goes trought the incoming edges of a certain node.
     class InEdgeIt : public Edge {
     public:
       /// @warning The default constructor sets the iterator
       /// to an undefined value.
-      InEdgeIt() {}
-      /// Initialize the iterator to be invalid
-      InEdgeIt(Invalid i) : Edge(i) {}
+      InEdgeIt() { }
+      /// Initialize the iterator to be invalid
+      InEdgeIt(Invalid i) : Edge(i) { }
       InEdgeIt(const LedaGraphWrapper & G, Node n) : Edge(G.l_graph->first_in_edge(n.l_n)) { }
     };
 
     //  class SymEdgeIt : public Edge {};
+    
+    /// This iterator goes trought the edges of the graph.
     class EdgeIt : public Edge {
     public:
       /// @warning The default constructor sets the iterator
       /// to an undefined value.
-      EdgeIt() {}
-      /// Initialize the iterator to be invalid
-      EdgeIt(Invalid i) : Edge(i) {}
+      EdgeIt() { }
+      /// Initialize the iterator to be invalid
+      EdgeIt(Invalid i) : Edge(i) { }
       EdgeIt(const LedaGraphWrapper & G) : Edge(G.l_graph->first_edge()) { }
     };
 
     /// First node of the graph.
-
+    ///
     /// \post \c i and the return value will be the first node.
     ///
@@ -164 +167 @@
     }
     //  SymEdgeIt &first(SymEdgeIt &, Node) const { return i;}
-    /// The first edge of the Graph.
+    /// The first edge of the graph.
     EdgeIt &first(EdgeIt &i) const {      
       i=EdgeIt(*this); 
@@ -254 +257 @@
     int edgeNum() const { return l_graph->number_of_edges(); }
 
-    ///Read/write map from the nodes to type \c T.
+    /// Read/write map from the nodes to type \c T.
     template<typename T> class NodeMap
     {
@@ -274 +277 @@
     };
 
-    ///Read/write map from the edges to type \c T.
+    /// Read/write map from the edges to type \c T.
     template<typename T> class EdgeMap
     {
@@ -295 +298 @@
 
 
-    ///Read/write map from the nodes to type \c T.
+    /// This class is to wrap existing 
+    /// LEDA node-maps to HUGO ones.
     template<typename T> class NodeMapWrapper
     {
-      leda_node_map<T>* leda_stuff;
+      leda_node_array<T>* leda_stuff;
     public:
       typedef T ValueType;
       typedef Node KeyType;
 
-      NodeMapWrapper(leda_node_map<T>& _leda_stuff) : 
+      NodeMapWrapper(leda_node_array<T>& _leda_stuff) : 
         leda_stuff(&_leda_stuff) { }
       //NodeMap(leda_node_map& &G, T t) : leda_stuff(*(G.l_graph), t) {}
 
       void set(Node i, T t) { (*leda_stuff)[i.l_n]=t; }
-      T get(Node i) const { return (*leda_stuff)[i.l_n]; }  //FIXME: Is it necessary
+      //T get(Node i) const { return (*leda_stuff)[i.l_n]; }  //FIXME: Is it necessary
       T &operator[](Node i) { return (*leda_stuff)[i.l_n]; }
       const T &operator[](Node i) const { return (*leda_stuff)[i.l_n]; }
@@ -316 +320 @@
     };
 
-    ///Read/write map from the edges to type \c T.
+    /// This class is to wrap existing 
+    /// LEDA edge-maps to HUGO ones.
     template<typename T> class EdgeMapWrapper
     {
-      leda_edge_map<T>* leda_stuff;
+      leda_edge_array<T>* leda_stuff;
     public:
       typedef T ValueType;
       typedef Edge KeyType;
 
-      EdgeMapWrapper(leda_edge_map<T>& _leda_stuff) : 
+      EdgeMapWrapper(leda_edge_array<T>& _leda_stuff) : 
         leda_stuff(_leda_stuff) { }
       //EdgeMap(const LedaGraphWrapper &G, T t) : leda_stuff(*(G.l_graph), t) {}
 
       void set(Edge i, T t) { (*leda_stuff)[i.l_e]=t; }
-      T get(Edge i) const { return (*leda_stuff)[i.l_e]; }  //FIXME: Is it necessary
+      //T get(Edge i) const { return (*leda_stuff)[i.l_e]; }  //FIXME: Is it necessary
       T &operator[](Edge i) { return (*leda_stuff)[i.l_e]; }
       const T &operator[](Edge i) const { return (*leda_stuff)[i.l_e]; }
@@ -335 +340 @@
       void update() { /*leda_stuff.init(leda_stuff.get_graph());*/ }
       //void update(T a) { leda_stuff.init(leda_stuff.get_graph()/**(G.l_graph)*/, a); }   //FIXME: Is it necessary
+    };
+
+    /// This class is used for access node-data of 
+    /// LEDA parametrized graphs.
+    template<typename T> 
+    class NodeDataMap : public NodeMapWrapper<T>
+    {
+    public:
+      NodeDataMap(LedaGraphWrapper<Graph>& LGW) : 
+        NodeMapWrapper<T>(*(LGW._g_graph).node_data()) { }
+    };
+
+    /// This class is used for access edge-data of 
+    /// LEDA parametrized graphs.
+    template<typename T> 
+    class EdgeDataMap : public EdgeMapWrapper<T>
+    {
+    public:
+      EdgeDataMap(LedaGraphWrapper<Graph>& LGW) : 
+        EdgeMapWrapper<T>(*(LGW._g_graph).edge_data()) { }
     };