Changeset 2519:a7376f7ed899 in lemon-0.x for lemon/dynamic_tree.h

Timestamp:

11/21/07 14:35:10 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3395

Message:

Changed queue implementation

File:

• lemon/dynamic_tree.h (modified) (12 diffs)

lemon/dynamic_tree.h

@@ -144 +144 @@
     /// \brief Add \e x value to the cost of every node on the path from
     /// \e item to findRoot(item).
-    void addCost(const Item &item, Value x){
+    void addCost(const Item &item, Value x) {
       addPathCost(expose(_iim[item]), x);
     }
@@ -201 +201 @@
     }
 
-    int findPath(int v){
+    int findPath(int v) {
       splay(v);
       return v;
     }
     
-    int findPathCost(int p, Value &d){
+    int findPathCost(int p, Value &d) {
       while ((_data[p].right != -1 && 
               !_tolerance.less(0, _data[_data[p].right].dmin)) || 
@@ -214 +214 @@
           p = _data[p].right;
         } else if (_data[p].left != -1 && 
-                   !_tolerance.less(0, _data[_data[p].left].dmin)){
+                   !_tolerance.less(0, _data[_data[p].left].dmin)) {
           p = _data[p].left;
         }
@@ -231 +231 @@
     }
     
-    void addPathCost(int p, Value x){
+    void addPathCost(int p, Value x) {
       if (!_tolerance.less(x, _max_value)) {
-        _data[p].dmin = x;_data[p].dcost = x;
+        _data[p].dmin = x;
+        _data[p].dcost = x;
       } else if (!_tolerance.less(-x, _max_value)) {
         _data[p].dmin = 0;
@@ -364 +365 @@
       Value aa = _data[a].dcost;
       if (_tolerance.less(aa, _max_value)) { 
-        aa+= min;
+        aa += min;
       }
 
@@ -372 +373 @@
       Value bb = _data[b].dcost;
       if (_tolerance.less(bb, _max_value)) { 
-        bb+= ab;
+        bb += ab;
       }
 
@@ -381 +382 @@
         cc = _data[c].dmin;
         if (_tolerance.less(cc, _max_value)) {
-          cc+=min;
+          cc += min;
         }
       }
@@ -687 +688 @@
     }
 
-    int findPath(int v){
+    int findPath(int v) {
       splay(v);
       return v;
     }
     
-    int findPathCost(int p, Value &d){
+    int findPathCost(int p, Value &d) {
       while ((_data[p].right != -1 && 
               !_tolerance.less(0, _data[_data[p].right].dmin)) || 
@@ -709 +710 @@
     }
 
-    int findTail(int p){
+    int findTail(int p) {
       while (_data[p].right != -1) {
         p = _data[p].right;
@@ -717 +718 @@
     }
     
-    void addPathCost(int p, Value x){
+    void addPathCost(int p, Value x) {
       if (!_tolerance.less(x, _max_value)) {
         _data[p].dmin = x;_data[p].dcost = x;
@@ -756 +757 @@
         _data[p].dmin -= min;
       }
-      if (q!=-1){
+      if (q != -1){
         _data[q].parent = v;
         if (_tolerance.less(_data[q].dmin,_max_value)) {
@@ -764 +765 @@
       _data[v].left = p;
       _data[v].right = q;
-      if (_tolerance.less(min,_max_value)) {
+      if (_tolerance.less(min, _max_value)) {
         _data[v].dcost = _data[v].dmin - min;
       }