ViewVC Help

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

root/jsr166/jsr166/src/extra166y/PAS.java

Comparing jsr166/src/extra166y/PAS.java (file contents):
Revision 1.11 by jsr166, Sat Oct 16 16:40:44 2010 UTC vs.
Revision 1.19 by jsr166, Sun Jan 18 20:17:32 2015 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
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 676 | Line 677 | class PAS {
677		}
678		}
679
680	<	void  atLeaf(int l, int h) {
680	>	void atLeaf(int l, int h) {
681		if (pap.hasFilter())
682		filteredAtLeaf(l, h);
683		else {
#	Line 689 | Line 690 | class PAS {
690		}
691		}
692
693	<	void  filteredAtLeaf(int l, int h) {
693	>	void filteredAtLeaf(int l, int h) {
694		for (int i = l; i < h; ++i) {
695		if (pap.isSelected(i)) {
696		Object x = pap.oget(i);
#	Line 772 | Line 773 | class PAS {
773		}
774		}
775
776	<	void  filteredAtLeaf(int l, int h) {
776	>	void filteredAtLeaf(int l, int h) {
777		for (int i = l; i < h; ++i) {
778		if (pap.isSelected(i)) {
779		double x = pap.dget(i);
#	Line 843 | Line 844 | class PAS {
844		}
845		}
846
847	<	void  atLeaf(int l, int h) {
847	>	void atLeaf(int l, int h) {
848		if (pap.hasFilter())
849		filteredAtLeaf(l, h);
850		else {
#	Line 857 | Line 858 | class PAS {
858		}
859		}
860
861	<	void  filteredAtLeaf(int l, int h) {
861	>	void filteredAtLeaf(int l, int h) {
862		for (int i = l; i < h; ++i) {
863		if (pap.isSelected(i)) {
864		long x = pap.lget(i);
#	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 1491 | Line 1492 | class PAS {
1492		if ((filtered && !pap.isSelected(k)) ||
1493		(x = src[k]) == null)
1494		continue;
1495	<	int hc = byIdentity? System.identityHashCode(x): x.hashCode();
1495	>	int hc = byIdentity ? System.identityHashCode(x) : x.hashCode();
1496		int hash = hash(hc);
1497		long entry = (((long)hash) << 32) + (k + 1);
1498		int idx = hash & mask;
#	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 1681 | Line 1682 | class PAS {
1682		l+h, n-h, l, g, null).compute();
1683		}
1684		else
1685	<	oquickSort(a, cmp, l, l+n-1);
1685	>	Arrays.sort(a, l, l+n, cmp);
1686		}
1687		}
1688
#	Line 1717 | Line 1718 | class PAS {
1718		l+h, n-h, l, g, null).compute();
1719		}
1720		else
1721	<	ocquickSort(a, l, l+n-1);
1721	>	Arrays.sort(a, l, l+n);
1722		}
1723		}
1724
#	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 2307 | Line 2308 | class PAS {
2308
2309		// versions of quicksort with comparators
2310
2310	–	static void oquickSort(Object[] a, Comparator cmp, int lo, int hi) {
2311	–	for (;;) {
2312	–	if (hi - lo <= INSERTION_SORT_THRESHOLD) {
2313	–	for (int i = lo + 1; i <= hi; i++) {
2314	–	Object t = a[i];
2315	–	int j = i - 1;
2316	–	while (j >= lo && cmp.compare(t, a[j]) < 0) {
2317	–	a[j+1] = a[j];
2318	–	--j;
2319	–	}
2320	–	a[j+1] = t;
2321	–	}
2322	–	return;
2323	–	}
2324	–
2325	–	int mid = (lo + hi) >>> 1;
2326	–	if (cmp.compare(a[lo], a[mid]) > 0) {
2327	–	Object t = a[lo]; a[lo] = a[mid]; a[mid] = t;
2328	–	}
2329	–	if (cmp.compare(a[mid], a[hi]) > 0) {
2330	–	Object t = a[mid]; a[mid] = a[hi]; a[hi] = t;
2331	–	if (cmp.compare(a[lo], a[mid]) > 0) {
2332	–	Object u = a[lo]; a[lo] = a[mid]; a[mid] = u;
2333	–	}
2334	–	}
2335	–
2336	–	Object pivot = a[mid];
2337	–	int left = lo+1;
2338	–	int right = hi-1;
2339	–	boolean sameLefts = true;
2340	–	for (;;) {
2341	–	while (cmp.compare(pivot, a[right]) < 0)
2342	–	--right;
2343	–	int c;
2344	–	while (left < right &&
2345	–	(c = cmp.compare(pivot, a[left])) >= 0) {
2346	–	if (c != 0)
2347	–	sameLefts = false;
2348	–	++left;
2349	–	}
2350	–	if (left < right) {
2351	–	Object t = a[left]; a[left] = a[right]; a[right] = t;
2352	–	--right;
2353	–	}
2354	–	else break;
2355	–	}
2356	–
2357	–	if (sameLefts && right == hi - 1)
2358	–	return;
2359	–	if (left - lo <= hi - right) {
2360	–	oquickSort(a, cmp, lo, left);
2361	–	lo = left + 1;
2362	–	}
2363	–	else {
2364	–	oquickSort(a, cmp, right, hi);
2365	–	hi = left;
2366	–	}
2367	–	}
2368	–	}
2369	–
2370	–	static void ocquickSort(Comparable[] a, int lo, int hi) {
2371	–	for (;;) {
2372	–	if (hi - lo <= INSERTION_SORT_THRESHOLD) {
2373	–	for (int i = lo + 1; i <= hi; i++) {
2374	–	Comparable t = a[i];
2375	–	int j = i - 1;
2376	–	while (j >= lo && t.compareTo(a[j]) < 0) {
2377	–	a[j+1] = a[j];
2378	–	--j;
2379	–	}
2380	–	a[j+1] = t;
2381	–	}
2382	–	return;
2383	–	}
2384	–
2385	–	int mid = (lo + hi) >>> 1;
2386	–	if (a[lo].compareTo(a[mid]) > 0) {
2387	–	Comparable t = a[lo]; a[lo] = a[mid]; a[mid] = t;
2388	–	}
2389	–	if (a[mid].compareTo(a[hi]) > 0) {
2390	–	Comparable t = a[mid]; a[mid] = a[hi]; a[hi] = t;
2391	–	if (a[lo].compareTo(a[mid]) > 0) {
2392	–	Comparable u = a[lo]; a[lo] = a[mid]; a[mid] = u;
2393	–	}
2394	–	}
2395	–	Comparable pivot = a[mid];
2396	–	int left = lo+1;
2397	–	int right = hi-1;
2398	–	boolean sameLefts = true;
2399	–	for (;;) {
2400	–	while (pivot.compareTo(a[right]) < 0)
2401	–	--right;
2402	–	int c;
2403	–	while (left < right && (c = pivot.compareTo(a[left])) >= 0) {
2404	–	if (c != 0)
2405	–	sameLefts = false;
2406	–	++left;
2407	–	}
2408	–	if (left < right) {
2409	–	Comparable t = a[left]; a[left] = a[right]; a[right] = t;
2410	–	--right;
2411	–	}
2412	–	else break;
2413	–	}
2414	–
2415	–	if (sameLefts && right == hi - 1)
2416	–	return;
2417	–	if (left - lo <= hi - right) {
2418	–	ocquickSort(a, lo, left);
2419	–	lo = left + 1;
2420	–	}
2421	–	else {
2422	–	ocquickSort(a, right, hi);
2423	–	hi = left;
2424	–	}
2425	–	}
2426	–	}
2427	–
2311
2312		static void dquickSort(double[] a, DoubleComparator cmp, int lo, int hi) {
2313		for (;;) {
#	Line 2579 | 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 2673 | Line 2556 | class PAS {
2556		op.pushUp(par, par.left, par.right);
2557		int refork =
2558		((pb & CUMULATE) == 0 &&
2559	<	par.lo == op.origin)? CUMULATE : 0;
2559	>	par.lo == op.origin) ? CUMULATE : 0;
2560		int nextPhase = pb|cb|refork;
2561		if (pb == nextPhase ||
2562		phaseUpdater.compareAndSet(par, pb, nextPhase)) {
#	Line 2750 | 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 2767 | 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 2857 | 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 2947 | 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 3039 | 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 3121 | 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