algorithms 0.1.0 → 0.2.0

data/lib/algorithms.rb

@@ -45,11 +45,12 @@
 =end
 
 module Algorithms; end
-module Containers
-  dir = File.dirname(__FILE__)
-  autoload :CBst, File.join(dir,"..","ext","containers","bst","CBst")
-  autoload :CDeque, File.join(dir,"..","ext","containers","deque","CDeque")
-  autoload :CRBTreeMap, File.join(dir,"..","ext","containers","tree_map","CRBTreeMap")
+module Containers; end
+
+begin
+  require 'CBst'
+  Containers::Bst = Containers::CBst
+rescue LoadError # C Version could not be found
 end
 
 require 'algorithms/search'

data/lib/containers/deque.rb

@@ -6,6 +6,9 @@
 =end
 class Containers::RubyDeque
   include Enumerable
+  
+  Node = Struct.new(:left, :right, :obj)
+  
   # Create a new Deque. Takes an optional array argument to initialize the Deque.
   #
   #   d = Containers::Deque.new([1, 2, 3])
@@ -64,7 +67,7 @@ class Containers::RubyDeque
   #   d.push_front(0)
   #   d.pop_front #=> 0
   def push_front(obj)
-    node = Node.new(obj)
+    node = Node.new(nil, nil, obj)
     if @front
       node.right = @front
       @front.left = node
@@ -82,7 +85,7 @@ class Containers::RubyDeque
   #   d.push_back(4)
   #   d.pop_back #=> 4
   def push_back(obj)
-    node = Node.new(obj)
+    node = Node.new(nil, nil, obj)
     if @back
       node.left = @back
       @back.right = node
@@ -158,14 +161,6 @@ class Containers::RubyDeque
   end
   alias_method :reverse_each, :each_backward
 
-  class Node # :nodoc: all
-    attr_accessor :left, :right, :obj
-    
-    def initialize(obj)
-      @left = @right = nil
-      @obj = obj
-    end
-  end
 end
 
 begin

data/lib/containers/splay_tree_map.rb

@@ -13,11 +13,14 @@ require 'containers/stack'
     when keys are added in sorted order, causing the tree to have a height of the number of items added.
     
 =end
-class Containers::SplayTreeMap
+class Containers::RubySplayTreeMap
   include Enumerable
   
+  Node = Struct.new(:key, :value, :left, :right)
+  
   # Create and initialize a new empty SplayTreeMap.
   def initialize
+    @size = 0
     clear
   end
   
@@ -30,7 +33,7 @@ class Containers::SplayTreeMap
   #   map.get("MA") #=> "Massachusetts"
   def push(key, value)
     if @root.nil?
-      @root = Node.new(key, value)
+      @root = Node.new(key, value, nil, nil)
       @size = 1
       return value
     end
@@ -41,7 +44,7 @@ class Containers::SplayTreeMap
       @root.value = value
       return value
     end
-    node = Node.new(key, value)
+    node = Node.new(key, value, nil, nil)
     if cmp < 1
       node.left = @root.left
       node.right = @root
@@ -74,7 +77,7 @@ class Containers::SplayTreeMap
   def clear
     @root = nil
     @size = 0
-    @header = Node.new(nil, nil)
+    @header = Node.new(nil, nil, nil, nil)
   end
   
   # Return the height of the tree structure in the SplayTreeMap.
@@ -203,20 +206,6 @@ class Containers::SplayTreeMap
     end
   end
   
-  class Node # :nodoc: all
-    attr_accessor :key, :value, :left, :right
-    def initialize(key, value)
-      @key = key
-      @value = value
-      @left = nil
-      @right = nil
-    end
-    
-    def size
-      self.num_nodes
-    end
-  end
-  
   # Moves a key to the root, updating the structure in each step.
   def splay(key)
     l, r = @header, @header
@@ -270,5 +259,11 @@ class Containers::SplayTreeMap
     left_height > right_height ? left_height : right_height
   end
   private :height_recursive
+end
 
-end
+begin
+  require 'CSplayTreeMap'
+  Containers::SplayTreeMap = Containers::CSplayTreeMap
+rescue LoadError # C Version could not be found, try ruby version
+  Containers::SplayTreeMap = Containers::RubySplayTreeMap
+end

data/spec/deque_gc_mark_spec.rb

@@ -0,0 +1,18 @@
+$: << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
+require 'algorithms'
+
+if defined? Containers::CDeque
+  describe "CDeque" do
+    it "should mark ruby object references" do
+      anon_class = Class.new
+      @deque = Containers::CDeque.new
+      100.times { @deque.push_front(anon_class.new) }
+      # Mark and sweep
+      ObjectSpace.garbage_collect
+      # Check if any instances were swept
+      count = 0
+      ObjectSpace.each_object(anon_class) { |x| count += 1 }
+      count.should eql(100)
+    end
+  end
+end

data/spec/heap_spec.rb

@@ -1,119 +1,126 @@
 $: << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
 require 'algorithms'
 
