# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1228139395 0
# Node ID 532f34ea9cf302857a2e40919456ff36145ac451
# Parent  c5f010a5647a60db355859c47befaa6716479c08# Parent  62f9787c516c468a3676bb7a91731da83aa64543
Merge

diff -r c5f010a5647a -r 532f34ea9cf3 lemon/dijkstra.h
--- a/lemon/dijkstra.h	Sun Nov 30 22:06:36 2008 +0100
+++ b/lemon/dijkstra.h	Mon Dec 01 13:49:55 2008 +0000
@@ -54,29 +54,6 @@
     }
   };
 
-  /// \brief Widest path operation traits for the Dijkstra algorithm class.
-  ///
-  /// This operation traits class defines all computational operations and
-  /// constants which are used in the Dijkstra algorithm for widest path
-  /// computation.
-  ///
-  /// \see DijkstraDefaultOperationTraits
-  template <typename Value>
-  struct DijkstraWidestPathOperationTraits {
-    /// \brief Gives back the maximum value of the type.
-    static Value zero() {
-      return std::numeric_limits<Value>::max();
-    }
-    /// \brief Gives back the minimum of the given two elements.
-    static Value plus(const Value& left, const Value& right) {
-      return std::min(left, right);
-    }
-    /// \brief Gives back true only if the first value is less than the second.
-    static bool less(const Value& left, const Value& right) {
-      return left < right;
-    }
-  };
-
   ///Default traits class of Dijkstra class.
 
   ///Default traits class of Dijkstra class.
diff -r c5f010a5647a -r 532f34ea9cf3 test/dijkstra_test.cc
--- a/test/dijkstra_test.cc	Sun Nov 30 22:06:36 2008 +0100
+++ b/test/dijkstra_test.cc	Mon Dec 01 13:49:55 2008 +0000
@@ -89,7 +89,7 @@
       ::SetDistMap<concepts::ReadWriteMap<Node,VType> >
       ::SetProcessedMap<concepts::WriteMap<Node,bool> >
       ::SetStandardProcessedMap
-      ::SetOperationTraits<DijkstraWidestPathOperationTraits<VType> >
+      ::SetOperationTraits<DijkstraDefaultOperationTraits<VType> >
       ::SetHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
       ::SetStandardHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
       ::Create dijkstra_test(G,length);