vns 0.2.0.pre.rc.2 → 1.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c56f91de10ef30babc78a4767c83d7fd6b3b40753d257cfd7d05e3d69ae5307
-  data.tar.gz: 9cf40c45a088d35cd002f3db0cfeac0be5d7a6678a5f2b64f037279254a70fef
+  metadata.gz: f8eacfde3fd497f7317f610995db9fc16942bec62eb40602da5286b94593b448
+  data.tar.gz: '08103a631dc376473929349c08ad35801478a9d865c33235fa86109d6ce37c65'
 SHA512:
-  metadata.gz: d002aeb4045d278914880fb1672a98bec542ad09d1aa9e455044af30053efdbd4696cdfa1ed7abf62c1a037a113d64d93091d7177bee82e3901870c38e354599
-  data.tar.gz: 342529f673fac35e88073e8a1bf51249b1ab531014c1c8783410cd5073cbe8f2ad28f15e671c175610bedc57f11b7ed1d027a95ce295de267a70732f286906c3
+  metadata.gz: 6f265e1ff335f4aac537957c1c989d15679cafa3b987d87eb4e514abf590ff0711d89fe3541ceda044be8e1684314f6ba220309d545bf6abb259985a6392d2f3
+  data.tar.gz: 780e7f9cf043f89059dc3809852c5a6ff6c6911d6983a57e3b9f6ccd87c6694dd88c8086a76409199f8839bf47be26a5eba9cee5a99af6db980ca8b9c4bc4b8b

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    vns (0.2.0.pre.rc.2)
+    vns (1.0.pre.rc.1)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -15,11 +15,11 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.1)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    i18n (1.8.7)
+    concurrent-ruby (1.1.9)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.14.3)
+    minitest (5.15.0)
     parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -45,7 +45,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/lib/vns/person.rb

@@ -1,13 +1,14 @@
 module VNS
   class Person
-    attr_reader :id, :name
-    def initialize(id, name)
+    attr_reader :id, :name, :group
+    def initialize(id, name, group)
       @id = id
       @name = name
+      @group = group
     end
 
     def to_s
-      "#{id}\t#{name}"
+      "#{id}\t#{name} (#{group})"
     end
   end
 end

data/lib/vns/session.rb

@@ -1,6 +1,5 @@
 module VNS
   class Session
-    MAX_ALLOCATION = 25
     attr_reader :id, :name
 
     def initialize(id, name)
@@ -12,4 +11,4 @@ module VNS
       "#{id}\t#{name}"
     end
   end
-end
+end

data/lib/vns/version.rb

@@ -1,3 +1,3 @@
 module VNS
-  VERSION = '0.2.0-rc.2'
+  VERSION = '1.0-rc.1'
 end

data/lib/vns.rb

@@ -4,15 +4,17 @@ module VNS
   require 'active_support/all'
 
   class VNS
-    attr_reader :people, :sessions, :preferences
+    attr_reader :people, :sessions, :preferences, :max_allocation, :group_duplication_factor
 
     PERTURBATION_COUNT = 100
 
-    def initialize(people, sessions, preferences, &inspection)
-      @people = people.map.with_index { |person, i| Person.new(i, person) }
+    def initialize(people, groups, sessions, preferences, max_allocation, group_duplication_factor, &inspection)
+      @people = people.map.with_index { |person, i| Person.new(i, person, groups[i]) }
       @sessions = sessions.map.with_index { |session, i| Session.new(i, session) }
       @preferences = preferences
       @inspection = inspection
+      @max_allocation = max_allocation
+      @group_duplication_factor = group_duplication_factor
     end
 
     def run
@@ -40,11 +42,19 @@ module VNS
     def target_function(solution = @solution)
       return Float::INFINITY unless solution
 
-      solution.map do |session, people|
-        people.map do |person|
-          preferences[person.id][session.id]
-        end
-      end.flatten.inject(:+)
+      individual_penalty = solution.map do |session, people|
+                             people.map do |person|
+                               preferences[person.id][session.id]
+                             end
+                           end.flatten.inject(:+)
+
+      group_penalty = solution.map do |session, people| 
+        people.group_by(&:group).map{|group, people| people.count - 1 }.sum
+      end.inject(:+)
+
+      Rails.logger.info "Penalty: #{individual_penalty} + #{group_penalty}"
+
+      individual_penalty + group_duplication_factor * group_penalty
     end
 
     private
@@ -141,7 +151,7 @@ module VNS
     end
 
     def feasible?(solution)
-      solution.values.all? { |group| group.size <= Session::MAX_ALLOCATION }
+      solution.values.all? { |group| group.size <= max_allocation }
     end
 
     def swap(solution, person1, person2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vns
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.rc.2
+  version: 1.0.pre.rc.1
 platform: ruby
 authors:
 - Manuel Bustillo
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: VNS