vns 0.2.0 → 1.0.pre.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aabc4061fa4c01eebf965ce36dda299b11b35d49906eb5815bde21a3d4647703
-  data.tar.gz: 273f309115f63a6ccfa5bf4497bbe940a31c8d5bdf4e8046d9b23115c48f6971
+  metadata.gz: 0b4ff50c222a84989a4a3ef027795ad4e10607605755eae0a511cd36c351c7e3
+  data.tar.gz: 5cf1261af73b72f49cf453098029ac2482fc149e46ab869bd19ffeb938e614e3
 SHA512:
-  metadata.gz: bf5aec1de3b5c24b83c48acdfa4c895f7d01391be41d6cc5689b1ddf5a1b946105d022b286c7ea408f538c081c73e1da5dac3714f405e27054c2bce89c6840c5
-  data.tar.gz: 0b3370fa91a444e225ed7462acc19dacba4b0cb1428111c93801822f673a8581142a2d920c509157bd146cfc13ebd775994eada3ae9d822f6417668acd118e8f
+  metadata.gz: 133f330f6a0ab768e1e3cbcc3d198668450ca1af04331b57da4b2a02f97ec786ca236f785356acc75ad072d8df5044c42f2d5803401b49ef761761b2700b2def
+  data.tar.gz: 07c681af54608712f69df1992f377d977b6001f297399dc7bbb43e4831cf08886241dd31cfeadcf2c8de1407bfaae1a98c90e9532a251c1e1c9fdf9170d8e03a

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    vns (0.2.0)
+    vns (1.0.pre.rc.2)
       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.10.0)
       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'
+  VERSION = '1.0-rc.2'
 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,17 @@ 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(:+)
+
+      individual_penalty + group_duplication_factor * group_penalty
     end
 
     private
@@ -141,7 +149,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
+  version: 1.0.pre.rc.2
 platform: ruby
 authors:
 - Manuel Bustillo
@@ -112,11 +112,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: VNS