louvian_ruby 0.0.5 → 0.0.7

data/lib/louvian.rb

@@ -1,92 +1,97 @@
-module Louvian
+class Louvian
   require 'louvian/community'
   require 'louvian/graph'
 
   MIN_INCREASE = 0.000001
 
 
-  def self.graph
-    @@graph
+  # This method sets up the whole environemnt for calculations
+  #
+  # @param string [String] in the form of src dest (one edge per line)
+  #
+  def initialize tuples, directed
+    #list = string.split("\n").map {|line| line.split.map{|n| n.to_i}}
+    @graph = Graph.new tuples, directed, 0
+    @levels = [] # List of Graphs
   end
 
-  def self.graph= value
-    @@graph = value
+  def graph
+    @graph
   end
 
-  def self.levels
-    @@levels
+  def graph= value
+    @graph = value
   end
 
-  def self.levels= value
-    @@levels = value
+  def levels
+    @levels
   end
-  # This method sets up the whole environemnt for calculations
-  #
-  # @param string [String] in the form of src dest (one edge per line)
-  def self.init_env string, directed
-    list = string.split("\n").map {|line| line.split.map{|n| n.to_i}}
-    @@graph = Graph.new list, directed, 0
-    @@levels = [] # List of Graphs
-    nil
+
+  def levels= value
+    @levels = value
   end
 
-  def self.run
+  def run
     l = 0
-    mod = @@graph.modularity
-    puts "Level #{l}: Comms #{@@graph.communities.size}"
+    puts "Level #{l}: Comms #{@graph.communities.size}"
     l +=1
 
     while self.one_level
-      puts "Level #{l}: Comms #{@@graph.communities.size}"
-      @@levels << @@graph
-      @@graph = @@graph.build_graph_from_comms
+      puts "Level #{l}: Comms #{@graph.communities.size}"
+      @levels << @graph
+      @graph = @graph.build_graph_from_comms
+
       l+=1
     end
+    self
   end
 
-  def self.unfold_levels!
-    @@levels[(1..-1)].each_with_index do |graph, i|
-      graph.expand! @@levels[i]
+  def unfold_levels!
+    return false if @levels.size < 2
+    puts  "levels count #{@levels.size}"
+    @levels[(1..-1)].each_with_index do |graph, i|
+      graph.expand! @levels[i]
     end
+    true
   end
 
-  def self.display_hierarchy
-    @@levels.each do |graph|
+  def display_hierarchy
+    @levels.each do |graph|
       puts "level #{graph.level}: Nodes #{graph.communities.count}"
     end
-
+    nil
   end
 
   # This method iterates over the graph to optimze the modularity. Iterations
   # stops when there are no possible moves anymore.
   # @returns improvement [Boolean] indicates whether there was improvment or no
-  def self.one_level
+  def one_level
     improvement = false
     nb_passes = 0
-    cur_mod = @@graph.modularity
+    cur_mod = @graph.modularity
     new_mod = cur_mod
     begin
       #puts "Iterating"
-      #puts "modularity is #{@@graph.modularity}"
+      #puts "modularity is #{@graph.modularity}"
       cur_mod = new_mod
       nb_moves = 0
       nb_passes += 1
-      @@graph.nodes.shuffle.each do |node|
-        #puts "\t#{@@graph.n2c}"
+      @graph.nodes.shuffle.each do |node|
+        #puts "\t#{@graph.n2c}"
         #puts "\tconsidering node #{node}"
-        orig_community = @@graph.get_community node
+        orig_community = @graph.get_community node
 
-        neighbour_communities = @@graph.get_neighbour_comms node
+        neighbour_communities = @graph.get_neighbour_comms node
 
         #puts "\tneihbours#{neighbour_communities.map {|i| i.id}} origin #{orig_community.id}"
-        @@graph.remove_node node, orig_community
+        @graph.remove_node node, orig_community
 
 
         best_community = orig_community
         max_gain = 0.0
 
         neighbour_communities.each do |comm|
-          mod_gain = @@graph.modularity_gain node, comm
+          mod_gain = @graph.modularity_gain node, comm
           #puts "\t\tfor comm #{comm.id} mod increase is #{mod_gain}"
           if mod_gain > max_gain
             max_gain = mod_gain
@@ -99,20 +104,19 @@ module Louvian
           #puts "\t\tbest comm #{best_community.id}"
         end
 
-        @@graph.insert_node node, best_community
+        @graph.insert_node node, best_community
 
-        @@graph.garbage_collect orig_community
+        @graph.garbage_collect orig_community
 
       end
-      new_mod = @@graph.modularity
+      new_mod = @graph.modularity
       #puts "modularity was #{cur_mod} and now #{new_mod}, moves #{nb_moves}"
     end while  nb_moves > 0 and new_mod - cur_mod >= MIN_INCREASE
     return improvement
   end
 
-
-  def self.example
-    s='0 1 1
+  def self.example s=nil
+    s ||='0 1 1
     0 8 1
     1 3 1
     1 4 1
@@ -124,14 +128,19 @@ module Louvian
     4 7 1
     5 6 1
     5 7 1'
+    list = self.make_list_from_string s
+
+    l = Louvian.new(list, false)
+    #l.one_level
+    #ng = l.graph.build_graph_from_comms
+    #l.levels << l.graph
+    #l.graph = ng
+    l.run
+    return l
+  end
 
-    Louvian.init_env s, false
-    Louvian.one_level
-    ng = Louvian.graph.build_graph_from_comms
-    Louvian.levels << Louvian.graph
-    Louvian.graph = ng
-    #L = Louvian
-    #Louvian.run
-    nil
+  def self.make_list_from_string s
+    list = (s.split("\n").map {|line| line.split.map{|n| n.to_i}})
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: louvian_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: