Author: simonetripodi
Date: Tue Jul 12 07:18:15 2011
New Revision: 1145474
URL: http://svn.apache.org/viewvc?rev=1145474&view=rev
Log:
'value' reference name replaced with 'element' in the Fibonacci Heap node
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeap.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeapNode.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=1145474&r1=1145473&r2=1145474&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:18:15 2011
@@ -105,7 +105,7 @@ public final class FibonacciHeap<E>
minimumNode.setLeft( node );
// if key[x] < key[min[H]]
- if ( compare( e, minimumNode.getValue() ) < 0 )
+ if ( compare( e, minimumNode.getElement() ) < 0 )
{
// then min[H] <- x
minimumNode = node;
@@ -227,7 +227,7 @@ public final class FibonacciHeap<E>
{
return null;
}
- return minimumNode.getValue();
+ return minimumNode.getElement();
}
/**
@@ -304,7 +304,7 @@ public final class FibonacciHeap<E>
size--;
- return currentRoot.getValue();
+ return currentRoot.getElement();
}
private void consolidate()
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeapNode.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeapNode.java?rev=1145474&r1=1145473&r2=1145474&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeapNode.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/collections/FibonacciHeapNode.java
Tue Jul 12 07:18:15 2011
@@ -25,7 +25,7 @@ package org.apache.commons.graph.collect
final class FibonacciHeapNode<E>
{
- private final E value;
+ private final E element;
private FibonacciHeapNode<E> parent;
@@ -52,9 +52,9 @@ final class FibonacciHeapNode<E>
*/
private boolean marked = false;
- public FibonacciHeapNode( E value )
+ public FibonacciHeapNode( E element )
{
- this.value = value;
+ this.element = element;
}
public FibonacciHeapNode<E> getParent()
@@ -117,9 +117,9 @@ final class FibonacciHeapNode<E>
this.marked = marked;
}
- public E getValue()
+ public E getElement()
{
- return value;
+ return element;
}
}