refactor 445

fishercoder1534 · fishercoder1534 · commit 4f21ae0f1a84 · 2019-04-06T08:17:07.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_445.java b/src/main/java/com/fishercoder/solutions/_445.java
@@ -8,6 +8,7 @@
 
 /**
  * 445. Add Two Numbers II
+ *
  * You are given two non-empty linked lists representing two non-negative integers.
  * The most significant digit comes first and each of their nodes contain a single digit. Add the two numbers and return it as a linked list.
 
@@ -23,36 +24,38 @@
  */
 public class _445 {
 
-    public ListNode addTwoNumbers(ListNode l1, ListNode l2) {
-        Deque<Integer> stack1 = popIntoStack(l1);
-        Deque<Integer> stack2 = popIntoStack(l2);
+    public static class Solution1 {
+        public ListNode addTwoNumbers(ListNode l1, ListNode l2) {
+            Deque<Integer> stack1 = popIntoStack(l1);
+            Deque<Integer> stack2 = popIntoStack(l2);
 
-        int sum = 0;
-        ListNode list = new ListNode(0);
-        while (!stack1.isEmpty() || !stack2.isEmpty()) {
-            if (!stack1.isEmpty()) {
-                sum += stack1.removeFirst();
-            }
-            if (!stack2.isEmpty()) {
-                sum += stack2.removeFirst();
+            int sum = 0;
+            ListNode list = new ListNode(0);
+            while (!stack1.isEmpty() || !stack2.isEmpty()) {
+                if (!stack1.isEmpty()) {
+                    sum += stack1.removeFirst();
+                }
+                if (!stack2.isEmpty()) {
+                    sum += stack2.removeFirst();
+                }
+                list.val = sum % 10;
+                ListNode head = new ListNode(sum / 10);
+                head.next = list;
+                list = head;
+                sum /= 10;
             }
-            list.val = sum % 10;
-            ListNode head = new ListNode(sum / 10);
-            head.next = list;
-            list = head;
-            sum /= 10;
+            return list.val == 0 ? list.next : list;
         }
-        return list.val == 0 ? list.next : list;
-    }
 
-    private Deque<Integer> popIntoStack(ListNode head) {
-        ListNode tmp = head;
-        Deque<Integer> stack = new ArrayDeque<>();
-        while (tmp != null) {
-            stack.push(tmp.val);
-            tmp = tmp.next;
+        private Deque<Integer> popIntoStack(ListNode head) {
+            ListNode tmp = head;
+            Deque<Integer> stack = new ArrayDeque<>();
+            while (tmp != null) {
+                stack.push(tmp.val);
+                tmp = tmp.next;
+            }
+            return stack;
         }
-        return stack;
     }
 
 
diff --git a/src/test/java/com/fishercoder/_445Test.java b/src/test/java/com/fishercoder/_445Test.java
@@ -12,12 +12,12 @@
  * Created by fishercoder on 5/13/17.
  */
 public class _445Test {
-    private static _445 test;
+    private static _445.Solution1 solution1;
     private static _445.Solution2 solution2;
 
     @BeforeClass
     public static void setup() {
-        test = new _445();
+        solution1 = new _445.Solution1();
         solution2 = new _445.Solution2();
     }
 
@@ -29,7 +29,7 @@ public void test1() {
 
         ListNode expected = LinkedListUtils.contructLinkedList(new int[]{7, 8, 0, 7});
 
-        assertEquals(expected, test.addTwoNumbers(l1, l2));
+        assertEquals(expected, solution1.addTwoNumbers(l1, l2));
     }
 
     @Test
