[N-0] refactor

fishercoder1534 · fishercoder1534 · commit 57fc6fe9834c · 2017-10-30T17:01:11.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_99999RandomQuestions.java b/src/main/java/com/fishercoder/solutions/_99999RandomQuestions.java
@@ -1,6 +1,5 @@
 package com.fishercoder.solutions;
 
-import com.fishercoder.common.classes.Interval;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -238,160 +237,6 @@ public String findLongestRepeatedSubstring(String s) {
         }
     }
 
-
-    public static class RangeModule {
-        /**
-         * OA on 9/30/2017
-         */
-        List<Interval> intervals;
-
-        public RangeModule() {
-            this.intervals = new ArrayList<>();
-        }
-
-        public void addRange(int lower, int upper) {
-            intervals = addRange(intervals, new Interval(lower, upper));
-
-        }
-
-        private List<Interval> addRange(List<Interval> intervals, Interval newInterval) {
-            List<Interval> result = new ArrayList<>();
-            int i = 0;
-            // add all the intervals ending before newInterval starts
-            while (i < intervals.size() && intervals.get(i).end < newInterval.start) {
-                result.add(intervals.get(i++));
-            }
-            // merge all overlapping intervals to one considering newInterval
-            while (i < intervals.size() && intervals.get(i).start <= newInterval.end) {
-                newInterval = new Interval( // we could mutate newInterval here also
-                        Math.min(newInterval.start, intervals.get(i).start),
-                        Math.max(newInterval.end, intervals.get(i).end));
-                i++;
-            }
-            result.add(newInterval);
-            // add all the rest
-            while (i < intervals.size()) {
-                result.add(intervals.get(i++));
-            }
-            return result;
-        }
-
-        public boolean queryRange(int lower, int upper) {
-            /**check two ends first*/
-            if (intervals.get(0).start > upper || intervals.get(intervals.size() - 1).end < lower) {
-                return false;
-            }
-
-            /**Since intervals are sorted, I can use binary search for this query range to achieve log(n) (best) time complexity*/
-
-            int left = 0;
-            int right = intervals.size() - 1;
-            int start;//this is the index of the interval that has overlapping with "lower"
-            while (left < right) {
-                int mid = left + (right - left) / 2;
-                int pos = isInRange(intervals.get(mid), lower);
-                if (pos == 0) {
-                    start = mid;
-                    if (intervals.get(start).end >= upper) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else if (pos < 0) {
-                    right = mid - 1;
-                } else {
-                    left = mid + 1;
-                }
-            }
-            int pos = isInRange(intervals.get(left), lower);
-            if (pos == 0) {
-                if (intervals.get(left).end >= upper) {
-                    return true;
-                } else {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-
-        private int isInRange(Interval interval, int lower) {
-            if (interval.start <= lower && lower <= interval.end) {
-                return 0;
-            } else if (interval.start > lower) {
-                return -1;//this means lower is on the left part of this interval
-            } else {
-                return 1;//this means lower is on the right part of this interval
-            }
-        }
-
-        public void deleteRange(int lower, int upper) {
-            /**check two ends first*/
-            if (intervals.get(0).start > upper || intervals.get(intervals.size() - 1).end < lower) {
-                return;
-            }
-
-            /**Since intervals are sorted, one can use binary search for this query range to achieve log(n) (best) time complexity*/
-            int left = 0;
-            int right = intervals.size() - 1;
-            int start = Integer.MIN_VALUE;//this is the index of the interval that has overlapping with "lower"
-            while (left < right) {
-                int mid = left + (right - left) / 2;
-                int pos = isInRange(intervals.get(mid), lower);
-                if (pos == 0) {
-                    start = mid;
-                    break;
-                } else if (pos < 0) {
-                    right = mid - 1;
-                } else {
-                    left = mid + 1;
-                }
-            }
-            if (start == Integer.MIN_VALUE) {
-                start = left;
-            }
-            Interval startInterval = intervals.get(start);
-            intervals.remove(start);//remove this interval first
-
-            if (startInterval.start < lower - 1) {
-                addRange(startInterval.start, lower - 1);
-            }
-
-            if (startInterval.end > upper + 1) {
-                addRange(upper + 1, startInterval.end);
-            }
-
-            if (startInterval.end < upper) {
-                //only in this case, we'll have to do the following, otherwise we don't need to do anything but just return
-
-                int end = start;//find the index of the interval that overlapping with upper
-                left = start + 1;
-                right = intervals.size() - 1;
-                while (left < right) {
-                    int mid = left + (right - left) / 2;
-                    int pos = isInRange(intervals.get(mid), upper);
-                    if (pos == 0) {
-                        end = mid;
-                        break;
-                    } else if (pos < 0) {
-                        right = mid - 1;
-                    } else {
-                        left = mid + 1;
-                    }
-                }
-                Interval endInterval = intervals.get(end);//retrieve this interval first before removing the others
-
-                //remove all of the ranges up to end
-                for (int i = start + 1; i <= end; i++) {
-                    intervals.remove(i);
-                }
-
-                addRange(upper + 1, endInterval.end);
-            }
-
-        }
-    }
-
     public static String getShiftedString(String s, int left, int right) {
         if (left == right) {
             return s;
diff --git a/src/test/java/com/fishercoder/_99999RandomQuestionsTest.java b/src/test/java/com/fishercoder/_99999RandomQuestionsTest.java
@@ -1,7 +1,6 @@
 package com.fishercoder;
 
 import com.fishercoder.solutions._99999RandomQuestions;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -13,19 +12,13 @@
 public class _99999RandomQuestionsTest {
     private static _99999RandomQuestions test;
     private static _99999RandomQuestions.LongestRepeatedSubstring longestRepeatedSubstring;
-    private static _99999RandomQuestions.RangeModule rangeModule;
 
     @BeforeClass
     public static void setup() {
         test = new _99999RandomQuestions();
         longestRepeatedSubstring = new _99999RandomQuestions.LongestRepeatedSubstring();
     }
 
-    @Before
-    public void cleanUpForEachTest() {
-        rangeModule = new _99999RandomQuestions.RangeModule();
-    }
-
     @Test
     public void test1() {
         assertEquals(true, test.isValid("()"));
@@ -96,56 +89,4 @@ public void test13() {
 //        assertEquals("bc", longestRepeatedSubstring.findLongestRepeatedSubstring("abcbca"));
 //    }
 
-    @Test
-    public void test15() {
-        rangeModule.addRange(10, 180);
-        rangeModule.addRange(150, 200);
-        rangeModule.addRange(250, 500);
-        assertEquals(true, rangeModule.queryRange(50, 100));
-        assertEquals(false, rangeModule.queryRange(180, 300));
-        assertEquals(false, rangeModule.queryRange(600, 1000));
-
-        rangeModule.deleteRange(50, 150);
-        assertEquals(false, rangeModule.queryRange(50, 100));
-    }
-
-    @Test
-    public void test16() {
-        rangeModule.addRange(10, 100);
-        assertEquals(true, rangeModule.queryRange(10, 100));
-        assertEquals(false, rangeModule.queryRange(5, 20));
-        assertEquals(false, rangeModule.queryRange(0, 9));
-        assertEquals(false, rangeModule.queryRange(1, 20));
-    }
-
-    @Test
-    public void test17() {
-        rangeModule.addRange(10, 100);
-        assertEquals(true, rangeModule.queryRange(10, 100));
-
-        rangeModule.deleteRange(25, 44);
-        assertEquals(false, rangeModule.queryRange(10, 100));
-        assertEquals(false, rangeModule.queryRange(10, 25));
-        assertEquals(false, rangeModule.queryRange(44, 50));
-        assertEquals(true, rangeModule.queryRange(10, 24));
-        assertEquals(true, rangeModule.queryRange(50, 60));
-
-        rangeModule.deleteRange(15, 50);
-        assertEquals(false, rangeModule.queryRange(10, 24));
-        assertEquals(false, rangeModule.queryRange(45, 100));
-        assertEquals(true, rangeModule.queryRange(10, 14));
-    }
-
-    @Test
-    public void test18() {
-        rangeModule.addRange(10, 200);
-        rangeModule.addRange(150, 180);
-        rangeModule.addRange(250, 500);
-        assertEquals(true, rangeModule.queryRange(50, 100));
-        assertEquals(false, rangeModule.queryRange(180, 300));
-        assertEquals(false, rangeModule.queryRange(600, 1000));
-
-        rangeModule.deleteRange(50, 150);
-        assertEquals(false, rangeModule.queryRange(50, 100));
-    }
 }
