graphos 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e52e382a16f64bff7268a1e16d05b766ffba07
-  data.tar.gz: 2722ab24892ed985395292e46d7589cf0a610cbf
+  metadata.gz: d2e7925a7c025ce637e6903a5de7bd4ccf279da1
+  data.tar.gz: 5606dcf83f9d0f7df45a0f506884629c51e9d1b4
 SHA512:
-  metadata.gz: 3ddb151b5cec18977a18fd12b6814009c0744241e02d42fd2b38c68fe05a78cb9c4dc0b4be8af84b5447792b59565ba2c15aeeb1ea6ea034f6c92a2e15b58458
-  data.tar.gz: e459dd620cb44803f8581bbd6f1df29a1d1a82db01731741bef88c6e23a3edf641d32915e58f9e9dde6bc28eafbeb7c8f9a718a7954318334f0a99b41de06c00
+  metadata.gz: 29976de225239e5008690fc052e899dfc597f4b7760b26a40f04fb33176b9d71296b2459d648d250b9b58afef0baf7e11c76020596aa8ff5b1401231cc761501
+  data.tar.gz: 4136aec7330eca3220c5e826ff7011d9a1193292abb8d3c7c7084d9a785a472e8553d330a5b45c7a3dc55ea8e85f01886f0466d4dba2c2a64e09d256a81d6747

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in graphos.gemspec
 gemspec
-
-gem "ruby-lxc", github: "lxc/ruby-lxc", require: "lxc"

data/graphos.gemspec

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

data/lib/graphos/algorithm/dijkstra.rb

@@ -2,15 +2,11 @@ require "algorithms"
 require "graphos/path"
 module Graphos
   module Algorithm
-    include Containers
     ##
     # Runs the dijstra algorithm on a given graph
     # at a starting node
     # This uses a Heap to get the lightest edge
     def self.dijkstra graph, initial
-      #OK? E o path?
-      fathers = Array.new(graph.size)
-
       #os paf
       allPaths = Array.new(graph.size)
 
@@ -20,23 +16,23 @@ module Graphos
       costs[initial] = 0
 
       #OK
-      heap = Heap.new{|x,y| (costs[x] <=> costs[y]) == -1}
-      (0...graph.size).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
 
-      count = 0
-
       #Para cada vértice v
       #enquanto heap (S-V) != 0
-      while idx=heap.pop
-        count += 1
+
+      while keyval=heap.pop
+        idx = keyval.key
         #Selecione u em V-S, tal que dist[u] é mínima
         u = graph[idx]
         distu = costs[idx]
@@ -46,16 +42,12 @@ module Graphos
           #Se dist[v] > dist[u] + w(u,v) então
           if costs[edge.to.index] > distu + edge.weight
             #dist[v] = dist[u] + w(u,v)
-            fathers[edge.to.index] = u.index
             update_cost.call(edge.to.index, distu + edge.weight)
             #criar o Path entre root e v
             #se existe já, tem q atualizar. O novo é o do pai + ele msm
             allPaths[edge.to.index] = allPaths[u.index] + Path.new(edge)
           end
         end
-
-        # No more nodes!
-        break if(idx == heap.next)
       end
 
       allPaths

data/lib/graphos/binary_heap.rb

@@ -0,0 +1,113 @@
+module Graphos
+  class BinaryHeap
+    def initialize &compare
+      @compare = compare
+      @indexes = []
+      @keys = []
+      @values = []
+    end
+
+    def push key, value
+      if !has_key? key
+        insert key, value
+      end
+    end
+
+    def has_key? key
+      @indexes[key] != nil
+    end
+
+    def next
+      if key = @keys.first
+        key_val key
+      end
+    end
+
+    def change key, new_value
+      if has_key? key
+        @values[key] = new_value
+        move_up key
+        move_down key
+      end
+    end
+
+    def pop
+      return nil if size == 0
+
+      result = key_val(@keys.first)
+      @indexes[result.key] = nil
+      @values[result.key] = nil
+
+      last = @keys.pop
+      if size > 0
+        @keys[0] = last 
+        @indexes[last] = 0
+      end
+
+      result
+    end
+
+    def size
+      @keys.size
+    end
+
+  private
+    KeyVal = Struct.new(:key, :value)
+
+    def key_val key
+      KeyVal.new(key, @values[key])
+    end
+
+    def insert key, value
+      @indexes[key] = @keys.size
+      @keys.push key
+      @values[key] = value
+
+      move_up key
+    end
+
+    def move_down 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|
+        @compare.call(key_val(x), key_val(y))
+      end.first
+
+      return if max_key == key
+
+      swap(@indexes[key], @indexes[max_key])
+      move_down max_key
+    end
+
+    def move_up key
+      while(
+        @indexes[key] != 0 && 
+        smaller(key_val(key), key_val(@keys[parent(@indexes[key])]))
+      )
+          swap(parent(@indexes[key]), @indexes[key])
+      end
+    end
+
+    def parent i
+      (i-1)/2
+    end
+
+    def left i
+      2*i + 1
+    end
+    def right i
+      2*i + 2
+    end
+
+    def swap a, b
+      @keys[a], @keys[b] = @keys[b], @keys[a]
+      @indexes[@keys[a]], @indexes[@keys[b]] = @indexes[@keys[b]], @indexes[@keys[a]]
+    end
+
+    def smaller a, b
+      @compare.call(a,b) == -1
+    end
+  end
+end

data/lib/graphos/version.rb

@@ -1,3 +1,3 @@
 module Graphos
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/binary_heap_test.rb

@@ -0,0 +1,32 @@
+require_relative "minitest_helper.rb"
+require "graphos/binary_heap"
+
+class BinaryHeapTest < MiniTest::Test
+  def test_binary_heap
+    bh = Graphos::BinaryHeap.new{|x,y| x.value <=> y.value}
+    bh.push(1,5)
+    bh.push(2,4)
+    bh.push(3,7)
+
+    assert_equal(2, bh.next.key)
+    bh.change(2,6)
+    assert_equal(1, bh.next.key)
+    bh.change(3,4)
+    assert_equal(3, bh.pop.key)
+    assert_equal(1, bh.pop.key)
+    assert_equal(2, bh.pop.key)
+    assert_equal(nil, bh.pop)
+  end
+
+  def test_move_up
+    bh = Graphos::BinaryHeap.new{|x,y| x.value <=> y.value}
+    (1..100).each do |i|
+      bh.push(i,Float::INFINITY)
+    end
+
+    bh.change(100,1)
+    assert_equal(100,bh.next.key)
+    bh.change(99,0)
+    assert_equal(99,bh.next.key)
+  end
+end

data/test/dijsktra_test.rb

@@ -8,7 +8,8 @@ class DijkstraTest < MiniTest::Test
 
     dij = Graphos::Algorithm.dijkstra graph, 0
 
-    assert_equal([99,16,7,66,9], ipath(dij[9]))
+    assert_equal(19, dij[9].cost)
+    assert_equal(24, dij[19].cost)
   end
   def test_dijskstra
     graph = Graphos::Weighted::Graph.new(5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphos
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Bernardo Amorim
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: algorithms
+  name: amorim-algorithms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -112,12 +112,14 @@ files:
 - lib/graphos.rb
 - lib/graphos/algorithm/dijkstra.rb
 - lib/graphos/algorithm/prim.rb
+- lib/graphos/binary_heap.rb
 - lib/graphos/path.rb
 - lib/graphos/version.rb
 - lib/graphos/weighted/edge.rb
 - lib/graphos/weighted/graph.rb
 - lib/graphos/weighted/node.rb
 - lib/graphos/weighted/text_factory.rb
+- test/binary_heap_test.rb
 - test/dijsktra_test.rb
 - test/fixtures/grafo_1.txt
 - test/fixtures/wgraph.txt
@@ -150,6 +152,7 @@ signing_key:
 specification_version: 4
 summary: Educational gem to Graph Theory @ UFRJ
 test_files:
+- test/binary_heap_test.rb
 - test/dijsktra_test.rb
 - test/fixtures/grafo_1.txt
 - test/fixtures/wgraph.txt