074 (3) update tests

stevencooks · stevencooks · commit ede59f7ccdd4 · 2015-10-18T23:45:12.000-04:00
diff --git a/src/_074_SearchA2DMatrix/Practice.java b/src/_074_SearchA2DMatrix/Practice.java
@@ -27,52 +27,12 @@
  */
 package _074_SearchA2DMatrix;
 
-/** see test {@link _074_SearchA2DMatrix.SolutionTest } */
+/** see test {@link _074_SearchA2DMatrix.PracticeTest } */
 public class Practice {
 
     public boolean searchMatrix(int[][] matrix, int target) {
-        if (matrix.length == 0 || matrix[0].length == 0) {
-            return false;
-        }
-        int rows = matrix.length;
-        int cols = matrix[0].length;
-        int startRow = 0;
-        int endRow = rows - 1;
-        while (startRow < endRow) {
-            int halfRow = (startRow + endRow) / 2;
-            int half = matrix[halfRow][cols - 1];
-            if (half == target) {
-                return true;
-            } else if (half < target) {
-                // go to lower rows to find target
-                startRow = halfRow + 1;
-            } else {
-                // !target can be in end row
-                endRow = halfRow;
-            }
-        }
-        // search in 1D array
-        return searchLine(matrix[startRow], target);
-    }
-
-    private boolean searchLine(int[] line, int target) {
-        if (line.length == 0) {
-            return false;
-        }
-        int left = 0;
-        int right = line.length - 1;
-        while (left <= right) {
-            int mid = (left + right) >> 1;
-            if (line[mid] == target) {
-                return true;
-            } else if (line[mid] < target) {
-                // go to right part
-                left = mid + 1;
-            } else {
-                right = mid - 1;
-            }
-        }
+        // TODO Auto-generated method stub
         return false;
     }
 
-}
+}
diff --git a/src/_074_SearchA2DMatrix/Solution.java b/src/_074_SearchA2DMatrix/Solution.java
@@ -1,5 +1,5 @@
 /**
- * Time : O(); Space: O()
+ * Time : O(lg(mn)); Space: O(1)
  * @tag : Array; Binary Search
  * @by  : Steven Cooks
  * @date: Jun 6, 2015
diff --git a/test/_074_SearchA2DMatrix/PracticeTest.java b/test/_074_SearchA2DMatrix/PracticeTest.java
@@ -10,15 +10,15 @@
 
 public class PracticeTest {
 
-    /** Test method for {@link _074_SearchA2DMatrix.Solution } */
-    Solution solution;
+    /** Test method for {@link _074_SearchA2DMatrix.Practice } */
+    Practice solution;
     
     @Rule
     public Timeout globalTimeout = new Timeout(200);
 
     @Before
     public void setUp() throws Exception {
-        solution = new Solution();
+        solution = new Practice();
     }
 
     @After
@@ -28,8 +28,11 @@ public void tearDown() throws Exception {
 
     @Test
     public void Test1() {
-        int[][] matrix = { { 1, 3, 5, 7 }, { 10, 11, 16, 20 },
-                { 23, 30, 34, 50 } };
+        int[][] matrix = { 
+                {  1,  3,  5,  7 }, 
+                { 10, 11, 16, 20 },
+                { 23, 30, 34, 50 } 
+        };
         int target = 3;
         boolean actual = solution.searchMatrix(matrix, target);
         boolean expected = true;
@@ -38,8 +41,11 @@ public void Test1() {
 
     @Test
     public void Test2() {
-        int[][] matrix = { { 1, 3, 5, 7 }, { 10, 11, 16, 20 },
-                { 23, 30, 34, 50 } };
+        int[][] matrix = { 
+                {  1,  3,  5,  7 }, 
+                { 10, 11, 16, 20 },
+                { 23, 30, 34, 50 } 
+        };
         int target = 100;
         boolean actual = solution.searchMatrix(matrix, target);
         boolean expected = false;
@@ -48,8 +54,11 @@ public void Test2() {
 
     @Test
     public void Test3() {
-        int[][] matrix = { { 1, 3, 5, 7 }, { 10, 11, 16, 20 },
-                { 23, 30, 34, 50 } };
+        int[][] matrix = { 
+                {  1,  3,  5,  7 }, 
+                { 10, 11, 16, 20 },
+                { 23, 30, 34, 50 } 
+        };
         int target = 15;
         boolean actual = solution.searchMatrix(matrix, target);
         boolean expected = false;
@@ -58,8 +67,11 @@ public void Test3() {
 
     @Test
     public void Test4() {
-        int[][] matrix = { { 1, 3, 5, 7 }, { 10, 11, 16, 20 },
-                { 23, 30, 34, 50 } };
+        int[][] matrix = { 
+                {  1,  3,  5,  7 }, 
+                { 10, 11, 16, 20 },
+                { 23, 30, 34, 50 } 
+        };
         int target = 30;
         boolean actual = solution.searchMatrix(matrix, target);
         boolean expected = true;
@@ -68,8 +80,11 @@ public void Test4() {
 
     @Test
     public void Test5() {
-        int[][] matrix = { { 1, 3, 5, 7 }, { 10, 11, 16, 20 },
-                { 23, 30, 34, 50 } };
+        int[][] matrix = { 
+                {  1,  3,  5,  7 }, 
+                { 10, 11, 16, 20 },
+                { 23, 30, 34, 50 } 
+        };
         int target = 0;
         boolean actual = solution.searchMatrix(matrix, target);
         boolean expected = false;
@@ -78,12 +93,127 @@ public void Test5() {
 
     @Test
     public void Test6() {
-        int[][] matrix = { { 1, 3, 5, 7 }, { 10, 11, 16, 20 },
-                { 23, 30, 34, 50 } };
+        int[][] matrix = { 
+                {  1,  3,  5,  7 }, 
+                { 10, 11, 16, 20 },
+                { 23, 30, 34, 50 } 
+        };
         int target = 10;
         boolean actual = solution.searchMatrix(matrix, target);
         boolean expected = true;
         assertEquals(expected, actual);
     }
 
+    @Test
+    public void Test7() {
+        int[][] matrix = { {  1,  3,  5,  7 } };
+        int target = 10;
+        assertFalse(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test8() {
+        int[][] matrix = { {  1,  3,  5,  7 } };
+        int target = 7;
+        assertTrue(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test9() {
+        int[][] matrix = { {  1,  3,  5,  7 } };
+        int target = 1;
+        assertTrue(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test10() {
+        int[][] matrix = { {  1,  3,  5,  7 } };
+        int target = 4;
+        assertFalse(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test11() {
+        int[][] matrix = { {  1,  3,  5,  7 } };
+        int target = 5;
+        assertTrue(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test12() {
+        int[][] matrix = { 
+                { 1 },
+                { 5 },
+                { 9 },
+        };
+        int target = 9;
+        assertTrue(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test13() {
+        int[][] matrix = { 
+                { 1 },
+                { 5 },
+                { 9 },
+        };
+        int target = 1;
+        assertTrue(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test14() {
+        int[][] matrix = { 
+                { 1 },
+                { 5 },
+                { 9 },
+        };
+        int target = 5;
+        assertTrue(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test15() {
+        int[][] matrix = { 
+                { 1 },
+                { 5 },
+                { 9 },
+        };
+        int target = 18;
+        assertFalse(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test16() {
+        int[][] matrix = { 
+                { 1 },
+                { 5 },
+                { 9 },
+        };
+        int target = 0;
+        assertFalse(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test17() {
+        int[][] matrix = { 
+                { 1 },
+                { 5 },
+                { 9 },
+        };
+        int target = 3;
+        assertFalse(solution.searchMatrix(matrix, target));
+    }
+
+    @Test
+    public void Test18() {
+        int[][] matrix = { 
+                { 1 },
+                { 5 },
+                { 9 },
+        };
+        int target = 7;
+        assertFalse(solution.searchMatrix(matrix, target));
+    }
+
 }
diff --git a/test/_074_SearchA2DMatrix/SolutionTest.java b/test/_074_SearchA2DMatrix/SolutionTest.java
