ds 0.0.2 → 0.0.3

data/lib/ds/queues/queue.rb

@@ -13,7 +13,7 @@ module DS
       end
     end
     
-    #Create new queue.Internaly uses list to store elements.
+    #Create new queue. Internaly uses list to store elements.
     def Queue.create
       new(:list)
     end

data/lib/ds/sets/ordered_set.rb

@@ -0,0 +1,32 @@
+module DS
+  class OrderedSet
+    attr_reader :size
+
+    #Creates new Ordered Set.
+    def initialize
+      @size = 0
+      @store = {}
+    end
+
+    #Adds new element to set
+    def push e
+      if index = @store[e]
+        index
+      else
+        @size = @size+1
+        @store[e] = @size-1
+      end
+    end
+
+    #Returns element index.
+    def index e
+      @store[e]
+    end
+
+    def to_a
+      @store.sort{|a,b| a[1]<=>b[1]}.map{|e| e.first}
+    end
+
+
+  end
+end

data/lib/ds/trees/binary_heap.rb

@@ -14,10 +14,18 @@ module DS
       heapify!
     end
 
-    def set_relation(&relation)
-      @relation = relation
+    #Create new Maximum Heap from args.
+    def BinaryHeap.max(*args)
+      new(*args){|parent,child| parent >= child}
     end
 
+    #Create new Minimum Heap from args.
+    def BinaryHeap.min(*args)
+      new(*args){|parent,child| parent < child}
+    end
+
+
+    #Evaluates Heap relation.
     def relation(parent,child)
       @relation.call(@data[parent],@data[child])
     end
@@ -30,6 +38,34 @@ module DS
       end
     end
 
+    #Maintains heap condition for i node.
+    #O(log)
+    def heapify(i)
+      left =  left_index(i)
+      left = nil if left >= @data.size
+
+      right = right_index(i)
+      right = nil if right >= @data.size
+
+      largest = [i,left,right].compact.sort{|x,y| relation(x,y)?-1:1}.first
+
+      if largest != i
+        @data[i], @data[largest] = @data[largest], @data[i]
+        heapify(largest)
+      end
+    end
+
+    #Removes element from heap maintaining heap relation.
+    def shift
+      if @data.size > 0
+        result = @data.shift
+        return result if @data.size.zero?
+        @data.unshift @data.pop
+        heapify(0)
+      end
+      result
+    end
+
     #Inserts new value to heap maintaining the heap relation.
     #Returns heap itself.
     #O(log)
@@ -46,21 +82,16 @@ module DS
       self
     end
 
-    #Maintain heap condition for i node.
-    #O(log)
-    def heapify(i)
-      left =  left_index(i)
-      left = nil if left >= @data.size
 
-      right = right_index(i)
-      right = nil if right >= @data.size
 
-      largest = [i,left,right].compact.sort{|x,y| relation(x,y)?-1:1}.first
+    def length
+      @data.size 
+    end
 
-      if largest != i
-        @data[i], @data[largest] = @data[largest], @data[i]
-        heapify(largest)
-      end
+    alias :size :length
+
+    def empty?
+      @data.empty?
     end
 
     def to_a

data/lib/ds/trees/binary_search_tree.rb

@@ -1,6 +1,7 @@
 module DS
   class BinarySearchTree < BinaryTree
 
+    #Creates new search tree from array.
     def self.from_array(arr)
       tree = BinarySearchTree.new(arr.shift)
       arr.each do |e|
@@ -9,6 +10,7 @@ module DS
       tree
     end
 
+    #Inserts new element.
     def insert x
       if x > @data and right.nil?
         self.right = BinarySearchTree.new(x)
@@ -21,7 +23,7 @@ module DS
       end
     end
 
-
+    #Checks if tree is valid Binary Search Tree.
     def BinarySearchTree.valid?(other)
       walker = TreeWalker.new(other)
       walker.traverse(:inorder)

data/lib/ds/trees/binary_tree.rb

@@ -1,6 +1,14 @@
 module DS
   class BinaryTree < Tree
 
+    #Inserts a new subtree.
+    def << (value)
+      subtree = BinaryTree.new(value)
+      @children << subtree
+      return subtree
+    end
+
+    #Returns left subtree
     def left
       if @children.empty?
         nil
@@ -9,10 +17,12 @@ module DS
       end
     end
 
+    #Sets left subtree
     def left=(value)
       @children[0] = value
     end
 
+    #Returns right subtree
     def right
       if @children.empty?
         nil
@@ -21,15 +31,11 @@ module DS
       end
     end
 
+    #Sets right subtree
     def right=(value)
       @children[1] = value
     end
 
-    def << (value)
-      subtree = BinaryTree.new(value)
-      @children << subtree
-      return subtree
-    end
 
     #Inserts new element in BSF order
     def insert(x)

data/lib/ds/trees/complete_binary_tree.rb

@@ -1,6 +1,7 @@
 module DS
   class CompleteBinaryTree
-    
+   
+    #Creates new tree (stored in array).
     def initialize(*args)
       if args.empty? 
         @data = []
@@ -9,41 +10,48 @@ module DS
       end
     end
 
+    #Inserts new element.
     def << (value)
       @data.push value
     end
 
+    #Returns root element.
     def root
       @data.first
     end
 
-    def children(value)
-      i = @data.index(value) 
-      return [@data[2*i+1], @data[2*i+2]]
-    end
-
-    def right value
-      children(value)[1]
-    end
-
-    def left value
-      children(value).first
-    end
-
+    #Returns index of left child.
     def left_index(i)
       2*i+1  
     end
 
+    #Returns index of right child.
     def right_index(i)
       2*i+2
     end
 
+    #Returns index of parent.
     def parent_index(i)
       (i+1)/2 - 1
     end
 
-    def parent value
-      i = @data.index(value)
+    #Returns children of node i.
+    def children(i)
+      [@data[left_index(i)], @data[right_index(i)]]
+    end
+
+    #Returns left child of node i.
+    def left(i)
+      @data[left_index(i)]
+    end
+
+    #Returns left child of node i.
+    def right(i)
+      @data[right_index(i)]
+    end
+
+    #Returns parent of node i.
+    def parent(i)
       @data[parent_index(i)]
     end
 

data/lib/ds/trees/tree.rb

@@ -64,7 +64,7 @@ module DS
     end
   
     #Returns subtree height.
-    def h(tree)
+    def self.h(tree)
       unless tree.leaf?
         tree.children.map{|t| h(t) }.max + 1
       else
@@ -74,12 +74,12 @@ module DS
 
     #Returns tree height.
     def height
-      h(self)
+      Tree.h(self)
     end
 
     #Returns node which lies closest to the root. 
     def lowest_height
-      find{ |node| node.leaf? }.data
+      find{ |node| node.leaf? }
     end
 
     #Mirrors tree.

data/lib/ds/trees/tree_walker.rb

@@ -32,7 +32,7 @@ module DS
         walk(tree,:postorder,&block)
       when :preorder
         walk(tree,:preorder, &block)
-      when (:inorder)
+      when :inorder
         raise ArgumentError unless tree.kind_of? BinaryTree
         walk(tree,order,&block)
       end
@@ -65,6 +65,7 @@ module DS
 
 
 
+    #Traverses tree with tracking level.
     def traverse_with_h(tree,height=nil,&block)
 
       tree.children.each do |t|
@@ -73,8 +74,6 @@ module DS
 
       if block_given?
         yield tree, height
-      else 
-        @visited << tree.data
       end
 
     end
@@ -103,9 +102,9 @@ module DS
 
         when :inorder
           raise ArgumentError unless  self.tree.is_a? BinaryTree
-          recalculate!(tree.left,order,&block)
+          recalculate!(tree.left,order,memo,&block)
 
-            tree.data = yield tree.memo
+            tree.data = yield tree, memo
             memo = tree.data
 
           recalculate!(tree.right,order,memo,&block)
