ds 0.0.2 → 0.0.3

data/Rakefile

@@ -5,7 +5,7 @@ Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/test*.rb']
   #t.pattern = "test/test_*.rb"
-  t.verbose= true
+  t.verbose = true
 end
 
 desc "Run tests"

data/lib/ds.rb

@@ -1,25 +1,13 @@
 require "ds/version"
 
-require "ds/ext/ext"
+require "ds/ext/array_x"
+require "ds/pair"
 
 require "ds/matrixes/expandable_array"
 require "ds/matrixes/array_2d"
 require "ds/matrixes/tri_matrix"
 
-require "ds/graphs/edge"
-require "ds/graphs/graph_as_list"
-require "ds/graphs/graph_as_matrix"
-require "ds/graphs/graph_as_tri_matrix"
-require "ds/graphs/graph"
-require "ds/graphs/digraph"
-
-require "ds/trees/tree"
-require "ds/trees/tree_walker"
-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/sets/ordered_set"
 
 require "ds/lists/list_element"
 require "ds/lists/list"
@@ -28,12 +16,22 @@ require "ds/lists/ring"
 
 require "ds/stacks/stack"
 require "ds/queues/queue"
+require "ds/queues/priority_queue"
 
+require "ds/trees/tree"
+require "ds/trees/tree_walker"
+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/graphs/edge"
+require "ds/graphs/graph_as_list"
+require "ds/graphs/graph_as_matrix"
+require "ds/graphs/graph_as_tri_matrix"
+require "ds/graphs/graph"
+require "ds/graphs/digraph"
 
 
 

data/lib/ds/ext/array_x.rb

@@ -0,0 +1,35 @@
+module DS
+  module ArrayX
+
+    #Checks if array is already sorted.
+    def sorted?(order=:any)
+      return true if size < 2
+      
+      if size == 2
+        return false if self[0] > self[1] and order == :asc
+        return false if self[0] < self[1] and order == :desc
+      else
+        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
+      end
+
+      true
+    end
+
+    #Checks if array has duplicates.
+    def duplications?
+      size != uniq.size 
+    end
+
+    #Returns array tail.
+    def tail
+      self[1..-1]
+    end
+  end
+end

data/lib/ds/graphs/graph.rb

@@ -6,14 +6,12 @@ module DS
     #Create new graph from array of edges. Second parameter determines
     #graph internal implementation: :list (Adjency List), :tri_matrix (Triangular
     #Matrix), :matrix (Matrix).
-    def initialize(edges,store = :list)
+    def initialize(edges,store = :matrix)
       case store
       when :matrix
         @g = GraphAsMatrix.new(edges)
       when :tri_matrix
         @g = GraphAsTriMatrix.new(edges)
-      else
-        @g = GraphAsList.new(edges)
       end
     end
 
@@ -23,14 +21,47 @@ module DS
       new(edges,:tri_matrix) 
     end
 
-    def add(x,y)
-      @g.add(x,y)
+    #Adds new edge to graph.
+    def add(x,y,weight=1)
+      e = Edge.new(x,y,weight)
+      add_edges([e])
     end
 
+    #Adds new edges to graph.
+    def add_edges(edges)
+      @g.add_edges(edges)
+    end
+    
+
+    #Removes conection between vertex x and y.
     def remove(x,y)
       @g.remove(x,y) 
     end
 
+    #Returns all neighbors for given vertex.
+    def neighbors v
+      @g.neighbors v
+    end
+
+    #Returns vertex degree.
+    def degree x
+      @g.degree x
+    end
+
+    #Checks if two elements are connected.
+    def edge? x,y
+      @g.edge? x,y
+    end
+
+    #Returns Edge(x,y) if exist.
+    def get_edge x, y
+      @g.get_edge x,y
+    end
+
+    def vertex_size
+      @g.vertex_size
+    end
+
     def each_vertex &block
       @g.each_vertex &block
     end
@@ -39,9 +70,6 @@ module DS
       @g.each_edge &block
     end
 
-    def neighbors v
-      @g.neighbors v
-    end
 
     def bfs s
       colors = {}
@@ -78,30 +106,6 @@ module DS
       res
     end
 
-    def add_edges(edges)
-      @g.add_edges(edges)
-    end
     
-    #Returns vertex degree. Second parameter determines direction - :in incoming
-    #edges, :out - outcoming edges, :all - incoming and outcoming edges.
-    def degree x
-      @g.degree x
-    end
-
-    def edge? x,y
-      @g.edge? x,y
-    end
-
-    def get_edge x, y
-      @g.get_edge x,y
-    end
-
-    def vertex_size
-      @g.vertex_size
-    end
-
-    def edge_size
-      @g.vmax+1
-    end
   end
 end

data/lib/ds/graphs/graph_as_matrix.rb

@@ -5,38 +5,31 @@ module DS
       @store = Array2D.new
       @max = 0
 
-      @v = 0 #vertex count
-       
-      @map = [] #maps objects to matrix indexes.
+      @map = OrderedSet.new #maps objects to matrix indexes.
 
       add_edges(edges)
     end
 
-    #Checks if two elements are connected.
-    def edge? x,y
-      v1 = @map.index(x)
-      v2 = @map.index(y)
-      @store[v1,v2] > 0
-    end
-
     #Adds new edges to graph.
     def add_edges(edges)
       for e in edges
-        x = @map.extend(ArrayX).push_uniq e.from
-        y = @map.extend(ArrayX).push_uniq e.to
+        x = @map.push e.from
+        y = @map.push e.to
 
         @store[x,y] = e.weight
+
         @max = [@max, x, y].max
-        @v = @v +  1
       end
     end
 
     #Returns all neighbors for given vertex.
     def neighbors(v)
       n = []
+      vertexes = @map.to_a
       v = @map.index(v)
+
       0.upto @max do |i|
-        n << @map[i] if @store[v,i] > 0
+        n << vertexes[i] if @store[v,i] > 0
       end
       n
     end
@@ -46,11 +39,12 @@ module DS
       v1 = @map.index(x)
       v2 = @map.index(y)
 
+      vertexes = @map.to_a
+
       @store[v1,v2] = 0
-      if (degree @map[@max]) == 0
+      if (degree vertexes[@max]) == 0
         @max -= 1
       end
-      @v -= 1
     end
 
     #Returns Edge(x,y) if exist.
@@ -58,19 +52,22 @@ module DS
       s = @map.index x
       t = @map.index y
       if @store[s,t] > 0
-        Edge.new(@map[s], @map[t], @store[s,t])
+        Edge.new(x, y, @store[s,t])
       else
         nil
       end
     end
 
-    def vmax
-      @max
+    #Checks if two elements are connected.
+    def edge? x,y
+      v1 = @map.index(x)
+      v2 = @map.index(y)
+      @store[v1,v2] > 0
     end
-
+    
     #Returns vertex counter.
     def vertex_size
-      @v
+      @map.size
     end
 
 
@@ -98,14 +95,16 @@ module DS
 
     #Vertex iterator
     def each_vertex
-      (0..@max).each {|v| yield @map[v]}
+      vertexes = @map.to_a
+      (0..@max).each {|v| yield vertexes[v]}
     end
 
     #Edge iterator
     def each_edge
+      vertexes = @map.to_a
       for v0 in 0..@max
         for v1 in 0..v0-1
-          yield Edge.new(@map[v0],@map[v1],@store[v0,v1]) if @store[v0,v1] > 0
+          yield Edge.new(vertexes[v0],vertexes[v1],@store[v0,v1]) if @store[v0,v1] > 0
         end    
       end    
     end

data/lib/ds/graphs/graph_as_tri_matrix.rb

@@ -4,8 +4,7 @@ module DS
     def initialize(edges)
       @store = TriMatrix.new(0)
       @max = 0
-      @map = []
-      @v = 0
+      @map = OrderedSet.new
 
       add_edges(edges)
     end

data/lib/ds/lists/list.rb

@@ -55,7 +55,7 @@ module DS
           el = el.next
         end
 
-        raise "Element not found" unless el
+        raise ListError, "Element not found" unless el
 
         prev.next = el.next
         el.next = nil
@@ -106,7 +106,7 @@ module DS
         end
 
         if el.nil?
-          raise "List element not found"
+          raise ListError, "List element not found"
         else
           prev.next = x
           x.next = el
@@ -212,9 +212,17 @@ module DS
           b = b.next
         end
 
-        a = a.next
-        prev.next = a
-        b = b.next
+        if prev.nil?
+          prev =  a
+          a = a.next
+          prev.next = nil
+          self.head = a 
+          b = b.next
+        else
+          a = a.next
+          prev.next = a
+          b = b.next
+        end
       end
       self
     end
@@ -267,37 +275,26 @@ module DS
 
       @head = prev
       self
-
     end
 
-    #Prints list.
-    def print
-      each { |e| p }
-    end
 
     #Converts list to array.
     def to_a
-      map { |e| e}
+      map { |e| e.data}
     end
 
     #Default list iterator.
     def each
       elem = @head
       while elem
-        yield elem.data
+        yield elem
         elem = elem.next
       end
     end
 
-    def each_with_index
-      elem = @head
-      i = 0
-      while elem
-        yield elem,i
-        elem = elem.next
-        i = i + 1
-      end
-    end
+  end
 
+  class ListError < StandardError
   end
+
 end

data/lib/ds/matrixes/array_2d.rb

@@ -28,6 +28,10 @@ module DS
     end
 
     def to_a
+      @store
+    end
+
+    def flatten
       @store.flatten
     end
 

data/lib/ds/pair.rb

@@ -0,0 +1,14 @@
+module DS
+  class Pair
+    attr_accessor :key, :value
+
+    alias :first :key
+    alias :second :value
+
+    def initialize(x,y)
+      @key = x
+      @value = y
+    end
+
+  end
+end

data/lib/ds/queues/priority_queue.rb

@@ -0,0 +1,36 @@
+module DS
+  class PriorityQueue < Queue
+
+    #Create new priority queue. Internaly uses heap to store elements.
+    def initialize
+      @store = BinaryHeap.new {|parent,child| parent.key >= child.key}
+    end
+
+
+    #Adds element to queue with given priority.
+    def enqueue x, priority
+      pair = Pair.new(priority,x)
+      @store.insert(pair)
+      self
+    end
+    
+    alias :push :enqueue
+
+    #Removes element with highest priority from queue . 
+    def dequeue
+      if x = @store.shift
+        x.value
+      else
+        x
+      end
+    end
+
+    alias :shift :dequeue
+
+    #Returns element with highest priority.
+    def peek
+      @store.data.first.value
+    end
+
+  end
+end