graphos 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d4c0ca86eff6a4e8787e26744bbe20fcf26646
-  data.tar.gz: 96d69c71586846335829e530ee9ad82c6f64a2f8
+  metadata.gz: 485ba688a49044d2f348f871a9a86a5e153311d2
+  data.tar.gz: 7052de8250626dea8ddebe9f13b23bee4f49a257
 SHA512:
-  metadata.gz: f1dcc65d651e204dd016dc2d35bed53595fdfd0a4ccead3b3f8456fd0638152fa32483a4ef6419449bd21bc8acff6d3077c0c8383cb84e57db973392e7b743cd
-  data.tar.gz: 50120e8b5d17ff5c0982a586f44f89ca63c36b9d8ddcad50d005e0ee5b5c484cc18f9abc8eef4f09f56d16d3e978cb19a387b03d3253689013d06d1714faf22f
+  metadata.gz: 7e5ea2654b8cd7fe0274397ae1c200d9d572002a2e4e83cb6f19c694fda020d2c9df0669286faa2131a75844d70623d20cfc90a38f845e026227248913b915b8
+  data.tar.gz: 89966d08f93340481181609b86d07d6e04d770b5ddbbfb392c76a0b287b6f7e567ad92e6819a1ceed56883a986d82bd4283df77a68bdc77e1448ff52e211c000

data/graphos.gemspec

@@ -23,6 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.4"
   spec.add_development_dependency "minitest-reporters", "~> 1.0"
   spec.add_development_dependency "pry", "~>0.10"
-
-  spec.add_dependency "amorim-algorithms", "~>0.6"
 end

data/lib/graphos/algorithm/prim.rb

@@ -14,6 +14,8 @@ module Graphos
       heap = BinaryHeap.new{|x,y| x.value <=> y.value}
       heap.push(initial, 0)
 
+      visited = Array.new(graph.size, false)
+
       update_cost = -> (idx,cost) do
         costs[idx] = cost
         if heap.has_key? idx
@@ -24,10 +26,21 @@ module Graphos
       end
 
       while keyval=heap.pop
+        # Selecione u em V-S, tal que custo[u] é mínimo
         idx = keyval.key
+
+        next if visited[idx]
+
+        # Adicione u em S
+        visited[idx] = true
+
         node = graph[idx]
+
+        # Selecione u em V-S, tal que custo[u] é mínimo
         node.edges.each do |edge|
+          # Se custo[v] > w((u,v)) então
           if costs[edge.to.index] > edge.weight
+            # custo[v] = w((u,v))
             fathers[edge.to.index] = node.index
             update_cost.call(edge.to.index, edge.weight)
           end
@@ -37,6 +50,9 @@ module Graphos
       result = Weighted::Graph.new graph.size
       fathers.each_with_index do |f,c|
         if f
+          if result.edge(f,c)
+            puts "Existing #{f},#{c}"
+          end
           result.add_edge(f, c, costs[c])
         end
       end

data/lib/graphos/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphos
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bernardo Amorim
@@ -81,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: amorim-algorithms
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 description: This gems implements some graph algorithms and representations.
 email:
 - contato@bamorim.com
@@ -108,6 +94,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- graphos-0.3.0.gem
 - graphos.gemspec
 - lib/graphos.rb
 - lib/graphos/algorithm/dijkstra.rb