group_mixer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803b16515ee2c9793290564601830785abeddf32
-  data.tar.gz: a0ca5dc163c745825228c5c042b05c2df5e4ca37
+  metadata.gz: 96f7557c79b022995704b2bc75254edf5d42107c
+  data.tar.gz: 18afffdc0fbeddf1df63dea8eb2ef3f3a9e2255a
 SHA512:
-  metadata.gz: 72d76c61644dbd58cc76368dc5b42dc875909e7e17c9967507e73b3601a2e47128ea0147ebabf6ba17e82b6230864b3a5379eeaed4bd9da4456ab44638ec6472
-  data.tar.gz: 37c5e42b7149f4454bea18ab91c3e761aa1daaca3dd1e57ded7998ab7e3ca3cfb27b053f0b13812a82ffc9cc9e0bd5094992a51264b17ec6583c0c594e9f22f6
+  metadata.gz: d9ab635121d010486477f7e446123cf9f9758c210e4a7337cc3fccdea39cfa34e3994322a4c57a2a53ec803ebd5a1a6f60beeae6fa8936d68d81df49ca3ff4ec
+  data.tar.gz: 38d73ebc47c003fce25efefcc0f1107ac1cfcdc74fe9d45b0770ff2593d1e8c6dda0598e910534a09035dc733ffb7130d09d2f2b52615761dd47baf65ace12aa

data/Gemfile.lock

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

data/lib/group_mixer/group.rb

@@ -3,6 +3,7 @@ require 'forwardable'
 
 module GroupMixer
   class Group
+    include Enumerable
     extend Forwardable
 
     def initialize(max_size)

data/lib/group_mixer/mixer.rb

@@ -1,15 +1,5 @@
 require "group_mixer/group"
 
-class Set
-  def pairs
-    Set.new(self.map do |i1|
-      self.map do |i2|
-        Set[i1, i2] if i1 != i2
-      end.compact
-    end.flatten)
-  end
-end
-
 class Mixer
   MAX_AMOUNT = 2 ** ([42].pack('i').size * 16 - 2) - 1
 
@@ -21,10 +11,10 @@ class Mixer
   end
 
   def execute
-    links = make_heuristic_from_past(@past_set)
+    links = make_heuristic_from_past(@people, @past_set)
     link_amount_hash = make_link_amount_hash(@people, links)
 
-    link_amount_hash.sort {|a, b| b[1]<=>a[1]}.map{|k, v| k }.each do |person|
+    link_amount_hash.sort { |a, b| b[1]<=>a[1] }.each do |person, amount|
       select_group(@groups, person, links).add person
     end
 
@@ -38,41 +28,33 @@ class Mixer
         (group_size - max_group_size).times.map { |n| GroupMixer::Group.new(min_member_size) }
   end
 
-  def make_heuristic_from_past(past_set)
+  def make_heuristic_from_past(people, past_set)
     past_pheromone = Hash.new(0)
     past_set.each do |past|
-      Set.new(past).pairs.each do |pair|
-        past_pheromone[pair] += 1
+      past.combination(2).each do |pair|
+        if people.include?(pair[0]) && people.include?(pair[1])
+          past_pheromone[Set.new(pair)] += 1
+        end
       end
     end
     past_pheromone
   end
 
   def make_link_amount_hash(people, links)
-    hash = {}
-    people.each do |person|
-      amount = 0
-      links.each do |pair, value|
-        amount += value if pair.member? person
-      end
-      hash[person] = amount
+    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
-    hash
   end
 
   def select_group(groups, person, links)
-    group_amounts = {}
-    groups.each do |g|
+    groups.each_with_object(Hash.new) { |g, hash|
       if g.full?
-        group_amounts[g] = MAX_AMOUNT
+        hash[g] = MAX_AMOUNT
       else
-        amount = 0
-        g.each do |member|
-          amount += links[Set[member, person]].to_i
-        end
-        group_amounts[g] = amount
+        hash[g] = g.inject(0) { |sum, m| sum += links[Set[m, person]].to_i }
       end
-    end
-    group_amounts.min{ |x, y| x[1] <=> y[1] }[0]
+    }.min{ |x, y| x[1] <=> y[1] }[0]
   end
 end

data/lib/group_mixer/version.rb

@@ -1,3 +1,3 @@
 module GroupMixer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/group_mixer.rb

@@ -7,7 +7,7 @@ module GroupMixer
   end
 
   def self.by_member_size(people, past_set, max_member_size)
-    group_size = people.size / max_member_size + 1
+    group_size = (people.size / max_member_size.to_f).ceil
     Mixer.new(people, past_set, group_size).execute
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: group_mixer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - iwtn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler