refactor 227

fishercoder1534 · fishercoder1534 · commit 8748eb6533e6 · 2018-10-05T07:48:54.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_227.java b/src/main/java/com/fishercoder/solutions/_227.java
@@ -1,6 +1,5 @@
 package com.fishercoder.solutions;
 
-
 import java.util.ArrayDeque;
 import java.util.Deque;
 
@@ -21,38 +20,38 @@
  */
 public class _227 {
 
-    /**Credit: https://discuss.leetcode.com/topic/16935/share-my-java-solution*/
-    public int calculate(String s) {
-        if (s == null || s.length() == 0) {
-            return 0;
-        }
-        int len = s.length();
-        Deque<Integer> stack = new ArrayDeque<>();
-        int num = 0;
-        char sign = '+';
-        for (int i = 0; i < len; i++) {
-            if (Character.isDigit(s.charAt(i))) {
-                num = num * 10 + s.charAt(i) - '0';
+    public static class Solution1 {
+        public int calculate(String s) {
+            if (s == null || s.length() == 0) {
+                return 0;
             }
-            if ((!Character.isDigit(s.charAt(i))) && ' ' != s.charAt(i) || i == len - 1) {
-                if (sign == '+') {
-                    stack.addLast(num);
-                } else if (sign == '-') {
-                    stack.addLast(-num);
-                } else if (sign == '/') {
-                    stack.addLast(stack.pollLast() / num);
-                } else if (sign == '*') {
-                    stack.addLast(stack.pollLast() * num);
+            int len = s.length();
+            Deque<Integer> stack = new ArrayDeque<>();
+            int num = 0;
+            char sign = '+';
+            for (int i = 0; i < len; i++) {
+                if (Character.isDigit(s.charAt(i))) {
+                    num = num * 10 + s.charAt(i) - '0';
+                }
+                if ((!Character.isDigit(s.charAt(i))) && ' ' != s.charAt(i) || i == len - 1) {
+                    if (sign == '+') {
+                        stack.addLast(num);
+                    } else if (sign == '-') {
+                        stack.addLast(-num);
+                    } else if (sign == '/') {
+                        stack.addLast(stack.pollLast() / num);
+                    } else if (sign == '*') {
+                        stack.addLast(stack.pollLast() * num);
+                    }
+                    sign = s.charAt(i);
+                    num = 0;
                 }
-                sign = s.charAt(i);
-                num = 0;
             }
+            int result = 0;
+            while (!stack.isEmpty()) {
+                result += stack.poll();
+            }
+            return result;
         }
-        int result = 0;
-        while (!stack.isEmpty()) {
-            result += stack.poll();
-        }
-        return result;
     }
-
 }
diff --git a/src/test/java/com/fishercoder/_227Test.java b/src/test/java/com/fishercoder/_227Test.java
@@ -6,35 +6,32 @@
 
 import static org.junit.Assert.assertEquals;
 
-/**
- * Created by stevesun on 5/29/17.
- */
 public class _227Test {
-    private static _227 test;
+    private static _227.Solution1 solution1;
 
     @BeforeClass
     public static void setup() {
-        test = new _227();
+        solution1 = new _227.Solution1();
     }
 
     @Test
     public void test1() {
-        assertEquals(7, test.calculate("3+2*2"));
+        assertEquals(7, solution1.calculate("3+2*2"));
     }
 
     @Test
     public void test2() {
-        assertEquals(1, test.calculate(" 3/2 "));
+        assertEquals(1, solution1.calculate(" 3/2 "));
     }
 
     @Test
     public void test3() {
-        assertEquals(5, test.calculate(" 3+5 / 2 "));
+        assertEquals(5, solution1.calculate(" 3+5 / 2 "));
     }
 
     @Test
     public void test4() {
-        assertEquals(27, test.calculate("100000000/1/2/3/4/5/6/7/8/9/10"));
+        assertEquals(27, solution1.calculate("100000000/1/2/3/4/5/6/7/8/9/10"));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -6,35 +6,32 @@`
`6`	`6`
`7`	`7`	`import static org.junit.Assert.assertEquals;`
`8`	`8`
`9`		`-/**`
`10`		`- * Created by stevesun on 5/29/17.`
`11`		`- */`
`12`	`9`	`public class _227Test {`
`13`		`- private static _227 test;`
	`10`	`+ private static _227.Solution1 solution1;`
`14`	`11`
`15`	`12`	`@BeforeClass`
`16`	`13`	`public static void setup() {`
`17`		`- test = new _227();`
	`14`	`+ solution1 = new _227.Solution1();`
`18`	`15`	`}`
`19`	`16`
`20`	`17`	`@Test`
`21`	`18`	`public void test1() {`
`22`		`- assertEquals(7, test.calculate("3+2*2"));`
	`19`	`+ assertEquals(7, solution1.calculate("3+2*2"));`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`@Test`
`26`	`23`	`public void test2() {`
`27`		`- assertEquals(1, test.calculate(" 3/2 "));`
	`24`	`+ assertEquals(1, solution1.calculate(" 3/2 "));`
`28`	`25`	`}`
`29`	`26`
`30`	`27`	`@Test`
`31`	`28`	`public void test3() {`
`32`		`- assertEquals(5, test.calculate(" 3+5 / 2 "));`
	`29`	`+ assertEquals(5, solution1.calculate(" 3+5 / 2 "));`
`33`	`30`	`}`
`34`	`31`
`35`	`32`	`@Test`
`36`	`33`	`public void test4() {`
`37`		`- assertEquals(27, test.calculate("100000000/1/2/3/4/5/6/7/8/9/10"));`
	`34`	`+ assertEquals(27, solution1.calculate("100000000/1/2/3/4/5/6/7/8/9/10"));`
`38`	`35`	`}`
`39`	`36`
`40`	`37`	`}`