graphos 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c7f99e440b3123de01dfb8bce9a8192e6a20ec4
-  data.tar.gz: 7c495f8ef31bf0d277675a1c80590acbf4c654ef
+  metadata.gz: 14d4c0ca86eff6a4e8787e26744bbe20fcf26646
+  data.tar.gz: 96d69c71586846335829e530ee9ad82c6f64a2f8
 SHA512:
-  metadata.gz: 9471f4cecb0bb302cd753e64c289c2a981551aab5705050499f612d5efff678c29d2a7d4504baac0b809af72eda2bed5fbf27b176c24798d3adf02504f229116
-  data.tar.gz: 03a3fee629b2e299125e6cb0b14a0d69661c57d3013e7e3726696b8e179e6e35ae5a73a19a13410fa0d7ff53e6227ba65abcd6d76235ddfad794325a9376a588
+  metadata.gz: f1dcc65d651e204dd016dc2d35bed53595fdfd0a4ccead3b3f8456fd0638152fa32483a4ef6419449bd21bc8acff6d3077c0c8383cb84e57db973392e7b743cd
+  data.tar.gz: 50120e8b5d17ff5c0982a586f44f89ca63c36b9d8ddcad50d005e0ee5b5c484cc18f9abc8eef4f09f56d16d3e978cb19a387b03d3253689013d06d1714faf22f

data/lib/graphos/algorithm/prim.rb

@@ -1,8 +1,6 @@
 require "algorithms"
 module Graphos
   module Algorithm
-    include Containers
-
     ##
     # Runs the prim algorithm in order to
     # find a MST for a given graph.
@@ -13,18 +11,20 @@ module Graphos
       costs = Array.new(graph.size, Float::INFINITY)
       costs[initial] = 0
 
-      heap = Heap.new{|x,y| (costs[x] <=> costs[y]) == -1}
-      (0..graph.size-1).each{|i| heap.push(i)}
+      heap = BinaryHeap.new{|x,y| x.value <=> y.value}
+      heap.push(initial, 0)
 
       update_cost = -> (idx,cost) do
         costs[idx] = cost
-        if(heap.has_key?(idx))
-          heap.delete(idx)
-          heap.push(idx)
+        if heap.has_key? idx
+          heap.change idx, cost
+        else
+          heap.push idx, cost
         end
       end
 
-      while idx=heap.pop
+      while keyval=heap.pop
+        idx = keyval.key
         node = graph[idx]
         node.edges.each do |edge|
           if costs[edge.to.index] > edge.weight

data/lib/graphos/version.rb

@@ -1,3 +1,3 @@
 module Graphos
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/graphos/weighted/graph.rb

@@ -7,6 +7,7 @@ module Graphos
       require "graphos/weighted/node"
       require "graphos/weighted/edge"
 
+      attr_reader :nodes
 
       def initialize size
         @nodes = (0..size-1).map{|i| Node.new i }

data/test/prim_test.rb

@@ -21,4 +21,13 @@ class PrimTest < MiniTest::Test
     assert_equal(1, mst.edge(0,2).weight)
     assert_equal(4, mst.edge(2,3).weight)
   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)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphos
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bernardo Amorim