Changeset 330:7ac0d4e8a31c in lemon-0.x for src/work/marci/graph_wrapper.h

Timestamp:

04/15/04 16:41:20 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

In the resgraphwrapper interface, and in the constructor,
the order of FlowMap? and CapacityMap? is changed.

File:

• src/work/marci/graph_wrapper.h (modified) (16 diffs)

src/work/marci/graph_wrapper.h

@@ -897 +897 @@
   
 
-  template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
+  template<typename Graph, typename Number, 
+           typename CapacityMap, typename FlowMap>
   class ResGraphWrapper : public GraphWrapper<Graph> {
   protected:
@@ -903 +904 @@
 //    typedef typename Graph::InEdgeIt GraphInEdgeIt;
 //    typedef typename Graph::Edge GraphEdge;
+    const CapacityMap* capacity;
     FlowMap* flow;
-    const CapacityMap* capacity;
   public:
 
-    ResGraphWrapper(Graph& _graph, FlowMap& _flow, 
-                    const CapacityMap& _capacity) : 
-      GraphWrapper<Graph>(_graph), flow(&_flow), capacity(&_capacity) { }
+    ResGraphWrapper(Graph& _graph, const CapacityMap& _capacity, 
+                    FlowMap& _flow) : 
+      GraphWrapper<Graph>(_graph), capacity(&_capacity), flow(&_flow) { }
 
     class Edge; 
@@ -919 +920 @@
     typedef typename GraphWrapper<Graph>::NodeIt NodeIt;
     class Edge : public Graph::Edge {
-      friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+      friend class ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>;
     protected:
       bool forward; //true, iff forward
@@ -941 +942 @@
     };
 //     class Edge {
-//       friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+//       friend class ResGraphWrapper<Graph, Number,lksd FlowMap, CapacityMap>;
 //     protected:
 //       bool out_or_in; //true, iff out
@@ -968 +969 @@
 //     };
     class OutEdgeIt {
-      friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+      friend class ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>;
     protected:
       typename Graph::OutEdgeIt out;
@@ -979 +980 @@
       OutEdgeIt(const Invalid& i) : out(i), in(i), forward(false) { }
 //the unique invalid iterator
-      OutEdgeIt(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& resG, Node v) { 
+      OutEdgeIt(const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>& resG, Node v) { 
         forward=true;
         resG.graph->first(out, v);
@@ -1001 +1002 @@
     };
 //     class OutEdgeIt : public Edge {
-//       friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+//       friend class ResGraphWrapper<Graph, Number, FkklowMap, CapacityMap>;
 //     public:
 //       OutEdgeIt() { }
@@ -1007 +1008 @@
 //       OutEdgeIt(const Edge& e) : Edge(e) { }
 //       OutEdgeIt(const Invalid& i) : Edge(i) { }
-//       OutEdgeIt(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& resG, Node v) : Edge() { 
+//       OutEdgeIt(const ResGraphWrapper<Graph, Number, FdfvlowMap, CapacityMap>& resG, Node v) : Edge() { 
 //      resG.graph->first(out, v);
 //      while( resG.graph->valid(out) && !(resG.resCap(out)>0) ) { resG.graph->next(out); }
@@ -1039 +1040 @@
 
     class InEdgeIt {
-      friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+      friend class ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>;
     protected:
       typename Graph::OutEdgeIt out;
@@ -1050 +1051 @@
       InEdgeIt(const Invalid& i) : out(i), in(i), forward(false) { }
 //the unique invalid iterator
-      InEdgeIt(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& resG, Node v) { 
+      InEdgeIt(const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>& resG, Node v) { 
         forward=true;
         resG.graph->first(in, v);
@@ -1073 +1074 @@
 
     class EdgeIt {
-      friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+      friend class ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>;
     protected:
       typename Graph::EdgeIt e;
@@ -1080 +1081 @@
       EdgeIt() { }
       EdgeIt(const Invalid& i) : e(i), forward(false) { }
-      EdgeIt(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& resG) { 
+      EdgeIt(const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>& resG) { 
         forward=true;
         resG.graph->first(e);
@@ -1095 +1096 @@
     };
 //     class EdgeIt : public Edge {
-//       friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+//       friend class ResGraphWrapper<Graph, Number, FflowMap, CapacityMap>;
 //       NodeIt v; 
 //     public:
@@ -1101 +1102 @@
 //       //EdgeIt(const EdgeIt& e) : Edge(e), v(e.v) { }
 //       EdgeIt(const Invalid& i) : Edge(i) { }
-//       EdgeIt(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& resG) : Edge() { 
+//       EdgeIt(const ResGraphWrapper<Graph, Number, FlfowMap, CapacityMap>& resG) : Edge() { 
 //      resG.graph->first(v);
 //      if (resG.graph->valid(v)) resG.graph->first(out, v); else out=INVALID;
@@ -1318 +1319 @@
 //     template<typename T> class NodeMap : public Graph::NodeMap<T> { 
 //     public:
-//       NodeMap(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& _G) 
+//       NodeMap(const ResGraphWrapper<Graph, Number, FlovwMap, CapacityMap>& _G) 
 //      : Graph::NodeMap<T>(_G.gw) { }
-//       NodeMap(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& _G, 
+//       NodeMap(const ResGraphWrapper<Graph, Number, FlowvMap, CapacityMap>& _G, 
 //            T a) : Graph::NodeMap<T>(_G.gw, a) { }
 //     };
@@ -1338 +1339 @@
       typename Graph::EdgeMap<T> forward_map, backward_map; 
     public:
-      EdgeMap(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& _G) : forward_map(*(_G.graph)), backward_map(*(_G.graph)) { }
-      EdgeMap(const ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>& _G, T a) : forward_map(*(_G.graph), a), backward_map(*(_G.graph), a) { }
+      EdgeMap(const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>& _G) : forward_map(*(_G.graph)), backward_map(*(_G.graph)) { }
+      EdgeMap(const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>& _G, T a) : forward_map(*(_G.graph), a), backward_map(*(_G.graph), a) { }
       void set(Edge e, T a) { 
         if (e.forward)