Author: simonetripodi
Date: Tue Jul 12 07:32:17 2011
New Revision: 1145476
URL: http://svn.apache.org/viewvc?rev=1145476&view=rev
Log:
according to java.util.Queue javadoc, remove() Throws exceptions when poll()
returns special values
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=1145476&r1=1145475&r2=1145476&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:32:17 2011
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
import java.util.Queue;
/**
@@ -251,16 +252,6 @@ public final class FibonacciHeap<E>
*/
public E poll()
{
- return remove();
- }
-
- /**
- * {@inheritDoc}
- */
- public E remove()
- {
- // FIB-HEAP-EXTRACT-MIN(H)
-
if ( isEmpty() )
{
return null;
@@ -307,6 +298,21 @@ public final class FibonacciHeap<E>
return currentMinimum.getElement();
}
+ /**
+ * {@inheritDoc}
+ */
+ public E remove()
+ {
+ // FIB-HEAP-EXTRACT-MIN(H)
+
+ if ( isEmpty() )
+ {
+ throw new NoSuchElementException();
+ }
+
+ return poll();
+ }
+
private void consolidate()
{
if ( minimumNode == null )
