refactor 74

fishercoder1534 · fishercoder1534 · commit fa886874edbf · 2018-02-09T07:32:23.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_74.java b/src/main/java/com/fishercoder/solutions/_74.java
@@ -23,29 +23,31 @@
  */
 public class _74 {
 
-    public boolean searchMatrix(int[][] matrix, int target) {
-        if (matrix == null || matrix.length == 0
+    public static class Solution1 {
+        public boolean searchMatrix(int[][] matrix, int target) {
+            if (matrix == null || matrix.length == 0
                 || matrix[0].length == 0
                 || matrix[0][0] > target
                 || matrix[matrix.length - 1][matrix[0].length - 1] < target) {
-            return false;
-        }
-        int m = matrix.length;
-        int n = matrix[0].length;
-        int left = 0;
-        int right = m * n - 1;
-        while (left <= right) {
-            int mid = left + (right - left) / 2;
-            int row = mid / n;
-            int col = mid % n;
-            if (matrix[row][col] == target) {
-                return true;
-            } else if (matrix[row][col] > target) {
-                right = mid - 1;
-            } else {
-                left = mid + 1;
+                return false;
             }
+            int m = matrix.length;
+            int n = matrix[0].length;
+            int left = 0;
+            int right = m * n - 1;
+            while (left <= right) {
+                int mid = left + (right - left) / 2;
+                int row = mid / n;
+                int col = mid % n;
+                if (matrix[row][col] == target) {
+                    return true;
+                } else if (matrix[row][col] > target) {
+                    right = mid - 1;
+                } else {
+                    left = mid + 1;
+                }
+            }
+            return false;
         }
-        return false;
     }
 }
diff --git a/src/test/java/com/fishercoder/_74Test.java b/src/test/java/com/fishercoder/_74Test.java
@@ -1,38 +1,29 @@
 package com.fishercoder;
 
 import com.fishercoder.solutions._74;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;
 
 public class _74Test {
-    private static _74 test;
-    private static boolean actual;
-    private static boolean expected;
-    private static int target;
-    private static int[][] matrix;
+  private static _74.Solution1 solution1;
+  private static int target;
+  private static int[][] matrix;
 
-    @BeforeClass
-    public static void setup() {
-        test = new _74();
-    }
+  @BeforeClass
+  public static void setup() {
+    solution1 = new _74.Solution1();
+  }
 
-    @Before
-    public void setupForEachTest() {
-    }
-
-    @Test
-    public void test1() {
-        target = 3;
-        matrix = new int[][]{
-                {1, 3, 5, 7},
-                {10, 11, 16, 20},
-                {23, 30, 34, 50},
-        };
-        expected = true;
-        actual = test.searchMatrix(matrix, target);
-        assertEquals(expected, actual);
-    }
+  @Test
+  public void test1() {
+    target = 3;
+    matrix = new int[][] {
+        {1, 3, 5, 7},
+        {10, 11, 16, 20},
+        {23, 30, 34, 50},
+    };
+    assertEquals(true, solution1.searchMatrix(matrix, target));
+  }
 }