-describe "empty heap" do
+describe Containers::Heap do
   before(:each) do
     @heap = Containers::MaxHeap.new
   end
-
+  
   it "should not let you merge with non-heaps" do
     lambda { @heap.merge!(nil) }.should raise_error
     lambda { @heap.merge!([]) }.should raise_error
   end
-
-  it "should return nil when getting the maximum" do
-    @heap.max!.should be_nil
-  end
-
-  it "should let you insert and remove one item" do
-    @heap.size.should eql(0)
-
-    @heap.push(1)
-    @heap.size.should eql(1)
-
-    @heap.max!.should eql(1)
-    @heap.size.should eql(0)
-  end
-
-  it "should let you initialize with an array" do
-    @heap = Containers::MaxHeap.new([1,2,3])
-    @heap.size.should eql(3)
-  end
-
-end
-
-describe "non-empty heap" do
-  before(:each) do
-    @random_array = []
-    @num_items = 100
-    @num_items.times { |x| @random_array << rand(@num_items) }
-    @heap = Containers::MaxHeap.new(@random_array)
-  end
-
-  it "should display the correct size" do
-    @heap.size.should eql(@num_items)
-  end
-
-  it "should delete random keys" do
-    @heap.delete(@random_array[0]).should eql(@random_array[0])
-    @heap.delete(@random_array[1]).should eql(@random_array[1])
-    ordered = []
-    ordered << @heap.max! until @heap.empty?
-    ordered.should eql( @random_array[2..-1].sort.reverse )
-  end
-
-  it "should delete all keys" do
-    ordered = []
-    @random_array.size.times do |t|
-      ordered << @heap.delete(@random_array[t])
+  
+  describe "(empty)" do
+  
+    it "should return nil when getting the maximum" do
+      @heap.max!.should be_nil
+    end
+    
+    it "should let you insert and remove one item" do
+      @heap.size.should eql(0)
+      
+      @heap.push(1)
+      @heap.size.should eql(1)
+      
+      @heap.max!.should eql(1)
+      @heap.size.should eql(0)
+    end
+    
+    it "should let you initialize with an array" do
+      @heap = Containers::MaxHeap.new([1,2,3])
+      @heap.size.should eql(3)
     end
-    @heap.should be_empty
-    ordered.should eql( @random_array )
-  end
-
-  it "should be in max->min order" do
-    ordered = []
-    ordered << @heap.max! until @heap.empty?
-
-    ordered.should eql(@random_array.sort.reverse)
-  end
-
-  it "should change certain keys" do
-    numbers = [1,2,3,4,5,6,7,8,9,10,100,101]
-    heap = Containers::MinHeap.new(numbers)
-    heap.change_key(101, 50)
-    heap.pop
-    heap.pop
-    heap.change_key(8, 0)
-    ordered = []
-    ordered << heap.min! until heap.empty?
-    ordered.should eql( [8,3,4,5,6,7,9,10,101,100] )
-  end
-
-  it "should not delete keys it doesn't have" do
-    @heap.delete(:nonexisting).should be_nil
-    @heap.size.should eql(@num_items)
-  end
-
-  it "should delete certain keys" do
-    numbers = [1,2,3,4,5,6,7,8,9,10,100,101]
-    heap = Containers::MinHeap.new(numbers)
-    heap.delete(5)
-    heap.pop
-    heap.pop
-    heap.delete(100)
-    ordered = []
-    ordered << heap.min! until heap.empty?
-    ordered.should eql( [3,4,6,7,8,9,10,101] )
-  end
-
-  it "should let you merge with another heap" do
-    numbers = [1,2,3,4,5,6,7,8]
-    otherheap = Containers::MaxHeap.new(numbers)
-    otherheap.size.should eql(8)
-    @heap.merge!(otherheap)
-
-    ordered = []
-    ordered << @heap.max! until @heap.empty?
 
-    ordered.should eql( (@random_array + numbers).sort.reverse)
   end
+  
+  describe "(non-empty)" do
+    before(:each) do
+      @random_array = []
+      @num_items = 100
+      @num_items.times { |x| @random_array << rand(@num_items) }
+      @heap = Containers::MaxHeap.new(@random_array)
+    end
+    
+    it "should display the correct size" do
+      @heap.size.should eql(@num_items)
+    end
+    
+    it "should delete random keys" do
+      @heap.delete(@random_array[0]).should eql(@random_array[0])
+      @heap.delete(@random_array[1]).should eql(@random_array[1])
+      ordered = []
+      ordered << @heap.max! until @heap.empty?
+      ordered.should eql( @random_array[2..-1].sort.reverse )
+    end
+    
+    it "should delete all keys" do
+      ordered = []
+      @random_array.size.times do |t|
+        ordered << @heap.delete(@random_array[t])
+      end
+      @heap.should be_empty
+      ordered.should eql( @random_array )
+    end
 
