rgraph 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e957e5282af5a7c082bc428cb198d0c8eb135b6b
-  data.tar.gz: 27bf0d9882da344b9d132d9fc983416862016d7d
+  metadata.gz: 4c4d3fdd3c5cedd1f8ea3f6f12ac4cfc35ced188
+  data.tar.gz: b9ee2affd0263db5ec94a3bf395d5569ee8ece85
 SHA512:
-  metadata.gz: 300c04213aae09989dcd40ac0edd917ee40560a5ed72aa1965721c873c27b593e1d35afd752c71d988cddfdf5f1fef3ecb4122f422a6be6903716fdd1632d94f
-  data.tar.gz: b1479e98a98990a428f61608af3c88d9ec41f8d383695623372c2e1098c811d7db04acf5bdcc7017a00e7492505cbcbd766ec509058c058527410066d329131d
+  metadata.gz: 7723113a6c7b319dd3dadae64511d8d0c623832f588ce40f418da526df01a81cb052d509fd89550638ad2554c89cc64e02632cda004f73892d88410601e7e158
+  data.tar.gz: 86883eca3a63e40d83d3cd1c2e2eb326347e8585a39b75bd555f31c56d44e2ca152da0aab91097e0dcc540b903efe656b745eb422c33e62a5410c6780924f92b

data/lib/rgraph/graph.rb

@@ -52,30 +52,26 @@ class Graph
   end
 
   def cumulative_degree
-    cached_degrees = degrees
-    out = []
-
-    0.upto(degrees.max - 1) do |i|
-      out[i] = cached_degrees.select{|degree| degree > i}.count
-    end
+    out = (0..(degrees.max - 1)).map { |i| degrees.select{|degree| degree > i}.count }
     out.map{|a| a / out.max.to_f}
   end
 
   def idistance
-    dist = Array.new(@nodes.size) { Array.new(@nodes.size, 0) }
+    dist = matrix(@nodes.size, 0)
 
-    @nodes.sort{|a,b| a.id <=> b.id}.each_with_index do |n1, i|
-      @nodes.sort{|a,b| a.id <=> b.id}.each_with_index do |n2, j|
-        if i != j
-          dist[i][j] = n1.neighbours.include?(n2) ? @links.select{ |link| (link.source == n1 || link.source == n2) && (link.target == n1 || link.target == n2) }.first.weight.to_i : @infinity
-          end
+    sorted = @nodes.sort { |a,b| a.id <=> b.id}
+
+    sorted.each_with_index do |n1, i|
+      sorted.each_with_index do |n2, j|
+        next if i == j
+        dist[i][j] = n1.has_neighbour?(n2) ? link_between(n1, n2).weight.to_i : @infinity
       end
     end
     dist
   end
 
   def distances
-    @path = Array.new(@nodes.size) { Array.new(@nodes.size, nil) }
+    @path = matrix(@nodes.size, [nil])
 
     @distance = idistance
     @distance.each_index do |k|
@@ -84,7 +80,10 @@ class Graph
           new_dist = @distance[i][k] + @distance[k][j]
           if @distance[i][j] > new_dist
             @distance[i][j] = new_dist
-            @path[i][j] = k
+            @path[i][j] = [k]
+          end
+          if @distance[i][j] == new_dist && !(@path[i][j].include? k) && ! [i,j].include?(k)
+            @path[i][j] << k
           end
         end
       end
@@ -99,41 +98,51 @@ class Graph
     fdistance.inject(:+) / fdistance.count.to_f
   end
 
-  def shortest_paths
-    tmp = []
+  def shortest_paths(args = {})
+    multiples = args[:multiples] || false
+    @shortest_paths = []
 
-    distances unless @my_shortest_paths
+    distances
 
     0.upto(@nodes.size - 1).each do |i|
-      i.upto(@nodes.size - 1).each do |j|
-        next if i == j
-        sp = shortest_path(i, j)
-        tmp << sp unless sp.empty?
+      (i + 1).upto(@nodes.size - 1).each do |j|
+        @shortest_paths += shortest_path(i, j, multiples)
       end
     end
 
-    @shortest_paths = tmp
+    @shortest_paths
   end
 
-  def shortest_path(i, j)
+  def shortest_path(i, j, multiples = false)
 
     return [] if @distance[i][j] == @infinity
 
-    k = @path[i][j]
+    path = @path[i][j].count == 1 || multiples ? @path[i][j] : [@path[i][j].first]
+    out = []
 
-    case k
-    when @infinity
-      []
-    when nil
-      [i,j]
-    else
-      #We need to do this or k will appear three times
-      shortest_path(i, k)[0..-2] + [k] + shortest_path(k, j)[1..-1]
+    path.each do |k|
+
+      case k
+      when @infinity
+        out << []
+      when nil
+        out << [i,j]
+      else
+        i_k = shortest_path(i, k)
+        k_j = shortest_path(k, j)
+
+        i_k.each do |ik|
+          k_j.each do |kj|
+            out << ik[0..-2] + [k] + kj[1..-1]
+          end
+        end
+      end
     end
+    out
   end
 
   def between(i)
-    shortest_paths unless @shortest_paths
+    shortest_paths(multiples: true)
 
     n = @shortest_paths.select{|c| c[1..-2].include?(i)}.size.to_f
     m = @shortest_paths.size.to_f
@@ -249,8 +258,16 @@ class Graph
     end
   end
 
+  def link_between(n1, n2)
+    @links.select{ |l| (l.source == n1 && l.target == n2) || (l.source == n2 && l.target == n1) }.first
+  end
+
   def possible_connections(node)
     total = node.neighbours.count
     total * (total - 1) / 2
   end
+
+  def matrix(size, value)
+    Array.new(size) { Array.new(size, value) }
+  end
 end

data/lib/rgraph/node.rb

@@ -10,6 +10,10 @@ class Node
     @neighbours.size
   end
 
+  def has_neighbour?(node)
+    @neighbours.include?(node)
+  end
+
   def method_missing(name, *args)
     super unless args.empty?
     @args[name]

data/lib/rgraph/version.rb

@@ -1,3 +1,3 @@
 module Rgraph
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/spec/rgraph/graph_spec.rb

@@ -125,6 +125,17 @@ describe Graph do
   end
   describe "Paths' metrics" do
     subject { Graph.new('spec/fixtures/small_graph.csv') }
+
+    it "calculates a simple shortest path" do
+      g = Graph.new_from_string("source,target\n1,2")
+      expect(g.shortest_paths).to eq([[0, 1]])
+    end
+
+    it "doesn't return empty paths" do
+      g = Graph.new_from_string("source,target\n1,2\n3,4")
+      expect(g.shortest_paths).to eq([[0,1],[2,3]])
+    end
+
     it "calculates the shortest paths" do
       expect(subject.shortest_paths.sort).to eq(
         [[0, 1],
@@ -142,36 +153,39 @@ describe Graph do
          [3, 4], [3, 5],
          [4, 3, 5]].sort)
     end
-    it "doesn't return empty paths" do
-      g = Graph.new_from_string("source,target\n1,2\n3,4")
-      expect(g.shortest_paths).to eq([[0,1],[2,3]])
+    it "returns multiples short paths when asked" do
+      g = Graph.new_from_string("source,target\n1,2\n2,3\n1,4\n4,3")
+      expect(g.shortest_paths.count).to eq(6)
+      expect(g.shortest_paths(multiples: true).count).to eq(8)
     end
-
     it "calculates the betweenness of a single node" do
-      expect(subject.between(0)).to eq(0 / 15.0)
-      expect(subject.between(1)).to eq(2 / 15.0)
-      expect(subject.between(2)).to eq(2 / 15.0)
-      expect(subject.between(3)).to eq(4 / 15.0)
-      expect(subject.between(4)).to eq(2 / 15.0)
-      expect(subject.between(5)).to eq(0 / 15.0)
+      expect(subject.between(0)).to eq(0 / 18.0)
+      expect(subject.between(1)).to eq(2 / 18.0)
+      expect(subject.between(2)).to eq(2 / 18.0)
+      expect(subject.between(3)).to eq(6 / 18.0)
+      expect(subject.between(4)).to eq(4 / 18.0)
+      expect(subject.between(5)).to eq(0 / 18.0)
     end
     it "calculates all betweenness" do
       expect(subject.betweenness).to eq(
-        [0 / 15.0,
-         2 / 15.0,
-         2 / 15.0,
-         4 / 15.0,
-         2 / 15.0,
-         0 / 15.0])
+        [0 / 18.0,
+         2 / 18.0,
+         2 / 18.0,
+         6 / 18.0,
+         4 / 18.0,
+         0 / 18.0])
     end
     it "calculates all betweenness normalized" do
       expect(subject.betweenness(normalized: true)).to eq(
-        [0.0, 0.5, 0.5, 1.0, 0.5, 0.0])
+        [0.0, 1 / 3.0, 1 / 3.0, 1.0, 2 / 3.0, 0.0])
     end
     it "works with holes" do
       g = Graph.new_from_string("source,target\n1,2\n3,4")
       expect(g.betweenness.inject(:+)).to eq(0)
     end
+    it "calculates cumulative betweenness" do
+      expect(subject.betweenness(cumulative: true)).to eq([[6, 0.0], [4, 1 / 3.0], [2, 2 / 3.0], [1, 1.0]])
+    end
     it "calculates diameter" do
       expect(subject.diameter).to eq(3)
     end
@@ -185,9 +199,6 @@ describe Graph do
       g = Graph.new_from_string("source,target\n1,2\n3,4")
       expect(g.components).to eq([g.nodes[0..1], g.nodes[2..3]])
     end
-    it "calculates cumulative betweenness" do
-      expect(subject.betweenness(cumulative: true)).to eq([[6, 0.0], [4, 0.5], [1, 1.0]])
-    end
     it "calculates clustering of a single node" do
       nodes = subject.nodes.sort{|a,b| a.id <=> b.id}
 

data/spec/rgraph/node_spec.rb

@@ -11,4 +11,13 @@ describe Node do
   describe "#degree" do
     its(:degree) { should eq 0}
   end
+
+  describe "#has_neighbour" do
+    it "recognizes its neighbour" do
+      n1 = Node.new(id: 1)
+      n2 = Node.new(id: 1)
+      n1.neighbours << n2
+      expect(n1.has_neighbour?(n2)).to be_true
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgraph
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Lucas Aride Moulin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler