group_mixer 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9751efce09d105cce6e127118fa18817407890d
-  data.tar.gz: 263d704111169002f26c3421232fdf3cd2b32db3
+  metadata.gz: d2244487635816f4daae27506f6b62e81ca7b5a3
+  data.tar.gz: b62def8bd28c31908672da97c710e2d5b87b691a
 SHA512:
-  metadata.gz: f8afd0d15766ad527e6080af957baa84fda1ad4c5d1a0e26a5328c5d5f186fa586b799ce76f72fe251f73c6bae17efa121f9a9fd4743c496d2e156a9ca35001f
-  data.tar.gz: d317036037330b80d355c8a054d23065e851b1aaf929e62af8c79fbfbcdb29052934b2033e8a0753e3e8faee9f48ce14cbf26fef7fb7bcfaf0bc24e1a5cd0bf2
+  metadata.gz: 55434fcb65417df5efa89add82b5ffce947e591ca2b1d0058d8f8921687aa79dfc4aebc45a3601960c5d68ef882389feaa62b56640e6c95e7685e9ba2d40ebba
+  data.tar.gz: c52c9e9aacdc9733370fc64937793604d390c0f6b68f474e094a76d868292de0c0aec6128a2cb4bf843c41f90242d2715e590195f05856a2388ff8266245ac19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    group_mixer (0.5.0)
+    group_mixer (0.5.1)
       thor
 
 GEM

data/lib/group_mixer.rb

@@ -7,14 +7,77 @@ module GroupMixer
   end
 
   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
+    if group_size.zero?
+      raise ZeroGroupSize, 'group_size must be a number greater than 1'
+    end
+    max_member_size = (people.size.to_f / group_size).ceil
+    rest = people.size % max_member_size
+    groups = make_groups(rest, group_size, max_member_size, is_separate_reminders)
+    Mixer.new(people, past_set, groups, is_separate_reminders).execute
   end
 
   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, is_separate_reminders).execute
+    rest = people.size % max_member_size
+    group_size = (people.size.to_f / max_member_size).ceil
+    groups = make_groups(rest, group_size, max_member_size, is_separate_reminders)
+    Mixer.new(people, past_set, groups, is_separate_reminders).execute
+  end
+
+  private
+
+  def self.make_groups_hoge(group_size_set)
+    group_size_set.map { |s| Group.new(s) }
+  end
+
+  def self.make_groups_by_group_size(people_size, group_size, is_separate_reminders)
+    max_mem = (people_size.to_f / group_size).ceil
+    if is_separate_reminders
+      rest = people_size % max_mem
+      if rest.zero?
+        Array.new(group_size) { max_mem }
+      else
+        Array.new(group_size - 1) { max_mem } + [rest]
+      end
+    else
+      rest = people_size % group_size
+      if rest.zero?
+        Array.new(group_size) { max_mem }
+      else
+        Array.new(rest) { max_mem } + Array.new(group_size - rest) { max_mem - 1 }
+      end
+    end
+  end
+
+  def self.make_groups_by_member_size(people_size, member_size, is_separate_reminders)
+    group_size = (people_size.to_f / member_size).ceil
+    if is_separate_reminders
+      rest = people_size % member_size
+      return Array.new(group_size) { member_size } if rest.zero?
+
+      Array.new(group_size - 1) { member_size } + [rest]
+    else
+      rest = people_size % group_size
+      if rest.zero?
+        msize = (people_size < group_size * member_size) ? member_size - 1 : member_size
+        Array.new(group_size) { msize }
+      else
+        Array.new(rest) { member_size } + Array.new(group_size - rest) { member_size - 1 }
+      end
+    end
+  end
+
+  def self.make_groups(rest, group_size, max_member_size, is_separate_reminders)
+    return  Array.new(group_size) { Group.new(max_member_size) } if rest.zero?
+
+    if is_separate_reminders
+      Array.new(group_size - 1) { Group.new(max_member_size) } + [Group.new(rest)]
+    else
+      min_group_size = max_member_size - rest
+      Array.new(group_size - min_group_size) { Group.new(max_member_size) } +
+        Array.new(min_group_size) { Group.new(max_member_size - 1) }
+    end
   end
 end

data/lib/group_mixer/mixer.rb

@@ -5,14 +5,10 @@ module GroupMixer
   class Mixer
     MAX_AMOUNT = 2 ** ([42].pack('i').size * 16 - 2) - 1
 
-    def initialize(people, past_set, group_size, is_separate_reminders)
+    def initialize(people, past_set, groups, is_separate_reminders)
       @people = people.shuffle
+      @groups = groups
       @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
-      @groups = make_groups(is_separate_reminders, group_size)
     end
 
     def execute
@@ -28,23 +24,6 @@ module GroupMixer
 
     private
 
-    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 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_set.each_with_object(Hash.new(0)) { |past, pheromone|
         past.members.to_a.combination(2).each do |pair|

data/lib/group_mixer/version.rb

@@ -1,3 +1,3 @@
 module GroupMixer
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: group_mixer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - iwtn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor