graphos 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cfe336de6a10ae14a29bc67b90f4af411f795f2
-  data.tar.gz: 29c44144d25742d02f9a4deb2d2576bdbe76763f
+  metadata.gz: 1ba60b53a39cf6c34299ed5a55f7372618c1a4c2
+  data.tar.gz: 89cb915d41ae66525516851b699187cff654caa5
 SHA512:
-  metadata.gz: 7b6e21253d41a19dbf2885dbd5fa2986a1b28872cb9984648594a7c0609cb0cb683a5bcd9b0117162b6161cd3fee3ae8528f60daf5ff765f2cddd7c8c3087f00
-  data.tar.gz: f7ee06141d139fc25a40a65eba7c1290995ac8d98e0f032affea302e179c08daf5c63ca0496d2ed3b806fe684265018e978334f0598baa88808c80799fc99247
+  metadata.gz: f1ba13a86d3c753a036db4fcbf844ade4959b28a5c12cbc1a2ddb568990adf2f04a51b21db188e147979e695145f8d0fa5880e80b203a2b48dcb7d0f7e578a73
+  data.tar.gz: 50f395bccfe7da8e2cb0d41b4fba2ff05ff11967228fc65109a8f1e240d922763589e951cc74cc18f7f8facd78e40c4215610344a0836d6423ec74179a28f1f1

data/lib/graphos/algorithm/prim.rb

@@ -12,6 +12,9 @@ module Graphos
 
       heap = BinaryHeap.new{|x,y| x.value <=> y.value}
       heap.push(initial, 0)
+      costs.each_with_index do |v,i|
+        heap.push(i,v)
+      end
 
       visited = Array.new(graph.size, false)
 
@@ -40,7 +43,6 @@ module Graphos
       fathers.each_with_index do |f,c|
         if f
           result.add_edge(f, c, costs[c])
-          count += 1
         end
       end
       result

data/lib/graphos/binary_heap.rb

@@ -26,8 +26,9 @@ module Graphos
     def change key, new_value
       if has_key? key
         @values[key] = new_value
+        parent_val = @values[parent(@indexes[key])]
         move_up key
-        move_down key
+        heapify key
       end
     end
 
@@ -42,6 +43,7 @@ module Graphos
       if size > 0
         @keys[0] = last 
         @indexes[last] = 0
+        heapify last
       end
 
       result
@@ -51,6 +53,9 @@ module Graphos
       @keys.size
     end
 
+    def ordered
+    end
+
   private
     KeyVal = Struct.new(:key, :value)
 
@@ -66,19 +71,20 @@ module Graphos
       move_up key
     end
 
-    def move_down key
+    def heapify key
       left_key = @keys[left(@indexes[key])]
       right_key = @keys[right(@indexes[key])]
+
       return if !left_key && !right_key
 
-      max_key = [key, left_key, right_key].select{|x| !!x}.sort do |x,y|
+      min_key = [key, left_key, right_key].select{|x| !!x}.sort do |x,y|
         @compare.call(key_val(x), key_val(y))
       end.first
 
-      return if max_key == key
+      return if min_key == key
 
-      swap(@indexes[key], @indexes[max_key])
-      move_down max_key
+      swap(@indexes[key], @indexes[min_key])
+      heapify key
     end
 
     def move_up key

data/lib/graphos/version.rb

@@ -1,3 +1,3 @@
 module Graphos
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/binary_heap_test.rb

@@ -29,4 +29,57 @@ class BinaryHeapTest < MiniTest::Test
     bh.change(99,0)
     assert_equal(99,bh.next.key)
   end
+
+  def test_infinity
+    bh = Graphos::BinaryHeap.new{|x,y| x.value <=> y.value}
+    bh.extend(Simulator)
+    costs = Array.new(30, Float::INFINITY)
+    [0,3,7,16,22,28].each do |i|
+      costs[i] = i
+    end
+
+    costs.each_with_index do |v,i|
+      bh.push(i,v)
+    end
+
+    last = -1
+    while pop = bh.pop
+      assert_operator last, :<=, pop.value
+      last = pop.value
+    end
+  end
+
+private
+
+  module Simulator
+    def get_vals
+      @keys.map{|k| @values[k]}
+    end
+    def simulate index=0, &block
+      return if index >= size
+      block.call(@values[@keys[index]])
+      l = left(index)
+      r = right(index)
+      if(r < size)
+        if(smaller(key_val(@keys[l]), key_val(@keys[r])))
+          simulate l, &block
+          simulate r, &block
+        else
+          simulate r, &block
+          simulate l, &block
+        end
+      elsif(l < size)
+        simulate l, &block
+      end
+    end
+  end
+
+  def assert_ordered bh
+    last = -1
+    bh.simulate do |v|
+      puts "#{v}"
+      assert_operator last, :<=, v
+      last = v
+    end
+  end
 end

data/test/prim_test.rb

@@ -22,12 +22,23 @@ class PrimTest < MiniTest::Test
     assert_equal(4, mst.edge(2,3).weight)
   end
 
+  def test_line
+    graph = Graphos::Weighted::Graph.new 4
+    graph.add_edge 0, 1, 3
+    graph.add_edge 1, 2, 1
+    graph.add_edge 2, 3, 2
+
+    mst = Graphos::Algorithm.prim graph, 0
+
+    refute_equal(nil, mst.edge(0,1))
+  end
+
   def test_100
     graph = Graphos::Weighted::TextFactory.read("test/fixtures/grafo_1.txt")
 
     mst = Graphos::Algorithm.prim graph, 0
     sum = mst.nodes.map(&:edges).flatten.map(&:weight).reduce(:+)/2
 
-    assert_equal(253, sum)
+    assert_equal(336, sum)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphos
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Bernardo Amorim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler