--- jsr166/src/extra166y/AbstractParallelAnyArray.java 2013/01/28 17:47:08 1.13 +++ jsr166/src/extra166y/AbstractParallelAnyArray.java 2013/06/18 19:18:28 1.16 @@ -132,7 +132,7 @@ public abstract class AbstractParallelAn */ Object[] ogetArray() { return null; } double[] dgetArray() { return null; } - long[] lgetArray() { return null; } + long[] lgetArray() { return null; } abstract Object oget(int index); abstract double dget(int index); abstract long lget(int index); @@ -275,7 +275,7 @@ public abstract class AbstractParallelAn /** * Shared support for select/map all -- probe filter, map, and * type to start selection driver, or do parallel mapping, or - * just copy, + * just copy. */ final Object[] allObjects(Class elementType) { if (hasFilter()) { @@ -514,7 +514,7 @@ public abstract class AbstractParallelAn return new ORPap(ex, origin, fence, array, selector); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OUOMPap(ex, origin, fence, array, op); } @@ -1170,7 +1170,7 @@ public abstract class AbstractParallelAn compoundIndexedSelector(this.selector, selector)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OFOMPap(ex, origin, fence, array, selector, op); } @@ -1711,7 +1711,7 @@ public abstract class AbstractParallelAn compoundIndexedSelector(this.selector, selector)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OROMPap(ex, origin, fence, array, selector, op); } @@ -2325,7 +2325,7 @@ public abstract class AbstractParallelAn super(ex, origin, fence, array, op); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OUOMPap(ex, origin, fence, array, CommonOps.compoundOp(this.op, op)); @@ -2519,7 +2519,7 @@ public abstract class AbstractParallelAn boolean hasFilter() { return true; } boolean isSelected(int i) { return selector.op(this.array[i]); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OFOMPap (ex, origin, fence, array, selector, @@ -2774,7 +2774,7 @@ public abstract class AbstractParallelAn boolean hasFilter() { return true; } boolean isSelected(int i) { return selector.op(i, this.array[i]); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OROMPap (ex, origin, fence, array, selector, @@ -3116,7 +3116,7 @@ public abstract class AbstractParallelAn super(ex, origin, fence, array, op); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OUOCPap(ex, origin, fence, array, compoundIndexedOp(this.op, op)); @@ -3310,7 +3310,7 @@ public abstract class AbstractParallelAn boolean hasFilter() { return true; } boolean isSelected(int i) { return selector.op(this.array[i]); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OFOCPap(ex, origin, fence, array, selector, compoundIndexedOp(this.op, op)); @@ -3553,7 +3553,7 @@ public abstract class AbstractParallelAn boolean hasFilter() { return true; } boolean isSelected(int i) { return selector.op(i, this.array[i]); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (Op op) { return new OROCPap(ex, origin, fence, array, selector, compoundIndexedOp(this.op, op)); @@ -3893,7 +3893,7 @@ public abstract class AbstractParallelAn CommonOps.compoundOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (DoubleToObject op) { return new OUOMPap(ex, origin, fence, array, CommonOps.compoundOp(this.op, op)); @@ -4081,7 +4081,7 @@ public abstract class AbstractParallelAn CommonOps.compoundOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (DoubleToObject op) { return new OFOMPap(ex, origin, fence, array, selector, CommonOps.compoundOp(this.op, op)); @@ -4317,7 +4317,7 @@ public abstract class AbstractParallelAn CommonOps.compoundOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (DoubleToObject op) { return new OROMPap(ex, origin, fence, array, selector, CommonOps.compoundOp(this.op, op)); @@ -4642,7 +4642,7 @@ public abstract class AbstractParallelAn compoundIndexedOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (DoubleToObject op) { return new OUOCPap(ex, origin, fence, array, compoundIndexedOp(this.op, op)); @@ -4829,7 +4829,7 @@ public abstract class AbstractParallelAn compoundIndexedOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (DoubleToObject op) { return new OFOCPap(ex, origin, fence, array, selector, compoundIndexedOp(this.op, op)); @@ -5067,7 +5067,7 @@ public abstract class AbstractParallelAn compoundIndexedOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (DoubleToObject op) { return new OROCPap(ex, origin, fence, array, selector, compoundIndexedOp(this.op, op)); @@ -5388,7 +5388,7 @@ public abstract class AbstractParallelAn CommonOps.compoundOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (LongToObject op) { return new OUOMPap(ex, origin, fence, array, CommonOps.compoundOp(this.op, op)); @@ -5577,7 +5577,7 @@ public abstract class AbstractParallelAn CommonOps.compoundOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (LongToObject op) { return new OFOMPap(ex, origin, fence, array, selector, CommonOps.compoundOp(this.op, op)); @@ -5817,7 +5817,7 @@ public abstract class AbstractParallelAn CommonOps.compoundOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (LongToObject op) { return new OROMPap(ex, origin, fence, array, selector, CommonOps.compoundOp(this.op, op)); @@ -6143,7 +6143,7 @@ public abstract class AbstractParallelAn compoundIndexedOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (LongToObject op) { return new OUOCPap(ex, origin, fence, array, compoundIndexedOp(this.op, op)); @@ -6328,7 +6328,7 @@ public abstract class AbstractParallelAn compoundIndexedOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (LongToObject op) { return new OFOCPap(ex, origin, fence, array, selector, @@ -6570,7 +6570,7 @@ public abstract class AbstractParallelAn compoundIndexedOp(this.op, op)); } - public ParallelArrayWithMapping withMapping + public ParallelArrayWithMapping withMapping (LongToObject op) { return new OROCPap(ex, origin, fence, array, selector,