graphos 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c01223437fbfd0807465f7c3e906beea53a3968
-  data.tar.gz: c22534c9913af9e5fe26f349ea47acae83076338
+  metadata.gz: 17e52e382a16f64bff7268a1e16d05b766ffba07
+  data.tar.gz: 2722ab24892ed985395292e46d7589cf0a610cbf
 SHA512:
-  metadata.gz: 1bc419449e7f18fed8132f94b9adf7322a9e556f61f0cc281a488d8cd856b45b3477596e17762e2205427dddabd8c84806881363719e19c779e1be83528b6984
-  data.tar.gz: 22504d8ce07925db07a2aab39d76db7b0201be6e0c0ff4f35205b9b767a9d602a0d963a5f5f0a5e34e34daf19d8ff27e9e0928cca17fc4d00dfc3675b64660b5
+  metadata.gz: 3ddb151b5cec18977a18fd12b6814009c0744241e02d42fd2b38c68fe05a78cb9c4dc0b4be8af84b5447792b59565ba2c15aeeb1ea6ea034f6c92a2e15b58458
+  data.tar.gz: e459dd620cb44803f8581bbd6f1df29a1d1a82db01731741bef88c6e23a3edf641d32915e58f9e9dde6bc28eafbeb7c8f9a718a7954318334f0a99b41de06c00

data/lib/graphos/algorithm/dijkstra.rb

@@ -25,13 +25,18 @@ module Graphos
 
       update_cost = -> (idx,cost) do
         costs[idx] = cost
-        heap.change_key(idx,idx)
+        if(heap.has_key?(idx))
+          heap.delete(idx)
+          heap.push(idx)
+        end
       end
 
+      count = 0
 
       #Para cada vértice v
       #enquanto heap (S-V) != 0
       while idx=heap.pop
+        count += 1
         #Selecione u em V-S, tal que dist[u] é mínima
         u = graph[idx]
         distu = costs[idx]
@@ -48,6 +53,9 @@ module Graphos
             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/algorithm/prim.rb

@@ -18,7 +18,10 @@ module Graphos
 
       update_cost = -> (idx,cost) do
         costs[idx] = cost
-        heap.change_key(idx,idx)
+        if(heap.has_key?(idx))
+          heap.delete(idx)
+          heap.push(idx)
+        end
       end
 
       while idx=heap.pop

data/lib/graphos/version.rb

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

data/test/dijsktra_test.rb

@@ -3,6 +3,13 @@ require "graphos/weighted/graph"
 require "graphos/algorithm/dijkstra"
 
 class DijkstraTest < MiniTest::Test
+  def test_100
+    graph = Graphos::Weighted::TextFactory.read("test/fixtures/grafo_1.txt")
+
+    dij = Graphos::Algorithm.dijkstra graph, 0
+
+    assert_equal([99,16,7,66,9], ipath(dij[9]))
+  end
   def test_dijskstra
     graph = Graphos::Weighted::Graph.new(5)
     graph.add_edge 0, 1, 2

data/test/fixtures/grafo_1.txt

@@ -0,0 +1,420 @@
+100
+22 84 4
+30 37 15
+10 67 2
+24 64 6
+55 82 1
+73 82 10
+6 67 15
+55 87 2
+48 53 2
+47 81 14
+2 61 10
+57 100 12
+7 87 11
+79 95 12
+6 29 3
+5 6 7
+21 68 11
+55 62 6
+50 53 14
+10 26 8
+6 34 14
+67 89 1
+62 98 3
+26 85 11
+40 74 13
+92 93 12
+14 34 11
+8 39 5
+87 88 4
+3 4 8
+23 93 7
+10 40 3
+89 91 11
+25 81 12
+19 91 10
+10 98 6
+15 45 7
+72 82 13
+31 77 10
+30 93 1
+60 72 1
+7 58 5
+23 24 11
+51 52 15
+24 25 15
+21 97 6
+72 73 8
+59 60 7
+45 72 4
+72 94 8
+37 93 7
+55 59 8
+8 14 11
+30 94 3
+88 89 11
+50 73 6
+50 82 15
+6 73 2
+100 1 12
+24 94 15
+76 77 11
+29 87 5
+48 73 7
+24 26 9
+58 98 1
+57 86 1
+21 62 14
+6 72 12
+26 40 4
+14 64 3
+24 29 12
+48 87 3
+48 61 2
+44 45 7
+61 98 13
+36 37 1
+59 82 15
+9 79 7
+6 45 14
+24 72 6
+2 81 7
+45 60 7
+48 81 2
+48 60 9
+53 82 13
+10 74 15
+35 80 2
+7 35 5
+2 98 15
+37 97 7
+15 82 7
+34 87 11
+84 87 5
+6 41 9
+9 95 14
+6 50 8
+14 91 2
+19 26 7
+52 53 5
+50 59 3
+14 89 4
+15 60 1
+35 36 5
+53 55 7
+14 24 8
+9 10 2
+61 84 11
+19 20 3
+73 74 2
+62 94 5
+99 100 4
+75 76 1
+10 64 14
+24 67 14
+2 85 15
+4 8 12
+95 96 14
+13 14 1
+50 72 14
+72 93 5
+2 3 2
+24 40 4
+60 82 13
+62 73 4
+55 73 15
+34 35 12
+7 80 7
+71 72 4
+8 17 1
+15 16 12
+6 82 13
+40 58 6
+11 12 1
+45 62 11
+19 67 5
+24 74 12
+34 84 6
+65 66 15
+10 89 2
+60 87 14
+2 34 11
+62 87 12
+7 61 7
+67 91 11
+6 15 2
+81 86 4
+96 97 3
+18 90 8
+37 72 4
+14 40 9
+68 97 5
+40 62 7
+40 41 13
+24 93 15
+8 40 3
+10 24 4
+8 24 6
+48 62 4
+29 61 2
+47 86 13
+6 53 11
+7 67 14
+51 95 5
+55 56 3
+55 72 4
+33 34 8
+7 84 7
+37 98 8
+6 62 10
+8 79 2
+6 60 6
+4 51 4
+8 73 1
+14 19 5
+61 81 4
+15 59 11
+6 59 9
+6 98 15
+32 33 5
+38 39 13
+20 21 10
+2 25 15
+69 70 8
+40 89 12
+2 37 5
+30 31 2
+14 15 9
+59 73 14
+80 81 5
+8 95 7
+2 97 15
+2 20 11
+46 89 8
+29 93 6
+4 5 7
+60 62 13
+22 87 7
+53 54 5
+7 8 6
+93 94 8
+22 34 7
+25 47 8
+23 37 10
+53 87 14
+63 98 8
+74 89 10
+53 62 6
+55 60 7
+24 89 13
+1 2 15
+12 13 15
+73 87 3
+67 87 15
+47 61 15
+42 43 14
+2 47 13
+50 60 6
+84 98 2
+22 61 6
+8 91 3
+25 48 15
+30 72 5
+23 72 4
+63 64 9
+29 67 1
+45 46 15
+34 98 14
+18 19 12
+15 53 6
+10 63 12
+6 48 5
+15 73 15
+45 73 15
+9 39 8
+40 91 9
+23 94 9
+48 59 8
+61 67 9
+34 61 2
+61 87 6
+41 42 10
+45 59 8
+4 9 14
+48 86 12
+83 84 8
+20 34 10
+27 28 13
+15 55 13
+19 24 7
+64 89 10
+78 79 5
+14 74 9
+45 48 6
+82 87 6
+81 82 13
+62 63 12
+53 73 7
+48 82 8
+26 31 1
+62 82 13
+98 99 3
+38 92 2
+2 48 12
+2 6 11
+7 34 2
+6 52 10
+24 30 2
+8 74 4
+3 12 4
+8 10 4
+23 30 10
+29 30 14
+82 83 12
+67 84 5
+29 94 9
+60 73 6
+37 94 1
+10 11 9
+7 62 13
+49 50 9
+26 77 6
+29 98 6
+45 53 12
+19 74 2
+59 72 11
+59 62 3
+8 19 10
+45 55 15
+7 29 4
+37 38 9
+27 92 14
+29 34 7
+26 67 1
+86 100 14
+48 49 13
+63 75 2
+26 89 15
+10 14 10
+70 71 13
+90 91 5
+15 72 7
+31 32 5
+19 64 9
+26 27 10
+60 61 14
+28 29 3
+22 98 14
+35 71 10
+6 22 3
+74 91 15
+28 80 2
+6 87 13
+53 72 8
+50 51 9
+87 94 7
+67 68 3
+51 92 7
+8 9 14
+29 72 2
+26 64 15
+15 62 15
+7 98 6
+19 89 14
+47 48 6
+64 74 2
+8 67 1
+74 75 14
+22 29 12
+72 87 7
+4 63 4
+46 47 13
+50 62 15
+89 90 11
+21 22 15
+45 50 13
+86 87 8
+58 59 9
+17 100 3
+39 40 4
+40 67 6
+87 98 12
+4 95 3
+14 26 12
+64 67 1
+59 87 11
+10 91 5
+39 95 2
+34 67 14
+91 92 10
+29 84 8
+8 26 11
+43 44 3
+58 62 13
+17 18 3
+53 60 10
+8 89 13
+50 87 7
+85 86 15
+84 85 15
+61 62 9
+24 91 1
+68 69 7
+40 98 14
+38 51 12
+10 85 5
+45 87 14
+57 58 4
+51 63 2
+22 23 11
+23 29 4
+7 22 5
+79 80 1
+15 87 2
+6 7 13
+22 67 14
+94 95 12
+54 55 11
+48 50 7
+24 37 1
+6 84 12
+10 19 6
+39 79 6
+29 37 7
+56 57 3
+66 67 7
+45 82 10
+25 26 6
+4 39 14
+7 40 7
+61 86 2
+26 74 7
+6 55 11
+64 91 6
+25 61 6
+4 79 9
+53 59 5
+2 86 5
+25 86 11
+48 72 12
+67 74 15
+48 55 11
+40 64 12
+8 64 6
+19 40 4
+41 52 3
+15 50 7
+16 17 10
+26 91 2
+6 61 15
+50 55 10
+64 65 4
+35 72 15
+97 98 5
+14 67 14
+15 48 5
+8 100 11
+67 98 11
+77 78 8
+62 72 14

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphos
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bernardo Amorim
@@ -119,6 +119,7 @@ files:
 - lib/graphos/weighted/node.rb
 - lib/graphos/weighted/text_factory.rb
 - test/dijsktra_test.rb
+- test/fixtures/grafo_1.txt
 - test/fixtures/wgraph.txt
 - test/minitest_helper.rb
 - test/prim_test.rb
@@ -150,6 +151,7 @@ specification_version: 4
 summary: Educational gem to Graph Theory @ UFRJ
 test_files:
 - test/dijsktra_test.rb
+- test/fixtures/grafo_1.txt
 - test/fixtures/wgraph.txt
 - test/minitest_helper.rb
 - test/prim_test.rb