Changeset 1710:f531c16dd923 in lemon-0.x for lemon/belmann_ford.h

Timestamp:

10/06/05 11:37:53 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug solved in named parameters
Simplify my Johnson algorithm

File:

• lemon/belmann_ford.h (modified) (8 diffs)

lemon/belmann_ford.h

@@ -168 +168 @@
   /// \author Balazs Dezso
 
+#ifdef DOXYGEN
+  template <typename _Graph, typename _LengthMap, typename _Traits>
+#else
   template <typename _Graph=ListGraph,
             typename _LengthMap=typename _Graph::template EdgeMap<int>,
             typename _Traits=BelmannFordDefaultTraits<_Graph,_LengthMap> >
+#endif
   class BelmannFord {
   public:
@@ -234 +238 @@
   public :
  
+    typedef BelmannFord Create;
+
     /// \name Named template parameters
 
@@ -241 +247 @@
     struct DefPredMapTraits : public Traits {
       typedef T PredMap;
-      static PredMap *createPredMap(const Graph& graph) {
+      static PredMap *createPredMap(const Graph&) {
         throw UninitializedParameter();
       }
@@ -251 +257 @@
     ///
     template <class T>
-    class DefPredMap 
-      : public BelmannFord< Graph, LengthMap, DefPredMapTraits<T> > {};
+    struct DefPredMap {
+      typedef BelmannFord< Graph, LengthMap, DefPredMapTraits<T> > Create;
+    };
     
     template <class T>
@@ -268 +275 @@
     ///
     template <class T>
-    class DefDistMap 
-      : public BelmannFord< Graph, LengthMap, DefDistMapTraits<T> > {};
+    struct DefDistMap 
+      : public BelmannFord< Graph, LengthMap, DefDistMapTraits<T> > {
+      typedef BelmannFord< Graph, LengthMap, DefDistMapTraits<T> > Create;
+    };
     
     template <class T>
@@ -279 +288 @@
     /// OperationTraits type
     ///
-    /// \ref named-templ-param "Named parameter" for setting PredMap type
+    /// \ref named-templ-param "Named parameter" for setting OperationTraits
+    /// type
     template <class T>
-    class DefOperationTraits
+    struct DefOperationTraits
       : public BelmannFord< Graph, LengthMap, DefOperationTraitsTraits<T> > {
-    public:
       typedef BelmannFord< Graph, LengthMap, DefOperationTraitsTraits<T> >
-      BelmannFord;
+      Create;
     };
     
     ///@}
+
+  protected:
+    
+    BelmannFord() {}
 
   public:      
@@ -363 +376 @@
     /// 
     /// Initializes the internal data structures.
-    void init() {
+    void init(const Value value = OperationTraits::infinity()) {
       create_maps();
       for (NodeIt it(*graph); it != INVALID; ++it) {
         _pred->set(it, INVALID);
-        _dist->set(it, OperationTraits::infinity());
+        _dist->set(it, value);
       }
     }
@@ -741 +754 @@
       return BelmannFordWizard<DefDistMapBase<T> >(*this);
     }
+
+    template<class T>
+    struct DefOperationTraitsBase : public Base {
+      typedef T OperationTraits;
+      DefOperationTraitsBase(const _Traits &b) : _Traits(b) {}
+    };
+    
+    ///\brief \ref named-templ-param "Named parameter"
+    ///function for setting OperationTraits type
+    ///
+    /// \ref named-templ-param "Named parameter"
+    ///function for setting OperationTraits type
+    ///
+    template<class T>
+    BelmannFordWizard<DefOperationTraitsBase<T> > distMap() {
+      return BelmannFordWizard<DefDistMapBase<T> >(*this);
+    }
     
     /// \brief Sets the source node, from which the BelmannFord algorithm runs.