1.1 --- a/lemon/dynamic_tree.h	Wed Nov 21 13:34:38 2007 +0000
     1.2 +++ b/lemon/dynamic_tree.h	Wed Nov 21 13:35:10 2007 +0000
     1.3 @@ -143,7 +143,7 @@
     1.4      
     1.5      /// \brief Add \e x value to the cost of every node on the path from
     1.6      /// \e item to findRoot(item).
     1.7 -    void addCost(const Item &item, Value x){
     1.8 +    void addCost(const Item &item, Value x) {
     1.9        addPathCost(expose(_iim[item]), x);
    1.10      }
    1.11      
    1.12 @@ -200,12 +200,12 @@
    1.13        return _iim[item];
    1.14      }
    1.15  
    1.16 -    int findPath(int v){
    1.17 +    int findPath(int v) {
    1.18        splay(v);
    1.19        return v;
    1.20      }
    1.21      
    1.22 -    int findPathCost(int p, Value &d){
    1.23 +    int findPathCost(int p, Value &d) {
    1.24        while ((_data[p].right != -1 && 
    1.25  	      !_tolerance.less(0, _data[_data[p].right].dmin)) || 
    1.26  	     (_data[p].left != -1 && _tolerance.less(0, _data[p].dcost))) {
    1.27 @@ -213,7 +213,7 @@
    1.28  	    !_tolerance.less(0, _data[_data[p].right].dmin)) {
    1.29  	  p = _data[p].right;
    1.30  	} else if (_data[p].left != -1 && 
    1.31 -		   !_tolerance.less(0, _data[_data[p].left].dmin)){
    1.32 +		   !_tolerance.less(0, _data[_data[p].left].dmin)) {
    1.33  	  p = _data[p].left;
    1.34  	}
    1.35        }
    1.36 @@ -230,9 +230,10 @@
    1.37        return p;
    1.38      }
    1.39      
    1.40 -    void addPathCost(int p, Value x){
    1.41 +    void addPathCost(int p, Value x) {
    1.42        if (!_tolerance.less(x, _max_value)) {
    1.43 -	_data[p].dmin = x;_data[p].dcost = x;
    1.44 +	_data[p].dmin = x;
    1.45 +	_data[p].dcost = x;
    1.46        } else if (!_tolerance.less(-x, _max_value)) {
    1.47  	_data[p].dmin = 0;
    1.48  	_data[p].dcost = 0;
    1.49 @@ -363,7 +364,7 @@
    1.50          
    1.51        Value aa = _data[a].dcost;
    1.52        if (_tolerance.less(aa, _max_value)) { 
    1.53 -	aa+= min;
    1.54 +	aa += min;
    1.55        }
    1.56  
    1.57  
    1.58 @@ -371,7 +372,7 @@
    1.59        Value ab = min + _data[b].dmin;
    1.60        Value bb = _data[b].dcost;
    1.61        if (_tolerance.less(bb, _max_value)) { 
    1.62 -	bb+= ab;
    1.63 +	bb += ab;
    1.64        }
    1.65  
    1.66        int c = -1;
    1.67 @@ -380,7 +381,7 @@
    1.68  	c = _data[a].right;
    1.69  	cc = _data[c].dmin;
    1.70  	if (_tolerance.less(cc, _max_value)) {
    1.71 -	  cc+=min;
    1.72 +	  cc += min;
    1.73  	}
    1.74        }
    1.75  
    1.76 @@ -686,12 +687,12 @@
    1.77        return _iim[item];
    1.78      }
    1.79  
    1.80 -    int findPath(int v){
    1.81 +    int findPath(int v) {
    1.82        splay(v);
    1.83        return v;
    1.84      }
    1.85      
    1.86 -    int findPathCost(int p, Value &d){
    1.87 +    int findPathCost(int p, Value &d) {
    1.88        while ((_data[p].right != -1 && 
    1.89  	      !_tolerance.less(0, _data[_data[p].right].dmin)) || 
    1.90  	     (_data[p].left != -1 && _tolerance.less(0, _data[p].dcost))) {
    1.91 @@ -708,7 +709,7 @@
    1.92        return p; 
    1.93      }
    1.94  
    1.95 -    int findTail(int p){
    1.96 +    int findTail(int p) {
    1.97        while (_data[p].right != -1) {
    1.98  	p = _data[p].right;
    1.99        }
   1.100 @@ -716,7 +717,7 @@
   1.101        return p;
   1.102      }
   1.103      
   1.104 -    void addPathCost(int p, Value x){
   1.105 +    void addPathCost(int p, Value x) {
   1.106        if (!_tolerance.less(x, _max_value)) {
   1.107  	_data[p].dmin = x;_data[p].dcost = x;
   1.108        } else if (!_tolerance.less(-x, _max_value)) {
   1.109 @@ -755,7 +756,7 @@
   1.110  	_data[p].parent = v;
   1.111  	_data[p].dmin -= min;
   1.112        }
   1.113 -      if (q!=-1){
   1.114 +      if (q != -1){
   1.115  	_data[q].parent = v;
   1.116  	if (_tolerance.less(_data[q].dmin,_max_value)) {
   1.117  	  _data[q].dmin -= min;
   1.118 @@ -763,7 +764,7 @@
   1.119        }
   1.120        _data[v].left = p;
   1.121        _data[v].right = q;
   1.122 -      if (_tolerance.less(min,_max_value)) {
   1.123 +      if (_tolerance.less(min, _max_value)) {
   1.124  	_data[v].dcost = _data[v].dmin - min;
   1.125        }
   1.126        _data[v].dmin = min;