rgraph 0.0.6 → 0.0.8

data/Guardfile

@@ -1,5 +1,5 @@
 guard :rspec do
   watch(%r{^spec/(.+)/.+_spec\.rb$})
-  watch(%r{^lib/(.+)/(.+)\.rb$})     { |m| "spec/m[1]/#{m[2]}_spec.rb" }
+  watch(%r{^lib/(.+)/(.+)\.rb$}) { |m| "spec/#{m[1]}/#{m[2]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end

data/lib/rgraph/graph.rb

@@ -1,14 +1,16 @@
+#encoding: utf-8
 require 'csv'
 require_relative '../../lib/rgraph/link'
 require_relative '../../lib/rgraph/node'
 
-
 class Graph
-  attr_accessor :nodes, :links
+  attr_accessor :nodes, :links, :infinity
 
   def initialize(csv)
     @nodes = []
     @links = []
+    @distance = nil
+    @infinity = 100_000
     raise Exception.new("the file must be a .csv") unless File.extname(csv) == ".csv"
 
     CSV.foreach(csv, headers: true) do |row|
@@ -16,14 +18,10 @@ class Graph
       source_id = row.delete('source').last
       target_id = row.delete('target').last
 
-      unless source = get_node_by_id(source_id)
-        source = Node.new(id: source_id)
-        @nodes << source
-      end
-      unless target = get_node_by_id(target_id)
-        target = Node.new(id: target_id)
-        @nodes << target
-      end
+      source = get_node_by_id(source_id) || Node.new(id: source_id)
+      target = get_node_by_id(target_id) || Node.new(id: target_id)
+
+      maybe_add_to_nodes(source, target)
 
       @links << Link.new(source: source, target: target, weight: row['weight'], year: row['year'])
     end
@@ -47,12 +45,103 @@ class Graph
 
   def cumulative_degree
     cached_degrees = degrees
-    cum = []
+    out = []
 
     0.upto(degrees.max - 1) do |i|
-      cum[i] = cached_degrees.select{|degree| degree > i}.count
+      out[i] = cached_degrees.select{|degree| degree > i}.count
     end
-    cum.map{|a| a / cum.max.to_f}
+    out.map{|a| a / out.max.to_f}
+  end
+
+  def idistance
+    dist = Array.new(@nodes.size) { Array.new(@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
+      end
+    end
+    dist
+  end
+
+  def distances
+    @path = Array.new(@nodes.size) { Array.new(@nodes.size, nil) }
+
+    @distance = idistance
+    @distance.each_index do |k|
+      @distance.each_index do |i|
+        @distance.each_index do |j|
+          new_dist = @distance[i][k] + @distance[k][j]
+          if @distance[i][j] > new_dist
+            @distance[i][j] = new_dist
+            @path[i][j] = k
+          end
+        end
+      end
+    end
+    @distance
+  end
+
+  def shortest_paths
+    tmp = []
+
+    distances unless @my_shortest_paths
+
+    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 if sp
+      end
+    end
+
+    @shortest_paths = tmp
+  end
+
+  def shortest_path(i, j)
+
+    return [] if @distance[i][j] == @infinity
+
+    k = @path[i][j]
+
+    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]
+    end
+  end
+
+  def between(i)
+    shortest_paths unless @shortest_paths
+
+    n = @shortest_paths.select{|c| c[1..-2].include?(i)}.size.to_f
+    m = @shortest_paths.size.to_f
+    n / m
+  end
+
+  def betweenness(normalized = false)
+    bts = 0.upto(@nodes.size - 1).map { |i| between(i) }
+
+    if normalized
+      max = bts.max
+      min = bts.min
+
+      bts.map{|bt| (bt - min) / (max - min)}
+    else
+      bts
+    end
+  end
+
+  def diameter
+    distances unless @distance
+
+    (distances.flatten - [@infinity]).max
   end
 
   private
@@ -60,4 +149,10 @@ class Graph
   def get_node_by_id(node_id)
     @nodes.select{|n| n.id == node_id}.first
   end
+
+  def maybe_add_to_nodes(*nodes)
+    nodes.each do |node|
+      @nodes << node unless get_node_by_id(node.id)
+    end
+  end
 end

data/lib/rgraph/link.rb

@@ -1,24 +1,24 @@
-  class Link
-    attr_accessor :source, :target
+class Link
+  attr_accessor :source, :target
 
-    def initialize(arg)
-      @args = arg
-      @source = @args.delete(:source)
-      @target = @args.delete(:target)
+  def initialize(arg)
+    @args = arg
+    @source = @args.delete(:source)
+    @target = @args.delete(:target)
 
-      raise Exception.new("source cant be nil") unless @source
-      raise Exception.new("target cant be nil") unless @target
-      raise Exception.new("source must be of type Node") unless @source.is_a? Node
-      raise Exception.new("target must be of type Node") unless @target.is_a? Node
+    raise Exception.new("source cant be nil") unless @source
+    raise Exception.new("target cant be nil") unless @target
+    raise Exception.new("source must be of type Node") unless @source.is_a? Node
+    raise Exception.new("target must be of type Node") unless @target.is_a? Node
 
-      @args[:weight] ||= 1
+    @args[:weight] ||= 1
 
-      @source.neighbours << @target
-      @target.neighbours << @source
-    end
+    @source.neighbours << @target
+    @target.neighbours << @source
+  end
 
-    def method_missing(name, *args)
-      super unless args.empty?
-      @args[name]
-    end
+  def method_missing(name, *args)
+    super unless args.empty?
+    @args[name]
   end
+end

data/lib/rgraph/version.rb

@@ -1,3 +1,3 @@
 module Rgraph
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/lib/rgraph.rb

@@ -2,7 +2,3 @@ require "rgraph/version"
 require "rgraph/link"
 require "rgraph/node"
 require "rgraph/graph"
-
-module Rgraph
-  # Your code goes here...
-end

data/rgraph.gemspec

@@ -14,12 +14,11 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.14.1"
   spec.add_development_dependency "guard-rspec", "~> 3.0.2"
-  spec.add_development_dependency "fastercsv", "~> 1.5.5"
 end

data/spec/fixtures/small_graph.csv

@@ -0,0 +1,8 @@
+source,target
+1,2
+1,5
+2,3
+2,5
+3,4
+4,5
+4,6

data/spec/fixtures/three_links.csv

@@ -1,4 +1,4 @@
 source,target,weight,year
 n1,n2,1,2005
-n2,n3,1,2005
-n3,n1,1,2005
+n3,n2,1,2005
+n1,n3,1,2005

data/spec/fixtures/two_links_with_hole.csv

@@ -0,0 +1,4 @@
+source,target,weight,year
+n1,n2,1,2005
+n2,n3,1,2005
+n4,n5,1,2005

data/spec/rgraph/graph_spec.rb

@@ -1,8 +1,11 @@
+#coding: utf-8
+
 require_relative '../../lib/rgraph/graph'
 
 describe Graph do
   describe "read .csv" do
     subject { Graph.new('spec/fixtures/three_links.csv') }
+
     it "creates three nodes" do
       expect(subject.nodes.size).to eq(3)
     end
@@ -43,6 +46,11 @@ describe Graph do
 
   describe "Metrics" do
     subject { Graph.new('spec/fixtures/three_links.csv') }
+
+    it "sets default infinity to 100_000" do
+      expect(subject.infinity).to eq(100_000)
+    end
+
     it "all nodes degree" do
       expect(subject.degrees).to eq([2,2,2])
     end
@@ -53,4 +61,90 @@ describe Graph do
       expect(subject.cumulative_degree).to eq([1.0, 1.0])
     end
   end
+
+  describe "Distance" do
+    subject { Graph.new('spec/fixtures/small_graph.csv') }
+
+    it "calculates the initial distance matrix" do
+      k = subject.infinity
+      expect(subject.idistance).to eq(
+        [[0,1,k,k,1,k],
+         [1,0,1,k,1,k],
+         [k,1,0,1,k,k],
+         [k,k,1,0,1,1],
+         [1,1,k,1,0,k],
+         [k,k,k,1,k,0]])
+    end
+
+    it "checks distances" do
+      expect(subject.distances).to eq(
+        [[0,1,2,2,1,3],
+         [1,0,1,2,1,3],
+         [2,1,0,1,2,2],
+         [2,2,1,0,1,1],
+         [1,1,2,1,0,2],
+         [3,3,2,1,2,0]])
+    end
+
+    it "understands holes on the graph" do
+      graph = Graph.new('spec/fixtures/two_links_with_hole.csv')
+      k = graph.infinity
+      expect(graph.idistance).to eq(
+        [[0,1,k,k,k],
+         [1,0,1,k,k],
+         [k,1,0,k,k],
+         [k,k,k,0,1],
+         [k,k,k,1,0]])
+      expect(graph.distances).to eq(
+        [[0,1,2,k,k],
+         [1,0,1,k,k],
+         [2,1,0,k,k],
+         [k,k,k,0,1],
+         [k,k,k,1,0]])
+    end
+  end
+  describe "Paths' metrics" do
+    subject { Graph.new('spec/fixtures/small_graph.csv') }
+    it "calculates the shortest paths" do
+      expect(subject.shortest_paths.sort).to eq(
+        [[0, 1],
+         [0, 1, 2],
+         [0, 4],
+         [0, 4, 3],
+         [0, 4, 3, 5],
+         [1, 2],
+         [1, 2, 3],
+         [1, 2, 3, 5],
+         [1, 4],
+         [2, 1, 4],
+         [2, 3],
+         [2, 3, 5],
+         [3, 4], [3, 5],
+         [4, 3, 5]].sort)
+    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)
+    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])
+    end
+    it "calculates all betweenness normalized" do
+      expect(subject.betweenness(true)).to eq(
+        [0.0, 0.5, 0.5, 1.0, 0.5, 0.0])
+    end
+    it "calculates diameter" do
+      expect(subject.diameter).to eq(3)
+    end
+  end
 end

data/spec/rgraph/link_spec.rb

@@ -9,6 +9,12 @@ describe Link do
     its(:target) { should be_kind_of Node }
     its(:weight) { should == 1 }
     its(:years) { should == [2011, 2012] }
+
+    it "checks the creation of neighbours" do
+      expect(subject.source.neighbours).to eq([subject.target])
+      expect(subject.target.neighbours).to eq([subject.source])
+    end
+
   end
 
   describe "creates a link passing a weight" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgraph
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,22 +76,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.2
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
 description: Ruby's Graph Library
 email:
 - aride.moulin@gmail.com
@@ -116,8 +100,10 @@ files:
 - lib/rgraph/version.rb
 - rgraph.gemspec
 - spec/fixtures/2005.csv
+- spec/fixtures/small_graph.csv
 - spec/fixtures/three_links.csv
 - spec/fixtures/two_links.csv
+- spec/fixtures/two_links_with_hole.csv
 - spec/rgraph/graph_spec.rb
 - spec/rgraph/link_spec.rb
 - spec/rgraph/node_spec.rb
@@ -150,8 +136,10 @@ specification_version: 3
 summary: A Ruby's Graph Library
 test_files:
 - spec/fixtures/2005.csv
+- spec/fixtures/small_graph.csv
 - spec/fixtures/three_links.csv
 - spec/fixtures/two_links.csv
+- spec/fixtures/two_links_with_hole.csv
 - spec/rgraph/graph_spec.rb
 - spec/rgraph/link_spec.rb
 - spec/rgraph/node_spec.rb