Changeset 2529:93de38566e6c in lemon-0.x for lemon/graph_adaptor.h

Timestamp:

11/30/07 10:22:38 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Minor changes

File:

• lemon/graph_adaptor.h (modified) (7 diffs)

lemon/graph_adaptor.h

@@ -35 +35 @@
 #include <lemon/bits/graph_adaptor_extender.h>
 #include <lemon/bits/graph_extender.h>
-
 #include <lemon/tolerance.h>
 
@@ -948 +947 @@
   ///Graph::EdgeMap<int> flow(g, 0);
   ///
-  ///Preflow<SubGA, int, ConstMap<Edge, int>, Graph::EdgeMap<int> > 
-  ///  preflow(ga, s, t, const_1_map, flow);
+  ///Preflow<SubGA, ConstMap<Edge, int>, Graph::EdgeMap<int> > 
+  ///  preflow(ga, const_1_map, s, t);
   ///preflow.run();
   ///\endcode
@@ -959 +958 @@
   ///     << endl;
   ///for(EdgeIt e(g); e!=INVALID; ++e) 
-  ///  if (flow[e])
+  ///  if (preflow.flow(e))
   ///    cout << " " << g.id(g.source(e)) << "--"
   ///         << length[e] << "->" << g.id(g.target(e)) << endl;
@@ -2022 +2021 @@
       return INVALID;
     }
+
     
     template <typename T>
@@ -2031 +2031 @@
       NodeMap(const SplitGraphAdaptorBase& _graph, const T& t) 
         : inNodeMap(_graph, t), outNodeMap(_graph, t) {}
-      
+      NodeMap& operator=(const NodeMap& cmap) {
+        return operator=<NodeMap>(cmap);
+      }
+      template <typename CMap>
+      NodeMap& operator=(const CMap& cmap) {
+        Parent::operator=(cmap);
+        return *this;
+      }
+
       void set(const Node& key, const T& val) {
         if (SplitGraphAdaptorBase::inNode(key)) { inNodeMap.set(key, val); }
@@ -2063 +2071 @@
       EdgeMap(const SplitGraphAdaptorBase& _graph, const T& t) 
         : edge_map(_graph, t), node_map(_graph, t) {}
+      EdgeMap& operator=(const EdgeMap& cmap) {
+        return operator=<EdgeMap>(cmap);
+      }
+      template <typename CMap>
+      EdgeMap& operator=(const CMap& cmap) {
+        Parent::operator=(cmap);
+        return *this;
+      }
       
       void set(const Edge& key, const T& val) {
@@ -2471 +2487 @@
   /// SGraph::EdgeMap<int> sflow(sgraph);
   ///
-  /// Preflow<SGraph, int, SCapacity> 
-  ///   spreflow(sgraph, SGraph::outNode(source),SGraph::inNode(target),  
-  ///            scapacity, sflow);
+  /// Preflow<SGraph, SCapacity> 
+  ///   spreflow(sgraph, scapacity, 
+  ///            SGraph::outNode(source), SGraph::inNode(target));
   ///                                            
   /// spreflow.run();