vns 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe1c277a047286ad18e02f1536bc192aa8327444a1d7cf2d6efa3c7d31fcd42e
-  data.tar.gz: 020472d1dd94083946b4b39a2e82647953e65ff592f3fccdfdf052f10f1e85b6
+  metadata.gz: b1128cbe4173ea847fb81d2a84a1155e6a4203b42101eacef121d71018ec823b
+  data.tar.gz: 7586d4596737a7ed4e5f46b2b80e596d3d099c44f9b9133cf386aa8f1691c3e8
 SHA512:
-  metadata.gz: ae6143e3d7ee45ace9391a20183265ceb1bc89dc4cad7aeeb6620e75556ab88ee990e51c18ac734b565f6ad49b670142ed0fc820da317903100cfd73307b8501
-  data.tar.gz: f6d70a283e94d1d3eb0e1331ef7d9e07d4b2853923c25c2b9fb075b7c5f3397721654ffa78417f6eb4e5972764d25b8b7b53c39620ee03de72b8247d17aaa416
+  metadata.gz: 17ddca60952da55c8e2917a3f11e73305c930950e1b9b35ac9be63686906807b32b1194ca801903fcfcd1d12c0a7a9a8910d50264fcda41ae8e04c13962c4540
+  data.tar.gz: 8da56db54249ad9038caadfdfb3daad4a4de8c04f17d9ba78aceecd16b8a7e2f99befbbe3b0bb6d641d083b6cdf8e8ca456c090ccdf3995864d81d17a98aa41b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vns (0.1.1)
+    vns (0.3.0)
       activesupport
 
 GEM

data/lib/vns.rb

@@ -4,15 +4,16 @@ module VNS
   require 'active_support/all'
 
   class VNS
-    attr_reader :people, :sessions, :preferences
+    attr_reader :people, :sessions, :preferences, :max_allocation
 
     PERTURBATION_COUNT = 100
 
-    def initialize(people, sessions, preferences, &inspection)
+    def initialize(people, sessions, preferences, max_allocation, &inspection)
       @people = people.map.with_index { |person, i| Person.new(i, person) }
       @sessions = sessions.map.with_index { |session, i| Session.new(i, session) }
       @preferences = preferences
       @inspection = inspection
+      @max_allocation = max_allocation
     end
 
     def run
@@ -71,7 +72,7 @@ module VNS
         end
 
         progress = (counter + 1) * 1.0 / PERTURBATION_COUNT
-        @inspection.call(progress, target_function(best_solution)) if @inspection
+        @inspection&.call(progress, target_function(best_solution), public_format(best_solution))
       end
 
       best_solution
@@ -119,13 +120,13 @@ module VNS
     def perturbate(solution)
       2.times do
         extracted = []
-      solution.each do |_, people|
-        extracted << people.delete_at(rand(people.length))
-      end
+        solution.each do |_, people|
+          extracted << people.delete_at(rand(people.length))
+        end
 
-      extracted.shuffle.each_with_index do |person, i|
-        solution.values[i] << person
-      end
+        extracted.shuffle.each_with_index do |person, i|
+          solution.values[i] << person
+        end
       end
     end
 
@@ -141,7 +142,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)
@@ -161,5 +162,9 @@ module VNS
     def find_session(solution, person)
       sessions.detect { |s| solution[s].include?(person) }
     end
+
+    def public_format(solution)
+      solution.map { |k, v| [k.name, v.map(&:name)] }.to_h
+    end
   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.1.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vns
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Manuel Bustillo