You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/07/12 09:26:28 UTC

svn commit: r1145475 - /commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java

Author: simonetripodi
Date: Tue Jul 12 07:26:28 2011
New Revision: 1145475

URL: http://svn.apache.org/viewvc?rev=1145475&view=rev
Log:
variables properly renamed inside remove() body

Modified:
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java?rev=1145475&r1=1145474&r2=1145475&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java Tue Jul 12 07:26:28 2011
@@ -266,10 +266,10 @@ public final class FibonacciHeap<E>
             return null;
         }
 
-        FibonacciHeapNode<E> currentRoot = minimumNode;
+        FibonacciHeapNode<E> currentMinimum = minimumNode;
 
-        int degree = currentRoot.getDegree();
-        FibonacciHeapNode<E> currentChild = currentRoot.getChild();
+        int degree = currentMinimum.getDegree();
+        FibonacciHeapNode<E> currentChild = currentMinimum.getChild();
         FibonacciHeapNode<E> pointer;
 
         while ( degree > 0 )
@@ -289,22 +289,22 @@ public final class FibonacciHeap<E>
             degree--;
         }
 
-        currentRoot.getLeft().setRight( currentRoot.getRight() );
-        currentRoot.getRight().setLeft( currentRoot.getLeft() );
+        currentMinimum.getLeft().setRight( currentMinimum.getRight() );
+        currentMinimum.getRight().setLeft( currentMinimum.getLeft() );
 
-        if ( currentRoot == currentRoot.getRight() )
+        if ( currentMinimum == currentMinimum.getRight() )
         {
             minimumNode = null;
         }
         else
         {
-            minimumNode = currentRoot.getRight();
+            minimumNode = currentMinimum.getRight();
             consolidate();
         }
 
         size--;
 
-        return currentRoot.getElement();
+        return currentMinimum.getElement();
     }
 
     private void consolidate()