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.102 by jsr166, Wed Dec 31 07:54:13 2014 UTC vs.
Revision 1.112 by jsr166, Tue Nov 29 18:11:28 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
2	>	* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
3		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5		* This code is free software; you can redistribute it and/or modify it
#	Line 26 | Line 26
26		package java.util;
27
28		import java.util.function.Consumer;
29	–	import java.util.stream.Stream;
29
30		/**
31		* An unbounded priority {@linkplain Queue queue} based on a priority heap.
#	Line 55 | Line 54 | import java.util.stream.Stream;
54		* <p>This class and its iterator implement all of the
55		* <em>optional</em> methods of the {@link Collection} and {@link
56		* Iterator} interfaces.  The Iterator provided in method {@link
57	<	* #iterator()} is <em>not</em> guaranteed to traverse the elements of
57	>	* #iterator()} and the Spliterator provided in method {@link #spliterator()}
58	>	* are <em>not</em> guaranteed to traverse the elements of
59		* the priority queue in any particular order. If you need ordered
60		* traversal, consider using {@code Arrays.sort(pq.toArray())}.
61		*
#	Line 100 | Line 100 | public class PriorityQueue<E> extends Ab
100		/**
101		* The number of elements in the priority queue.
102		*/
103	<	private int size;
103	>	int size;
104
105		/**
106		* The comparator, or null if priority queue uses elements'
#	Line 112 | Line 112 | public class PriorityQueue<E> extends Ab
112		* The number of times this priority queue has been
113		* <i>structurally modified</i>.  See AbstractList for gory details.
114		*/
115	<	transient int modCount = 0; // non-private to simplify nested class access
115	>	transient int modCount;     // non-private to simplify nested class access
116
117		/**
118		* Creates a {@code PriorityQueue} with the default initial
#	Line 137 | Line 137 | public class PriorityQueue<E> extends Ab
137		}
138
139		/**
140	+	* Creates a {@code PriorityQueue} with the default initial capacity and
141	+	* whose elements are ordered according to the specified comparator.
142	+	*
143	+	* @param  comparator the comparator that will be used to order this
144	+	*         priority queue.  If {@code null}, the {@linkplain Comparable
145	+	*         natural ordering} of the elements will be used.
146	+	* @since 1.8
147	+	*/
148	+	public PriorityQueue(Comparator<? super E> comparator) {
149	+	this(DEFAULT_INITIAL_CAPACITY, comparator);
150	+	}
151	+
152	+	/**
153		* Creates a {@code PriorityQueue} with the specified initial capacity
154		* that orders its elements according to the specified comparator.
155		*
#	Line 246 | Line 259 | public class PriorityQueue<E> extends Ab
259		a = Arrays.copyOf(a, a.length, Object[].class);
260		int len = a.length;
261		if (len == 1 || this.comparator != null)
262	<	for (int i = 0; i < len; i++)
263	<	if (a[i] == null)
262	>	for (Object e : a)
263	>	if (e == null)
264		throw new NullPointerException();
265		this.queue = a;
266		this.size = a.length;
#	Line 325 | Line 338 | public class PriorityQueue<E> extends Ab
338		int i = size;
339		if (i >= queue.length)
340		grow(i + 1);
341	+	siftUp(i, e);
342		size = i + 1;
329	–	if (i == 0)
330	–	queue[0] = e;
331	–	else
332	–	siftUp(i, e);
343		return true;
344		}
345
#	Line 436 | Line 446 | public class PriorityQueue<E> extends Ab
446		* The following code can be used to dump the queue into a newly
447		* allocated array of {@code String}:
448		*
449	<	*  <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
449	>	* <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
450		*
451		* Note that {@code toArray(new Object[0])} is identical in function to
452		* {@code toArray()}.
#	Line 597 | Line 607 | public class PriorityQueue<E> extends Ab
607		* avoid missing traversing elements.
608		*/
609		@SuppressWarnings("unchecked")
610	<	private E removeAt(int i) {
610	>	E removeAt(int i) {
611		// assert i >= 0 && i < size;
612		modCount++;
613		int s = --size;
#	Line 717 | Line 727 | public class PriorityQueue<E> extends Ab
727		/**
728		* Establishes the heap invariant (described above) in the entire tree,
729		* assuming nothing about the order of the elements prior to the call.
730	+	* This classic algorithm due to Floyd (1964) is known to be O(size).
731		*/
732		@SuppressWarnings("unchecked")
733		private void heapify() {
#	Line 740 | Line 751 | public class PriorityQueue<E> extends Ab
751		/**
752		* Saves this queue to a stream (that is, serializes it).
753		*
754	+	* @param s the stream
755	+	* @throws java.io.IOException if an I/O error occurs
756		* @serialData The length of the array backing the instance is
757		*             emitted (int), followed by all of its elements
758		*             (each an {@code Object}) in the proper order.
746	–	* @param s the stream
747	–	* @throws java.io.IOException if an I/O error occurs
759		*/
760		private void writeObject(java.io.ObjectOutputStream s)
761		throws java.io.IOException {
#	Line 787 | Line 798 | public class PriorityQueue<E> extends Ab
798		heapify();
799		}
800
790	–	public Spliterator<E> spliterator() {
791	–	return new PriorityQueueSpliterator<E>(this, 0, -1, 0);
792	–	}
793	–
801		/**
802	<	* This is very similar to ArrayList Spliterator, except for extra
803	<	* null checks.
802	>	* Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
803	>	* and <em>fail-fast</em> {@link Spliterator} over the elements in this
804	>	* queue. The spliterator does not traverse elements in any particular order
805	>	* (the {@link Spliterator#ORDERED ORDERED} characteristic is not reported).
806	>	*
807	>	* <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
808	>	* {@link Spliterator#SUBSIZED}, and {@link Spliterator#NONNULL}.
809	>	* Overriding implementations should document the reporting of additional
810	>	* characteristic values.
811	>	*
812	>	* @return a {@code Spliterator} over the elements in this queue
813	>	* @since 1.8
814		*/
815	+	public final Spliterator<E> spliterator() {
816	+	return new PriorityQueueSpliterator<>(this, 0, -1, 0);
817	+	}
818	+
819		static final class PriorityQueueSpliterator<E> implements Spliterator<E> {
820	+	/*
821	+	* This is very similar to ArrayList Spliterator, except for
822	+	* extra null checks.
823	+	*/
824		private final PriorityQueue<E> pq;
825		private int index;            // current index, modified on advance/split
826		private int fence;            // -1 until first use
827		private int expectedModCount; // initialized when fence set
828
829	<	/** Creates new spliterator covering the given range */
829	>	/** Creates new spliterator covering the given range. */
830		PriorityQueueSpliterator(PriorityQueue<E> pq, int origin, int fence,
831	<	int expectedModCount) {
831	>	int expectedModCount) {
832		this.pq = pq;
833		this.index = origin;
834		this.fence = fence;
#	Line 819 | Line 844 | public class PriorityQueue<E> extends Ab
844		return hi;
845		}
846
847	<	public Spliterator<E> trySplit() {
847	>	public PriorityQueueSpliterator<E> trySplit() {
848		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
849		return (lo >= mid) ? null :
850	<	new PriorityQueueSpliterator<E>(pq, lo, index = mid,
851	<	expectedModCount);
850	>	new PriorityQueueSpliterator<>(pq, lo, index = mid,
851	>	expectedModCount);
852		}
853
854		@SuppressWarnings("unchecked")
#	Line 857 | Line 882 | public class PriorityQueue<E> extends Ab
882		}
883
884		public boolean tryAdvance(Consumer<? super E> action) {
885	+	if (action == null)
886	+	throw new NullPointerException();
887		int hi = getFence(), lo = index;
888		if (lo >= 0 && lo < hi) {
889		index = lo + 1;

Diff Legend

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