@@ -115,7 +114,6 @@ module DS
     end
 
 
-
     #Summarize tree
     def summarize(direction=:bottomup)
 
@@ -126,6 +124,9 @@ module DS
       when :topdown
         recalculate!(self.tree,:preorder,0){|x,memo| memo = memo+x.data} 
         self.tree
+      when :inorder
+        recalculate!(self.tree,:inorder,0){|x,memo| memo = memo+x.data if x.data and memo} 
+        self.tree
       end
     end
 

data/lib/ds/trees/trie.rb

@@ -12,25 +12,24 @@ module DS
       @data = value
     end
 
-    def insert(s, value)
-      priv_insert(s.scan(/./), value)
+    def insert(s, value=true)
+      letters = s.scan(/./)
+      raise ArgumentError, "Not allowed symbol." unless (letters - alphabet).empty?
+      priv_insert(letters, value)
     end
 
     def find(s)
-      priv_find(s.scan(/./))
+      letters = s.scan(/./)
+      raise ArgumentError, "Not allowed symbol." unless (letters - alphabet).empty?
+      priv_find(letters)
     end
 
     protected
     def key(chr)
-      raise ArgumentError,  "Argument chr is nil" unless chr
       k=alphabet.index(chr) 
-      if k.nil?
-        raise ArgumentError, "Character not found"
-      else
-        k
-      end
     end
 
+
     def priv_insert(s, value)
       if s.empty?
           @data = value
@@ -47,21 +46,16 @@ module DS
     end
 
     def priv_find(search)
-      if @children[0]
-        @children[0].value
+      if search.empty?
+        @data
       else
-        if search.empty?
-          @data
+        index = key(search.first)
+        if @children[index]
+          @children[index].priv_find(search[1..-1])
         else
-          index = key(search.first)
-          if @children[index]
-            @children[index].priv_find(search[1..-1])
-          else
-            nil
-          end
+          nil
         end
       end
     end
-
   end
 end

data/lib/ds/version.rb

@@ -1,3 +1,3 @@
 module DS
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/help.rb

@@ -1,8 +1,17 @@
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/test/"
+  end
+end
+
+
 require 'rubygems'
+gem 'minitest'
 require 'minitest/autorun'
 require "minitest/benchmark" if ENV['BENCH']
-require 'redgreen'
+require "minitest/pride"
 
-require 'ds'
-include DS
 
+require './lib/ds.rb'
+include DS

data/test/test_array2d.rb

@@ -13,9 +13,14 @@ describe Array2D do
       @zero_matrix[0,0].must_equal 0 
     end
 
-    it "#to_a should return matrix flattened to array." do
+    it "#flatten should return matrix flattened to array." do
+      @zero_matrix.flatten.must_be_instance_of Array
+      @zero_matrix.flatten.must_equal [0,0,0,0] 
+    end
+    
+    it "#to_a should return internal representation (nested arrays)" do
       @zero_matrix.to_a.must_be_instance_of Array
-      @zero_matrix.to_a.must_equal [0,0,0,0] 
+      @zero_matrix.to_a.must_equal [[0,0],[0,0]]
     end
 
     it "#should extend magically." do
@@ -35,9 +40,14 @@ describe Array2D do
       refute @discrete_matrix[0,0]
     end
 
-    it "#to_a should return matrix flattened to array." do
+    it "#flatten should return matrix flattened to array." do
+      @discrete_matrix.flatten.must_be_instance_of Array
+      @discrete_matrix.flatten.must_equal [false,false,false,false,false,false,false,false,false] 
+    end
+
+    it "#to_a should return internal representation (nested arrays)" do
       @discrete_matrix.to_a.must_be_instance_of Array
-      @discrete_matrix.to_a.must_equal [false,false,false,false,false,false,false,false,false] 
+      @discrete_matrix.to_a.must_equal [[false,false,false],[false,false,false],[false,false,false]]
     end
 
     it "#should extend magically." do