ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/PriorityQueue.java
(Generate patch)

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.86 by dl, Tue Jan 22 19:28:05 2013 UTC vs.
Revision 1.117 by jsr166, Tue Dec 20 22:37:31 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 24 | Line 24
24   */
25  
26   package java.util;
27 < import java.util.stream.Stream;
28 < import java.util.Spliterator;
29 < import java.util.stream.Streams;
30 < import java.util.function.Block;
27 >
28 > import java.util.function.Consumer;
29  
30   /**
31   * An unbounded priority {@linkplain Queue queue} based on a priority heap.
# Line 56 | Line 54 | import java.util.function.Block;
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 67 | Line 66 | import java.util.function.Block;
66   * java.util.concurrent.PriorityBlockingQueue} class.
67   *
68   * <p>Implementation note: this implementation provides
69 < * O(log(n)) time for the enqueing and dequeing methods
69 > * O(log(n)) time for the enqueuing and dequeuing methods
70   * ({@code offer}, {@code poll}, {@code remove()} and {@code add});
71   * linear time for the {@code remove(Object)} and {@code contains(Object)}
72   * methods; and constant time for the retrieval methods
# Line 79 | Line 78 | import java.util.function.Block;
78   *
79   * @since 1.5
80   * @author Josh Bloch, Doug Lea
81 < * @param <E> the type of elements held in this collection
81 > * @param <E> the type of elements held in this queue
82   */
83   public class PriorityQueue<E> extends AbstractQueue<E>
84      implements java.io.Serializable {
# Line 101 | Line 100 | public class PriorityQueue<E> extends Ab
100      /**
101       * The number of elements in the priority queue.
102       */
103 <    private int size = 0;
103 >    int size;
104  
105      /**
106       * The comparator, or null if priority queue uses elements'
# Line 113 | 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 138 | 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 247 | 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 326 | 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;
330        if (i == 0)
331            queue[0] = e;
332        else
333            siftUp(i, e);
343          return true;
344      }
345  
# Line 395 | Line 404 | public class PriorityQueue<E> extends Ab
404       * @return {@code true} if this queue contains the specified element
405       */
406      public boolean contains(Object o) {
407 <        return indexOf(o) != -1;
407 >        return indexOf(o) >= 0;
408      }
409  
410      /**
# Line 437 | 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 478 | Line 487 | public class PriorityQueue<E> extends Ab
487           * Index (into queue array) of element to be returned by
488           * subsequent call to next.
489           */
490 <        private int cursor = 0;
490 >        private int cursor;
491  
492          /**
493           * Index of element returned by most recent call to next,
# Line 498 | Line 507 | public class PriorityQueue<E> extends Ab
507           * We expect that most iterations, even those involving removals,
508           * will not need to store elements in this field.
509           */
510 <        private ArrayDeque<E> forgetMeNot = null;
510 >        private ArrayDeque<E> forgetMeNot;
511  
512          /**
513           * Element returned by the most recent call to next iff that
514           * element was drawn from the forgetMeNot list.
515           */
516 <        private E lastRetElt = null;
516 >        private E lastRetElt;
517  
518          /**
519           * The modCount value that the iterator believes that the backing
# Line 513 | Line 522 | public class PriorityQueue<E> extends Ab
522           */
523          private int expectedModCount = modCount;
524  
525 +        Itr() {}                        // prevent access constructor creation
526 +
527          public boolean hasNext() {
528              return cursor < size ||
529                  (forgetMeNot != null && !forgetMeNot.isEmpty());
# Line 543 | Line 554 | public class PriorityQueue<E> extends Ab
554                      cursor--;
555                  else {
556                      if (forgetMeNot == null)
557 <                        forgetMeNot = new ArrayDeque<E>();
557 >                        forgetMeNot = new ArrayDeque<>();
558                      forgetMeNot.add(moved);
559                  }
560              } else if (lastRetElt != null) {
# Line 598 | Line 609 | public class PriorityQueue<E> extends Ab
609       * avoid missing traversing elements.
610       */
611      @SuppressWarnings("unchecked")
612 <    private E removeAt(int i) {
612 >    E removeAt(int i) {
613          // assert i >= 0 && i < size;
614          modCount++;
615          int s = --size;
# Line 622 | Line 633 | public class PriorityQueue<E> extends Ab
633       * promoting x up the tree until it is greater than or equal to
634       * its parent, or is the root.
635       *
636 <     * To simplify and speed up coercions and comparisons. the
636 >     * To simplify and speed up coercions and comparisons, the
637       * Comparable and Comparator versions are separated into different
638       * methods that are otherwise identical. (Similarly for siftDown.)
639       *
# Line 718 | Line 729 | public class PriorityQueue<E> extends Ab
729      /**
730       * Establishes the heap invariant (described above) in the entire tree,
731       * assuming nothing about the order of the elements prior to the call.
732 +     * This classic algorithm due to Floyd (1964) is known to be O(size).
733       */
734      @SuppressWarnings("unchecked")
735      private void heapify() {
736 <        for (int i = (size >>> 1) - 1; i >= 0; i--)
737 <            siftDown(i, (E) queue[i]);
736 >        final Object[] es = queue;
737 >        final int half = (size >>> 1) - 1;
738 >        if (comparator == null)
739 >            for (int i = half; i >= 0; i--)
740 >                siftDownComparable(i, (E) es[i]);
741 >        else
742 >            for (int i = half; i >= 0; i--)
743 >                siftDownUsingComparator(i, (E) es[i]);
744      }
745  
746      /**
# Line 741 | Line 759 | public class PriorityQueue<E> extends Ab
759      /**
760       * Saves this queue to a stream (that is, serializes it).
761       *
762 +     * @param s the stream
763 +     * @throws java.io.IOException if an I/O error occurs
764       * @serialData The length of the array backing the instance is
765       *             emitted (int), followed by all of its elements
766       *             (each an {@code Object}) in the proper order.
747     * @param s the stream
767       */
768      private void writeObject(java.io.ObjectOutputStream s)
769          throws java.io.IOException {
# Line 764 | Line 783 | public class PriorityQueue<E> extends Ab
783       * (that is, deserializes it).
784       *
785       * @param s the stream
786 +     * @throws ClassNotFoundException if the class of a serialized object
787 +     *         could not be found
788 +     * @throws java.io.IOException if an I/O error occurs
789       */
790      private void readObject(java.io.ObjectInputStream s)
791          throws java.io.IOException, ClassNotFoundException {
# Line 784 | Line 806 | public class PriorityQueue<E> extends Ab
806          heapify();
807      }
808  
809 <    // wrapping constructor in method avoids transient javac problems
810 <    final PriorityQueueSpliterator<E> spliterator(int origin, int fence,
811 <                                                  int expectedModCount) {
812 <        return new PriorityQueueSpliterator<E>(this, origin, fence,
813 <                                               expectedModCount);
814 <    }
815 <
816 <    public Stream<E> stream() {
817 <        int flags = Streams.STREAM_IS_SIZED;
818 <        return Streams.stream
819 <            (() -> spliterator(0, size, modCount), flags);
820 <    }
821 <    public Stream<E> parallelStream() {
822 <        int flags = Streams.STREAM_IS_SIZED;
823 <        return Streams.parallelStream
824 <            (() -> spliterator(0, size, modCount), flags);
825 <    }
826 <
827 <    /** Index-based split-by-two Spliterator */
828 <    static final class PriorityQueueSpliterator<E> implements Spliterator<E> {
829 <        private final PriorityQueue<E> pq;
830 <        private int index;           // current index, modified on advance/split
831 <        private final int fence;     // one past last index
832 <        private final int expectedModCount; // for comodification checks
833 <
834 <        /** Create new spliterator covering the given  range */
835 <        PriorityQueueSpliterator(PriorityQueue<E> pq, int origin, int fence,
814 <                             int expectedModCount) {
815 <            this.pq = pq; this.index = origin; this.fence = fence;
809 >    /**
810 >     * Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
811 >     * and <em>fail-fast</em> {@link Spliterator} over the elements in this
812 >     * queue. The spliterator does not traverse elements in any particular order
813 >     * (the {@link Spliterator#ORDERED ORDERED} characteristic is not reported).
814 >     *
815 >     * <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
816 >     * {@link Spliterator#SUBSIZED}, and {@link Spliterator#NONNULL}.
817 >     * Overriding implementations should document the reporting of additional
818 >     * characteristic values.
819 >     *
820 >     * @return a {@code Spliterator} over the elements in this queue
821 >     * @since 1.8
822 >     */
823 >    public final Spliterator<E> spliterator() {
824 >        return new PriorityQueueSpliterator(0, -1, 0);
825 >    }
826 >
827 >    final class PriorityQueueSpliterator implements Spliterator<E> {
828 >        private int index;            // current index, modified on advance/split
829 >        private int fence;            // -1 until first use
830 >        private int expectedModCount; // initialized when fence set
831 >
832 >        /** Creates new spliterator covering the given range. */
833 >        PriorityQueueSpliterator(int origin, int fence, int expectedModCount) {
834 >            this.index = origin;
835 >            this.fence = fence;
836              this.expectedModCount = expectedModCount;
837          }
838  
839 <        public PriorityQueueSpliterator<E> trySplit() {
840 <            int lo = index, mid = (lo + fence) >>> 1;
839 >        private int getFence() { // initialize fence to size on first use
840 >            int hi;
841 >            if ((hi = fence) < 0) {
842 >                expectedModCount = modCount;
843 >                hi = fence = size;
844 >            }
845 >            return hi;
846 >        }
847 >
848 >        public PriorityQueueSpliterator trySplit() {
849 >            int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
850              return (lo >= mid) ? null :
851 <                new PriorityQueueSpliterator<E>(pq, lo, index = mid,
823 <                                                expectedModCount);
851 >                new PriorityQueueSpliterator(lo, index = mid, expectedModCount);
852          }
853  
854 <        public void forEach(Block<? super E> block) {
855 <            Object[] a; int i, hi; // hoist accesses and checks from loop
856 <            if (block == null)
854 >        @SuppressWarnings("unchecked")
855 >        public void forEachRemaining(Consumer<? super E> action) {
856 >            if (action == null)
857                  throw new NullPointerException();
858 <            if ((a = pq.queue).length >= (hi = fence) &&
859 <                (i = index) >= 0 && i < hi) {
860 <                index = hi;
861 <                do {
862 <                    @SuppressWarnings("unchecked") E e = (E) a[i];
863 <                    block.accept(e);
864 <                } while (++i < hi);
837 <                if (pq.modCount != expectedModCount)
838 <                    throw new ConcurrentModificationException();
858 >            if (fence < 0) { fence = size; expectedModCount = modCount; }
859 >            final Object[] a = queue;
860 >            int i, hi; E e;
861 >            for (i = index, index = hi = fence; i < hi; i++) {
862 >                if ((e = (E) a[i]) == null)
863 >                    break;      // must be CME
864 >                action.accept(e);
865              }
866 +            if (modCount != expectedModCount)
867 +                throw new ConcurrentModificationException();
868          }
869  
870 <        public boolean tryAdvance(Block<? super E> block) {
871 <            if (index >= 0 && index < fence) {
872 <                @SuppressWarnings("unchecked") E e =
873 <                    (E)pq.queue[index++];
874 <                block.accept(e);
875 <                if (pq.modCount != expectedModCount)
870 >        @SuppressWarnings("unchecked")
871 >        public boolean tryAdvance(Consumer<? super E> action) {
872 >            if (action == null)
873 >                throw new NullPointerException();
874 >            if (fence < 0) { fence = size; expectedModCount = modCount; }
875 >            int i;
876 >            if ((i = index) < fence) {
877 >                index = i + 1;
878 >                E e;
879 >                if ((e = (E) queue[i]) == null
880 >                    || modCount != expectedModCount)
881                      throw new ConcurrentModificationException();
882 +                action.accept(e);
883                  return true;
884              }
885              return false;
886          }
887  
888 <        public long estimateSize() { return (long)(fence - index); }
889 <        public boolean hasExactSize() { return true; }
890 <        public boolean hasExactSplits() { return true; }
888 >        public long estimateSize() {
889 >            return getFence() - index;
890 >        }
891 >
892 >        public int characteristics() {
893 >            return Spliterator.SIZED | Spliterator.SUBSIZED | Spliterator.NONNULL;
894 >        }
895      }
896   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines