Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 01 Dec 2008 13:49:55 +0000
changeset 413532f34ea9cf3
parent 411 c5f010a5647a
parent 412 62f9787c516c
child 419 59d3aa4f921f
Merge
     1.1 --- a/lemon/dijkstra.h	Sun Nov 30 22:06:36 2008 +0100
     1.2 +++ b/lemon/dijkstra.h	Mon Dec 01 13:49:55 2008 +0000
     1.3 @@ -54,29 +54,6 @@
     1.4      }
     1.5    };
     1.6  
     1.7 -  /// \brief Widest path operation traits for the Dijkstra algorithm class.
     1.8 -  ///
     1.9 -  /// This operation traits class defines all computational operations and
    1.10 -  /// constants which are used in the Dijkstra algorithm for widest path
    1.11 -  /// computation.
    1.12 -  ///
    1.13 -  /// \see DijkstraDefaultOperationTraits
    1.14 -  template <typename Value>
    1.15 -  struct DijkstraWidestPathOperationTraits {
    1.16 -    /// \brief Gives back the maximum value of the type.
    1.17 -    static Value zero() {
    1.18 -      return std::numeric_limits<Value>::max();
    1.19 -    }
    1.20 -    /// \brief Gives back the minimum of the given two elements.
    1.21 -    static Value plus(const Value& left, const Value& right) {
    1.22 -      return std::min(left, right);
    1.23 -    }
    1.24 -    /// \brief Gives back true only if the first value is less than the second.
    1.25 -    static bool less(const Value& left, const Value& right) {
    1.26 -      return left < right;
    1.27 -    }
    1.28 -  };
    1.29 -
    1.30    ///Default traits class of Dijkstra class.
    1.31  
    1.32    ///Default traits class of Dijkstra class.
     2.1 --- a/test/dijkstra_test.cc	Sun Nov 30 22:06:36 2008 +0100
     2.2 +++ b/test/dijkstra_test.cc	Mon Dec 01 13:49:55 2008 +0000
     2.3 @@ -89,7 +89,7 @@
     2.4        ::SetDistMap<concepts::ReadWriteMap<Node,VType> >
     2.5        ::SetProcessedMap<concepts::WriteMap<Node,bool> >
     2.6        ::SetStandardProcessedMap
     2.7 -      ::SetOperationTraits<DijkstraWidestPathOperationTraits<VType> >
     2.8 +      ::SetOperationTraits<DijkstraDefaultOperationTraits<VType> >
     2.9        ::SetHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
    2.10        ::SetStandardHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
    2.11        ::Create dijkstra_test(G,length);