Simplify code where possible by reusing a utility method

bdezonia · Jan 23, 2023 · 8fe57c8 · 8fe57c8
1 parent 4396205
commit 8fe57c8
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 38 deletions.
diff --git a/src/main/java/nom/bdezonia/zorbage/algorithm/CreateMask.java b/src/main/java/nom/bdezonia/zorbage/algorithm/CreateMask.java
@@ -37,6 +37,7 @@
 import nom.bdezonia.zorbage.data.NdData;
 import nom.bdezonia.zorbage.datasource.IndexedDataSource;
 import nom.bdezonia.zorbage.function.Function1;
+import nom.bdezonia.zorbage.misc.DataSourceUtils;
 import nom.bdezonia.zorbage.procedure.Procedure2;
 
 /**
@@ -97,11 +98,9 @@ public void call(U a, UnsignedInt1Member b) {
 	public static <T extends Algebra<T,U>, U>
 		DimensionedDataSource<UnsignedInt1Member> compute(T alg, Function1<Boolean,U> condition, DimensionedDataSource<U> a)
 	{
-		long[] dims = new long[a.numDimensions()];
-		for (int i = 0; i < dims.length; i++) {
-			dims[i] = a.dimension(i);
-		}
-		IndexedDataSource<UnsignedInt1Member> data = compute(alg, condition, a.rawData());
+		long[] dims = DataSourceUtils.dimensions(a);
+		IndexedDataSource<UnsignedInt1Member> data =
+				compute(alg, condition, a.rawData());
 		return new NdData<>(dims, data);
 	}
 }
diff --git a/src/main/java/nom/bdezonia/zorbage/algorithm/DimensionalPermutation.java b/src/main/java/nom/bdezonia/zorbage/algorithm/DimensionalPermutation.java
@@ -38,6 +38,7 @@
 import nom.bdezonia.zorbage.coordinates.LinearNdCoordinateSpace;
 import nom.bdezonia.zorbage.data.DimensionedDataSource;
 import nom.bdezonia.zorbage.data.DimensionedStorage;
+import nom.bdezonia.zorbage.misc.DataSourceUtils;
 import nom.bdezonia.zorbage.sampling.IntegerIndex;
 import nom.bdezonia.zorbage.sampling.SamplingIterator;
 
@@ -87,10 +88,7 @@ DimensionedDataSource<U> compute(T alg, int[] permutation, DimensionedDataSource
 
 		int numD = input.numDimensions();
 
-		long[] origDims = new long[numD];
-		for (int i = 0; i < numD; i++) {
-			origDims[i] = input.dimension(i);
-		}
+		long[] origDims = DataSourceUtils.dimensions(input);
 
 		// test the correctness of the input data
 

diff --git a/src/main/java/nom/bdezonia/zorbage/algorithm/GridIterator.java b/src/main/java/nom/bdezonia/zorbage/algorithm/GridIterator.java
@@ -31,6 +31,7 @@
 package nom.bdezonia.zorbage.algorithm;
 
 import nom.bdezonia.zorbage.algebra.Dimensioned;
+import nom.bdezonia.zorbage.misc.DataSourceUtils;
 import nom.bdezonia.zorbage.sampling.IntegerIndex;
 import nom.bdezonia.zorbage.sampling.SamplingCartesianIntegerGrid;
 import nom.bdezonia.zorbage.sampling.SamplingIterator;
@@ -106,13 +107,7 @@ SamplingIterator<IntegerIndex> compute(long[] dims)
 	public static
 		SamplingIterator<IntegerIndex> compute(Dimensioned entity)
 	{
-		int numD = entity.numDimensions();
-
-		long[] dims = new long[numD];
-
-		for (int i = 0; i < numD; i++) {
-			dims[i] = entity.dimension(i);
-		}
+		long[] dims = DataSourceUtils.dimensions(entity);
 
 		return compute(dims);
 	}

diff --git a/src/main/java/nom/bdezonia/zorbage/algorithm/TensorShape.java b/src/main/java/nom/bdezonia/zorbage/algorithm/TensorShape.java
@@ -31,6 +31,7 @@
 package nom.bdezonia.zorbage.algorithm;
 
 import nom.bdezonia.zorbage.algebra.TensorMember;
+import nom.bdezonia.zorbage.misc.DataSourceUtils;
 
 /**
  * 
@@ -53,10 +54,7 @@ private TensorShape() { }
 		void compute(TensorMember<?> input, TensorMember<?> output)
 	{
 		if (input == output) return;
-		long[] dims = new long[input.numDimensions()];
-		for (int i = 0; i < dims.length; i++) {
-			dims[i] = input.dimension(i);
-		}
+		long[] dims = DataSourceUtils.dimensions(input);
 		output.alloc(dims);
 	}
 

diff --git a/src/main/java/nom/bdezonia/zorbage/algorithm/resample/ResampleCubic.java b/src/main/java/nom/bdezonia/zorbage/algorithm/resample/ResampleCubic.java
@@ -36,6 +36,7 @@
 import nom.bdezonia.zorbage.algorithm.GridIterator;
 import nom.bdezonia.zorbage.data.DimensionedDataSource;
 import nom.bdezonia.zorbage.data.DimensionedStorage;
+import nom.bdezonia.zorbage.misc.DataSourceUtils;
 import nom.bdezonia.zorbage.misc.ThreadingUtils;
 import nom.bdezonia.zorbage.sampling.IntegerIndex;
 import nom.bdezonia.zorbage.sampling.SamplingIterator;
@@ -176,10 +177,7 @@ public void run() {
 			U value = alg.construct();
 			IntegerIndex inputPoint = new IntegerIndex(numD);
 			IntegerIndex outputPoint = new IntegerIndex(numD);
-			long[] inputDims = new long[numD];
-			for (int i = 0; i < numD; i++) {
-				inputDims[i] = input.dimension(i);
-			}
+			long[] inputDims = DataSourceUtils.dimensions(input);
 			SamplingIterator<IntegerIndex> iter = GridIterator.compute(min, max);
 			while (iter.hasNext()) {
 				iter.next(outputPoint);

diff --git a/src/main/java/nom/bdezonia/zorbage/algorithm/resample/ResampleLinear.java b/src/main/java/nom/bdezonia/zorbage/algorithm/resample/ResampleLinear.java
@@ -36,6 +36,7 @@
 import nom.bdezonia.zorbage.algorithm.GridIterator;
 import nom.bdezonia.zorbage.data.DimensionedDataSource;
 import nom.bdezonia.zorbage.data.DimensionedStorage;
+import nom.bdezonia.zorbage.misc.DataSourceUtils;
 import nom.bdezonia.zorbage.misc.ThreadingUtils;
 import nom.bdezonia.zorbage.sampling.IntegerIndex;
 import nom.bdezonia.zorbage.sampling.SamplingIterator;
@@ -176,10 +177,7 @@ public void run() {
 			U value = alg.construct();
 			IntegerIndex inputPoint = new IntegerIndex(numD);
 			IntegerIndex outputPoint = new IntegerIndex(numD);
-			long[] inputDims = new long[numD];
-			for (int i = 0; i < numD; i++) {
-				inputDims[i] = input.dimension(i);
-			}
+			long[] inputDims = DataSourceUtils.dimensions(input);
 			SamplingIterator<IntegerIndex> iter = GridIterator.compute(min, max);
 			while (iter.hasNext()) {
 				iter.next(outputPoint);

diff --git a/src/main/java/nom/bdezonia/zorbage/algorithm/resample/ResampleNN.java b/src/main/java/nom/bdezonia/zorbage/algorithm/resample/ResampleNN.java
@@ -42,6 +42,7 @@
 import nom.bdezonia.zorbage.data.DimensionedDataSource;
 import nom.bdezonia.zorbage.data.DimensionedStorage;
 import nom.bdezonia.zorbage.misc.BigDecimalUtils;
+import nom.bdezonia.zorbage.misc.DataSourceUtils;
 import nom.bdezonia.zorbage.misc.ThreadingUtils;
 
 /**
@@ -172,10 +173,7 @@ public void run() {
 			U value = alg.construct();
 			IntegerIndex inputPoint = new IntegerIndex(numD);
 			IntegerIndex outputPoint = new IntegerIndex(numD);
-			long[] inputDims = new long[numD];
-			for (int i = 0; i < numD; i++) {
-				inputDims[i] = input.dimension(i);
-			}
+			long[] inputDims = DataSourceUtils.dimensions(input);
 			SamplingIterator<IntegerIndex> iter = GridIterator.compute(min, max);
 			while (iter.hasNext()) {
 				iter.next(outputPoint);

diff --git a/src/main/java/nom/bdezonia/zorbage/data/PipedDataSource.java b/src/main/java/nom/bdezonia/zorbage/data/PipedDataSource.java
@@ -34,6 +34,7 @@
 import nom.bdezonia.zorbage.algebra.StorageConstruction;
 import nom.bdezonia.zorbage.datasource.IndexedDataSource;
 import nom.bdezonia.zorbage.datasource.SequencedDataSource;
+import nom.bdezonia.zorbage.misc.DataSourceUtils;
 
 /**
  * 
@@ -74,10 +75,7 @@ public PipedDataSource(DimensionedDataSource<U> d, int dim, IntegerIndex coords)
 		for (int i = 0; i < coords.numDimensions(); i++) {
 			this.coords.set(i, coords.get(i));
 		}
-		this.parentDims = new long[d.numDimensions()];
-		for (int i = 0; i < d.numDimensions(); i++) {
-			this.parentDims[i] = d.dimension(i);
-		}
+		this.parentDims = DataSourceUtils.dimensions(d);
 		this.data = findSubset();
 	}
 

diff --git a/src/main/java/nom/bdezonia/zorbage/misc/DataSourceUtils.java b/src/main/java/nom/bdezonia/zorbage/misc/DataSourceUtils.java
@@ -30,7 +30,7 @@
  */
 package nom.bdezonia.zorbage.misc;
 
-import nom.bdezonia.zorbage.data.DimensionedDataSource;
+import nom.bdezonia.zorbage.algebra.Dimensioned;
 
 /**
  * 
@@ -50,7 +50,7 @@ private DataSourceUtils() { }
 	 * 
 	 * @return The dimensions of the data
 	 */
-	public static long[] dimensions(DimensionedDataSource<?> ds) {
+	public static long[] dimensions(Dimensioned ds) {
 
 		long[] dims = new long[ds.numDimensions()];