time_frame 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efbf94fb0f87fe1ae9932c5adff2d7d2e0eecceb
-  data.tar.gz: 6333edbdc572720acfd58530eb9dc8d6cce0641c
+  metadata.gz: ef554cd54e51a1fc22a6c16b6cf1bac7b43b19d8
+  data.tar.gz: 319e9ef2ced0c9ec7f4fe221cc22c4e48743a2a6
 SHA512:
-  metadata.gz: d7d02280bee7697e3403816914747f1881e0eabc328bccfbac33e1fe4789eaf43c058c51772589d2d9e888a956eb9fc8ebcf737f39582cd790dfb050424c2138
-  data.tar.gz: b361470e27cb987f9e653325a29db4e11489632a425e52dfaa140a29dac74a9b31a118811f4e0d9315d3e344cd2f9477336e3da3b30c820d2883c2df2b27d00a
+  metadata.gz: ac152a3d12403ee212d374f1282f2ec3d63cc39d223d6e292680e8ea6e45fbcb55b1b465319fa0d8bfb448d6b33a444e53d74c4341aacfee8fe2f1a737bd9333
+  data.tar.gz: a5a439ab393e88bcef9195d632c8b774e7c88f538e9bce1efea20ace56ba76c182f5cf3d8deb43cf0e77f36d50e1b5357682000418321872fdc2fed072b8869b

data/lib/time_frame/collection.rb

@@ -1,68 +1,70 @@
 # Encoding: utf-8
 
-# This collection supports the concept of interval trees to improve the
-# access speed to intervals (or objects containing intervals) intersecting
-# given time_frames or covering time elements
-class Collection
-  attr_reader :tree_nodes, :root
-  def initialize(item_list = [], sorted = false, &block)
-    @block = block ? block : ->(item) { item }
-    @tree_nodes = item_list.map do |item|
-      TreeNode.new(item: item, &@block)
-    end
+class TimeFrame
+  # This collection supports the concept of interval trees to improve the
+  # access speed to intervals (or objects containing intervals) intersecting
+  # given time_frames or covering time elements
+  class Collection
+    attr_reader :tree_nodes, :root
+    def initialize(item_list = [], sorted = false, &block)
+      @block = block ? block : ->(item) { item }
+      @tree_nodes = item_list.map do |item|
+        TreeNode.new(item: item, &@block)
+      end
 
-    sort_list(@tree_nodes) unless sorted
-    build_tree(0, @tree_nodes.size - 1)
-    @root = @tree_nodes[(@tree_nodes.size - 1) / 2]
-  end
+      sort_list(@tree_nodes) unless sorted
+      build_tree(0, @tree_nodes.size - 1)
+      @root = @tree_nodes[(@tree_nodes.size - 1) / 2]
+    end
 
-  def all_covering(time)
-    result = []
-    add_covering(time, @root, result)
-    result.sort_by { |item | [@block.call(item).min, @block.call(item).max] }
-  end
+    def all_covering(time)
+      result = []
+      add_covering(time, @root, result)
+      result.sort_by { |item | [@block.call(item).min, @block.call(item).max] }
+    end
 
-  def all_intersecting(time_frame)
-    result = []
-    add_intersecting(time_frame, @root, result)
-    result.sort_by { |item | [@block.call(item).min, @block.call(item).max] }
-  end
+    def all_intersecting(time_frame)
+      result = []
+      add_intersecting(time_frame, @root, result)
+      result.sort_by { |item | [@block.call(item).min, @block.call(item).max] }
+    end
 
-  private
+    private
 
-  def sort_list(item_list)
-    item_list.sort_by! do |item|
-      [item.time_frame.min, item.time_frame.max]
+    def sort_list(item_list)
+      item_list.sort_by! do |item|
+        [item.time_frame.min, item.time_frame.max]
+      end
     end
-  end
 
-  def build_tree(lower, upper, ancestor = nil, side = nil)
-    mid = (lower + upper) / 2
-    node = @tree_nodes[mid]
+    def build_tree(lower, upper, ancestor = nil, side = nil)
+      mid = (lower + upper) / 2
+      node = @tree_nodes[mid]
 
