ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/PriorityQueue.java

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.57 by jsr166, Mon Nov 28 02:44:06 2005 UTC vs.
Revision 1.73 by jsr166, Tue Jun 21 19:29:21 2011 UTC

#	Line 1 | Line 1
1		/*
2	<	* %W% %E%
2	>	* Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
3	>	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5	<	* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
6	<	* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
5	>	* This code is free software; you can redistribute it and/or modify it
6	>	* under the terms of the GNU General Public License version 2 only, as
7	>	* published by the Free Software Foundation.  Sun designates this
8	>	* particular file as subject to the "Classpath" exception as provided
9	>	* by Sun in the LICENSE file that accompanied this code.
10	>	*
11	>	* This code is distributed in the hope that it will be useful, but WITHOUT
12	>	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13	>	* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
14	>	* version 2 for more details (a copy is included in the LICENSE file that
15	>	* accompanied this code).
16	>	*
17	>	* You should have received a copy of the GNU General Public License version
18	>	* 2 along with this work; if not, write to the Free Software Foundation,
19	>	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20	>	*
21	>	* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22	>	* or visit www.oracle.com if you need additional information or have any
23	>	* questions.
24		*/
25
26		package java.util;
9	–	import java.util.*; // for javadoc (till 6280605 is fixed)
27
28		/**
29	<	* An unbounded priority {@linkplain Queue queue} based on a priority
30	<	* heap.  The elements of the priority queue are ordered according to
31	<	* their {@linkplain Comparable natural ordering}, or by a {@link
32	<	* Comparator} provided at queue construction time, depending on which
33	<	* constructor is used.  A priority queue does not permit
34	<	* <tt>null</tt> elements.  A priority queue relying on natural
35	<	* ordering also does not permit insertion of non-comparable objects
36	<	* (doing so may result in <tt>ClassCastException</tt>).
29	>	* An unbounded priority {@linkplain Queue queue} based on a priority heap.
30	>	* The elements of the priority queue are ordered according to their
31	>	* {@linkplain Comparable natural ordering}, or by a {@link Comparator}
32	>	* provided at queue construction time, depending on which constructor is
33	>	* used.  A priority queue does not permit {@code null} elements.
34	>	* A priority queue relying on natural ordering also does not permit
35	>	* insertion of non-comparable objects (doing so may result in
36	>	* {@code ClassCastException}).
37		*
38		* <p>The <em>head</em> of this queue is the <em>least</em> element
39		* with respect to the specified ordering.  If multiple elements are
40		* tied for least value, the head is one of those elements -- ties are
41	<	* broken arbitrarily.  The queue retrieval operations <tt>poll</tt>,
42	<	* <tt>remove</tt>, <tt>peek</tt>, and <tt>element</tt> access the
41	>	* broken arbitrarily.  The queue retrieval operations {@code poll},
42	>	* {@code remove}, {@code peek}, and {@code element} access the
43		* element at the head of the queue.
44		*
45		* <p>A priority queue is unbounded, but has an internal
#	Line 37 | Line 54 | import java.util.*; // for javadoc (till
54		* Iterator} interfaces.  The Iterator provided in method {@link
55		* #iterator()} is <em>not</em> guaranteed to traverse the elements of
56		* the priority queue in any particular order. If you need ordered
57	<	* traversal, consider using <tt>Arrays.sort(pq.toArray())</tt>.
57	>	* traversal, consider using {@code Arrays.sort(pq.toArray())}.
58		*
59		* <p> <strong>Note that this implementation is not synchronized.</strong>
60	<	* Multiple threads should not access a <tt>PriorityQueue</tt>
61	<	* instance concurrently if any of the threads modifies the list
62	<	* structurally. Instead, use the thread-safe {@link
60	>	* Multiple threads should not access a {@code PriorityQueue}
61	>	* instance concurrently if any of the threads modifies the queue.
62	>	* Instead, use the thread-safe {@link
63		* java.util.concurrent.PriorityBlockingQueue} class.
64		*
65	<	* <p>Implementation note: this implementation provides O(log(n)) time
66	<	* for the insertion methods (<tt>offer</tt>, <tt>poll</tt>,
67	<	* <tt>remove()</tt> and <tt>add</tt>) methods; linear time for the
68	<	* <tt>remove(Object)</tt> and <tt>contains(Object)</tt> methods; and
69	<	* constant time for the retrieval methods (<tt>peek</tt>,
70	<	* <tt>element</tt>, and <tt>size</tt>).
65	>	* <p>Implementation note: this implementation provides
66	>	* O(log(n)) time for the enqueing and dequeing methods
67	>	* ({@code offer}, {@code poll}, {@code remove()} and {@code add});
68	>	* linear time for the {@code remove(Object)} and {@code contains(Object)}
69	>	* methods; and constant time for the retrieval methods
70	>	* ({@code peek}, {@code element}, and {@code size}).
71		*
72		* <p>This class is a member of the
73	<	* <a href="{@docRoot}/../guide/collections/index.html">
73	>	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
74		* Java Collections Framework</a>.
75	+	*
76		* @since 1.5
77	<	* @version 1.8, 08/27/05
60	<	* @author Josh Bloch
77	>	* @author Josh Bloch, Doug Lea
78		* @param <E> the type of elements held in this collection
79		*/
80		public class PriorityQueue<E> extends AbstractQueue<E>
#	Line 95 | Line 112 | public class PriorityQueue<E> extends Ab
112		private transient int modCount = 0;
113
114		/**
115	<	* Creates a <tt>PriorityQueue</tt> with the default initial
115	>	* Creates a {@code PriorityQueue} with the default initial
116		* capacity (11) that orders its elements according to their
117		* {@linkplain Comparable natural ordering}.
118		*/
#	Line 104 | Line 121 | public class PriorityQueue<E> extends Ab
121		}
122
123		/**
124	<	* Creates a <tt>PriorityQueue</tt> with the specified initial
124	>	* Creates a {@code PriorityQueue} with the specified initial
125		* capacity that orders its elements according to their
126		* {@linkplain Comparable natural ordering}.
127		*
128		* @param initialCapacity the initial capacity for this priority queue
129	<	* @throws IllegalArgumentException if <tt>initialCapacity</tt> is less
130	<	* than 1
129	>	* @throws IllegalArgumentException if {@code initialCapacity} is less
130	>	*         than 1
131		*/
132		public PriorityQueue(int initialCapacity) {
133		this(initialCapacity, null);
134		}
135
136		/**
137	<	* Creates a <tt>PriorityQueue</tt> with the specified initial capacity
137	>	* Creates a {@code PriorityQueue} with the specified initial capacity
138		* that orders its elements according to the specified comparator.
139		*
140		* @param  initialCapacity the initial capacity for this priority queue
141	<	* @param  comparator the comparator that will be used to order
142	<	*         this priority queue.  If <tt>null</tt>, the <i>natural
143	<	*         ordering</i> of the elements will be used.
144	<	* @throws IllegalArgumentException if <tt>initialCapacity</tt> is
141	>	* @param  comparator the comparator that will be used to order this
142	>	*         priority queue.  If {@code null}, the {@linkplain Comparable
143	>	*         natural ordering} of the elements will be used.
144	>	* @throws IllegalArgumentException if {@code initialCapacity} is
145		*         less than 1
146		*/
147		public PriorityQueue(int initialCapacity,
#	Line 138 | Line 155 | public class PriorityQueue<E> extends Ab
155		}
156
157		/**
158	<	* Creates a <tt>PriorityQueue</tt> containing the elements in the
159	<	* specified collection.   If the specified collection is an
160	<	* instance of a {@link java.util.SortedSet} or is another
161	<	* <tt>PriorityQueue</tt>, the priority queue will be ordered
162	<	* according to the same ordering.  Otherwise, this priority queue
163	<	* will be ordered according to the natural ordering of its elements.
158	>	* Creates a {@code PriorityQueue} containing the elements in the
159	>	* specified collection.  If the specified collection is an instance of
160	>	* a {@link SortedSet} or is another {@code PriorityQueue}, this
161	>	* priority queue will be ordered according to the same ordering.
162	>	* Otherwise, this priority queue will be ordered according to the
163	>	* {@linkplain Comparable natural ordering} of its elements.
164		*
165		* @param  c the collection whose elements are to be placed
166		*         into this priority queue
#	Line 153 | Line 170 | public class PriorityQueue<E> extends Ab
170		* @throws NullPointerException if the specified collection or any
171		*         of its elements are null
172		*/
173	+	@SuppressWarnings("unchecked")
174		public PriorityQueue(Collection<? extends E> c) {
175	<	initFromCollection(c);
176	<	if (c instanceof SortedSet)
177	<	comparator = (Comparator<? super E>)
178	<	((SortedSet<? extends E>)c).comparator();
179	<	else if (c instanceof PriorityQueue)
180	<	comparator = (Comparator<? super E>)
181	<	((PriorityQueue<? extends E>)c).comparator();
175	>	if (c instanceof SortedSet<?>) {
176	>	SortedSet<? extends E> ss = (SortedSet<? extends E>) c;
177	>	this.comparator = (Comparator<? super E>) ss.comparator();
178	>	initElementsFromCollection(ss);
179	>	}
180	>	else if (c instanceof PriorityQueue<?>) {
181	>	PriorityQueue<? extends E> pq = (PriorityQueue<? extends E>) c;
182	>	this.comparator = (Comparator<? super E>) pq.comparator();
183	>	initFromPriorityQueue(pq);
184	>	}
185		else {
186	<	comparator = null;
187	<	heapify();
186	>	this.comparator = null;
187	>	initFromCollection(c);
188		}
189		}
190
191		/**
192	<	* Creates a <tt>PriorityQueue</tt> containing the elements in the
192	>	* Creates a {@code PriorityQueue} containing the elements in the
193		* specified priority queue.  This priority queue will be
194		* ordered according to the same ordering as the given priority
195		* queue.
196		*
197		* @param  c the priority queue whose elements are to be placed
198		*         into this priority queue
199	<	* @throws ClassCastException if elements of <tt>c</tt> cannot be
200	<	*         compared to one another according to <tt>c</tt>'s
199	>	* @throws ClassCastException if elements of {@code c} cannot be
200	>	*         compared to one another according to {@code c}'s
201		*         ordering
202		* @throws NullPointerException if the specified priority queue or any
203		*         of its elements are null
204		*/
205	+	@SuppressWarnings("unchecked")
206		public PriorityQueue(PriorityQueue<? extends E> c) {
207	<	comparator = (Comparator<? super E>)c.comparator();
208	<	initFromCollection(c);
207	>	this.comparator = (Comparator<? super E>) c.comparator();
208	>	initFromPriorityQueue(c);
209		}
210
211		/**
212	<	* Creates a <tt>PriorityQueue</tt> containing the elements in the
213	<	* specified sorted set.  This priority queue will be ordered
212	>	* Creates a {@code PriorityQueue} containing the elements in the
213	>	* specified sorted set.   This priority queue will be ordered
214		* according to the same ordering as the given sorted set.
215		*
216		* @param  c the sorted set whose elements are to be placed
217	<	*         into this priority queue.
217	>	*         into this priority queue
218		* @throws ClassCastException if elements of the specified sorted
219		*         set cannot be compared to one another according to the
220		*         sorted set's ordering
221		* @throws NullPointerException if the specified sorted set or any
222		*         of its elements are null
223		*/
224	+	@SuppressWarnings("unchecked")
225		public PriorityQueue(SortedSet<? extends E> c) {
226	<	comparator = (Comparator<? super E>)c.comparator();
227	<	initFromCollection(c);
226	>	this.comparator = (Comparator<? super E>) c.comparator();
227	>	initElementsFromCollection(c);
228		}
229
230	<	/**
231	<	* Initialize queue array with elements from the given Collection.
232	<	* @param c the collection
233	<	*/
234	<	private void initFromCollection(Collection<? extends E> c) {
230	>	private void initFromPriorityQueue(PriorityQueue<? extends E> c) {
231	>	if (c.getClass() == PriorityQueue.class) {
232	>	this.queue = c.toArray();
233	>	this.size = c.size();
234	>	} else {
235	>	initFromCollection(c);
236	>	}
237	>	}
238	>
239	>	private void initElementsFromCollection(Collection<? extends E> c) {
240		Object[] a = c.toArray();
241		// If c.toArray incorrectly doesn't return Object[], copy it.
242		if (a.getClass() != Object[].class)
243		a = Arrays.copyOf(a, a.length, Object[].class);
244	<	queue = a;
245	<	size = a.length;
244	>	int len = a.length;
245	>	if (len == 1 || this.comparator != null)
246	>	for (int i = 0; i < len; i++)
247	>	if (a[i] == null)
248	>	throw new NullPointerException();
249	>	this.queue = a;
250	>	this.size = a.length;
251		}
252
253		/**
254	+	* Initializes queue array with elements from the given Collection.
255	+	*
256	+	* @param c the collection
257	+	*/
258	+	private void initFromCollection(Collection<? extends E> c) {
259	+	initElementsFromCollection(c);
260	+	heapify();
261	+	}
262	+
263	+	/**
264	+	* The maximum size of array to allocate.
265	+	* Some VMs reserve some header words in an array.
266	+	* Attempts to allocate larger arrays may result in
267	+	* OutOfMemoryError: Requested array size exceeds VM limit
268	+	*/
269	+	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
270	+
271	+	/**
272		* Increases the capacity of the array.
273		*
274		* @param minCapacity the desired minimum capacity
275		*/
276		private void grow(int minCapacity) {
277	<	if (minCapacity < 0) // overflow
227	<	throw new OutOfMemoryError();
228	<	int oldCapacity = queue.length;
277	>	int oldCapacity = queue.length;
278		// Double size if small; else grow by 50%
279	<	int newCapacity = ((oldCapacity < 64)?
280	<	((oldCapacity + 1) * 2):
281	<	((oldCapacity * 3) / 2));
282	<	if (newCapacity < minCapacity)
283	<	newCapacity = minCapacity;
279	>	int newCapacity = oldCapacity + ((oldCapacity < 64) ?
280	>	(oldCapacity + 2) :
281	>	(oldCapacity >> 1));
282	>	// overflow-conscious code
283	>	if (newCapacity - MAX_ARRAY_SIZE > 0)
284	>	newCapacity = hugeCapacity(minCapacity);
285		queue = Arrays.copyOf(queue, newCapacity);
286		}
287
288	+	private static int hugeCapacity(int minCapacity) {
289	+	if (minCapacity < 0) // overflow
290	+	throw new OutOfMemoryError();
291	+	return (minCapacity > MAX_ARRAY_SIZE) ?
292	+	Integer.MAX_VALUE :
293	+	MAX_ARRAY_SIZE;
294	+	}
295	+
296		/**
297		* Inserts the specified element into this priority queue.
298		*
299	<	* @return <tt>true</tt> (as specified by {@link Collection#add})
299	>	* @return {@code true} (as specified by {@link Collection#add})
300		* @throws ClassCastException if the specified element cannot be
301		*         compared with elements currently in this priority queue
302		*         according to the priority queue's ordering
#	Line 251 | Line 309 | public class PriorityQueue<E> extends Ab
309		/**
310		* Inserts the specified element into this priority queue.
311		*
312	<	* @return <tt>true</tt> (as specified by {@link Queue#offer})
312	>	* @return {@code true} (as specified by {@link Queue#offer})
313		* @throws ClassCastException if the specified element cannot be
314		*         compared with elements currently in this priority queue
315		*         according to the priority queue's ordering
#	Line 273 | Line 331 | public class PriorityQueue<E> extends Ab
331		}
332
333		public E peek() {
334	<	if (size == 0)
277	<	return null;
278	<	return (E) queue[0];
334	>	return (size == 0) ? null : (E) queue[0];
335		}
336
337		private int indexOf(Object o) {
338	<	if (o != null) {
338	>	if (o != null) {
339		for (int i = 0; i < size; i++)
340		if (o.equals(queue[i]))
341		return i;
#	Line 289 | Line 345 | public class PriorityQueue<E> extends Ab
345
346		/**
347		* Removes a single instance of the specified element from this queue,
348	<	* if it is present.  More formally, removes an element <tt>e</tt> such
349	<	* that <tt>o.equals(e)</tt>, if this queue contains one or more such
350	<	* elements.  Returns true if this queue contained the specified element
351	<	* (or equivalently, if this queue changed as a result of the call).
348	>	* if it is present.  More formally, removes an element {@code e} such
349	>	* that {@code o.equals(e)}, if this queue contains one or more such
350	>	* elements.  Returns {@code true} if and only if this queue contained
351	>	* the specified element (or equivalently, if this queue changed as a
352	>	* result of the call).
353		*
354		* @param o element to be removed from this queue, if present
355	<	* @return <tt>true</tt> if this queue changed as a result of the call
355	>	* @return {@code true} if this queue changed as a result of the call
356		*/
357		public boolean remove(Object o) {
358	<	int i = indexOf(o);
359	<	if (i == -1)
360	<	return false;
361	<	else {
362	<	removeAt(i);
363	<	return true;
364	<	}
358	>	int i = indexOf(o);
359	>	if (i == -1)
360	>	return false;
361	>	else {
362	>	removeAt(i);
363	>	return true;
364	>	}
365		}
366
367		/**
368		* Version of remove using reference equality, not equals.
369	<	* Needed by iterator.remove
369	>	* Needed by iterator.remove.
370		*
371		* @param o element to be removed from this queue, if present
372	<	* @return <tt>true</tt> if removed.
372	>	* @return {@code true} if removed
373		*/
374		boolean removeEq(Object o) {
375	<	for (int i = 0; i < size; i++) {
376	<	if (o == queue[i]) {
375	>	for (int i = 0; i < size; i++) {
376	>	if (o == queue[i]) {
377		removeAt(i);
378		return true;
379		}
#	Line 325 | Line 382 | public class PriorityQueue<E> extends Ab
382		}
383
384		/**
385	<	* Returns <tt>true</tt> if this queue contains the specified element.
386	<	* More formally, returns <tt>true</tt> if and only if this queue contains
387	<	* at least one element <tt>e</tt> such that <tt>o.equals(e)</tt>.
385	>	* Returns {@code true} if this queue contains the specified element.
386	>	* More formally, returns {@code true} if and only if this queue contains
387	>	* at least one element {@code e} such that {@code o.equals(e)}.
388		*
389		* @param o object to be checked for containment in this queue
390	<	* @return <tt>true</tt> if this queue contains the specified element
390	>	* @return {@code true} if this queue contains the specified element
391		*/
392		public boolean contains(Object o) {
393	<	return indexOf(o) != -1;
393	>	return indexOf(o) != -1;
394		}
395
396		/**
397	<	* Returns an array containing all of the elements in this queue,
397	>	* Returns an array containing all of the elements in this queue.
398		* The elements are in no particular order.
399		*
400		* <p>The returned array will be "safe" in that no references to it are
401	<	* maintained by this list.  (In other words, this method must allocate
401	>	* maintained by this queue.  (In other words, this method must allocate
402		* a new array).  The caller is thus free to modify the returned array.
403		*
404	<	* @return an array containing all of the elements in this queue.
404	>	* <p>This method acts as bridge between array-based and collection-based
405	>	* APIs.
406	>	*
407	>	* @return an array containing all of the elements in this queue
408		*/
409		public Object[] toArray() {
410		return Arrays.copyOf(queue, size);
411		}
412
413		/**
414	<	* Returns an array containing all of the elements in this queue.
415	<	* The elements are in no particular order.  The runtime type of
416	<	* the returned array is that of the specified array.  If the queue
417	<	* fits in the specified array, it is returned therein.
418	<	* Otherwise, a new array is allocated with the runtime type of
419	<	* the specified array and the size of this queue.
414	>	* Returns an array containing all of the elements in this queue; the
415	>	* runtime type of the returned array is that of the specified array.
416	>	* The returned array elements are in no particular order.
417	>	* If the queue fits in the specified array, it is returned therein.
418	>	* Otherwise, a new array is allocated with the runtime type of the
419	>	* specified array and the size of this queue.
420		*
421		* <p>If the queue fits in the specified array with room to spare
422		* (i.e., the array has more elements than the queue), the element in
423		* the array immediately following the end of the collection is set to
424	<	* <tt>null</tt>.  (This is useful in determining the length of the
425	<	* queue <i>only</i> if the caller knows that the queue does not contain
426	<	* any null elements.)
424	>	* {@code null}.
425	>	*
426	>	* <p>Like the {@link #toArray()} method, this method acts as bridge between
427	>	* array-based and collection-based APIs.  Further, this method allows
428	>	* precise control over the runtime type of the output array, and may,
429	>	* under certain circumstances, be used to save allocation costs.
430	>	*
431	>	* <p>Suppose <tt>x</tt> is a queue known to contain only strings.
432	>	* The following code can be used to dump the queue into a newly
433	>	* allocated array of <tt>String</tt>:
434	>	*
435	>	*  <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
436	>	*
437	>	* Note that <tt>toArray(new Object[0])</tt> is identical in function to
438	>	* <tt>toArray()</tt>.
439		*
440		* @param a the array into which the elements of the queue are to
441		*          be stored, if it is big enough; otherwise, a new array of the
442		*          same runtime type is allocated for this purpose.
443	<	* @return an array containing the elements of the queue
443	>	* @return an array containing all of the elements in this queue
444		* @throws ArrayStoreException if the runtime type of the specified array
445		*         is not a supertype of the runtime type of every element in
446		*         this queue
#	Line 378 | Line 450 | public class PriorityQueue<E> extends Ab
450		if (a.length < size)
451		// Make a new array of a's runtime type, but my contents:
452		return (T[]) Arrays.copyOf(queue, size, a.getClass());
453	<	System.arraycopy(queue, 0, a, 0, size);
453	>	System.arraycopy(queue, 0, a, 0, size);
454		if (a.length > size)
455		a[size] = null;
456		return a;
#	Line 417 | Line 489 | public class PriorityQueue<E> extends Ab
489		* after we've completed the "normal" iteration.
490		*
491		* We expect that most iterations, even those involving removals,
492	<	* will not use need to store elements in this field.
492	>	* will not need to store elements in this field.
493		*/
494		private ArrayDeque<E> forgetMeNot = null;
495
#	Line 429 | Line 501 | public class PriorityQueue<E> extends Ab
501
502		/**
503		* The modCount value that the iterator believes that the backing
504	<	* List should have.  If this expectation is violated, the iterator
504	>	* Queue should have.  If this expectation is violated, the iterator
505		* has detected concurrent modification.
506		*/
507		private int expectedModCount = modCount;
#	Line 456 | Line 528 | public class PriorityQueue<E> extends Ab
528		public void remove() {
529		if (expectedModCount != modCount)
530		throw new ConcurrentModificationException();
459	–	if (lastRet == -1 && lastRetElt == null)
460	–	throw new IllegalStateException();
531		if (lastRet != -1) {
532		E moved = PriorityQueue.this.removeAt(lastRet);
533		lastRet = -1;
#	Line 468 | Line 538 | public class PriorityQueue<E> extends Ab
538		forgetMeNot = new ArrayDeque<E>();
539		forgetMeNot.add(moved);
540		}
541	<	} else {
541	>	} else if (lastRetElt != null) {
542		PriorityQueue.this.removeEq(lastRetElt);
543		lastRetElt = null;
544	+	} else {
545	+	throw new IllegalStateException();
546		}
547		expectedModCount = modCount;
548		}
477	–
549		}
550
551		public int size() {
#	Line 497 | Line 568 | public class PriorityQueue<E> extends Ab
568		return null;
569		int s = --size;
570		modCount++;
571	<	E result = (E)queue[0];
572	<	E x = (E)queue[s];
571	>	E result = (E) queue[0];
572	>	E x = (E) queue[s];
573		queue[s] = null;
574		if (s != 0)
575		siftDown(0, x);
#	Line 515 | Line 586 | public class PriorityQueue<E> extends Ab
586		* i.  Under these circumstances, this method returns the element
587		* that was previously at the end of the list and is now at some
588		* position before i. This fact is used by iterator.remove so as to
589	<	* avoid missing traverseing elements.
589	>	* avoid missing traversing elements.
590		*/
591		private E removeAt(int i) {
592		assert i >= 0 && i < size;
#	Line 560 | Line 631 | public class PriorityQueue<E> extends Ab
631		while (k > 0) {
632		int parent = (k - 1) >>> 1;
633		Object e = queue[parent];
634	<	if (key.compareTo((E)e) >= 0)
634	>	if (key.compareTo((E) e) >= 0)
635		break;
636		queue[k] = e;
637		k = parent;
#	Line 572 | Line 643 | public class PriorityQueue<E> extends Ab
643		while (k > 0) {
644		int parent = (k - 1) >>> 1;
645		Object e = queue[parent];
646	<	if (comparator.compare(x, (E)e) >= 0)
646	>	if (comparator.compare(x, (E) e) >= 0)
647		break;
648		queue[k] = e;
649		k = parent;
#	Line 603 | Line 674 | public class PriorityQueue<E> extends Ab
674		Object c = queue[child];
675		int right = child + 1;
676		if (right < size &&
677	<	((Comparable<? super E>)c).compareTo((E)queue[right]) > 0)
677	>	((Comparable<? super E>) c).compareTo((E) queue[right]) > 0)
678		c = queue[child = right];
679	<	if (key.compareTo((E)c) <= 0)
679	>	if (key.compareTo((E) c) <= 0)
680		break;
681		queue[k] = c;
682		k = child;
#	Line 620 | Line 691 | public class PriorityQueue<E> extends Ab
691		Object c = queue[child];
692		int right = child + 1;
693		if (right < size &&
694	<	comparator.compare((E)c, (E)queue[right]) > 0)
694	>	comparator.compare((E) c, (E) queue[right]) > 0)
695		c = queue[child = right];
696	<	if (comparator.compare(x, (E)c) <= 0)
696	>	if (comparator.compare(x, (E) c) <= 0)
697		break;
698		queue[k] = c;
699		k = child;
#	Line 636 | Line 707 | public class PriorityQueue<E> extends Ab
707		*/
708		private void heapify() {
709		for (int i = (size >>> 1) - 1; i >= 0; i--)
710	<	siftDown(i, (E)queue[i]);
710	>	siftDown(i, (E) queue[i]);
711		}
712
713		/**
714		* Returns the comparator used to order the elements in this
715	<	* queue, or <tt>null</tt> if this queue is sorted according to
715	>	* queue, or {@code null} if this queue is sorted according to
716		* the {@linkplain Comparable natural ordering} of its elements.
717		*
718		* @return the comparator used to order this queue, or
719	<	*         <tt>null</tt> if this queue is sorted according to the
720	<	*         natural ordering of its elements.
719	>	*         {@code null} if this queue is sorted according to the
720	>	*         natural ordering of its elements
721		*/
722		public Comparator<? super E> comparator() {
723		return comparator;
724		}
725
726		/**
727	<	* Save the state of the instance to a stream (that
728	<	* is, serialize it).
727	>	* Saves the state of the instance to a stream (that
728	>	* is, serializes it).
729		*
730		* @serialData The length of the array backing the instance is
731	<	* emitted (int), followed by all of its elements (each an
732	<	* <tt>Object</tt>) in the proper order.
731	>	*             emitted (int), followed by all of its elements
732	>	*             (each an {@code Object}) in the proper order.
733		* @param s the stream
734		*/
735		private void writeObject(java.io.ObjectOutputStream s)
#	Line 666 | Line 737 | public class PriorityQueue<E> extends Ab
737		// Write out element count, and any hidden stuff
738		s.defaultWriteObject();
739
740	<	// Write out array length
741	<	// For compatibility with 1.5 version, must be at least 2.
671	<	s.writeInt(Math.max(2, queue.length));
740	>	// Write out array length, for compatibility with 1.5 version
741	>	s.writeInt(Math.max(2, size + 1));
742
743	<	// Write out all elements in the proper order.
744	<	for (int i=0; i<size; i++)
743	>	// Write out all elements in the "proper order".
744	>	for (int i = 0; i < size; i++)
745		s.writeObject(queue[i]);
746		}
747
748		/**
749	<	* Reconstitute the <tt>PriorityQueue</tt> instance from a stream
750	<	* (that is, deserialize it).
749	>	* Reconstitutes the {@code PriorityQueue} instance from a stream
750	>	* (that is, deserializes it).
751	>	*
752		* @param s the stream
753		*/
754		private void readObject(java.io.ObjectInputStream s)
#	Line 685 | Line 756 | public class PriorityQueue<E> extends Ab
756		// Read in size, and any hidden stuff
757		s.defaultReadObject();
758
759	<	// Read in array length and allocate array
760	<	int arrayLength = s.readInt();
761	<	queue = new Object[arrayLength];
762	<
692	<	// Read in all elements in the proper order.
693	<	for (int i=0; i<size; i++)
694	<	queue[i] = (E) s.readObject();
695	<	}
759	>	// Read in (and discard) array length
760	>	s.readInt();
761	>
762	>	queue = new Object[size];
763
764	+	// Read in all elements.
765	+	for (int i = 0; i < size; i++)
766	+	queue[i] = s.readObject();
767	+
768	+	// Elements are guaranteed to be in "proper order", but the
769	+	// spec has never explained what that might be.
770	+	heapify();
771	+	}
772		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines