louvian_ruby 0.0.2 → 0.0.3

data/lib/louvian/community.rb

@@ -1,19 +1,32 @@
 class Louvian::Community
   attr_accessor :in, :tot, :nodes_ids, :id
   @@count = 0
-  def initialize node_id
+  def initialize adj_list, level
+    #puts "Adj list is "
     @id = @@count
     @@count+=1
-    @nodes_ids = [node_id]
-    @in = 0 # sum of links weights inside the community
-    @tot = Louvian.get_adj(node_id).count # sum of links weights incident to the community
+
+    # TODO NO NEED TO SORT
+    @nodes_ids = adj_list.keys.sort
+    @level = level
+
+    # sum of links weights inside the community
+    #@in = adj_list.select {|k,v| nodes_ids.include? k}.inject(0) {|r,(k,v)| r+v.count}
+
+    @in = 0
+    adj_list.each do |node, neighbors|
+      @in += neighbors.select {|node| @nodes_ids.include? node}.count
+    end
+
+    # sum of links weights incident to the community
+    @tot = adj_list.inject(0) {|r,(k,v)| r+v.count}
   end
 
   def self.reset
     @@count = 0
   end
 
-  def insert node, links_to_comm
+  def insert node, node_adj
     #puts "\t\tinsert node #{node} to comm #{@id}"
     @nodes_ids << node
 
@@ -21,12 +34,13 @@ class Louvian::Community
     #@in += links_to_comm
     #@tot += (Louvian.get_adj(node).count - links_to_comm)
 
+    links_to_comm = node_adj.select {|n| nodes_ids.include? n}.count
     # Copied from the cpp code
     @in += 2*links_to_comm
-    @tot += (Louvian.get_adj(node).count)
+    @tot += node_adj.count
   end
 
-  def remove node, links_to_comm
+  def remove node, node_adj
     #puts "\t\tremove node #{node} to comm #{@id}"
     @nodes_ids.delete node
 
@@ -34,9 +48,10 @@ class Louvian::Community
     #@in -= links_to_comm
     #@tot -= (Louvian.get_adj(node).count - links_to_comm)
 
+    links_to_comm = node_adj.select {|n| nodes_ids.include? n}.count
     # Copied from the cpp code
     @in -= 2*links_to_comm
-    @tot -= (Louvian.get_adj(node).count)
+    @tot -= node_adj.count
   end
 
 end

data/lib/louvian.rb

@@ -1,179 +1,89 @@
-require 'set'
 module Louvian
   require 'louvian/community'
+  require 'louvian/graph'
 
   MIN_INCREASE = 0.000001
 
-  # Node => community
-  @@n2c = {}
 
-  # Adjacency list
-  @@adj={}
-
-  # List of all communities (meta_nodes)
-  @@communities = []
-
-  # List of all nodes
-  @@nodes = []
-
-  # Sum of all links half edges (double the number of edges)
-  @@total_weight = 0.0
-
-  def self.communities
-    @@communities
-  end
-
-  def self.get_adj node_id
-    return @@adj[node_id]
+  def self.graph
+    @@graph
   end
 
-  # This method outputs information about communities
-  def self.display_communities
-    @@communities.each do |m|
-      puts "#{m.id} => #{m.nodes_ids} in=#{m.in} tot=#{m.tot}"
-    end
+  def self.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
-    make_adj string
-    @@nodes = @@adj.keys.sort
-    @@nodes.each do |k,v|
-      @@communities << Community.new(k)
-      @@n2c[k] = @@communities.last.id
-    end
-   @@total_weight = @@adj.inject(0) {|r,(k,v)| r+v.count}
-
-  end
-
-  # This method reset the enviroment and all counters
-  def self.reset
-    @@n2c = {}
-    @@adj={}
-    @@communities = []
-    @@nodes = []
-    @@total_weight = 0.0
-    Community.reset
+  def self.init_env string, directed=false
+    list = string.split("\n").map {|line| line.split.map{|n| n.to_i}}
+    @@graph = Graph.new list, directed, 0
+    @@levels = [] # List of Graphs
+    nil
   end
 
-  # This method calcualtes the current modularity of the communities
-  # @returns q [Float]
-  def self.modularity
-    q = 0.0
-    m2 = @@total_weight
-
-    @@communities.each do |m_node|
-      q += m_node.in.to_f/m2 - (m_node.tot.to_f/m2 * m_node.tot.to_f/m2)
-    end
-    return q
+  def self.run
+    l = 0
+    mod = @@graph.modularity
+    begin 
+      puts "Level #{l}: Comms #{@@graph.communities.size}"
+      @@levels << @@graph
+      @@graph = @@graph.build_graph_from_comms
+      l+=1
+    end while self.one_level
   end
 
   # This method iterates over the graph to optimze the modularity. Iterations
   # stops when there are no possible moves anymore.
-  def self.iterate
-    cur_mod = self.modularity
-    new_mod =  cur_mod
-    improvement = 0.0
-    min_improvement = 0.01
+  # @returns improvement [Boolean] indicates whether there was improvment or no
+  def self.one_level
+    improvement = false
     nb_passes = 0
-    max_passes = 10
+    cur_mod = @@graph.modularity
+    new_mod = cur_mod
     begin
       #puts "Iterating"
-      #puts "modularity is #{self.modularity}"
+      #puts "modularity is #{@@graph.modularity}"
       cur_mod = new_mod
       nb_moves = 0
       nb_passes += 1
-      @@nodes.shuffle.each do |node|
+      @@graph.nodes.shuffle.each do |node|
+        #puts "\t#{@@graph.n2c}"
         #puts "\tconsidering node #{node}"
-        orig_community_id = @@n2c[node]
-        orig_community = @@communities.find {|i| i.id == orig_community_id}
-        node_to_comms_links = self.get_node_to_comms_links node
-        neighbour_communities = @@communities.find_all {|i| node_to_comms_links.include? i.id}
+        orig_community = @@graph.get_community node
 
-        orig_community.remove node, node_to_comms_links[orig_community_id]
+        neighbour_communities = @@graph.get_neighbour_comms node
 
+        #puts "\tneihbours#{neighbour_communities.map {|i| i.id}}"
+        @@graph.remove_node node, orig_community
 
-        best_community_id = orig_community_id
+
+        best_community = orig_community
         max_gain = 0.0
 
-        neighbour_communities.each do |m_node|
-          mod_gain = self.modularity_gain(node, m_node, node_to_comms_links[m_node.id])
-          #puts "\t\tfor comm #{m_node.id} mod increase is #{mod_gain}"
+        neighbour_communities.each do |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
-            best_community_id = m_node.id
+            best_community = comm
           end
         end
-        if best_community_id != orig_community_id
+        if best_community != orig_community
           nb_moves += 1
+          improvement = true
         end
 
-        best_community = @@communities.find{|m| m.id == best_community_id}
-        #puts "\t\tbest comm #{best_community.id}"
+        @@graph.insert_node node, best_community
 
-        best_community.insert node, node_to_comms_links[best_community.id]
-        @@n2c[node] = best_community_id
+        @@graph.garbage_collect orig_community
 
-        if  orig_community.nodes_ids.empty?
-          @@communities.delete orig_community
-        end
       end
-      display_communities
-      new_mod = self.modularity
-      puts "modularity is #{self.modularity}"
+      #display_communities
+      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
-  end
-
-  private
-
-  # This method builds the adjacency list from +string+
-  # @param string [String] in the form of src dest (edge per line)
-  def self.make_adj string
-    @@adj = {}
-    lines = string.split("\n")
-    lines.each do |l|
-      @@adj[l.split[0].to_i] ||= Set.new
-      @@adj[l.split[0].to_i] << l.split[1].to_i
-      @@adj[l.split[1].to_i] ||= Set.new
-      @@adj[l.split[1].to_i] << l.split[0].to_i
-    end
-    nil
-  end
-
-
-  # This method calcualtes the modularity gain for moving +node+ to +community+
-  # @param +node+ this is the node to be moved
-  # @param +community+ this is the destination community
-  # @param +nb_links_to_comm+ is the number of links from +node+ to +community+
-  # @returns delta_q (the gain of modularity)
-  def self.modularity_gain node, community, nb_links_to_comm
-    tot = community.tot
-    deg = get_adj(node).count
-    m2 = @@total_weight
-
-    #puts "\t\t\tcomm #{community.id} #{[tot, deg, m2, nb_links_to_comm]}"
-    # what makes sense
-    #return (nb_links_to_comm.to_f/m2) - (tot * deg.to_f/m2**2/2)
-
-    # copied from the cpp code
-    return nb_links_to_comm.to_f - tot*deg.to_f/m2
-  end
-
-  # This method gets all neighbour communities and the number of links from +node+
-  # to all neighbou communities
-  # @param +node+ to be considered
-  # @return +node_to_comms_links+ [Hash] {community => number_of_links from +node+
-  # to +community+}
-  def self.get_node_to_comms_links node
-    neighbour_nodes = self.get_adj node
-    node_to_comms_links = {}
-    neighbour_nodes.each do |node|
-      node_to_comms_links[@@n2c[node]] = (node_to_comms_links[@@n2c[node]] || 0) + 1
-    end
-    node_to_comms_links[@@n2c[node]] ||= 0
-    return node_to_comms_links
+    return improvement
   end
 
 
@@ -190,10 +100,8 @@ module Louvian
     5 6
     5 7'
 
-    Louvian.init_env s
-    Louvian.iterate
-    Louvian.display_communities
-    Louvian.reset
+    Louvian.init_env s, false
+    Louvian.run
     nil
   end
 end

metadata

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