refactor 397

fishercoder1534 · fishercoder1534 · commit 02934b39ca21 · 2019-01-12T07:52:05.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_397.java b/src/main/java/com/fishercoder/solutions/_397.java
@@ -6,7 +6,10 @@
 import java.util.Queue;
 import java.util.Set;
 
-/**Given a positive integer n and you can do operations as follow:
+/**
+ * 397. Integer Replacement
+ *
+ * Given a positive integer n and you can do operations as follow:
 
  If n is even, replace n with n/2.
  If n is odd, you can replace n with either n + 1 or n - 1.
@@ -36,54 +39,46 @@
  7 -> 6 -> 3 -> 2 -> 1*/
 public class _397 {
 
-    public static int integerReplacement(int n) {
-        long min = Long.MAX_VALUE;
-        Set<long[]> set = new HashSet();
-        Queue<long[]> q = new LinkedList();
-        long[] pair = new long[]{n, 0};
-        q.offer(pair);
-        while (!q.isEmpty()) {
-            int size = q.size();
-            for (int i = 0; i < size; i++) {
-                long[] curr = q.poll();
-                if (curr[0] == 1) {
-                    set.add(curr);
-                } else {
-
-                    if (curr[0] % 2 == 0) {
-                        curr[0] /= 2;
-                        curr[1]++;
-                        q.offer(curr);
+    public static class Solution1 {
+        public int integerReplacement(int n) {
+            long min = Long.MAX_VALUE;
+            Set<long[]> set = new HashSet();
+            Queue<long[]> q = new LinkedList();
+            long[] pair = new long[] {n, 0};
+            q.offer(pair);
+            while (!q.isEmpty()) {
+                int size = q.size();
+                for (int i = 0; i < size; i++) {
+                    long[] curr = q.poll();
+                    if (curr[0] == 1) {
+                        set.add(curr);
                     } else {
-                        long[] minus = new long[2];
-                        minus[0] = curr[0] - 1;
-                        minus[1] = curr[1] + 1;
-                        q.offer(minus);
 
-                        long[] plus = new long[2];
-                        plus[0] = curr[0] + 1;
-                        plus[1] = curr[1] + 1;
-                        q.offer(plus);
+                        if (curr[0] % 2 == 0) {
+                            curr[0] /= 2;
+                            curr[1]++;
+                            q.offer(curr);
+                        } else {
+                            long[] minus = new long[2];
+                            minus[0] = curr[0] - 1;
+                            minus[1] = curr[1] + 1;
+                            q.offer(minus);
+
+                            long[] plus = new long[2];
+                            plus[0] = curr[0] + 1;
+                            plus[1] = curr[1] + 1;
+                            q.offer(plus);
+                        }
                     }
                 }
             }
-        }
 
-        Iterator<long[]> it = set.iterator();
-        while (it.hasNext()) {
-            min = Math.min(min, it.next()[1]);
+            Iterator<long[]> it = set.iterator();
+            while (it.hasNext()) {
+                min = Math.min(min, it.next()[1]);
+            }
+            return (int) min;
         }
-        return (int) min;
     }
 
-    public static void main(String... strings) {
-        System.out.println(integerReplacement(2147483647));
-        System.out.println(integerReplacement(65535));//should be 17
-        System.out.println(integerReplacement(1234));//should be 14
-//        System.out.println(integerReplacement(1));
-//        System.out.println(integerReplacement(2));
-//        System.out.println(integerReplacement(3));
-        System.out.println(integerReplacement(5));//should be 3
-//        System.out.println(integerReplacement(7));
-    }
 }
diff --git a/src/test/java/com/fishercoder/_397Test.java b/src/test/java/com/fishercoder/_397Test.java
@@ -0,0 +1,31 @@
+package com.fishercoder;
+
+import com.fishercoder.solutions._397;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class _397Test {
+  private static _397.Solution1 solution1;
+
+  @BeforeClass
+  public static void setup() {
+    solution1 = new _397.Solution1();
+  }
+
+  @Test
+  public void test1() {
+    assertEquals(17, solution1.integerReplacement(65535));
+  }
+
+  @Test
+  public void test2() {
+    assertEquals(14, solution1.integerReplacement(1234));
+  }
+
+  @Test
+  public void test3() {
+    assertEquals(3, solution1.integerReplacement(5));
+  }
+}
