ds 0.0.1 → 0.0.2

data/lib/ds.rb

@@ -1,6 +1,6 @@
 require "ds/version"
 
-require "ext/ext"
+require "ds/ext/ext"
 
 require "ds/matrixes/expandable_array"
 require "ds/matrixes/array_2d"
@@ -19,6 +19,7 @@ require "ds/trees/binary_tree"
 require "ds/trees/binary_search_tree"
 require "ds/trees/complete_binary_tree"
 require "ds/trees/binary_heap"
+require "ds/trees/trie"
 
 require "ds/lists/list_element"
 require "ds/lists/list"

data/lib/ds/ext/ext.rb

@@ -0,0 +1,36 @@
+module DS
+  module ArrayX
+
+    #Checks if array is already sorted.
+    def sorted?(order=:any)
+      return true if size < 2
+
+      case order
+      when :asc
+        (size-2).times{ |i| return false if self[i] > self[i+1] }
+      when :desc
+        (size-2).times{ |i| return false if self[i] < self[i+1] }
+      else
+        return (self[0] < self[1])? sorted?(:asc) : sorted?(:desc) 
+      end
+
+      true
+    end
+
+    #Pushes element e only if it is not already in the array. Returns index of
+    #elemnt e.
+    def push_uniq e
+      if include? e
+        index e
+      else
+        push e
+        size-1
+      end
+    end
+
+    #Tail
+    def tail
+      self[1..-1]
+    end
+  end
+end

data/lib/ds/graphs/graph_as_matrix.rb

@@ -22,8 +22,8 @@ module DS
     #Adds new edges to graph.
     def add_edges(edges)
       for e in edges
-        x = @map.push_uniq e.from
-        y = @map.push_uniq e.to
+        x = @map.extend(ArrayX).push_uniq e.from
+        y = @map.extend(ArrayX).push_uniq e.to
 
         @store[x,y] = e.weight
         @max = [@max, x, y].max

data/lib/ds/trees/binary_search_tree.rb

@@ -25,7 +25,7 @@ module DS
     def BinarySearchTree.valid?(other)
       walker = TreeWalker.new(other)
       walker.traverse(:inorder)
-      walker.visited.sorted?
+      walker.visited.extend(ArrayX).sorted?
     end
 
   end

data/lib/ds/trees/trie.rb

@@ -0,0 +1,67 @@
+module DS
+  class Trie < Tree
+
+    ALPHABET = %w{- a b c d e f g h i j k l m n o p q r s t u v w x y z} 
+
+    def alphabet
+      self.class::ALPHABET
+    end
+    
+    def initialize(value=nil)
+      @children = Array.new(alphabet.size)
+      @data = value
+    end
+
+    def insert(s, value)
+      priv_insert(s.scan(/./), value)
+    end
+
+    def find(s)
+      priv_find(s.scan(/./))
+    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
+      else
+        index = key(s.first)
+        subtree = if @children[index]
+                    @children[index]
+                  else
+                    @children[index] = Trie.new
+                  end
+
+        subtree.priv_insert(s[1..-1], value)
+      end
+    end
+
+    def priv_find(search)
+      if @children[0]
+        @children[0].value
+      else
+        if search.empty?
+          @data
+        else
+          index = key(search.first)
+          if @children[index]
+            @children[index].priv_find(search[1..-1])
+          else
+            nil
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/ds/version.rb

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

data/test/test_array_x.rb

@@ -0,0 +1,31 @@
+require 'help'
+
+describe ArrayX do
+
+  before do
+    @asc = [1,3,6,9,10,13].extend(ArrayX)
+    @desc = [9,8,7,7,4,3,2].extend(ArrayX)
+    @empty = [].extend(ArrayX)
+    @one = [3].extend(ArrayX)
+    @not_sorted = [3,4,9,1,1,2,8].extend(ArrayX)
+  end
+
+  it "#sorted? should check if array is already sorted." do
+    assert @desc.sorted?
+    assert @asc.sorted?
+    assert @empty.sorted?
+    assert @one.sorted?
+    refute @not_sorted.sorted?
+  end
+
+  it "#push_uniq should push element only if it is not already in array."  do
+    @asc.size.must_equal 6 
+    @asc.push_uniq(3).must_equal 1
+    @asc.size.must_equal 6
+
+    @empty.push_uniq(3).must_equal 0
+    @empty.must_equal [3]
+  end
+end
+
+

data/test/test_trie.rb

@@ -0,0 +1,14 @@
+require 'help'
+
+describe Trie do
+
+  before do
+    @trie = Trie.new
+  end
+
+  it "#insert should add new string to trie." do
+    @trie.insert("thing",true);
+    assert @trie.find("thing");
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ds
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - knife
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: []
 
 description: Data structures (lists,stacks, trees, heaps, graphs..) in pure Ruby.
@@ -107,6 +107,7 @@ files:
 - doc/rdoc.css
 - ds.gemspec
 - lib/ds.rb
+- lib/ds/ext/ext.rb
 - lib/ds/graphs/digraph.rb
 - lib/ds/graphs/edge.rb
 - lib/ds/graphs/graph.rb
@@ -128,10 +129,11 @@ files:
 - lib/ds/trees/complete_binary_tree.rb
 - lib/ds/trees/tree.rb
 - lib/ds/trees/tree_walker.rb
+- lib/ds/trees/trie.rb
 - lib/ds/version.rb
-- lib/ext/ext.rb
 - test/help.rb
 - test/test_array2d.rb
+- test/test_array_x.rb
 - test/test_binary_heap.rb
 - test/test_binary_search_tree.rb
 - test/test_binary_tree.rb
@@ -147,6 +149,7 @@ files:
 - test/test_tree.rb
 - test/test_tree_walker.rb
 - test/test_tri_matrix.rb
+- test/test_trie.rb
 homepage: ""
 licenses: []
 
@@ -176,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ds
-rubygems_version: 1.8.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Some common data structures.

data/lib/ext/ext.rb

@@ -1,15 +0,0 @@
-class Array
-  def sorted?(order = :growing)
-    (size-2).times{ |i| return false if self[i] > self[i+1] }
-    true
-  end
-
-  def push_uniq e
-    if include? e
-      index e
-    else
-      push e
-      size-1
-    end
-  end
-end