refactor 204

fishercoder1534 · fishercoder1534 · commit 2eb379df3e22 · 2018-09-13T07:45:20.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_204.java b/src/main/java/com/fishercoder/solutions/_204.java
@@ -93,33 +93,6 @@ public int countPrimes(int n) {
 public class _204 {
 
     public static class Solution1 {
-        /**
-         * This solution works, but takes too long and resulted in TLE on Leetcode.
-         */
-        public int countPrimes(int n) {
-            int count = 0;
-            for (int i = 1; i < n; i++) {
-                if (isPrime(i)) {
-                    count++;
-                }
-            }
-            return count;
-        }
-
-        private boolean isPrime(int k) {
-            if (k <= 1) {
-                return false;
-            }
-            for (int i = 2; i * i <= k; i++) {
-                if (k % i == 0) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-
-    public static class Solution2 {
         public int countPrimes(int n) {
             boolean[] notPrime = new boolean[n];
             int count = 0;
diff --git a/src/test/java/com/fishercoder/_204Test.java b/src/test/java/com/fishercoder/_204Test.java
@@ -8,66 +8,55 @@
 
 public class _204Test {
     private static _204.Solution1 solution1;
-    private static _204.Solution2 solution2;
 
     @BeforeClass
     public static void setup() {
         solution1 = new _204.Solution1();
-        solution2 = new _204.Solution2();
     }
 
     @Test
     public void test1() {
         assertEquals(0, solution1.countPrimes(2));
-        assertEquals(0, solution2.countPrimes(2));
     }
 
     @Test
     public void test2() {
         assertEquals(1, solution1.countPrimes(3));
-        assertEquals(1, solution2.countPrimes(3));
     }
 
     @Test
     public void test3() {
         assertEquals(2, solution1.countPrimes(5));
-        assertEquals(2, solution2.countPrimes(5));
     }
 
     @Test
     public void test4() {
         assertEquals(114155, solution1.countPrimes(1500000));
-        assertEquals(114155, solution2.countPrimes(1500000));
     }
 
     @Test
     public void test5() {
         assertEquals(10, solution1.countPrimes(30));
-        assertEquals(10, solution2.countPrimes(30));
     }
 
     @Test
     public void test6() {
         assertEquals(4, solution1.countPrimes(10));
-        assertEquals(4, solution2.countPrimes(10));
     }
 
     @Test
     public void test7() {
         assertEquals(8, solution1.countPrimes(20));
-        assertEquals(8, solution2.countPrimes(20));
     }
 
     @Test
     public void test8() {
         assertEquals(12, solution1.countPrimes(40));
-        assertEquals(12, solution2.countPrimes(40));
     }
 
     @Test
     public void test9() {
         assertEquals(15, solution1.countPrimes(50));
-        assertEquals(15, solution2.countPrimes(50));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -8,66 +8,55 @@`
`8`	`8`
`9`	`9`	`public class _204Test {`
`10`	`10`	`private static _204.Solution1 solution1;`
`11`		`- private static _204.Solution2 solution2;`
`12`	`11`
`13`	`12`	`@BeforeClass`
`14`	`13`	`public static void setup() {`
`15`	`14`	`solution1 = new _204.Solution1();`
`16`		`- solution2 = new _204.Solution2();`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`@Test`
`20`	`18`	`public void test1() {`
`21`	`19`	`assertEquals(0, solution1.countPrimes(2));`
`22`		`- assertEquals(0, solution2.countPrimes(2));`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`@Test`
`26`	`23`	`public void test2() {`
`27`	`24`	`assertEquals(1, solution1.countPrimes(3));`
`28`		`- assertEquals(1, solution2.countPrimes(3));`
`29`	`25`	`}`
`30`	`26`
`31`	`27`	`@Test`
`32`	`28`	`public void test3() {`
`33`	`29`	`assertEquals(2, solution1.countPrimes(5));`
`34`		`- assertEquals(2, solution2.countPrimes(5));`
`35`	`30`	`}`
`36`	`31`
`37`	`32`	`@Test`
`38`	`33`	`public void test4() {`
`39`	`34`	`assertEquals(114155, solution1.countPrimes(1500000));`
`40`		`- assertEquals(114155, solution2.countPrimes(1500000));`
`41`	`35`	`}`
`42`	`36`
`43`	`37`	`@Test`
`44`	`38`	`public void test5() {`
`45`	`39`	`assertEquals(10, solution1.countPrimes(30));`
`46`		`- assertEquals(10, solution2.countPrimes(30));`
`47`	`40`	`}`
`48`	`41`
`49`	`42`	`@Test`
`50`	`43`	`public void test6() {`
`51`	`44`	`assertEquals(4, solution1.countPrimes(10));`
`52`		`- assertEquals(4, solution2.countPrimes(10));`
`53`	`45`	`}`
`54`	`46`
`55`	`47`	`@Test`
`56`	`48`	`public void test7() {`
`57`	`49`	`assertEquals(8, solution1.countPrimes(20));`
`58`		`- assertEquals(8, solution2.countPrimes(20));`
`59`	`50`	`}`
`60`	`51`
`61`	`52`	`@Test`
`62`	`53`	`public void test8() {`
`63`	`54`	`assertEquals(12, solution1.countPrimes(40));`
`64`		`- assertEquals(12, solution2.countPrimes(40));`
`65`	`55`	`}`
`66`	`56`
`67`	`57`	`@Test`
`68`	`58`	`public void test9() {`
`69`	`59`	`assertEquals(15, solution1.countPrimes(50));`
`70`		`- assertEquals(15, solution2.countPrimes(50));`
`71`	`60`	`}`
`72`	`61`
`73`	`62`	`}`