# HG changeset patch # User Alpar Juttner # Date 2008-12-01 14:48:26 # Node ID cb5f50e6c78b82b30d6c7bc4782d7d9cefb224cb # Parent 7d85a624093ec89411efa68c5b7a319d4a2e3c0f # Parent 62f9787c516c468a3676bb7a91731da83aa64543 Merge fix #187 diff --git a/lemon/dijkstra.h b/lemon/dijkstra.h --- a/lemon/dijkstra.h +++ b/lemon/dijkstra.h @@ -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 - struct DijkstraWidestPathOperationTraits { - /// \brief Gives back the maximum value of the type. - static Value zero() { - return std::numeric_limits::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 --git a/test/dijkstra_test.cc b/test/dijkstra_test.cc --- a/test/dijkstra_test.cc +++ b/test/dijkstra_test.cc @@ -89,7 +89,7 @@ ::SetDistMap > ::SetProcessedMap > ::SetStandardProcessedMap - ::SetOperationTraits > + ::SetOperationTraits > ::SetHeap > > ::SetStandardHeap > > ::Create dijkstra_test(G,length);