refactor 59

fishercoder1534 · fishercoder1534 · commit f79bbc151ed1 · 2021-10-12T16:46:49.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_59.java b/src/main/java/com/fishercoder/solutions/_59.java
@@ -38,4 +38,69 @@ public int[][] generateMatrix(int n) {
             return matrix;
         }
     }
+
+    public static class Solution2 {
+        /**
+         * My completely original solution on 10/12/2021.
+         */
+        public int[][] generateMatrix(int n) {
+            int direction = 0;
+            int[][] matrix = new int[n][n];
+            int num = 1;
+            int i = 0;
+            int j = 0;
+            int eastBoundary = n;
+            int southBoundary = n;
+            int westBoundary = 0;
+            int northBoundary = 0;
+            int limit = n * n;
+            while (num <= limit) {
+                if (direction % 4 == 0) {
+                    //0 means going east
+                    for (; j < eastBoundary && num <= limit; j++) {
+                        matrix[i][j] = num;
+                        num++;
+                    }
+                    j--;
+                    direction++;
+                    eastBoundary--;
+                    i++;
+                }
+                if (direction % 4 == 1) {
+                    //1 means going south
+                    for (; i < southBoundary && num <= limit; i++) {
+                        matrix[i][j] = num;
+                        num++;
+                    }
+                    i--;
+                    direction++;
+                    southBoundary--;
+                    j--;
+                }
+                if (direction % 4 == 2) {
+                    //2 means going west
+                    for (; j >= westBoundary && num <= limit; j--) {
+                        matrix[i][j] = num;
+                        num++;
+                    }
+                    j++;
+                    direction++;
+                    westBoundary++;
+                    i--;
+                }
+                if (direction % 4 == 3) {
+                    //3 means going north
+                    for (; i > northBoundary && num <= limit; i--) {
+                        matrix[i][j] = num;
+                        num++;
+                    }
+                    i++;
+                    direction++;
+                    northBoundary++;
+                    j++;
+                }
+            }
+            return matrix;
+        }
+    }
 }
diff --git a/src/test/java/com/fishercoder/_59Test.java b/src/test/java/com/fishercoder/_59Test.java
@@ -7,16 +7,17 @@
 
 public class _59Test {
     private static _59.Solution1 solution1;
-    private static int[][] matrix;
+    private static _59.Solution2 solution2;
 
     @BeforeClass
     public static void setup() {
         solution1 = new _59.Solution1();
+        solution2 = new _59.Solution2();
     }
 
     @Test
     public void test1() {
-        matrix = solution1.generateMatrix(6);
-        CommonUtils.print2DIntArray(matrix);
+        CommonUtils.print2DIntArray(solution1.generateMatrix(6));
+        CommonUtils.print2DIntArray(solution2.generateMatrix(6));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,17 @@`
`7`	`7`
`8`	`8`	`public class _59Test {`
`9`	`9`	`private static _59.Solution1 solution1;`
`10`		`- private static int[][] matrix;`
	`10`	`+ private static _59.Solution2 solution2;`
`11`	`11`
`12`	`12`	`@BeforeClass`
`13`	`13`	`public static void setup() {`
`14`	`14`	`solution1 = new _59.Solution1();`
	`15`	`+ solution2 = new _59.Solution2();`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`@Test`
`18`	`19`	`public void test1() {`
`19`		`- matrix = solution1.generateMatrix(6);`
`20`		`- CommonUtils.print2DIntArray(matrix);`
	`20`	`+ CommonUtils.print2DIntArray(solution1.generateMatrix(6));`
	`21`	`+ CommonUtils.print2DIntArray(solution2.generateMatrix(6));`
`21`	`22`	`}`
`22`	`23`	`}`