find_communities 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4baabfdcee6316ce51e6f68b4535e15ce0ecba2
-  data.tar.gz: 160f7bbd40b8bbde535ff26d11df977cf5c34f55
+  metadata.gz: 26db4fdbab99e3162dcf8b14bb14030c9229686a
+  data.tar.gz: 7e2a64dbe57d6c6e5c07cd20e95597f331e2c8af
 SHA512:
-  metadata.gz: bd8a31638591661e62877c976c3c4be5835efa0781582897c7df3352f91e33c48c936e7b2fd0357a9d6d09cf5a1a35e41be9169d2eb93a978d1ed8c437317683
-  data.tar.gz: 507a858459bc54620e901390dd892069ea838f81159f073483565af48f2824b36244c8b27fda1adaa8985f3bfa31d8ba8782a0ff33997f00ef4dd46630690212
+  metadata.gz: 94b8c318dbd8db9cbb6bb73c7b096871f2f589ee2342be9bff3765aee25fa6dadeb0abe18653ecfae774bcb233366168dac2d2027217a8cda794ef8fd0bde091
+  data.tar.gz: 78fcf5ed0acbbf38f748212089fb6208e1019cdb9b42ddd61686baddc0e2f7664d3220ee516f87628a36868a7d8d5fb80d56b5e883bc913fb4b35dd066c96bd6

data/bin/community

@@ -3,13 +3,14 @@
 require 'thor'
 require File.dirname(__FILE__)+"/../lib/find_communities"
 
-class CommunityMain < Thor
-  method_option :level, :aliases => "-l", :desc => "displays the graph of level k rather than the hierachical structure.  if k=-1 then displays the hierarchical structure rather than the graph at a given level"
-  method_option :verbose, :aliases => "-v", :desc => "verbose mode: gives computation time, information about the hierarchy and modularity."
+class CommunityMain < Thor::Group
 
-  desc "community", "Decompose graph into communities"
+  class_option :level, :default => -1, :aliases => "-l", :desc => "displays the graph of level k rather than the hierachical structure.  if k=-1 then displays the hierarchical structure rather than the graph at a given level"
+  class_option :verbose, :type => :boolean, :aliases => "-v", :desc => "verbose mode: gives computation time, information about the hierarchy and modularity."
+
+  desc "Decompose graph into communities"
   argument :filename
-  def community
+  def act
     t0 = Time.now
     verbose = options[:verbose]
     puts "Begin: #{t0}" if verbose
@@ -25,12 +26,12 @@ class CommunityMain < Thor
       if verbose
         puts "level #{level}:"
         puts "  start computation #{Time.now}"
-        puts "  network size: #{c.g.nb_nodes} nodes, #{c.g.nb_links} links, #{c.g.total_weight} weight."
+        puts "  network size: #{c.g.nb_nodes} nodes, #{c.g.nb_links} links, #{c.g.total_weight.to_i} weight."
       end
       improvement = c.one_level
       new_mod = c.modularity
       level += 1
-      g.display if level == display_level && g
+      g.display_graph if level == display_level && g
       c.display_partition if display_level == -1
       g = c.partition2graph_binary
       c = FindCommunities::Community.new(g, -1, precision)
@@ -50,7 +51,10 @@ class CommunityMain < Thor
     puts "%.6f" % new_mod
   end
 
-  default_task :community
+private
+  def self.banner
+    "community FILENAME"
+  end
 end
 
 CommunityMain.start

data/lib/find_communities/binary_graph.rb

@@ -21,6 +21,21 @@ module FindCommunities
       }
     end
 
+    def display_graph
+      nb_nodes.times do |node|
+        p = neighbors(node)
+        print "#{node}:"
+        nb_neighbors(node).times do |i|
+          if weights.any?
+            print " (#{p.first[i]} #{p.last[i].to_i})"
+          else
+            print " #{p.first[i]}"
+          end
+        end
+        print "\n"
+      end
+    end
+
     def nb_neighbors(node)
       check_node(node)
       node == 0 ? degrees[0] : degrees[node] - degrees[node-1]

data/lib/find_communities/version.rb

@@ -1,3 +1,3 @@
 module FindCommunities
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/spec/bin/community_spec.rb

@@ -1,13 +1,58 @@
 require 'spec_helper'
 
 describe "community (executable)" do
-  it "outputs a hierarchy", :retry => 3 do
-    filename = File.dirname(__FILE__) + "/../data/karate.bin"
-    run "community -l -1 #{filename}"
-    relevant_lines = out.split("\n").last(4)
-    relevant_lines[0].should == "1 1"
-    relevant_lines[1].should == "2 2"
-    relevant_lines[2].should == "3 3"
-    relevant_lines[3].to_f.round(1).should == 0.4
+  let(:filename) { File.dirname(__FILE__) + "/../data/karate.bin" }
+
+  context "outputs a hierarchy", :retry => 2 do
+    it "works when no level given" do
+      run "community #{filename}"
+      relevant_lines = out.split("\n").last(4)
+      3.times do |i|
+        relevant_lines[i].should == "#{i+1} #{i+1}"
+      end
+      relevant_lines[3].to_f.round(2).should == 0.43
+    end
+
+    it "works when level given is -1" do
+      run "community -l -1 #{filename}"
+      relevant_lines = out.split("\n").last(4)
+      3.times do |i|
+        relevant_lines[i].should == "#{i+1} #{i+1}"
+      end
+      relevant_lines[3].to_f.round(2).should == 0.43
+    end
+
+    it "can provide verbose output", :retry => 2 do
+      run "community #{filename} -v"
+      output = out
+      3.times do |i|
+        output.should match /^level #{i}:\n  start computation [0-9\-: ]+\n  network size: \d+ nodes, \d+ links, \d+ weight.$(\n\d+ \d+){4,}\n  modularity increased from (-)?\d+\.\d+ to \d+\.\d+\n  end computation [0-9\-: ]+$/
+      end
+      lines = output.split("\n")
+      lines.first.should match /^Begin: [0-9\-: ]+$/
+      lines[lines.length-3].should match /^End: [0-9\-: ]+$/
+      lines[lines.length-2].should match /^Total duration: \d+\.\d+ sec\.$/
+      lines.last.to_f.round(2).should == 0.43
+    end
+  end
+
+  it "outputs level 2 in the hierchy", :retry => 2 do
+    run "community -l 2 #{filename}"
+    lines = out.split("\n")
+    lines.length.should > 5
+    lines[0..lines.length-2].each_with_index do |l, i|
+      l.should match /\A#{i}:( \(\d+ \d+\)){3,}\z/
+    end
+    lines.last.to_f.round(2).should == 0.43
+  end
+
+  it "outputs level 3 in the hierchy", :retry => 2 do
+    run "community #{filename} -l 3"
+    lines = out.split("\n")
+    lines.length.should == 5
+    lines[0..lines.length-2].each_with_index do |l, i|
+      l.should match /\A#{i}:( \(\d+ \d+\)){2,}\z/
+    end
+    lines.last.to_f.round(2).should == 0.43
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: find_communities
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Gabe Kopley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata