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.123 by jsr166, Sun May 6 16:26:03 2018 UTC vs.
Revision 1.124 by jsr166, Sun May 6 19:35:51 2018 UTC

#	Line 81 | Line 81 | import jdk.internal.misc.SharedSecrets;
81		* @author Josh Bloch, Doug Lea
82		* @param <E> the type of elements held in this queue
83		*/
84	+	@SuppressWarnings("unchecked")
85		public class PriorityQueue<E> extends AbstractQueue<E>
86		implements java.io.Serializable {
87
#	Line 187 | Line 188 | public class PriorityQueue<E> extends Ab
188		* @throws NullPointerException if the specified collection or any
189		*         of its elements are null
190		*/
190	–	@SuppressWarnings("unchecked")
191		public PriorityQueue(Collection<? extends E> c) {
192		if (c instanceof SortedSet<?>) {
193		SortedSet<? extends E> ss = (SortedSet<? extends E>) c;
#	Line 219 | Line 219 | public class PriorityQueue<E> extends Ab
219		* @throws NullPointerException if the specified priority queue or any
220		*         of its elements are null
221		*/
222	–	@SuppressWarnings("unchecked")
222		public PriorityQueue(PriorityQueue<? extends E> c) {
223		this.comparator = (Comparator<? super E>) c.comparator();
224		initFromPriorityQueue(c);
#	Line 238 | Line 237 | public class PriorityQueue<E> extends Ab
237		* @throws NullPointerException if the specified sorted set or any
238		*         of its elements are null
239		*/
241	–	@SuppressWarnings("unchecked")
240		public PriorityQueue(SortedSet<? extends E> c) {
241		this.comparator = (Comparator<? super E>) c.comparator();
242		initElementsFromCollection(c);
#	Line 254 | Line 252 | public class PriorityQueue<E> extends Ab
252		}
253
254		private void initElementsFromCollection(Collection<? extends E> c) {
255	<	Object[] a = c.toArray();
255	>	Object[] es = c.toArray();
256	>	int len = es.length;
257		// If c.toArray incorrectly doesn't return Object[], copy it.
258	<	if (a.getClass() != Object[].class)
259	<	a = Arrays.copyOf(a, a.length, Object[].class);
261	<	int len = a.length;
258	>	if (es.getClass() != Object[].class)
259	>	es = Arrays.copyOf(es, len, Object[].class);
260		if (len == 1 || this.comparator != null)
261	<	for (Object e : a)
261	>	for (Object e : es)
262		if (e == null)
263		throw new NullPointerException();
264	<	this.queue = a;
265	<	this.size = a.length;
264	>	this.queue = es;
265	>	this.size = len;
266		}
267
268		/**
#	Line 344 | Line 342 | public class PriorityQueue<E> extends Ab
342		return true;
343		}
344
347	–	@SuppressWarnings("unchecked")
345		public E peek() {
346		return (size == 0) ? null : (E) queue[0];
347		}
#	Line 460 | Line 457 | public class PriorityQueue<E> extends Ab
457		*         this queue
458		* @throws NullPointerException if the specified array is null
459		*/
463	–	@SuppressWarnings("unchecked")
460		public <T> T[] toArray(T[] a) {
461		final int size = this.size;
462		if (a.length < size)
#	Line 529 | Line 525 | public class PriorityQueue<E> extends Ab
525		(forgetMeNot != null && !forgetMeNot.isEmpty());
526		}
527
532	–	@SuppressWarnings("unchecked")
528		public E next() {
529		if (expectedModCount != modCount)
530		throw new ConcurrentModificationException();
#	Line 583 | Line 578 | public class PriorityQueue<E> extends Ab
578		size = 0;
579		}
580
586	–	@SuppressWarnings("unchecked")
581		public E poll() {
582		if (size == 0)
583		return null;
#	Line 609 | Line 603 | public class PriorityQueue<E> extends Ab
603		* position before i. This fact is used by iterator.remove so as to
604		* avoid missing traversing elements.
605		*/
612	–	@SuppressWarnings("unchecked")
606		E removeAt(int i) {
607		// assert i >= 0 && i < size;
608		modCount++;
#	Line 643 | Line 636 | public class PriorityQueue<E> extends Ab
636		*/
637		private void siftUp(int k, E x) {
638		if (comparator != null)
639	<	siftUpUsingComparator(k, x);
639	>	siftUpUsingComparator(k, x, queue, comparator);
640		else
641	<	siftUpComparable(k, x);
641	>	siftUpComparable(k, x, queue);
642		}
643
644	<	@SuppressWarnings("unchecked")
645	<	private void siftUpComparable(int k, E x) {
653	<	Comparable<? super E> key = (Comparable<? super E>) x;
644	>	private static <T> void siftUpComparable(int k, T x, Object[] es) {
645	>	Comparable<? super T> key = (Comparable<? super T>) x;
646		while (k > 0) {
647		int parent = (k - 1) >>> 1;
648	<	Object e = queue[parent];
649	<	if (key.compareTo((E) e) >= 0)
648	>	Object e = es[parent];
649	>	if (key.compareTo((T) e) >= 0)
650		break;
651	<	queue[k] = e;
651	>	es[k] = e;
652		k = parent;
653		}
654	<	queue[k] = key;
654	>	es[k] = key;
655		}
656
657	<	@SuppressWarnings("unchecked")
658	<	private void siftUpUsingComparator(int k, E x) {
657	>	private static <T> void siftUpUsingComparator(
658	>	int k, T x, Object[] es, Comparator<? super T> cmp) {
659		while (k > 0) {
660		int parent = (k - 1) >>> 1;
661	<	Object e = queue[parent];
662	<	if (comparator.compare(x, (E) e) >= 0)
661	>	Object e = es[parent];
662	>	if (cmp.compare(x, (T) e) >= 0)
663		break;
664	<	queue[k] = e;
664	>	es[k] = e;
665		k = parent;
666		}
667	<	queue[k] = x;
667	>	es[k] = x;
668		}
669
670		/**
#	Line 685 | Line 677 | public class PriorityQueue<E> extends Ab
677		*/
678		private void siftDown(int k, E x) {
679		if (comparator != null)
680	<	siftDownUsingComparator(k, x);
680	>	siftDownUsingComparator(k, x, queue, size, comparator);
681		else
682	<	siftDownComparable(k, x);
682	>	siftDownComparable(k, x, queue, size);
683		}
684
685	<	@SuppressWarnings("unchecked")
686	<	private void siftDownComparable(int k, E x) {
687	<	Comparable<? super E> key = (Comparable<? super E>)x;
688	<	int half = size >>> 1;        // loop while a non-leaf
685	>	private static <T> void siftDownComparable(int k, T x, Object[] es, int n) {
686	>	// assert n > 0;
687	>	Comparable<? super T> key = (Comparable<? super T>)x;
688	>	int half = n >>> 1;           // loop while a non-leaf
689		while (k < half) {
690		int child = (k << 1) + 1; // assume left child is least
691	<	Object c = queue[child];
691	>	Object c = es[child];
692		int right = child + 1;
693	<	if (right < size &&
694	<	((Comparable<? super E>) c).compareTo((E) queue[right]) > 0)
695	<	c = queue[child = right];
696	<	if (key.compareTo((E) c) <= 0)
693	>	if (right < n &&
694	>	((Comparable<? super T>) c).compareTo((T) es[right]) > 0)
695	>	c = es[child = right];
696	>	if (key.compareTo((T) c) <= 0)
697		break;
698	<	queue[k] = c;
698	>	es[k] = c;
699		k = child;
700		}
701	<	queue[k] = key;
701	>	es[k] = key;
702		}
703
704	<	@SuppressWarnings("unchecked")
705	<	private void siftDownUsingComparator(int k, E x) {
706	<	int half = size >>> 1;
704	>	private static <T> void siftDownUsingComparator(
705	>	int k, T x, Object[] es, int n, Comparator<? super T> cmp) {
706	>	// assert n > 0;
707	>	int half = n >>> 1;
708		while (k < half) {
709		int child = (k << 1) + 1;
710	<	Object c = queue[child];
710	>	Object c = es[child];
711		int right = child + 1;
712	<	if (right < size &&
713	<	comparator.compare((E) c, (E) queue[right]) > 0)
714	<	c = queue[child = right];
722	<	if (comparator.compare(x, (E) c) <= 0)
712	>	if (right < n && cmp.compare((T) c, (T) es[right]) > 0)
713	>	c = es[child = right];
714	>	if (cmp.compare(x, (T) c) <= 0)
715		break;
716	<	queue[k] = c;
716	>	es[k] = c;
717		k = child;
718		}
719	<	queue[k] = x;
719	>	es[k] = x;
720		}
721
722		/**
#	Line 732 | Line 724 | public class PriorityQueue<E> extends Ab
724		* assuming nothing about the order of the elements prior to the call.
725		* This classic algorithm due to Floyd (1964) is known to be O(size).
726		*/
735	–	@SuppressWarnings("unchecked")
727		private void heapify() {
728		final Object[] es = queue;
729	<	int i = (size >>> 1) - 1;
730	<	if (comparator == null)
729	>	int n = size, i = (n >>> 1) - 1;
730	>	Comparator<? super E> cmp = comparator;
731	>	if (cmp == null)
732		for (; i >= 0; i--)
733	<	siftDownComparable(i, (E) es[i]);
733	>	siftDownComparable(i, (E) es[i], es, n);
734		else
735		for (; i >= 0; i--)
736	<	siftDownUsingComparator(i, (E) es[i]);
736	>	siftDownUsingComparator(i, (E) es[i], es, n, cmp);
737		}
738
739		/**
#	Line 855 | Line 847 | public class PriorityQueue<E> extends Ab
847		new PriorityQueueSpliterator(lo, index = mid, expectedModCount);
848		}
849
858	–	@SuppressWarnings("unchecked")
850		public void forEachRemaining(Consumer<? super E> action) {
851		if (action == null)
852		throw new NullPointerException();
853		if (fence < 0) { fence = size; expectedModCount = modCount; }
854	<	final Object[] a = queue;
854	>	final Object[] es = queue;
855		int i, hi; E e;
856		for (i = index, index = hi = fence; i < hi; i++) {
857	<	if ((e = (E) a[i]) == null)
857	>	if ((e = (E) es[i]) == null)
858		break;      // must be CME
859		action.accept(e);
860		}
#	Line 871 | Line 862 | public class PriorityQueue<E> extends Ab
862		throw new ConcurrentModificationException();
863		}
864
874	–	@SuppressWarnings("unchecked")
865		public boolean tryAdvance(Consumer<? super E> action) {
866		if (action == null)
867		throw new NullPointerException();
#	Line 901 | Line 891 | public class PriorityQueue<E> extends Ab
891		/**
892		* @throws NullPointerException {@inheritDoc}
893		*/
904	–	@SuppressWarnings("unchecked")
894		public void forEach(Consumer<? super E> action) {
895		Objects.requireNonNull(action);
896		final int expectedModCount = modCount;

Diff Legend

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