i = initialElements.iterator(); i.hasNext(); )
- add(i.next());
+ fillFromUnsorted(c);
}
}
+ /**
+ * Creates a PriorityQueue containing the elements in the
+ * specified collection. The priority queue has an initial
+ * capacity of 110% of the size of the specified collection or 1
+ * if the collection is empty. This priority queue will be sorted
+ * according to the same comparator as the given collection, or
+ * according to its elements' natural order if the collection is
+ * sorted according to its elements' natural order.
+ *
+ * @param c the collection whose elements are to be placed
+ * into this priority queue.
+ * @throws ClassCastException if elements of the specified collection
+ * cannot be compared to one another according to the priority
+ * queue's ordering.
+ * @throws NullPointerException if c or any element within it
+ * is null
+ */
+ public PriorityQueue(PriorityQueue extends E> c) {
+ initializeArray(c);
+ comparator = (Comparator super E>)c.comparator();
+ fillFromSorted(c);
+ }
+
+ /**
+ * Creates a PriorityQueue containing the elements in the
+ * specified collection. The priority queue has an initial
+ * capacity of 110% of the size of the specified collection or 1
+ * if the collection is empty. This priority queue will be sorted
+ * according to the same comparator as the given collection, or
+ * according to its elements' natural order if the collection is
+ * sorted according to its elements' natural order.
+ *
+ * @param c the collection whose elements are to be placed
+ * into this priority queue.
+ * @throws ClassCastException if elements of the specified collection
+ * cannot be compared to one another according to the priority
+ * queue's ordering.
+ * @throws NullPointerException if c or any element within it
+ * is null
+ */
+ public PriorityQueue(SortedSet extends E> c) {
+ initializeArray(c);
+ comparator = (Comparator super E>)c.comparator();
+ fillFromSorted(c);
+ }
+
+ /**
+ * Resize array, if necessary, to be able to hold given index
+ */
+ private void grow(int index) {
+ int newlen = queue.length;
+ if (index < newlen) // don't need to grow
+ return;
+ if (index == Integer.MAX_VALUE)
+ throw new OutOfMemoryError();
+ while (newlen <= index) {
+ if (newlen >= Integer.MAX_VALUE / 2) // avoid overflow
+ newlen = Integer.MAX_VALUE;
+ else
+ newlen <<= 2;
+ }
+ Object[] newQueue = new Object[newlen];
+ System.arraycopy(queue, 0, newQueue, 0, queue.length);
+ queue = newQueue;
+ }
+
// Queue Methods
+
+
/**
- * Remove and return the minimal element from this priority queue
- * if it contains one or more elements, otherwise return
- * null. The term minimal is defined according to
- * this priority queue's order.
+ * Add the specified element to this priority queue.
*
- * @return the minimal element from this priority queue if it contains
- * one or more elements, otherwise null.
+ * @return true
+ * @throws ClassCastException if the specified element cannot be compared
+ * with elements currently in the priority queue according
+ * to the priority queue's ordering.
+ * @throws NullPointerException if the specified element is null.
*/
+ public boolean offer(E o) {
+ if (o == null)
+ throw new NullPointerException();
+ modCount++;
+ ++size;
+
+ // Grow backing store if necessary
+ if (size >= queue.length)
+ grow(size);
+
+ queue[size] = o;
+ fixUp(size);
+ return true;
+ }
+
public E poll() {
if (size == 0)
return null;
- return remove(1);
+ return (E) remove(1);
+ }
+
+ public E peek() {
+ return (E) queue[1];
}
+ // Collection Methods - the first two override to update docs
+
/**
- * Return, but do not remove, the minimal element from the
- * priority queue, or return null if the queue is empty.
- * The term minimal is defined according to this priority
- * queue's order. This method returns the same object reference
- * that would be returned by by the poll method. The two
- * methods differ in that this method does not remove the element
- * from the priority queue.
+ * Adds the specified element to this queue.
+ * @return true (as per the general contract of
+ * Collection.add).
*
- * @return the minimal element from this priority queue if it contains
- * one or more elements, otherwise null.
+ * @throws NullPointerException {@inheritDoc}
+ * @throws ClassCastException if the specified element cannot be compared
+ * with elements currently in the priority queue according
+ * to the priority queue's ordering.
*/
- public E peek() {
- return queue[1];
+ public boolean add(E o) {
+ return super.add(o);
}
- // Collection Methods
-
+
/**
- * Removes a single instance of the specified element from this priority
- * queue, if it is present. Returns true if this collection contained the
- * specified element (or equivalently, if this collection changed as a
+ * Adds all of the elements in the specified collection to this queue.
+ * The behavior of this operation is undefined if
+ * the specified collection is modified while the operation is in
+ * progress. (This implies that the behavior of this call is undefined if
+ * the specified collection is this queue, and this queue is nonempty.)
+ *
+ * This implementation iterates over the specified collection, and adds
+ * each object returned by the iterator to this collection, in turn.
+ * @throws NullPointerException {@inheritDoc}
+ * @throws ClassCastException if any element cannot be compared
+ * with elements currently in the priority queue according
+ * to the priority queue's ordering.
+ */
+ public boolean addAll(Collection extends E> c) {
+ return super.addAll(c);
+ }
+
+
+ /**
+ * Removes a single instance of the specified element from this
+ * queue, if it is present. More formally,
+ * removes an element e such that (o==null ? e==null :
+ * o.equals(e)), if the queue contains one or more such
+ * elements. Returns true if the queue contained the
+ * specified element (or equivalently, if the queue changed as a
* result of the call).
*
- * @param element the element to be removed from this collection,
- * if present.
- * @return true if this collection changed as a result of the
- * call
- * @throws ClassCastException if the specified element cannot be compared
- * with elements currently in the priority queue according
- * to the priority queue's ordering.
- * @throws NullPointerException if the specified element is null.
+ *
This implementation iterates over the queue looking for the
+ * specified element. If it finds the element, it removes the element
+ * from the queue using the iterator's remove method.
+ *
*/
- public boolean remove(Object element) {
- if (element == null)
- throw new NullPointerException();
+ public boolean remove(Object o) {
+ if (o == null)
+ return false;
if (comparator == null) {
for (int i = 1; i <= size; i++) {
- if (((Comparable)queue[i]).compareTo(element) == 0) {
+ if (((Comparable)queue[i]).compareTo((E)o) == 0) {
remove(i);
return true;
}
}
} else {
for (int i = 1; i <= size; i++) {
- if (comparator.compare(queue[i], (E) element) == 0) {
+ if (comparator.compare((E)queue[i], (E)o) == 0) {
remove(i);
return true;
}
@@ -215,12 +367,10 @@ public class PriorityQueue extends Ab
}
/**
- * Returns an iterator over the elements in this priority queue. The
- * elements of the priority queue will be returned by this iterator in the
- * order specified by the queue, which is to say the order they would be
- * returned by repeated calls to poll.
- *
- * @return an Iterator over the elements in this priority queue.
+ * Returns an iterator over the elements in this queue. The iterator
+ * does not return the elements in any particular order.
+ *
+ * @return an iterator over the elements in this queue.
*/
public Iterator iterator() {
return new Itr();
@@ -255,7 +405,7 @@ public class PriorityQueue extends Ab
checkForComodification();
if (cursor > size)
throw new NoSuchElementException();
- E result = queue[cursor];
+ E result = (E) queue[cursor];
lastRet = cursor++;
return result;
}
@@ -278,43 +428,11 @@ public class PriorityQueue extends Ab
}
}
- /**
- * Returns the number of elements in this priority queue.
- *
- * @return the number of elements in this priority queue.
- */
public int size() {
return size;
}
/**
- * Add the specified element to this priority queue.
- *
- * @param element the element to add.
- * @return true
- * @throws ClassCastException if the specified element cannot be compared
- * with elements currently in the priority queue according
- * to the priority queue's ordering.
- * @throws NullPointerException if the specified element is null.
- */
- public boolean offer(E element) {
- if (element == null)
- throw new NullPointerException();
- modCount++;
-
- // Grow backing store if necessary
- if (++size == queue.length) {
- E[] newQueue = new E[2 * queue.length];
- System.arraycopy(queue, 0, newQueue, 0, size);
- queue = newQueue;
- }
-
- queue[size] = element;
- fixUp(size);
- return true;
- }
-
- /**
* Remove all elements from the priority queue.
*/
public void clear() {
@@ -338,7 +456,7 @@ public class PriorityQueue extends Ab
assert i <= size;
modCount++;
- E result = queue[i];
+ E result = (E) queue[i];
queue[i] = queue[size];
queue[size--] = null; // Drop extra ref to prevent memory leak
if (i <= size)
@@ -359,17 +477,17 @@ public class PriorityQueue extends Ab
if (comparator == null) {
while (k > 1) {
int j = k >> 1;
- if (((Comparable)queue[j]).compareTo(queue[k]) <= 0)
+ if (((Comparable)queue[j]).compareTo((E)queue[k]) <= 0)
break;
- E tmp = queue[j]; queue[j] = queue[k]; queue[k] = tmp;
+ Object tmp = queue[j]; queue[j] = queue[k]; queue[k] = tmp;
k = j;
}
} else {
while (k > 1) {
int j = k >> 1;
- if (comparator.compare(queue[j], queue[k]) <= 0)
+ if (comparator.compare((E)queue[j], (E)queue[k]) <= 0)
break;
- E tmp = queue[j]; queue[j] = queue[k]; queue[k] = tmp;
+ Object tmp = queue[j]; queue[j] = queue[k]; queue[k] = tmp;
k = j;
}
}
@@ -388,33 +506,35 @@ public class PriorityQueue extends Ab
int j;
if (comparator == null) {
while ((j = k << 1) <= size) {
- if (j 0)
+ if (j)queue[j]).compareTo((E)queue[j+1]) > 0)
j++; // j indexes smallest kid
- if (((Comparable)queue[k]).compareTo(queue[j]) <= 0)
+ if (((Comparable)queue[k]).compareTo((E)queue[j]) <= 0)
break;
- E tmp = queue[j]; queue[j] = queue[k]; queue[k] = tmp;
+ Object tmp = queue[j]; queue[j] = queue[k]; queue[k] = tmp;
k = j;
}
} else {
while ((j = k << 1) <= size) {
- if (j < size && comparator.compare(queue[j], queue[j+1]) > 0)
+ if (j < size && comparator.compare((E)queue[j], (E)queue[j+1]) > 0)
j++; // j indexes smallest kid
- if (comparator.compare(queue[k], queue[j]) <= 0)
+ if (comparator.compare((E)queue[k], (E)queue[j]) <= 0)
break;
- E tmp = queue[j]; queue[j] = queue[k]; queue[k] = tmp;
+ Object tmp = queue[j]; queue[j] = queue[k]; queue[k] = tmp;
k = j;
}
}
}
+
/**
- * Returns the comparator associated with this priority queue, or
- * null if it uses its elements' natural ordering.
+ * Returns the comparator used to order this collection, or null
+ * if this collection is sorted according to its elements natural ordering
+ * (using Comparable).
*
- * @return the comparator associated with this priority queue, or
- * null if it uses its elements' natural ordering.
+ * @return the comparator used to order this collection, or null
+ * if this collection is sorted according to its elements natural ordering.
*/
- Comparator comparator() {
+ public Comparator super E> comparator() {
return comparator;
}
@@ -427,7 +547,7 @@ public class PriorityQueue extends Ab
* Object) in the proper order.
* @param s the stream
*/
- private synchronized void writeObject(java.io.ObjectOutputStream s)
+ private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException{
// Write out element count, and any hidden stuff
s.defaultWriteObject();
@@ -445,18 +565,19 @@ public class PriorityQueue extends Ab
* deserialize it).
* @param s the stream
*/
- private synchronized void readObject(java.io.ObjectInputStream s)
+ private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
// Read in size, and any hidden stuff
s.defaultReadObject();
// Read in array length and allocate array
int arrayLength = s.readInt();
- queue = new E[arrayLength];
+ queue = new Object[arrayLength];
// Read in all elements in the proper order.
for (int i=0; i