group_mixer 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6803a4b304a1a963f6c0656fb7ba2a4587d52ecd
-  data.tar.gz: da773a35044ca0777473b689d8af68734f0b1d9c
+  metadata.gz: bf4090c12a830fe79fd2e9a82b0a9e0ff88c13d9
+  data.tar.gz: 706cf5a6414bcb35d01bc75e099b469e38eaee50
 SHA512:
-  metadata.gz: fcb51d63d7f89d52b103495da244d9635b7ac1b4d3c1165f1c3bbcc9905e028571670a34d328608dfe9bd69be3b0f369924e9fdec5c6dc03a323605b9ee0d67e
-  data.tar.gz: 3e1252e32d8eb405b7aec43cc2b699b961a84b2ef447b759e699fe7f36e96d8c12d7a625a5fad2a1c18c718ebdc2d5d06fd21c385b43bc5aeda20378c69a0851
+  metadata.gz: 4a300c0e167977749282c0c29eca872927aa8d13124c0dfac27b2c439f35b7aaeef9338f0c31d9a94405cae8a0269d2b7c3d9a8e6b8b1063e6535afdf6302821
+  data.tar.gz: 1c08980250baf23168ace07c0bad0a13cf6bc67fb0130554d9125fd835f39d75df33246dba700241f53c9f8bb73ff0e28519baae6b0405b67ee3b86715add9e6

data/Gemfile.lock

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

data/lib/group_mixer/mixer.rb

@@ -12,12 +12,7 @@ module GroupMixer
       if group_size.zero?
         raise ZeroGroupSize, 'group_size must be a number greater than 1'
       end
-      if is_separate_reminders
-        @groups = make_separate_groups(group_size, @people.size)
-      else
-        min_member_size, max_group_size = people.size.divmod group_size
-        @groups = make_groups(group_size, max_group_size, min_member_size)
-      end
+      @groups = make_groups(is_separate_reminders, group_size)
     end
 
     def execute
@@ -33,54 +28,52 @@ module GroupMixer
 
     private
 
-    def make_groups(group_size, max_group_size, min_member_size)
+    def make_groups(is_separate_reminders, group_size)
+      ps = @people.size
+      is_separate_reminders ?  separate_groups(group_size, ps) : flatting_groups(group_size, ps)
+    end
+
+    def flatting_groups(group_size, people_size)
+      min_member_size, max_group_size = people_size.divmod group_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_separate_groups(group_size, people_size)
+    def separate_groups(group_size, people_size)
       member_size = people_size / (group_size - 1)
       (group_size - 1).times.map { Group.new(member_size) } +
         [Group.new(people_size % (group_size - 1))]
     end
 
     def make_heuristic_from_past(people, past_set)
-      past_pheromone = Hash.new(0)
-      past_set.each do |past|
+      past_set.each_with_object(Hash.new(0)) { |past, pheromone|
         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
+          pheromone[Set.new(pair)] += past.weight if (people & pair).size > 1
         end
-      end
-      past_pheromone
+      }
     end
 
     def make_link_amount_hash(people, links)
-      people.each_with_object(Hash.new) do |person, hash|
+      people.each_with_object(Hash.new) { |person, hash|
         hash[person] = links.select { |pair, value| pair.member? person }
                             .map { |pair, value| value }
                             .inject(0) { |sum, value| sum += value }
-      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
+      relevances = group_relevance(groups, person, links)
+      min_relevence = relevances.min{ |x, y| x[1] <=> y[1] }[1]
+      min_relevence_groups = relevances.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)
+    def 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
+        hash[g] = g.full? ? MAX_AMOUNT : g.inject(0) { |sum, m| sum += links[Set[m, person]].to_i }
       }
     end
   end

data/lib/group_mixer/version.rb

@@ -1,3 +1,3 @@
 module GroupMixer
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: group_mixer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - iwtn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler