Changes between Version 6 and Version 7 of jazz/10-05-10

Timestamp:

May 11, 2010, 1:33:59 PM (14 years ago)

Author:

jazz

Comment:

--

jazz/10-05-10

@@ -30 +30 @@
 jazz@drbl:~/hadoop-0.20.2$ bin/hadoop jar matrix.jar TestMatrixMultiply
 }}}
+{{{
+--- source/TestMatrixMultiply.java      2009-12-12 23:00:03.000000000 +0800
++++ matrix/src/TestMatrixMultiply.java  2010-05-11 00:25:02.000000000 +0800
+@@ -72,13 +72,11 @@
+                for (int i = 0; i < rowDim; i++)
+                        for (int j = 0; j < colDim; j++)
+                                result[i][j] = 0;
+-               if (fs.isFile(path)) {
+-                       fillMatrix(result, path);
+-               } else {
+-                       FileStatus[] fileStatusArray = fs.listStatus(path);
+-                       for (FileStatus fileStatus : fileStatusArray) {
+-                               fillMatrix(result, fileStatus.getPath());
+-                       }
++               FileStatus[] fileStatusArray = fs.listStatus(path);
++               for (FileStatus fileStatus : fileStatusArray) {
++                 if (fs.isFile(fileStatus.getPath())) {
++                   fillMatrix(result, fileStatus.getPath());
++                 }
+                }
+                return result;
+        }
+@@ -100,10 +98,13 @@
+        public static void checkAnswer (int[][] A, int[][] B, int I, int K, int J)
+                throws Exception
+        {
++               System.out.println("......multiply(...)");
+                int[][] X = multiply(A, B, I, K, J);
++               System.out.println("......readMatrix("+I+","+J+","+OUTPUT_DIR_PATH);
+                int[][] Y = readMatrix(I, J, OUTPUT_DIR_PATH);
+                for (int i = 0; i < I; i++) {
+                        for (int j = 0; j < J; j++) {
++                               System.out.println("......X["+i+"]["+j+"]="+X[i][j]+", Y["+i+"]["+j+"]="+Y[i][j]);
+                                if (X[i][j] != Y[i][j]) {
+                                        throw new Exception("Bad answer!");
+                                }
+@@ -135,8 +136,10 @@
+                int IB, int KB, int JB)
+                        throws Exception
+        {
++               System.out.println("...MatrixMultiply.runJob(...)");
+                MatrixMultiply.runJob(conf, INPUT_PATH_A, INPUT_OATH_B, OUTPUT_DIR_PATH, TEMP_DIR_PATH,
+                        strategy, R1, R2, I, K, J, IB, KB, JB);
++               System.out.println("...checkAnswer(...)");
+                checkAnswer(A, B, I, K, J);
+        }
+
+@@ -279,8 +282,8 @@
+                        System.out.println("================");
+                        System.out.println();
+                } finally {
+-                       fs.delete(new Path(DATA_DIR_PATH), true);
++                       //fs.delete(new Path(DATA_DIR_PATH), true);
+                }
+        }
+}}}