Changeset 1679:e825655c24a4 in lemon-0.x

Timestamp:

09/12/05 11:15:59 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some bugfixes.

Location:

lemon

Files:

• graph_utils.h (modified) (3 diffs)
• kruskal.h (modified) (1 diff)
• maps.h (modified) (3 diffs)

lemon/graph_utils.h

@@ -160 +160 @@
   }
 
+  /// \brief Function to count the number of the in-edges to node \c n.
+  ///
+  /// This function counts the number of the in-edges to node \c n
+  /// in the graph.  
+  template <typename Graph>
+  inline int countIncEdges(const Graph& _g,  const typename Graph::Node& _n) {
+    return countNodeDegree<Graph, typename Graph::IncEdgeIt>(_g, _n);
+  }
+
 
   template <typename Graph>
@@ -913 +922 @@
     /// \param edge The edge 
     /// \return The source of the edge 
-    Value operator[](const Key& edge) {
+    Value operator[](const Key& edge) const {
       return graph.source(edge);
     }
@@ -954 +963 @@
     /// \param e The edge 
     /// \return The target of the edge 
-    Value operator[](const Key& e) {
+    Value operator[](const Key& e) const {
       return graph.target(e);
     }

lemon/kruskal.h

@@ -230 +230 @@
     {
       for(typename GR::UndirEdgeIt e(g);e!=INVALID;++e) 
-        push_back(value_type(typename GR::Edge(e,true), m[e]));
+        push_back(value_type(g.direct(e, true), m[e]));
     }
 

lemon/maps.h

@@ -710 +710 @@
            typename NC = False> 
   class FunctorMap : public MapBase<K, V, NC> {
-    const F &f;
+    F f;
   public:
     typedef MapBase<K, V, NC> Parent;
@@ -717 +717 @@
 
     ///Constructor
-    FunctorMap(const F &_f) : f(_f) {};
-    Value operator[](Key k) const {return f(k);}
+    FunctorMap(const F &_f) : f(_f) {}
+
+    Value operator[](Key k) const { return f(k);}
   };
   
@@ -735 +736 @@
   FunctorMap<F, typename F::argument_type, typename F::result_type, True> 
   functorMap(const F &f) {
-    return functorMap<typename F::argument_type, 
-      typename F::result_type, F>(f);
+    return FunctorMap<F, typename F::argument_type, 
+      typename F::result_type, True>(f);
   }
 
   template <typename K, typename V> inline 
   FunctorMap<V (*)(K), K, V, True> functorMap(V (*f)(K)) {
-    return functorMap<K, V, V (*)(K)>(f);
+    return FunctorMap<V (*)(K), K, V, True>(f);
   }