-  it "min-heap should be in min->max order" do
-    @heap = Containers::MinHeap.new(@random_array)
-    ordered = []
-    ordered << @heap.min! until @heap.empty?
-
-    ordered.should eql(@random_array.sort)
+    it "should be in max->min order" do
+      ordered = []
+      ordered << @heap.max! until @heap.empty?
+      
+      ordered.should eql(@random_array.sort.reverse)
+    end
+    
+    it "should change certain keys" do
+      numbers = [1,2,3,4,5,6,7,8,9,10,100,101]
+      heap = Containers::MinHeap.new(numbers)
+      heap.change_key(101, 50)
+      heap.pop
+      heap.pop
+      heap.change_key(8, 0)
+      ordered = []
+      ordered << heap.min! until heap.empty?
+      ordered.should eql( [8,3,4,5,6,7,9,10,101,100] )
+    end
+    
+    it "should not delete keys it doesn't have" do
+      @heap.delete(:nonexisting).should be_nil
+      @heap.size.should eql(@num_items)
+    end
+    
+    it "should delete certain keys" do
+      numbers = [1,2,3,4,5,6,7,8,9,10,100,101]
+      heap = Containers::MinHeap.new(numbers)
+      heap.delete(5)
+      heap.pop
+      heap.pop
+      heap.delete(100)
+      ordered = []
+      ordered << heap.min! until heap.empty?
+      ordered.should eql( [3,4,6,7,8,9,10,101] )
+    end
+    
+    it "should let you merge with another heap" do
+      numbers = [1,2,3,4,5,6,7,8]
+      otherheap = Containers::MaxHeap.new(numbers)
+      otherheap.size.should eql(8)
+      @heap.merge!(otherheap)
+      
+      ordered = []
+      ordered << @heap.max! until @heap.empty?
+      
+      ordered.should eql( (@random_array + numbers).sort.reverse)
+    end
+    
+    describe "min-heap" do
+      it "should be in min->max order" do
+        @heap = Containers::MinHeap.new(@random_array)
+        ordered = []
+        ordered << @heap.min! until @heap.empty?
+    
+        ordered.should eql(@random_array.sort)
+      end
+    end
+    
   end
+  
 end

data/spec/kd_tree_spec.rb

@@ -1,89 +1,4 @@
 $: << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
 require 'algorithms'
 
-#!/usr/bin/ruby
-# Small world puzzle
-# Kanwei Li, 2009
-
-# Make sure input file exists and read from it
-filename = ARGV[0]
-unless filename && File.exist?(filename)
-  puts "error: must specify a valid input file"
-  exit
-end
-input = File.open(filename)
-
-$points = [] # Store array of points as a global so we don't have to pass it around
-
-# Populate points array
-# while line = input.gets do
-#   break if line.empty?
-#   n, x, y = line.split(/\s+/)
-#   $points << [n.to_i, [x.to_f, y.to_f]]
-# end
-
-tree = Containers::KDTree.new($points)
-p tree
-
-$points.sort { |a, b| a[0] <=> b[0] }.each do |point|
-  nearest_4 = tree.find_nearest(point[1], 4)
-  puts "#{point[0]} #{nearest_4[1..-1].collect{ |n| n[1] }.join(',')}\n"
-end
-
-
-# describe "empty trie" do
-#   before(:each) do
-#     @trie = Containers::Trie.new
-#   end
-# 
-#   it "should not get or has_key?" do
-#     @trie.get("anything").should be_nil
-#     @trie.has_key?("anything").should be_false
-#   end
-# 
-#   it "should not have longest_prefix or match wildcards" do
-#     @trie.wildcard("an*thing").should eql([])
-#     @trie.longest_prefix("an*thing").should eql("")
-#   end
-# end
-# 
-# describe "non-empty trie" do
-#   before(:each) do
-#     @trie = Containers::Trie.new
-#     @trie.push("Hello", "World")
-#     @trie.push("Hilly", "World")
-#     @trie.push("Hello, brother", "World")
-#     @trie.push("Hello, bob", "World")
-#   end
-# 
-#   it "should has_key? keys it has" do
-#     @trie.has_key?("Hello").should be_true
-#     @trie.has_key?("Hello, brother").should be_true
-#     @trie.has_key?("Hello, bob").should be_true
-#   end
-# 
-#   it "should not has_key? keys it doesn't have" do
-#     @trie.has_key?("Nope").should be_false
-#   end
-# 
-#   it "should get values" do
-#     @trie.get("Hello").should eql("World")
-#   end
-# 
-#   it "should overwrite values" do
-#     @trie.push("Hello", "John")
-#     @trie.get("Hello").should eql("John")
-#   end
-# 
-#   it "should return longest prefix" do
-#     @trie.longest_prefix("Hello, brandon").should eql("Hello")
-#     @trie.longest_prefix("Hel").should eql("")
-#     @trie.longest_prefix("Hello").should eql("Hello")
-#     @trie.longest_prefix("Hello, bob").should eql("Hello, bob")
-#   end
-# 
-#   it "should match wildcards" do
-#     @trie.wildcard("H*ll.").should eql(["Hello", "Hilly"])
-#     @trie.wildcard("Hel").should eql([])
-#   end
-# end
+# TODO: KD Tree Spec