swak 0.1.0 → 0.1.1

data/lib/swak/interval.rb

@@ -12,26 +12,30 @@ module Swak
       return x[0] < y[1] && x[1] > y[0]
     end
 
-    def Interval.lists_intersect(list1, list2)
+    # Assumes that boths lists dont overlap with themselves
+    def Interval.nonoverlap_list_intersects_other_list(list1, list2)
       list1 = list1.sort_by(&Interval::sort_by_start)
-      list2 = list2.sort_by(&Interval::sort_by_end)
+      list2 = list2.sort_by(&Interval::sort_by_start)
 
       results = []
 
       return results if list1.size == 0 || list2.size == 0
 
-      j = 0
-      list1.each_with_index do |int1, i|
-        next if int1[1] <= list2[j][0] # int1 is strictly less than int2, so walk int1 forward
-
-        # int2 is strictly less than int1, walk it forward
-        while j < list2.size && list2[j][1] <= int1[0]
-          j += 1
+      for int1 in list1
+        # Throw out anything in list2 that ends before int1 starts
+        while list2.size > 0 && list2.first[1] <= int1[0]
+          list2.shift
+        end
+        break if list2.size == 0
+        
+        # Now we know the first element of list2 ends somewhere after int1 starts
+        for int2 in list2
+          if int2[0] < int1[1] # It must overlap if int2 starts before int1 ends 
+            results << [int1, int2]
+          else
+            break
+          end
         end
-
-        break if j >= list2.size
-
-        results << [int1, list2[j]] if intersect(int1, list2[j])
       end
 
       return results

metadata

@@ -2,7 +2,7 @@
 name: swak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jesse Rodriguez