1.1 --- a/lemon/preflow.h	Fri Mar 02 18:04:28 2007 +0000
     1.2 +++ b/lemon/preflow.h	Sat Mar 03 11:57:07 2007 +0000
     1.3 @@ -59,14 +59,14 @@
     1.4    ///\param Num The number type of the capacities and the flow values.
     1.5    ///\param CapacityMap The capacity map type.
     1.6    ///\param FlowMap The flow map type.
     1.7 -  ///\param Tolerance The tolerance type. 
     1.8 +  ///\param Tol The tolerance type. 
     1.9    ///
    1.10    ///\author Jacint Szabo 
    1.11    ///\todo Second template parameter is superfluous
    1.12    template <typename Graph, typename Num,
    1.13  	    typename CapacityMap=typename Graph::template EdgeMap<Num>,
    1.14              typename FlowMap=typename Graph::template EdgeMap<Num>,
    1.15 -	    typename Tolerance=Tolerance<Num> >
    1.16 +	    typename Tol=Tolerance<Num> >
    1.17    class Preflow {
    1.18    protected:
    1.19      typedef typename Graph::Node Node;
    1.20 @@ -84,7 +84,7 @@
    1.21      const CapacityMap* _capacity;
    1.22      FlowMap* _flow;
    1.23  
    1.24 -    Tolerance _surely;
    1.25 +    Tol _surely;
    1.26      
    1.27      int _node_num;      //the number of nodes of G
    1.28      
    1.29 @@ -155,13 +155,13 @@
    1.30      ///\param _t The target node.
    1.31      ///\param _cap The capacity of the edges. 
    1.32      ///\param _f The flow of the edges. 
    1.33 -    ///\param _sr Tolerance class.
    1.34 +    ///\param _sr Tol class.
    1.35      ///Except the graph, all of these parameters can be reset by
    1.36      ///calling \ref source, \ref target, \ref capacityMap and \ref
    1.37      ///flowMap, resp.
    1.38      Preflow(const Graph& _gr, Node _s, Node _t, 
    1.39              const CapacityMap& _cap, FlowMap& _f,
    1.40 -            const Tolerance &_sr=Tolerance()) :
    1.41 +            const Tol &_sr=Tol()) :
    1.42  	_g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
    1.43  	_flow(&_f), _surely(_sr),
    1.44  	_node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 
    1.45 @@ -174,7 +174,7 @@
    1.46  
    1.47      ///Give a reference to the tolerance handler class
    1.48      ///\sa Tolerance
    1.49 -    Tolerance &tolerance() { return _surely; }
    1.50 +    Tol &tolerance() { return _surely; }
    1.51  
    1.52      ///Runs the preflow algorithm.  
    1.53  

     2.1 --- a/lemon/random.h	Fri Mar 02 18:04:28 2007 +0000
     2.2 +++ b/lemon/random.h	Sat Mar 03 11:57:07 2007 +0000
     2.3 @@ -308,8 +308,8 @@
     2.4  
     2.5  
     2.6      template <typename Result, typename Word,
     2.7 -              bool one_word = std::numeric_limits<Word>::digits < 
     2.8 -                              std::numeric_limits<Result>::digits>
     2.9 +              bool one_word = (std::numeric_limits<Word>::digits < 
    2.10 +			       std::numeric_limits<Result>::digits) >
    2.11      struct Mapping {
    2.12        static Result map(RandomCore<Word>& rnd, const Result& bound) {
    2.13          Word max = Word(bound - 1);