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.1 by dl, Tue Jan 6 14:30:57 2009 UTC vs.
Revision 1.15 by jsr166, Mon Dec 5 04:08:47 2011 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;
#	Line 26 | Line 26 | class PAS {
26		static ForkJoinPool defaultExecutor() {
27		ForkJoinPool p = defaultExecutor; // double-check
28		if (p == null) {
29	<	synchronized(poolLock) {
29	>	synchronized (poolLock) {
30		p = defaultExecutor;
31		if (p == null) {
32		// use ceil(7/8 * ncpus)
#	Line 676 | Line 676 | class PAS {
676		}
677		}
678
679	<	void  atLeaf(int l, int h) {
679	>	void atLeaf(int l, int h) {
680		if (pap.hasFilter())
681		filteredAtLeaf(l, h);
682		else {
#	Line 689 | Line 689 | class PAS {
689		}
690		}
691
692	<	void  filteredAtLeaf(int l, int h) {
692	>	void filteredAtLeaf(int l, int h) {
693		for (int i = l; i < h; ++i) {
694		if (pap.isSelected(i)) {
695		Object x = pap.oget(i);
#	Line 772 | Line 772 | class PAS {
772		}
773		}
774
775	<	void  filteredAtLeaf(int l, int h) {
775	>	void filteredAtLeaf(int l, int h) {
776		for (int i = l; i < h; ++i) {
777		if (pap.isSelected(i)) {
778		double x = pap.dget(i);
#	Line 843 | Line 843 | class PAS {
843		}
844		}
845
846	<	void  atLeaf(int l, int h) {
846	>	void atLeaf(int l, int h) {
847		if (pap.hasFilter())
848		filteredAtLeaf(l, h);
849		else {
#	Line 857 | Line 857 | class PAS {
857		}
858		}
859
860	<	void  filteredAtLeaf(int l, int h) {
860	>	void filteredAtLeaf(int l, int h) {
861		for (int i = l; i < h; ++i) {
862		if (pap.isSelected(i)) {
863		long x = pap.lget(i);
#	Line 1491 | Line 1491 | class PAS {
1491		if ((filtered && !pap.isSelected(k)) ||
1492		(x = src[k]) == null)
1493		continue;
1494	<	int hc = byIdentity? System.identityHashCode(x): x.hashCode();
1494	>	int hc = byIdentity ? System.identityHashCode(x) : x.hashCode();
1495		int hash = hash(hc);
1496		long entry = (((long)hash) << 32) + (k + 1);
1497		int idx = hash & mask;
#	Line 1524 | Line 1524 | class PAS {
1524		continue;
1525		double x = src[k];
1526		long bits = Double.doubleToLongBits(x);
1527	<	int hash = hash((int)(bits ^ (bits >>> 32)));;
1527	>	int hash = hash((int)(bits ^ (bits >>> 32)));
1528		long entry = (((long)hash) << 32) + (k + 1);
1529		int idx = hash & mask;
1530		for (;;) {
#	Line 1657 | Line 1657 | class PAS {
1657		this.gran = gran;
1658		}
1659
1660	<	public void compute()  {
1660	>	public void compute() {
1661		int l = origin;
1662		int g = gran;
1663		if (n > g) {
#	Line 1681 | Line 1681 | class PAS {
1681		l+h, n-h, l, g, null).compute();
1682		}
1683		else
1684	<	oquickSort(a, cmp, l, l+n-1);
1684	>	Arrays.sort(a, l, l+n, cmp);
1685		}
1686		}
1687
#	Line 1693 | Line 1693 | class PAS {
1693		this.a = a; this.w = w; this.origin = origin; this.n = n;
1694		this.gran = gran;
1695		}
1696	<	public void compute()  {
1696	>	public void compute() {
1697		int l = origin;
1698		int g = gran;
1699		if (n > g) {
#	Line 1717 | Line 1717 | class PAS {
1717		l+h, n-h, l, g, null).compute();
1718		}
1719		else
1720	<	ocquickSort(a, l, l+n-1);
1720	>	Arrays.sort(a, l, l+n);
1721		}
1722		}
1723
#	Line 1730 | Line 1730 | class PAS {
1730		this.a = a; this.w = w; this.origin = origin; this.n = n;
1731		this.gran = gran;
1732		}
1733	<	public void compute()  {
1733	>	public void compute() {
1734		int l = origin;
1735		int g = gran;
1736		if (n > g) {
#	Line 1766 | Line 1766 | class PAS {
1766		this.a = a; this.w = w; this.origin = origin; this.n = n;
1767		this.gran = gran;
1768		}
1769	<	public void compute()  {
1769	>	public void compute() {
1770		int l = origin;
1771		int g = gran;
1772		if (n > g) {
#	Line 1790 | Line 1790 | class PAS {
1790		l+h, n-h, l, g, null).compute();
1791		}
1792		else
1793	<	dcquickSort(a, l, l+n-1);
1793	>	Arrays.sort(a, l, l+n);
1794		}
1795		}
1796
#	Line 1804 | Line 1804 | class PAS {
1804		this.gran = gran;
1805		}
1806
1807	<	public void compute()  {
1807	>	public void compute() {
1808		int l = origin;
1809		int g = gran;
1810		if (n > g) {
#	Line 1840 | Line 1840 | class PAS {
1840		this.a = a; this.w = w; this.origin = origin; this.n = n;
1841		this.gran = gran;
1842		}
1843	<	public void compute()  {
1843	>	public void compute() {
1844		int l = origin;
1845		int g = gran;
1846		if (n > g) {
#	Line 1865 | Line 1865 | class PAS {
1865		l+h, n-h, l, g, null).compute();
1866		}
1867		else
1868	<	lcquickSort(a, l, l+n-1);
1868	>	Arrays.sort(a, l, l+n);
1869		}
1870		}
1871
#	Line 1875 | Line 1875 | class PAS {
1875		final RecursiveAction right;
1876		final RecursiveAction merger;
1877		FJSubSorter(RecursiveAction left, RecursiveAction right,
1878	<	RecursiveAction merger){
1878	>	RecursiveAction merger) {
1879		this.left = left; this.right = right; this.merger = merger;
1880		}
1881		public void compute() {
1882	<	invokeAll(left, right);
1882	>	right.fork();
1883	>	left.invoke();
1884	>	right.join();
1885		merger.invoke();
1886		}
1887		}
#	Line 2303 | Line 2305 | class PAS {
2305		/** Cutoff for when to use insertion-sort instead of quicksort */
2306		static final int INSERTION_SORT_THRESHOLD = 8;
2307
2308	<	// Six nearly identical versions of quicksort
2308	>	// versions of quicksort with comparators
2309
2308	–	static void oquickSort(Object[] a, Comparator cmp, int lo, int hi) {
2309	–	for (;;) {
2310	–	if (hi - lo <= INSERTION_SORT_THRESHOLD) {
2311	–	for (int i = lo + 1; i <= hi; i++) {
2312	–	Object t = a[i];
2313	–	int j = i - 1;
2314	–	while (j >= lo && cmp.compare(t, a[j]) < 0) {
2315	–	a[j+1] = a[j];
2316	–	--j;
2317	–	}
2318	–	a[j+1] = t;
2319	–	}
2320	–	return;
2321	–	}
2322	–
2323	–	int mid = (lo + hi) >>> 1;
2324	–	if (cmp.compare(a[lo], a[mid]) > 0) {
2325	–	Object t = a[lo]; a[lo] = a[mid]; a[mid] = t;
2326	–	}
2327	–	if (cmp.compare(a[mid], a[hi]) > 0) {
2328	–	Object t = a[mid]; a[mid] = a[hi]; a[hi] = t;
2329	–	if (cmp.compare(a[lo], a[mid]) > 0) {
2330	–	Object u = a[lo]; a[lo] = a[mid]; a[mid] = u;
2331	–	}
2332	–	}
2333	–
2334	–	Object pivot = a[mid];
2335	–	int left = lo+1;
2336	–	int right = hi-1;
2337	–	for (;;) {
2338	–	while (cmp.compare(pivot, a[right]) < 0)
2339	–	--right;
2340	–	while (left < right && cmp.compare(pivot, a[left]) >= 0)
2341	–	++left;
2342	–	if (left < right) {
2343	–	Object t = a[left]; a[left] = a[right]; a[right] = t;
2344	–	--right;
2345	–	}
2346	–	else break;
2347	–	}
2348	–
2349	–	oquickSort(a, cmp, lo, left);
2350	–	lo = left + 1;
2351	–	}
2352	–	}
2353	–
2354	–	static void ocquickSort(Comparable[] a, int lo, int hi) {
2355	–	for (;;) {
2356	–	if (hi - lo <= INSERTION_SORT_THRESHOLD) {
2357	–	for (int i = lo + 1; i <= hi; i++) {
2358	–	Comparable t = a[i];
2359	–	int j = i - 1;
2360	–	while (j >= lo && t.compareTo(a[j]) < 0) {
2361	–	a[j+1] = a[j];
2362	–	--j;
2363	–	}
2364	–	a[j+1] = t;
2365	–	}
2366	–	return;
2367	–	}
2368	–
2369	–	int mid = (lo + hi) >>> 1;
2370	–	if (a[lo].compareTo(a[mid]) > 0) {
2371	–	Comparable t = a[lo]; a[lo] = a[mid]; a[mid] = t;
2372	–	}
2373	–	if (a[mid].compareTo(a[hi]) > 0) {
2374	–	Comparable t = a[mid]; a[mid] = a[hi]; a[hi] = t;
2375	–	if (a[lo].compareTo(a[mid]) > 0) {
2376	–	Comparable u = a[lo]; a[lo] = a[mid]; a[mid] = u;
2377	–	}
2378	–	}
2379	–
2380	–	Comparable pivot = a[mid];
2381	–	int left = lo+1;
2382	–	int right = hi-1;
2383	–	for (;;) {
2384	–	while (pivot.compareTo(a[right]) < 0)
2385	–	--right;
2386	–	while (left < right && pivot.compareTo(a[left]) >= 0)
2387	–	++left;
2388	–	if (left < right) {
2389	–	Comparable t = a[left]; a[left] = a[right]; a[right] = t;
2390	–	--right;
2391	–	}
2392	–	else break;
2393	–	}
2394	–
2395	–	ocquickSort(a, lo, left);
2396	–	lo = left + 1;
2397	–	}
2398	–	}
2310
2311		static void dquickSort(double[] a, DoubleComparator cmp, int lo, int hi) {
2312		for (;;) {
#	Line 2426 | Line 2337 | class PAS {
2337		double pivot = a[mid];
2338		int left = lo+1;
2339		int right = hi-1;
2340	+	boolean sameLefts = true;
2341		for (;;) {
2342		while (cmp.compare(pivot, a[right]) < 0)
2343		--right;
2344	<	while (left < right && cmp.compare(pivot, a[left]) >= 0)
2344	>	int c;
2345	>	while (left < right &&
2346	>	(c = cmp.compare(pivot, a[left])) >= 0) {
2347	>	if (c != 0)
2348	>	sameLefts = false;
2349		++left;
2350	+	}
2351		if (left < right) {
2352		double t = a[left]; a[left] = a[right]; a[right] = t;
2353		--right;
#	Line 2438 | Line 2355 | class PAS {
2355		else break;
2356		}
2357
2358	<	dquickSort(a, cmp, lo, left);
2442	<	lo = left + 1;
2443	<	}
2444	<	}
2445	<
2446	<	static void dcquickSort(double[] a, int lo, int hi) {
2447	<	for (;;) {
2448	<	if (hi - lo <= INSERTION_SORT_THRESHOLD) {
2449	<	for (int i = lo + 1; i <= hi; i++) {
2450	<	double t = a[i];
2451	<	int j = i - 1;
2452	<	while (j >= lo && t < a[j]) {
2453	<	a[j+1] = a[j];
2454	<	--j;
2455	<	}
2456	<	a[j+1] = t;
2457	<	}
2358	>	if (sameLefts && right == hi - 1)
2359		return;
2360	+	if (left - lo <= hi - right) {
2361	+	dquickSort(a, cmp, lo, left);
2362	+	lo = left + 1;
2363		}
2364	<
2365	<	int mid = (lo + hi) >>> 1;
2366	<	if (a[lo] > a[mid]) {
2463	<	double t = a[lo]; a[lo] = a[mid]; a[mid] = t;
2464	<	}
2465	<	if (a[mid] > a[hi]) {
2466	<	double t = a[mid]; a[mid] = a[hi]; a[hi] = t;
2467	<	if (a[lo] > a[mid]) {
2468	<	double u = a[lo]; a[lo] = a[mid]; a[mid] = u;
2469	<	}
2470	<	}
2471	<
2472	<	double pivot = a[mid];
2473	<	int left = lo+1;
2474	<	int right = hi-1;
2475	<	for (;;) {
2476	<	while (pivot < a[right])
2477	<	--right;
2478	<	while (left < right && pivot >= a[left])
2479	<	++left;
2480	<	if (left < right) {
2481	<	double t = a[left]; a[left] = a[right]; a[right] = t;
2482	<	--right;
2483	<	}
2484	<	else break;
2364	>	else {
2365	>	dquickSort(a, cmp, right, hi);
2366	>	hi = left;
2367		}
2486	–
2487	–	dcquickSort(a, lo, left);
2488	–	lo = left + 1;
2368		}
2369		}
2370
#	Line 2518 | Line 2397 | class PAS {
2397		long pivot = a[mid];
2398		int left = lo+1;
2399		int right = hi-1;
2400	+	boolean sameLefts = true;
2401		for (;;) {
2402		while (cmp.compare(pivot, a[right]) < 0)
2403		--right;
2404	<	while (left < right && cmp.compare(pivot, a[left]) >= 0)
2404	>	int c;
2405	>	while (left < right &&
2406	>	(c = cmp.compare(pivot, a[left])) >= 0) {
2407	>	if (c != 0)
2408	>	sameLefts = false;
2409		++left;
2410	+	}
2411		if (left < right) {
2412		long t = a[left]; a[left] = a[right]; a[right] = t;
2413		--right;
#	Line 2530 | Line 2415 | class PAS {
2415		else break;
2416		}
2417
2418	<	lquickSort(a, cmp, lo, left);
2534	<	lo = left + 1;
2535	<	}
2536	<	}
2537	<
2538	<	static void lcquickSort(long[] a, int lo, int hi) {
2539	<	for (;;) {
2540	<	if (hi - lo <= INSERTION_SORT_THRESHOLD) {
2541	<	for (int i = lo + 1; i <= hi; i++) {
2542	<	long t = a[i];
2543	<	int j = i - 1;
2544	<	while (j >= lo && t < a[j]) {
2545	<	a[j+1] = a[j];
2546	<	--j;
2547	<	}
2548	<	a[j+1] = t;
2549	<	}
2418	>	if (sameLefts && right == hi - 1)
2419		return;
2420	+	if (left - lo <= hi - right) {
2421	+	lquickSort(a, cmp, lo, left);
2422	+	lo = left + 1;
2423		}
2424	<
2425	<	int mid = (lo + hi) >>> 1;
2426	<	if (a[lo] > a[mid]) {
2555	<	long t = a[lo]; a[lo] = a[mid]; a[mid] = t;
2556	<	}
2557	<	if (a[mid] > a[hi]) {
2558	<	long t = a[mid]; a[mid] = a[hi]; a[hi] = t;
2559	<	if (a[lo] > a[mid]) {
2560	<	long u = a[lo]; a[lo] = a[mid]; a[mid] = u;
2561	<	}
2562	<	}
2563	<
2564	<	long pivot = a[mid];
2565	<	int left = lo+1;
2566	<	int right = hi-1;
2567	<	for (;;) {
2568	<	while (pivot < a[right])
2569	<	--right;
2570	<	while (left < right && pivot >= a[left])
2571	<	++left;
2572	<	if (left < right) {
2573	<	long t = a[left]; a[left] = a[right]; a[right] = t;
2574	<	--right;
2575	<	}
2576	<	else break;
2424	>	else {
2425	>	lquickSort(a, cmp, right, hi);
2426	>	hi = left;
2427		}
2578	–
2579	–	lcquickSort(a, lo, left);
2580	–	lo = left + 1;
2428		}
2429		}
2430
#	Line 2671 | Line 2518 | class PAS {
2518		int cb;
2519		for (;;) { // Establish action: sum, cumulate, or both
2520		int b = phase;
2521	<	if ((b & FINISHED) != 0) // already done
2521	>	if ((b & FINISHED) != 0) // already done
2522		return false;
2523		if ((b & CUMULATE) != 0)
2524		cb = FINISHED;
#	Line 2708 | Line 2555 | class PAS {
2555		op.pushUp(par, par.left, par.right);
2556		int refork =
2557		((pb & CUMULATE) == 0 &&
2558	<	par.lo == op.origin)? CUMULATE : 0;
2558	>	par.lo == op.origin) ? CUMULATE : 0;
2559		int nextPhase = pb|cb|refork;
2560		if (pb == nextPhase ||
2561		phaseUpdater.compareAndSet(par, pb, nextPhase)) {
#	Line 2783 | Line 2630 | class PAS {
2630		}
2631
2632		/**
2633	<	* Computational operations for FJSCan
2633	>	* Computational operations for FJScan
2634		*/
2635		static abstract class FJScanOp {
2636		final int threshold;

Diff Legend

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