group_mixer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a835a59f09e9161725341af2f34130dbb5e86b33
-  data.tar.gz: e0af0ea15926b2af38a53f11507f3140d26f6029
+  metadata.gz: f7caf9618c7138a93c346abf2bf6e49f0e29485a
+  data.tar.gz: 4f81a0ada0d4213a8b274b57311ed7ce6e30ddd9
 SHA512:
-  metadata.gz: c4fae5e6e48c9257ef761af1b43420c038106237989b915209982915e921dcf165abc40d75f4333cf1717dd1322970a755b5ec57c92c570e5b913bbf149d2db9
-  data.tar.gz: 9b03616081b1c3740229d9edc7575617eed74f67faec392f6163da0ee0ba264043e410860a8e31610e7dd61706be8ba2e695cbc18412ee8656a264fab0cd45fd
+  metadata.gz: 742eb41f5830c2a210c6b6255f635b1da4009ffb4679085a646c62337b989028b5d07104406bc61f0ff32de691360b398bf231fadf3e3873e5907411f48074d1
+  data.tar.gz: 7694cf9b56fd426d64a2512ba04ed5fa61b1c71ea6b9ee11e206a039736c6edc78b11e8d053b1e0c8c8667804ef2637f60ed2232472b44b5fab0220286a301e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    group_mixer (0.1.1)
+    group_mixer (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/group_mixer.rb

@@ -1,5 +1,6 @@
 require "group_mixer/version"
 require "group_mixer/mixer"
+require "group_mixer/weighted_group"
 
 module GroupMixer
   def self.by_group_size(people, past_set, group_size)

data/lib/group_mixer/mixer.rb

@@ -1,70 +1,73 @@
 require "group_mixer/group"
+require "group_mixer/weighted_group"
 
-class Mixer
-  MAX_AMOUNT = 2 ** ([42].pack('i').size * 16 - 2) - 1
+module GroupMixer
+  class Mixer
+    MAX_AMOUNT = 2 ** ([42].pack('i').size * 16 - 2) - 1
 
-  def initialize(people, past_set, group_size)
-    @people = people
-    @past_set = past_set
-    min_member_size, max_group_size = people.size.divmod group_size
-    @groups = make_groups(group_size, max_group_size, min_member_size)
-  end
+    def initialize(people, past_set, group_size)
+      @people = people
+      @past_groups = past_set.map { |s| s.is_a?(WeightedGroup) ? s : WeightedGroup.new(s) }
+      min_member_size, max_group_size = people.size.divmod group_size
+      @groups = make_groups(group_size, max_group_size, min_member_size)
+    end
 
-  def execute
-    links = make_heuristic_from_past(@people, @past_set)
-    link_amount_hash = make_link_amount_hash(@people, links)
+    def execute
+      links = make_heuristic_from_past(@people, @past_groups)
+      link_amount_hash = make_link_amount_hash(@people, links)
 
-    link_amount_hash.sort { |a, b| b[1]<=>a[1] }.each do |person, amount|
-      select_group(@groups, person, links).add person
-    end
+      link_amount_hash.sort { |a, b| b[1]<=>a[1] }.each do |person, amount|
+        select_group(@groups, person, links).add person
+      end
 
-    @groups.map(&:members)
-  end
+      @groups.map(&:members)
+    end
 
-  private
+    private
 
-  def make_groups(group_size, max_group_size, min_member_size)
-    max_group_size.times.map { |n| GroupMixer::Group.new(min_member_size + 1) } +
-        (group_size - max_group_size).times.map { |n| GroupMixer::Group.new(min_member_size) }
-  end
+    def make_groups(group_size, max_group_size, min_member_size)
+      max_group_size.times.map { |n| Group.new(min_member_size + 1) } +
+          (group_size - max_group_size).times.map { |n| Group.new(min_member_size) }
+    end
 
-  def make_heuristic_from_past(people, past_set)
-    past_pheromone = Hash.new(0)
-    past_set.each do |past|
-      past.combination(2).each do |pair|
-        if people.include?(pair[0]) && people.include?(pair[1])
-          past_pheromone[Set.new(pair)] += 1
+    def make_heuristic_from_past(people, past_set)
+      past_pheromone = Hash.new(0)
+      past_set.each do |past|
+        past.members.to_a.combination(2).each do |pair|
+          if people.include?(pair[0]) && people.include?(pair[1])
+            past_pheromone[Set.new(pair)] += past.weight
+          end
         end
       end
+      past_pheromone
     end
-    past_pheromone
-  end
 
-  def make_link_amount_hash(people, links)
-    people.each_with_object(Hash.new) do |person, hash|
-      hash[person] = links.select { |pair, value| pair.member? person }
-                          .map { |pair, value| value }
-                          .inject(0) { |sum, value| sum += value }
+    def make_link_amount_hash(people, links)
+      people.each_with_object(Hash.new) do |person, hash|
+        hash[person] = links.select { |pair, value| pair.member? person }
+                            .map { |pair, value| value }
+                            .inject(0) { |sum, value| sum += value }
+      end
     end
-  end
 
-  def select_group(groups, person, links)
-    group_relevance = get_group_relevance(groups, person, links)
-    min_relevence = group_relevance.min{ |x, y| x[1] <=> y[1] }[1]
-    min_relevence_groups = group_relevance.select { |g, v| v == min_relevence }.keys
-    max_relevence_group_size = min_relevence_groups.max{ |x, y|
-      x.members.size <=> y.members.size
-    }.members.size
-    min_relevence_groups.select { |g| g.members.size == max_relevence_group_size }.sample
-  end
+    def select_group(groups, person, links)
+      group_relevance = get_group_relevance(groups, person, links)
+      min_relevence = group_relevance.min{ |x, y| x[1] <=> y[1] }[1]
+      min_relevence_groups = group_relevance.select { |g, v| v == min_relevence }.keys
+      max_relevence_group_size = min_relevence_groups.max{ |x, y|
+        x.members.size <=> y.members.size
+      }.members.size
+      min_relevence_groups.select { |g| g.members.size == max_relevence_group_size }.sample
+    end
 
-  def get_group_relevance(groups, person, links)
-    groups.each_with_object(Hash.new) { |g, hash|
-      if g.full?
-        hash[g] = MAX_AMOUNT
-      else
-        hash[g] = g.inject(0) { |sum, m| sum += links[Set[m, person]].to_i }
-      end
-    }
+    def get_group_relevance(groups, person, links)
+      groups.each_with_object(Hash.new) { |g, hash|
+        if g.full?
+          hash[g] = MAX_AMOUNT
+        else
+          hash[g] = g.inject(0) { |sum, m| sum += links[Set[m, person]].to_i }
+        end
+      }
+    end
   end
 end

data/lib/group_mixer/version.rb

@@ -1,3 +1,3 @@
 module GroupMixer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/group_mixer/weighted_group.rb

@@ -0,0 +1,16 @@
+require 'set'
+
+module GroupMixer
+  class WeightedGroup
+    include Enumerable
+    extend Forwardable
+
+    def initialize(members=[], weight=1)
+      @members = Set.new(members)
+      @weight = weight
+    end
+
+    def_delegators :@members, :size, :each
+    attr_reader :members, :weight
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: group_mixer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - iwtn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - lib/group_mixer/group.rb
 - lib/group_mixer/mixer.rb
 - lib/group_mixer/version.rb
+- lib/group_mixer/weighted_group.rb
 homepage: https://github.com/iwtn/group_mixer
 licenses:
 - MIT