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

Comparing jsr166/src/extra166y/PAS.java (file contents):
Revision 1.15 by jsr166, Mon Dec 5 04:08:47 2011 UTC vs.
Revision 1.19 by jsr166, Sun Jan 18 20:17:32 2015 UTC

# Line 5 | Line 5
5   */
6  
7   package extra166y;
8 +
9   import jsr166y.*;
10   import static extra166y.Ops.*;
11   import java.util.*;
# Line 56 | Line 57 | class PAS {
57       * subclass, prefixed FJO (object reference), FJD (double) and FJL
58       * (long).
59       */
60 <    static abstract class FJBase extends RecursiveAction {
60 >    abstract static class FJBase extends RecursiveAction {
61          final AbstractParallelAnyArray pap;
62          final int lo;
63          final int hi;
# Line 906 | Line 907 | class PAS {
907       * Base for cancellable search tasks. Same idea as FJBase
908       * but cancels tasks when result nonnegative.
909       */
910 <    static abstract class FJSearchBase extends RecursiveAction {
910 >    abstract static class FJSearchBase extends RecursiveAction {
911          final AbstractParallelAnyArray pap;
912          final int lo;
913          final int hi;
# Line 1134 | Line 1135 | class PAS {
1135          }
1136      }
1137  
1138 <    static abstract class FJSelectAllDriver extends RecursiveAction {
1138 >    abstract static class FJSelectAllDriver extends RecursiveAction {
1139          final int[] indices;
1140          final AbstractParallelAnyArray pap;
1141          final int initialOffset;
# Line 1574 | Line 1575 | class PAS {
1575          }
1576  
1577          /**
1578 <         * Return new array holding all elements.
1578 >         * Returns new array holding all elements.
1579           */
1580          Object[] uniqueObjects(int size) {
1581              Object[] src = pap.ogetArray();
# Line 1887 | Line 1888 | class PAS {
1888      }
1889  
1890      /**
1891 <     * Perform merging for FJSorter. If big enough, splits Left
1891 >     * Performs merging for FJSorter. If big enough, splits Left
1892       * partition in half; finds the greatest point in Right partition
1893       * less than the beginning of the second half of Left via binary
1894       * search; and then, in parallel, merges left half of Left with
# Line 2461 | Line 2462 | class PAS {
2462       *
2463       * This class maintains only the basic control logic.  Subclasses
2464       * maintain the "in" and "out" fields, and *Ops classes perform
2465 <     * computations
2465 >     * computations.
2466       */
2467 <    static abstract class FJScan extends ForkJoinTask<Void> {
2467 >    abstract static class FJScan extends ForkJoinTask<Void> {
2468          static final short CUMULATE = (short)1;
2469          static final short SUMMED   = (short)2;
2470          static final short FINISHED = (short)4;
# Line 2632 | Line 2633 | class PAS {
2633      /**
2634       * Computational operations for FJScan
2635       */
2636 <    static abstract class FJScanOp {
2636 >    abstract static class FJScanOp {
2637          final int threshold;
2638          final int origin;
2639          final int fence;
# Line 2649 | Line 2650 | class PAS {
2650          abstract FJScan newSubtask(FJScan parent, int lo, int hi);
2651      }
2652  
2653 <    static abstract class FJOScanOp extends FJScanOp {
2653 >    abstract static class FJOScanOp extends FJScanOp {
2654          final Object[] array;
2655          final Reducer reducer;
2656          final Object base;
# Line 2739 | Line 2740 | class PAS {
2740          }
2741      }
2742  
2743 <    static abstract class FJDScanOp extends FJScanOp {
2743 >    abstract static class FJDScanOp extends FJScanOp {
2744          final double[] array;
2745          final DoubleReducer reducer;
2746          final double base;
# Line 2829 | Line 2830 | class PAS {
2830          }
2831      }
2832  
2833 <    static abstract class FJLScanOp extends FJScanOp {
2833 >    abstract static class FJLScanOp extends FJScanOp {
2834          final long[] array;
2835          final LongReducer reducer;
2836          final long base;
# Line 2921 | Line 2922 | class PAS {
2922  
2923      // specialized versions for plus
2924  
2925 <    static abstract class FJDScanPlusOp extends FJScanOp {
2925 >    abstract static class FJDScanPlusOp extends FJScanOp {
2926          final double[] array;
2927          FJDScanPlusOp(AbstractParallelAnyArray.DPap pap) {
2928              super(pap);
# Line 3003 | Line 3004 | class PAS {
3004          }
3005      }
3006  
3007 <    static abstract class FJLScanPlusOp extends FJScanOp {
3007 >    abstract static class FJLScanPlusOp extends FJScanOp {
3008          final long[] array;
3009          FJLScanPlusOp(AbstractParallelAnyArray.LPap pap) {
3010              super(pap);

Diff Legend

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