rgraph 0.0.8 → 0.0.9

data/lib/rgraph/graph.rb

@@ -125,14 +125,23 @@ class Graph
     n / m
   end
 
-  def betweenness(normalized = false)
+  def betweenness(args = {})
+    cumulative = args[:cumulative] || false
+    
+    #If we ask cumulative, normalized must be true
+    normalized = args[:normalized] || cumulative || 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)}
+      bts.map!{|bt| (bt - min) / (max - min)}
+    end
+
+    if cumulative
+      bts.uniq.sort.map{ |bt1| [bts.select{|bt2| bt2 >= bt1}.count, bt1] }
     else
       bts
     end

data/lib/rgraph/version.rb

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

data/spec/rgraph/graph_spec.rb

@@ -140,11 +140,14 @@ describe Graph do
          0 / 15.0])
     end
     it "calculates all betweenness normalized" do
-      expect(subject.betweenness(true)).to eq(
+      expect(subject.betweenness(normalized: 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
+    it "calculates cumulative betweenness" do
+      expect(subject.betweenness(cumulative: true)).to eq([[6, 0.0], [4, 0.5], [1, 1.0]])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgraph
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler