refactor 562

fishercoder1534 · fishercoder1534 · commit 81203eab9f01 · 2019-07-04T08:11:50.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_562.java b/src/main/java/com/fishercoder/solutions/_562.java
@@ -2,9 +2,8 @@
 
 /**
  * Created by fishercoder on 4/23/17.
- */
-
-/**Longest Line of Consecutive One in Matrix
+ *
+ * 562. Longest Line of Consecutive One in Matrix
  *
  * Given a 01 matrix m, find the longest line of consecutive one in the matrix. The line could be horizontal, vertical, diagonal or anti-diagonal.
 
@@ -20,48 +19,50 @@
  */
 public class _562 {
 
-    public int longestLine(int[][] M) {
-        if (M == null || M.length == 0) {
-            return 0;
-        }
-        int[][] directions = new int[][]{
-                {-1, 0},
-                {-1, 1},
-                {0, 1},
-                {1, 1},
-                {1, 0},
-                {1, -1},
-                {0, -1},
-                {-1, -1},
-        };
-        int longestLine = 0;
-        int m = M.length;
-        int n = M[0].length;
-        int[][][] cache = new int[m][n][8];
-        for (int i = 0; i < m; i++) {
-            for (int j = 0; j < n; j++) {
-                if (M[i][j] == 1) {
-                    for (int k = 0; k < directions.length; k++) {
-                        int nextI = i + directions[k][0];
-                        int nextJ = j + directions[k][1];
-                        int thisLine = 1;
-                        if (nextI >= 0 && nextI < m && nextJ >= 0 && nextJ < n && cache[nextI][nextJ][k] != 0) {
-                            thisLine += cache[nextI][nextJ][k];
-                            cache[i][j][k] = thisLine;
-                        } else {
-                            while (nextI >= 0 && nextI < m && nextJ >= 0 && nextJ < n && M[nextI][nextJ] == 1) {
-                                thisLine++;
+    public static class Solution1 {
+        public int longestLine(int[][] M) {
+            if (M == null || M.length == 0) {
+                return 0;
+            }
+            int[][] directions = new int[][]{
+                    {-1, 0},
+                    {-1, 1},
+                    {0, 1},
+                    {1, 1},
+                    {1, 0},
+                    {1, -1},
+                    {0, -1},
+                    {-1, -1},
+            };
+            int longestLine = 0;
+            int m = M.length;
+            int n = M[0].length;
+            int[][][] cache = new int[m][n][8];
+            for (int i = 0; i < m; i++) {
+                for (int j = 0; j < n; j++) {
+                    if (M[i][j] == 1) {
+                        for (int k = 0; k < directions.length; k++) {
+                            int nextI = i + directions[k][0];
+                            int nextJ = j + directions[k][1];
+                            int thisLine = 1;
+                            if (nextI >= 0 && nextI < m && nextJ >= 0 && nextJ < n && cache[nextI][nextJ][k] != 0) {
+                                thisLine += cache[nextI][nextJ][k];
                                 cache[i][j][k] = thisLine;
-                                nextI += directions[k][0];
-                                nextJ += directions[k][1];
+                            } else {
+                                while (nextI >= 0 && nextI < m && nextJ >= 0 && nextJ < n && M[nextI][nextJ] == 1) {
+                                    thisLine++;
+                                    cache[i][j][k] = thisLine;
+                                    nextI += directions[k][0];
+                                    nextJ += directions[k][1];
+                                }
                             }
+                            longestLine = Math.max(longestLine, thisLine);
                         }
-                        longestLine = Math.max(longestLine, thisLine);
                     }
                 }
             }
+            return longestLine;
         }
-        return longestLine;
     }
 
 }
diff --git a/src/test/java/com/fishercoder/_562Test.java b/src/test/java/com/fishercoder/_562Test.java
@@ -10,14 +10,14 @@
  * Created by fishercoder on 4/23/17.
  */
 public class _562Test {
-    private static _562 test;
+    private static _562.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int[][] M;
 
     @BeforeClass
     public static void setup() {
-        test = new _562();
+        solution1 = new _562.Solution1();
     }
 
     @Test
@@ -28,7 +28,7 @@ public void test1() {
                 {0, 0, 0, 1}
         };
         expected = 3;
-        actual = test.longestLine(M);
+        actual = solution1.longestLine(M);
         assertEquals(expected, actual);
     }
 
