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.2 by dl, Mon Jan 12 17:16:36 2009 UTC vs.
Revision 1.5 by jsr166, Sat Aug 1 22:12:58 2009 UTC

# 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 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() {
# Line 2351 | Line 2351 | class PAS {
2351              if (left - lo <= hi - right) {
2352                  oquickSort(a, cmp, lo, left);
2353                  lo = left + 1;
2354 <            }              
2354 >            }
2355              else {
2356                  oquickSort(a, cmp, right, hi);
2357                  hi = left;
# Line 2455 | Line 2455 | class PAS {
2455              if (left - lo <= hi - right) {
2456                  dquickSort(a, cmp, lo, left);
2457                  lo = left + 1;
2458 <            }              
2458 >            }
2459              else {
2460                  dquickSort(a, cmp, right, hi);
2461                  hi = left;
# Line 2559 | Line 2559 | class PAS {
2559              if (left - lo <= hi - right) {
2560                  lquickSort(a, cmp, lo, left);
2561                  lo = left + 1;
2562 <            }              
2562 >            }
2563              else {
2564                  lquickSort(a, cmp, right, hi);
2565                  hi = left;
# Line 2709 | Line 2709 | class PAS {
2709                  int cb;
2710                  for (;;) { // Establish action: sum, cumulate, or both
2711                      int b = phase;
2712 <                    if ((b & FINISHED) != 0) // already done
2712 >                    if ((b & FINISHED) != 0) // already done
2713                          return false;
2714                      if ((b & CUMULATE) != 0)
2715                          cb = FINISHED;

Diff Legend

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