-    node.update_ancestor_relation(ancestor, side) if ancestor && side
+      node.update_ancestor_relation(ancestor, side) if ancestor && side
 
-    build_tree(lower, mid - 1, node, :left) unless lower == mid
-    build_tree(mid + 1, upper, node, :right) unless upper == mid
+      build_tree(lower, mid - 1, node, :left) unless lower == mid
+      build_tree(mid + 1, upper, node, :right) unless upper == mid
 
-    node.update_child_range(node.min_child, node.max_child) if lower == upper
-  end
+      node.update_child_frame(node.child_time_frame) if lower == upper
+    end
 
-  def add_covering(time, node, result)
-    result << node.item if node.time_frame.cover?(time)
-    if node.continue_left_side_search_for_time?(time)
-      add_covering(time, node.left_child, result)
+    def add_covering(time, node, result)
+      result << node.item if node.time_frame.cover?(time)
+      if node.continue_left_side_search_for_time?(time)
+        add_covering(time, node.left_child, result)
+      end
+      return unless node.continue_right_side_search_for_time?(time)
+      add_covering(time, node.right_child, result)
     end
-    return unless node.continue_right_side_search_for_time?(time)
-    add_covering(time, node.right_child, result)
-  end
 
-  def add_intersecting(time_frame, node, result)
-    result << node.item unless (node.time_frame & time_frame).empty?
-    if node.continue_left_side_search_for_time_frame?(time_frame)
-      add_intersecting(time_frame, node.left_child, result)
+    def add_intersecting(time_frame, node, result)
+      result << node.item unless (node.time_frame & time_frame).empty?
+      if node.continue_left_side_search_for_time_frame?(time_frame)
+        add_intersecting(time_frame, node.left_child, result)
+      end
+      return unless node.continue_right_side_search_for_time_frame?(time_frame)
+      add_intersecting(time_frame, node.right_child, result)
     end
-    return unless node.continue_right_side_search_for_time_frame?(time_frame)
-    add_intersecting(time_frame, node.right_child, result)
   end
 end

data/lib/time_frame/tree_node.rb

@@ -1,55 +1,55 @@
 # Encoding: utf-8
-class Collection
-  # This is a helper class for the collection. It contains the node definition
-  # for the used tree structues.
-  class TreeNode
-    attr_accessor :max_child, :min_child, :left_child, :right_child
-    attr_reader :item, :time_frame, :ancestor
-    def initialize(args, &block)
-      @item = args.fetch(:item)
-      @time_frame = block.call(item)
-      # if ancestor is nil, then tree_item is root node
-      @ancestor = args.fetch(:ancestor, nil)
-      @left_child = args.fetch(:left_child, nil)
-      @right_child = args.fetch(:right_child, nil)
+class TimeFrame
+  class Collection
+    # This is a helper class for the collection. It contains the node definition
+    # for the used tree structues.
+    class TreeNode
+      attr_accessor :left_child, :right_child, :child_time_frame
+      attr_reader :item, :time_frame, :ancestor
+      def initialize(args, &block)
+        @item = args.fetch(:item)
+        @time_frame = block.call(item)
+        # if ancestor is nil, then tree_item is root node
+        @ancestor = args.fetch(:ancestor, nil)
+        @left_child = args.fetch(:left_child, nil)
+        @right_child = args.fetch(:right_child, nil)
 
-      # if block is given use it to get item's time frame
-      @max_child = args.fetch(:max_child, @time_frame.max)
-      @min_child = args.fetch(:max_child, @time_frame.min)
-    end
+        # if block is given use it to get item's time frame
+        @child_time_frame = @time_frame
+      end
 
-    def update_ancestor_relation(new_ancestor, side)
-      @ancestor = new_ancestor
-      new_ancestor.left_child = self if side == :left
-      new_ancestor.right_child = self if side == :right
-    end
+      def update_ancestor_relation(new_ancestor, side)
+        @ancestor = new_ancestor
+        new_ancestor.left_child = self if side == :left
+        new_ancestor.right_child = self if side == :right
+      end
 
-    def update_child_range(new_min_child, new_max_child)
-      @min_child = [@min_child, new_min_child].min
-      @max_child = [@max_child, new_max_child].max
-      ancestor.update_child_range(min_child, max_child) if ancestor
-    end
+      def update_child_frame(new_child_frame)
+        min = [@child_time_frame.min, new_child_frame.min].min
+        max = [@child_time_frame.max, new_child_frame.max].max
+        @child_time_frame = TimeFrame.new(min: min, max: max)
+        ancestor.update_child_frame(@child_time_frame) if ancestor
+      end
 
-    def continue_left_side_search_for_time?(time)
-      left_child &&
-      time >= left_child.min_child && time <= left_child.max_child
-    end
+      def continue_left_side_search_for_time?(time)
+        left_child && left_child.child_time_frame.cover?(time)
+      end
 
-    def continue_left_side_search_for_time_frame?(interval)
-      left_child &&
-      left_child.min_child <= interval.max &&
-      interval.min <= left_child.max_child
-    end
+      def continue_left_side_search_for_time_frame?(interval)
+        left_child &&
+        left_child.child_time_frame.min <= interval.max &&
+        left_child.child_time_frame.max >= interval.min
+      end
 
-    def continue_right_side_search_for_time?(time)
-      right_child &&
-      right_child.min_child <= time && time <= right_child.max_child
-    end
+      def continue_right_side_search_for_time?(time)
+        right_child && right_child.child_time_frame.cover?(time)
+      end
 
-    def continue_right_side_search_for_time_frame?(interval)
-      right_child &&
-      right_child.min_child <= interval.max &&
-      interval.min <= right_child.max_child
+      def continue_right_side_search_for_time_frame?(interval)
+        right_child &&
+        right_child.child_time_frame.min <= interval.max &&
+        right_child.child_time_frame.max >= interval.min
+      end
     end
   end
 end

data/lib/time_frame/version.rb

@@ -1,5 +1,5 @@
 # Encoding: utf-8
 # gem version
 class TimeFrame
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/collection_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Collection do
+describe TimeFrame::Collection do
 
   let(:time_frame) { TimeFrame.new(min: Time.utc(2014), duration: 20.days) }
   let(:time) { Time.utc(2014) }
@@ -9,7 +9,7 @@ describe Collection do
     context 'when a pure time_frame tree is given' do
       it 'returns all covering time_frames' do
         time_frames = 20.times.map { |i| time_frame.shift_by((5 * i).days) }
-        tree = Collection.new(time_frames)
+        tree = TimeFrame::Collection.new(time_frames)
 
         result = tree.all_covering(time)
         expected_result = time_frames.select { |t| t.cover?(time) }
@@ -44,7 +44,7 @@ describe Collection do
         objects = 20.times.map do |i|
           OpenStruct.new(time_frame: time_frame.shift_by((5 * i).days))
         end
-        tree = Collection.new(objects) { |item| item.time_frame }
+        tree = TimeFrame::Collection.new(objects) { |item| item.time_frame }
 
         result = tree.all_covering(time - 1.day)
         expect(result).to eq []
@@ -83,7 +83,7 @@ describe Collection do
     context 'when a pure time_frame tree is given' do
       it 'returns all intersecting time_frames' do
         time_frames = 20.times.map { |i| time_frame.shift_by((5 * i).days) }
-        tree = Collection.new(time_frames)
+        tree = TimeFrame::Collection.new(time_frames)
         interval = TimeFrame.new(min: time, duration: 1.hour)
 
         result = tree.all_intersecting(interval.shift_by((-1).day))
@@ -133,7 +133,7 @@ describe Collection do
         objects = 20.times.map do |i|
           OpenStruct.new(time_frame: time_frame.shift_by((5 * i).days))
         end
-        tree = Collection.new(objects) { |item| item.time_frame }
+        tree = TimeFrame::Collection.new(objects) { |item| item.time_frame }
         interval = TimeFrame.new(min: time, duration: 1.hour)
 
         result = tree.all_intersecting(interval.shift_by((-1).day))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_frame
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Patrick Derichs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake