Changeset 1710:f531c16dd923 in lemon-0.x for lemon/floyd_warshall.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/floyd_warshall.h (modified) (4 diffs)

lemon/floyd_warshall.h

@@ -171 +171 @@
   /// \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=FloydWarshallDefaultTraits<_Graph,_LengthMap> >
+#endif
   class FloydWarshall {
   public:
@@ -257 +260 @@
     ///
     template <class T>
-    class DefPredMap 
-      : public FloydWarshall< Graph, LengthMap, DefPredMapTraits<T> > {};
+    struct DefPredMap 
+      : public FloydWarshall< Graph, LengthMap, DefPredMapTraits<T> > {
+      typedef FloydWarshall< Graph, LengthMap, DefPredMapTraits<T> > Create;
+    };
     
     template <class T>
@@ -273 +278 @@
     ///
     template <class T>
-    class DefDistMap 
-      : public FloydWarshall< Graph, LengthMap, DefDistMapTraits<T> > {};
+    struct DefDistMap 
+      : public FloydWarshall< Graph, LengthMap, DefDistMapTraits<T> > {
+      typedef FloydWarshall< Graph, LengthMap, DefDistMapTraits<T> > Create;
+    };
     
     template <class T>
@@ -286 +293 @@
     /// \ref named-templ-param "Named parameter" for setting PredMap type
     template <class T>
-    class DefOperationTraits
+    struct DefOperationTraits
       : public FloydWarshall< Graph, LengthMap, DefOperationTraitsTraits<T> > {
+      typedef FloydWarshall< Graph, LengthMap, DefOperationTraitsTraits<T> >
+      Create;
     };
     
     ///@}
 
+  protected:
+
+    FloydWarshall() {}
+
   public:      
+
+    typedef FloydWarshall Create;
     
     /// \brief Constructor.