Changeset 421:54b943063901 in lemon-0.x for src/work/marci

Timestamp:

04/26/04 18:58:14 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

For working with undirected graphs, head is changed to aNode.
Some dimacs doki.

File:

• src/work/marci/dimacs.h (modified) (3 diffs)

src/work/marci/dimacs.h

@@ -9 +9 @@
 namespace hugo {
 
+  /// Dimacs flow files.
+
+  /// This function reads a flow instance from dimacs flow format.
+  /// At the beginning \c g is destroyed by \c g.clear().
+  /// If the data coming from \c is is a max flow innstance, then 
+  /// \c s and \t will be respectively the source and target nodes 
+  /// and \c capacity will contain the edge capacities.
+  /// If the data is a shortest path problem then \c s will be the 
+  /// source node and \capacity will contain the edge lengths.
   template<typename Graph, typename CapacityMap>
-  void readDimacsMaxFlow(std::istream& is, Graph &G, typename Graph::Node &s, typename Graph::Node &t, CapacityMap& capacity) {
-    G.clear();
+  void readDimacsMaxFlow(std::istream& is, Graph &g, typename Graph::Node &s, typename Graph::Node &t, CapacityMap& capacity) {
+    g.clear();
     int cap;
     char d;
@@ -30 +39 @@
         getline(is, str);
         nodes.resize(n+1);
-        for (int k=1; k<=n; ++k) nodes[k]=G.addNode();
+        for (int k=1; k<=n; ++k) nodes[k]=g.addNode();
         break;
       case 'n': //node definition
@@ -48 +57 @@
         is >> i >> j >> cap;
         getline(is, str);
-        e=G.addEdge(nodes[i], nodes[j]);
+        e=g.addEdge(nodes[i], nodes[j]);
         capacity.update();
         capacity.set(e, cap);