refactor 56

fishercoder1534 · fishercoder1534 · commit c0356e318c81 · 2020-11-18T06:34:48.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_56.java b/src/main/java/com/fishercoder/solutions/_56.java
@@ -1,33 +1,36 @@
 package com.fishercoder.solutions;
 
-import com.fishercoder.common.classes.Interval;
-
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 
 public class _56 {
 
     public static class Solution1 {
-        public List<Interval> merge(List<Interval> intervals) {
-            if (intervals.size() <= 1) {
+        public int[][] merge(int[][] intervals) {
+            if (intervals.length <= 1) {
                 return intervals;
             }
 
-            Collections.sort(intervals, (o1, o2) -> o1.start - o2.start);
+            Arrays.sort(intervals, (o1, o2) -> o1[0] - o2[0]);
 
-            List<Interval> result = new ArrayList();
-            for (int i = 0; i < intervals.size(); i++) {
-                int start = intervals.get(i).start;
-                int end = intervals.get(i).end;
-                while (i < intervals.size() && end >= intervals.get(i).start) {
-                    end = Math.max(end, intervals.get(i).end);
+            List<int[]> result = new ArrayList();
+            for (int i = 0; i < intervals.length; i++) {
+                int start = intervals[i][0];
+                int end = intervals[i][1];
+                while (i < intervals.length && end >= intervals[i][0]) {
+                    end = Math.max(end, intervals[i][1]);
                     i++;
                 }
-                result.add(new Interval(start, end));
+                result.add(new int[]{start, end});
                 i--;
             }
-            return result;
+            int[][] finalResult = new int[result.size()][2];
+            for (int i = 0; i < result.size(); i++) {
+                finalResult[i][0] = result.get(i)[0];
+                finalResult[i][1] = result.get(i)[1];
+            }
+            return finalResult;
         }
     }
 
diff --git a/src/test/java/com/fishercoder/_56Test.java b/src/test/java/com/fishercoder/_56Test.java
@@ -1,51 +1,35 @@
 package com.fishercoder;
 
-import com.fishercoder.common.classes.Interval;
 import com.fishercoder.solutions._56;
-import java.util.ArrayList;
-import java.util.List;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
 public class _56Test {
-  private static _56.Solution1 solution1;
-  private static List<Interval> intervals;
-  private static List<Interval> expected;
+    private static _56.Solution1 solution1;
+    private static int[][] intervals;
+    private static int[][] expected;
+
+    @BeforeClass
+    public static void setup() {
+        solution1 = new _56.Solution1();
+    }
+
+    @Test
+    public void test1() {
+        intervals = new int[][]{
+                {2, 3},
+                {5, 5},
+                {2, 2},
+                {3, 4},
+                {3, 4}
+        };
+        expected = new int[][]{
+                {2, 4},
+                {5, 5}
+        };
+        assertEquals(expected, solution1.merge(intervals));
+    }
 
-  @BeforeClass
-  public static void setup() {
-    solution1 = new _56.Solution1();
-  }
-
-  @Test
-  public void test1() {
-    intervals = new ArrayList();
-    intervals.add(new Interval(2, 3));
-    intervals.add(new Interval(5, 5));
-    intervals.add(new Interval(2, 2));
-    intervals.add(new Interval(3, 4));
-    intervals.add(new Interval(3, 4));
-
-    expected = new ArrayList<>();
-    expected.add(new Interval(2, 4));
-    expected.add(new Interval(5, 5));
-    assertEquals(expected, solution1.merge(intervals));
-  }
-
-  @Test
-  public void test2() {
-    intervals = new ArrayList();
-    intervals.add(new Interval(1, 3));
-    intervals.add(new Interval(2, 6));
-    intervals.add(new Interval(8, 10));
-    intervals.add(new Interval(15, 18));
-
-    expected = new ArrayList<>();
-    expected.add(new Interval(1, 6));
-    expected.add(new Interval(8, 10));
-    expected.add(new Interval(15, 18));
-    assertEquals(expected, solution1.merge(intervals));
-  }
 }
