refactor 592

fishercoder1534 · fishercoder1534 · commit a3c3e68fc1da · 2019-07-20T07:38:50.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_592.java b/src/main/java/com/fishercoder/solutions/_592.java
@@ -41,56 +41,61 @@ Each fraction (input and output) has format ±numerator/denominator.
  */
 public class _592 {
 
-    /**Credit: https://discuss.leetcode.com/topic/89993/java-solution-fraction-addition-and-gcd*/
-    public String fractionAddition(String expression) {
-        List<String> nums = new ArrayList<>();
-        int i = 0;
-        int j = 0;
-        while (j <= expression.length()) {
-            if (j == expression.length() || j != i && (expression.charAt(j) == '-' || expression.charAt(j) == '+')) {
-                if (expression.charAt(i) == '+') {
-                    nums.add(expression.substring(i + 1, j));
-                } else {
-                    nums.add(expression.substring(i, j));
+    public static class Solution1 {
+
+        /**
+         * Credit: https://discuss.leetcode.com/topic/89993/java-solution-fraction-addition-and-gcd
+         */
+        public String fractionAddition(String expression) {
+            List<String> nums = new ArrayList<>();
+            int i = 0;
+            int j = 0;
+            while (j <= expression.length()) {
+                if (j == expression.length() || j != i && (expression.charAt(j) == '-' || expression.charAt(j) == '+')) {
+                    if (expression.charAt(i) == '+') {
+                        nums.add(expression.substring(i + 1, j));
+                    } else {
+                        nums.add(expression.substring(i, j));
+                    }
+                    i = j;
                 }
-                i = j;
+                j++;
             }
-            j++;
-        }
 
-        String result = "0/1";
-        for (String frac : nums) {
-            result = add(result, frac);
+            String result = "0/1";
+            for (String frac : nums) {
+                result = add(result, frac);
+            }
+            return result;
         }
-        return result;
-    }
 
-    private String add(String result, String frac) {
-        String[] frac1 = frac.split("/");
-        String[] frac2 = result.split("/");
-        int n1 = Integer.parseInt(frac1[0]);
-        int d1 = Integer.parseInt(frac1[1]);
-        int n2 = Integer.parseInt(frac2[0]);
-        int d2 = Integer.parseInt(frac2[1]);
-        int numerator = n1 * d2 + n2 * d1;
-        int denominator = d1 * d2;
-        if (numerator == 0) {
-            return "0/1";
-        }
+        private String add(String result, String frac) {
+            String[] frac1 = frac.split("/");
+            String[] frac2 = result.split("/");
+            int n1 = Integer.parseInt(frac1[0]);
+            int d1 = Integer.parseInt(frac1[1]);
+            int n2 = Integer.parseInt(frac2[0]);
+            int d2 = Integer.parseInt(frac2[1]);
+            int numerator = n1 * d2 + n2 * d1;
+            int denominator = d1 * d2;
+            if (numerator == 0) {
+                return "0/1";
+            }
 
-        boolean negative = numerator * denominator < 0;
-        numerator = Math.abs(numerator);
-        denominator = Math.abs(denominator);
-        int gcd = getGCD(numerator, denominator);
+            boolean negative = numerator * denominator < 0;
+            numerator = Math.abs(numerator);
+            denominator = Math.abs(denominator);
+            int gcd = getGCD(numerator, denominator);
 
-        return (negative ? "-" : "") + (numerator / gcd) + "/" + (denominator / gcd);
-    }
+            return (negative ? "-" : "") + (numerator / gcd) + "/" + (denominator / gcd);
+        }
 
-    private int getGCD(int a, int b) {
-        if (a == 0 || b == 0) {
-            return a + b;
+        private int getGCD(int a, int b) {
+            if (a == 0 || b == 0) {
+                return a + b;
+            }
+            return getGCD(b, a % b);
         }
-        return getGCD(b, a % b);
     }
 
 }
diff --git a/src/test/java/com/fishercoder/_592Test.java b/src/test/java/com/fishercoder/_592Test.java
@@ -10,12 +10,12 @@
  * Created by fishercoder on 5/23/17.
  */
 public class _592Test {
-    private static _592 test;
+    private static _592.Solution1 test;
     private static String expression;
 
     @BeforeClass
     public static void setup() {
-        test = new _592();
+        test = new _592.Solution1();
     }
 
     @Test
