group_mixer 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b352c4423d0ccd5afa79ce79098d709cd01f22de
-  data.tar.gz: 261194246eefc4ac8fc903d81885313f217a2b63
+  metadata.gz: ec8323e04699c74b3b11148f75005eec5c3d4c03
+  data.tar.gz: ed62cb970cc742a568c4d317aacb27eb4c7334fb
 SHA512:
-  metadata.gz: 6b385b6bc3f80ca3783744a225b699131b60055208210ea8ea65206b056f7c5a673f57c3d1495283188a64350f0bdeb2eb395a821e8f0d4d8116f5b11fd56e04
-  data.tar.gz: 7b24c32e6dcd2243ebae53cc008b5e2073a4ee42a34b60d99daf0a6c050f55679b3ca862d7b25fa25512dd0319bbf3beafca1a8f953c56638e7f2de8f3806f22
+  metadata.gz: 9f9542fc909c46043da29140173702816488deebe85786edc227f1d5b03ca3d4b51a370568a66282cd2ff0ac52567d6098d91980a153cd1c8e2f7d566a831135
+  data.tar.gz: d8b89f1d2308564ab6d915e943f80478c80f22a2ba70a71db18576a07a8b3e750ba15b05d7bfceb9bc42efe3b9b3a0361358def55a6ccae7ca0532ca07ca50e4

data/Gemfile.lock

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

data/lib/group_mixer/mixer.rb

@@ -5,15 +5,19 @@ module GroupMixer
   class Mixer
     MAX_AMOUNT = 2 ** ([42].pack('i').size * 16 - 2) - 1
 
-    def initialize(people, past_set, group_size)
+    def initialize(people, past_set, group_size, is_separate_reminders)
       @people = people
       @past_groups = past_set.to_a.map { |s| s.is_a?(WeightedGroup) ? s : WeightedGroup.new(s) }
       group_size = group_size.to_i
       if group_size.zero?
         raise ZeroGroupSize, 'group_size must be a number greater than 1'
       end
-      min_member_size, max_group_size = people.size.divmod group_size
-      @groups = make_groups(group_size, max_group_size, min_member_size)
+      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
     end
 
     def execute
@@ -34,6 +38,12 @@ module GroupMixer
           (group_size - max_group_size).times.map { |n| Group.new(min_member_size) }
     end
 
+    def make_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|

data/lib/group_mixer/version.rb

@@ -1,3 +1,3 @@
 module GroupMixer
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/lib/group_mixer.rb

@@ -8,15 +8,15 @@ module GroupMixer
   class ZeroMaxMemberSize < StandardError
   end
 
-  def self.by_group_size(people, past_set, group_size)
-    Mixer.new(people, past_set, group_size).execute
+  def self.by_group_size(people, past_set, group_size, is_separate_reminders = false)
+    Mixer.new(people, past_set, group_size, is_separate_reminders).execute
   end
 
-  def self.by_member_size(people, past_set, max_member_size)
+  def self.by_member_size(people, past_set, max_member_size, is_separate_reminders = false)
     if max_member_size.to_f < 1
       raise ZeroMaxMemberSize, 'max_member_size must be a number greater than 1'
     end
     group_size = (people.size / max_member_size.to_f).ceil
-    Mixer.new(people, past_set, group_size).execute
+    Mixer.new(people, past_set, group_size, is_separate_reminders).execute
   end
 end

metadata

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