Test simple cartesian with vector supported

yuemingl · yuemingl · commit 2c3347f9ac76 · 2016-04-18T07:32:57.000-07:00
diff --git a/src/lambdacloud/test/TestBatchVec.java b/src/lambdacloud/test/TestBatchVec.java
@@ -75,7 +75,7 @@ public static void testSimpleCartesian() {
 		}
 		
 		BytecodeBatchVecFunc ff = new BytecodeBatchVecFunc(func, dim, dim);
-		double[][] args2 = BytecodeSelect.cartesion(args);
+		double[][] args2 = BytecodeSelect.cartesian(args);
 		double[] outAry2 = new double[args2[0].length];
 		ff.apply(outAry2, 0, args2);
 		for(double d : outAry2) {
@@ -90,7 +90,7 @@ public static void testCartesian() {
 		double[][][] args = { { {1,2,3}, {4,5,6} }, {{0,1,2,3}}};
 		
 		BytecodeBatchVecFunc ff = new BytecodeBatchVecFunc(func, dim, dim);
-		double[][] args2 = BytecodeSelect.cartesion(args);
+		double[][] args2 = BytecodeSelect.cartesian(args);
 		double[] outAry2 = new double[args2[0].length];
 		ff.apply(outAry2, 0, args2);
 		for(double d : outAry2) {
@@ -120,7 +120,7 @@ public static void testBatchVector() {
 		double[][][] args = { { {1,2,3}, {4,5,6} }, {{0,1,2,3}}};
 		
 		BytecodeBatchVecFunc ff = new BytecodeBatchVecFunc(func, dim, dim);
-		double[][] args2 = BytecodeSelect.cartesion(args);
+		double[][] args2 = BytecodeSelect.cartesian(args);
 		double[] outAry2 = new double[args2[0].length];
 		ff.apply(outAry2, 0, args2);
 		for(double d : outAry2) {
@@ -149,7 +149,7 @@ public static void testBatchVectorDot1() {
 		int dim = 3;
 		// The length of the return value of dot product is 1.
 		BytecodeBatchVecFunc ff = new BytecodeBatchVecFunc(func, dim, 1);
-		double[][] args2 = BytecodeSelect.cartesion(args);
+		double[][] args2 = BytecodeSelect.cartesian(args);
 		double[] outAry2 = new double[dim];
 		ff.apply(outAry2, 0, args2);
 		for(double d : outAry2) {
diff --git a/src/symjava/bytecode/BytecodeSelect.java b/src/symjava/bytecode/BytecodeSelect.java
@@ -40,7 +40,7 @@ public void cartesian(double[][][] args, int level, int col, double[] buf, doubl
 		}
 	}
 	
-	public static double[][] cartesion(double[]... args) {
+	public static double[][] cartesian(double[]... args) {
 		int colMax = args.length;
 		double[] buf = new double[colMax];
 		int rowMax = 1;
@@ -53,7 +53,22 @@ public static double[][] cartesion(double[]... args) {
 		return newArgs;
 	}
 	
-	public static double[][] cartesion(double[][]... args) {
+	public static double[][] cartesian(int vecLen, double[]... args) {
+		int colMax = args.length;
+		double[][] buf = new double[colMax][vecLen];
+		int rowMax = 1;
+		for(int i=0; i<args.length; i++) {
+			rowMax *= (args[i].length/vecLen);
+		}
+		rowMax *= vecLen;
+		double[][] newArgs = new double[colMax][rowMax];
+		BytecodeSelect sel = new BytecodeSelect(null);
+		sel.simpleCartesian(vecLen, args, 0, buf, newArgs);
+		return newArgs;
+	}
+
+	
+	public static double[][] cartesian(double[][]... args) {
 		int colMax = 0 ;
 		for(int i=0; i<args.length; i++)
 			colMax += args[i].length;
@@ -86,6 +101,26 @@ public void simpleCartesian(double[][] args, int col, double[] buf, double[][] n
 		}
 	}
 	
+	public void simpleCartesian(int vecLen, double[][] args, int col, double[][] buf, double[][] newArgs) {
+		if(col == args.length - 1) {
+			for(int i=0; i<args[col].length; i+=vecLen) {
+				for(int k=0; k<vecLen; k++)
+					buf[col][k] = args[col][i+k];
+				for(int j=0; j<buf.length; j++) {
+					for(int k=0; k<vecLen; k++)
+						newArgs[j][row+k] = buf[j][k];
+				}
+				row+=vecLen;
+			}
+			return;
+		}
+		for(int i=0; i<args[col].length; i+=vecLen) {
+			for(int k=0; k<vecLen; k++)
+				buf[col][k] = args[col][i+k];
+			simpleCartesian(vecLen, args, col+1, buf, newArgs);
+		}
+	}
+
 	public void testSimpleCartesian() {
 		double[][] args = {{1,2},{3,4,5,6},{7,8}};
 		int colMax = args.length;
@@ -104,6 +139,18 @@ public void testSimpleCartesian() {
 		}
 	}
 
+	public void testSimpleCartesian2() {
+		double[][] args = {{1,2,3,5,7,9},{4,5,6,7,8,9}};
+		double[][] newArgs = cartesian(3, args);
+		
+		for(int j=0; j<newArgs[0].length; j++) {
+			for(int i=0; i<newArgs.length; i++) {
+				System.out.print(newArgs[i][j]+" ");
+			}
+			System.out.println();
+		}
+	}
+	
 	public void testCartesian() {
 		//double[][][] args = { {{1,2},{3,4}}, {{7,8,9},{5,6,7}} };
 		double[][][] args = { {{1,2},{3,4}}, {{7,8,9}}, {{5,6,7}} };
@@ -130,8 +177,12 @@ public static void main(String[] args) {
 //		BytecodeSelect bs = new BytecodeSelect(null);
 //		bs.testSimpleCartesian();
 		
+//		//row = 0;
+//		BytecodeSelect bs2 = new BytecodeSelect(null);
+//		bs2.testCartesian();
+		
 		//row = 0;
-		BytecodeSelect bs2 = new BytecodeSelect(null);
-		bs2.testCartesian();
+		BytecodeSelect bs = new BytecodeSelect(null);
+		bs.testSimpleCartesian2();
 	}
 }
