Changeset 527:7550fed0cd91 in lemon-0.x for src

Timestamp:

05/04/04 16:54:21 (21 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

Nem tudom, a hugo-n miert nem megy.

Location:

src/work/athos

Files:

• makefile (modified) (1 diff)
• mincostflows.h (modified) (11 diffs)
• mincostflows_test.cc (copied) (copied from src/work/athos/minlengthpaths_test.cc) (2 diffs)

src/work/athos/makefile

@@ -1 @@
-BINARIES = suurballe minlength_demo
+BINARIES = suurballe minlength_demo mincostflows_test
 INCLUDEDIRS= -I../../include -I.. -I../{athos,klao,marci,jacint,alpar,johanna,akos} 
 include ../makefile

src/work/athos/mincostflows.h

@@ -39 +39 @@
 
     typedef typename LengthMap::ValueType Length;
+
+    typedef typename LengthMap::ValueType Length;
     
     typedef typename Graph::Node Node;
@@ -46 +48 @@
     typedef typename Graph::template EdgeMap<int> EdgeIntMap;
 
-    typedef ConstMap<Edge,int> ConstMap;
-
-    typedef ResGraphWrapper<const Graph,int,ConstMap,EdgeIntMap> ResGraphType;
+    //    typedef ConstMap<Edge,int> ConstMap;
+
+    typedef ResGraphWrapper<const Graph,int,EdgeIntMap,EdgeIntMap> ResGraphType;
 
     class ModLengthMap {   
       typedef typename ResGraphType::template NodeMap<Length> NodeMap;
       const ResGraphType& G;
-      const EdgeIntMap& rev;
+      //      const EdgeIntMap& rev;
       const LengthMap &ol;
       const NodeMap &pot;
@@ -61 +63 @@
         
       ValueType operator[](typename ResGraphType::Edge e) const {     
-        //if ( (1-2*rev[e])*ol[e]-(pot[G.head(e)]-pot[G.tail(e)] ) <0 ){
-        //  std::cout<<"Negative length!!"<<std::endl;
-        //}
-        return (1-2*rev[e])*ol[e]-(pot[G.head(e)]-pot[G.tail(e)]);   
+        if (G.forward(e))
+          return  ol[e]-(pot[G.head(e)]-pot[G.tail(e)]);   
+        else
+          return -ol[e]-(pot[G.head(e)]-pot[G.tail(e)]);   
       }     
         
       ModLengthMap(const ResGraphType& _G, const EdgeIntMap& _rev, 
                    const LengthMap &o,  const NodeMap &p) : 
-        G(_G), rev(_rev), ol(o), pot(p){}; 
+        G(_G), /*rev(_rev),*/ ol(o), pot(p){}; 
     };//ModLengthMap
 
 
     
-
+    //Input
     const Graph& G;
     const LengthMap& length;
+    const EdgeIntMap& capacity;
 
     //auxiliary variables
@@ -83 +86 @@
     //If the algorithm has finished, the edges of the seeked paths are 
     //exactly those that are reversed 
-    EdgeIntMap reversed; 
+    EdgeIntMap flow; 
     
     //Container to store found paths
@@ -96 +99 @@
 
 
-    MinLengthPaths(Graph& _G, LengthMap& _length) : G(_G), 
-      length(_length), reversed(_G)/*, dijkstra_dist(_G)*/{ }
+    MinLengthPaths(Graph& _G, LengthMap& _length, EdgeIntMap& _cap) : G(_G), 
+      length(_length), capacity(_cap), flow(_G)/*, dijkstra_dist(_G)*/{ }
 
     
@@ -106 +109 @@
     ///Otherwise it returns the number of found edge-disjoint paths from s to t.
     int run(Node s, Node t, int k) {
-      ConstMap const1map(1);
-
-
-      //We need a residual graph, in which some of the edges are reversed
-      ResGraphType res_graph(G, const1map, reversed);
+
+
+      //We need a residual graph
+      ResGraphType res_graph(G, capacity, flow);
 
       //Initialize the copy of the Dijkstra potential to zero
       typename ResGraphType::template NodeMap<Length> dijkstra_dist(res_graph);
-      ModLengthMap mod_length(res_graph, reversed, length, dijkstra_dist);
+      ModLengthMap mod_length(res_graph, length, dijkstra_dist);
 
       Dijkstra<ResGraphType, ModLengthMap> dijkstra(res_graph, mod_length);
@@ -135 +137 @@
 
 
-        //Reversing the sortest path
+        //Augmenting on the sortest path
         Node n=t;
         Edge e;
@@ -141 +143 @@
           e = dijkstra.pred(n);
           n = dijkstra.predNode(n);
-          reversed[e] = 1-reversed[e];
+          G.augment(e,1);
         }
 
@@ -147 +149 @@
       }
       
+      /*
+        ///\TODO To be implemented later
+
       //Let's find the paths
       //We put the paths into stl vectors (as an inner representation). 
@@ -176 +181 @@
         
       }
+      */
 
       return i;
@@ -207 +213 @@
 } //namespace hugo
 
-#endif //HUGO_MINLENGTHPATHS_H
+#endif //HUGO_MINCOSTFLOW_H

src/work/athos/mincostflows_test.cc

@@ -1 +1 @@
 #include <iostream>
 #include <list_graph.h>
-#include <minlengthpaths.h>
-#include <path.h>
+#include <mincostflows.h>
+//#include <path.h>
+#include <maps.h>
 
 using namespace std;
@@ -61 +62 @@
   length.set(v5_t, 8);
 
+  ConstMap const1map(1);
   std::cout << "Minlengthpaths algorithm test..." << std::endl;
 
   
   int k=3;
-  MinLengthPaths< ListGraph, ListGraph::EdgeMap<int> >
-    surb_test(graph, length);
+  MinCostFlows< ListGraph, ListGraph::EdgeMap<int> >
+    surb_test(graph, length, const1map);
 
   check(  surb_test.run(s,t,k) == 2 && surb_test.totalLength() == 46,"Two paths, total length should be 46");