diff -r 0dade87d013b -r 7ac0d4e8a31c src/work/marci/graph_wrapper.h
--- a/src/work/marci/graph_wrapper.h	Thu Apr 15 08:06:43 2004 +0000
+++ b/src/work/marci/graph_wrapper.h	Thu Apr 15 14:41:20 2004 +0000
@@ -896,19 +896,20 @@
 
   
 
-  template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
+  template<typename Graph, typename Number, 
+	   typename CapacityMap, typename FlowMap>
   class ResGraphWrapper : public GraphWrapper<Graph> {
   protected:
 //    typedef typename Graph::OutEdgeIt GraphOutEdgeIt;
 //    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; 
     class OutEdgeIt; 
@@ -918,7 +919,7 @@
     typedef typename GraphWrapper<Graph>::Node Node;
     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
 //      typename Graph::Edge e;
@@ -940,7 +941,7 @@
       } 
     };
 //     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
 //       GraphOutEdgeIt out;
@@ -967,7 +968,7 @@
 //       }
 //     };
     class OutEdgeIt {
-      friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+      friend class ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>;
     protected:
       typename Graph::OutEdgeIt out;
       typename Graph::InEdgeIt in;
@@ -978,7 +979,7 @@
 //      OutEdgeIt(const Edge& e) : Edge(e) { }
       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);
 	while( resG.graph->valid(out) && !(resG.resCap(*this)>0) ) { resG.graph->next(out); }
@@ -1000,13 +1001,13 @@
       }
     };
 //     class OutEdgeIt : public Edge {
-//       friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+//       friend class ResGraphWrapper<Graph, Number, FkklowMap, CapacityMap>;
 //     public:
 //       OutEdgeIt() { }
 //       //FIXME
 //       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); }
 // 	if (!resG.graph->valid(out)) {
@@ -1038,7 +1039,7 @@
 //    class InEdgeIt : public Edge { };
 
     class InEdgeIt {
-      friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+      friend class ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>;
     protected:
       typename Graph::OutEdgeIt out;
       typename Graph::InEdgeIt in;
@@ -1049,7 +1050,7 @@
 //      OutEdgeIt(const Edge& e) : Edge(e) { }
       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);
 	while( resG.graph->valid(in) && !(resG.resCap(*this)>0) ) { resG.graph->next(in); }
@@ -1072,14 +1073,14 @@
     };
 
     class EdgeIt {
-      friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+      friend class ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>;
     protected:
       typename Graph::EdgeIt e;
       bool forward;
     public:
       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);
 	while (resG.graph->valid(e) && !(resG.resCap(*this)>0)) resG.graph->next(e);
@@ -1094,13 +1095,13 @@
       }
     };
 //     class EdgeIt : public Edge {
-//       friend class ResGraphWrapper<Graph, Number, FlowMap, CapacityMap>;
+//       friend class ResGraphWrapper<Graph, Number, FflowMap, CapacityMap>;
 //       NodeIt v; 
 //     public:
 //       EdgeIt() { }
 //       //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;
 // 	while (resG.graph->valid(out) && !(resG.resCap(out)>0) ) { resG.graph->next(out); }
@@ -1317,9 +1318,9 @@
 
 //     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) { }
 //     };
 
@@ -1337,8 +1338,8 @@
     class EdgeMap {
       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) 
 	  forward_map.set(e.out, a);