Changeset 910:5a89cacf17f1 in lemon-0.x

Timestamp:

09/27/04 20:11:27 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

minor corrections

Location:

src/hugo

Files:

• graph_wrapper.h (modified) (8 diffs)
• min_cost_flow.h (modified) (5 diffs)
• tight_edge_filter_map.h (modified) (2 diffs)

src/hugo/graph_wrapper.h

@@ -28 +28 @@
 #include <hugo/invalid.h>
 #include <hugo/maps.h>
+#include <hugo/map_defines.h>
 #include <iostream>
 
@@ -315 +316 @@
   /// This wrapper shows a graph with filtered node-set and 
   /// edge-set. Given a bool-valued map on the node-set and one on 
-  /// the edge-set of the graphs, the iterators shows only the objects 
+  /// the edge-set of the graphs, the iterators show only the objects 
   /// having true value. 
   /// The quick brown fox iterators jump over 
@@ -578 +579 @@
   };
   
-  /// \brief An undirected graph template.
-  ///
-  ///\warning Graph wrappers are in even more experimental state than the other
-  ///parts of the lib. Use them at your own risk.
-  ///
-  /// An undirected graph template.
-  /// This class works as an undirected graph and a directed graph of 
-  /// class \c Graph is used for the physical storage.
-  /// \ingroup graphs
+//   /// \brief An undirected graph template.
+//   ///
+//   ///\warning Graph wrappers are in even more experimental state than the other
+//   ///parts of the lib. Use them at your own risk.
+//   ///
+//   /// An undirected graph template.
+//   /// This class works as an undirected graph and a directed graph of 
+//   /// class \c Graph is used for the physical storage.
+//   /// \ingroup graphs
   template<typename Graph>
   class UndirGraph : public UndirGraphWrapper<Graph> {
@@ -609 +610 @@
   ///
   /// Suppose that for a directed graph $G=(V, A)$, 
-  /// two predicates on the edge-set, $forward_filter$, and $backward_filter$ 
+  /// two bool valued maps on the edge-set, 
+  /// $forward_filter$, and $backward_filter$ 
   /// is given, and we are dealing with the directed graph
   /// a $G'=(V, \{uv : uv\in A \mbox{ and } forward_filter(uv) \mbox{ is true}\}+\{vu : uv\in A \mbox{ and } backward_filter(uv) \mbox{ is true}\})$. 
@@ -622 +624 @@
   /// But BidirGraphWrapper is obtained from 
   /// SubBidirGraphWrapper by considering everywhere true 
-  /// predicates both forward_filter and backward_filter. 
+  /// valued maps both for forward_filter and backward_filter. 
   /// Finally, one of the most important applications of SubBidirGraphWrapper 
   /// is ResGraphWrapper, which stands for the residual graph in directed 
@@ -629 +631 @@
   /// above mentioned graph structure without its physical storage, 
   /// that is the whole stuff eats constant memory. 
-  /// As the oppositely directed edges are logical different, 
+  /// As the oppositely directed edges are logically different, 
   /// the maps are able to attach different values for them. 
   template<typename Graph, 
@@ -671 +673 @@
     typedef typename Graph::Edge GraphEdge;
     /// SubBidirGraphWrapper<..., ..., ...>::Edge is inherited from 
-    /// Graph::Edge. It contains an extra bool flag which shows if the 
+    /// Graph::Edge. It contains an extra bool flag which is true 
+    /// if and only if the 
     /// edge is the backward version of the original edge.
     class Edge : public Graph::Edge {
@@ -1131 +1134 @@
     /// \brief Residual capacity map.
     ///
-    /// In generic residual graphs the residual capacity can be obtained as a map. Not tested.
+    /// In generic residual graphs the residual capacity can be obtained 
+    /// as a map. 
     class ResCap {
     protected:

src/hugo/min_cost_flow.h

@@ -72 +72 @@
 
 
-    typedef ResGraphWrapper<const Graph,int,CapacityMap,EdgeIntMap> ResGraphType;
-    typedef typename ResGraphType::Edge ResGraphEdge;
+    typedef ResGraphWrapper<const Graph,int,CapacityMap,EdgeIntMap> ResGW;
+    typedef typename ResGW::Edge ResGraphEdge;
 
     class ModLengthMap {   
       typedef typename Graph::template NodeMap<Length> NodeMap;
-      const ResGraphType& G;
+      const ResGW& G;
       const LengthMap &ol;
       const NodeMap &pot;
@@ -84 +84 @@
       typedef typename LengthMap::ValueType ValueType;
         
-      ValueType operator[](typename ResGraphType::Edge e) const {     
+      ValueType operator[](typename ResGW::Edge e) const {     
         if (G.forward(e))
           return  ol[e]-(pot[G.head(e)]-pot[G.tail(e)]);   
@@ -91 +91 @@
       }     
         
-      ModLengthMap(const ResGraphType& _G,
+      ModLengthMap(const ResGW& _G,
                    const LengthMap &o,  const NodeMap &p) : 
         G(_G), /*rev(_rev),*/ ol(o), pot(p){}; 
@@ -153 +153 @@
       
       //We need a residual graph
-      ResGraphType res_graph(G, capacity, flow);
+      ResGW res_graph(G, capacity, flow);
 
 
       ModLengthMap mod_length(res_graph, length, potential);
 
-      Dijkstra<ResGraphType, ModLengthMap> dijkstra(res_graph, mod_length);
+      Dijkstra<ResGW, ModLengthMap> dijkstra(res_graph, mod_length);
 
       int i;
@@ -169 +169 @@
         
         //We have to change the potential
-        for(typename ResGraphType::NodeIt n(res_graph); n!=INVALID; ++n)
+        for(typename ResGW::NodeIt n(res_graph); n!=INVALID; ++n)
           potential[n] += dijkstra.distMap()[n];
 

src/hugo/tight_edge_filter_map.h

@@ -17 +17 @@
 #ifndef HUGO_TIGHT_EDGE_FILTER_MAP_H
 #define HUGO_TIGHT_EDGE_FILTER_MAP_H
+
+#include <hugo/maps.h>
 
 // /// \file
@@ -39 +41 @@
   template<typename Graph, 
            typename NodePotentialMap, typename EdgeDistanceMap>
-  class TightEdgeFilterMap {
+  class TightEdgeFilterMap : public MapBase<typename Graph::Edge, bool> {
   protected:
     const Graph* g;