Use frozen versions of tables
Some checks failed
Run unit tests / rubocop (pull_request) Failing after 34s
Run unit tests / copyright_notice (pull_request) Successful in 56s
Run unit tests / check-licenses (pull_request) Successful in 1m12s
Run unit tests / unit_tests (pull_request) Failing after 1m27s
Run unit tests / build-static-assets (pull_request) Has been skipped

This commit is contained in:
bustikiller 2025-07-18 18:12:53 +02:00
parent bf15184360
commit 25bd53600e
5 changed files with 98 additions and 26 deletions

View File

@ -11,6 +11,7 @@ module Tables
end
def calculate
# Rails.logger.info "Calculating discomfort of table with id #{table.object_id}"
breakdown.values.sum
end

View File

@ -73,6 +73,8 @@ module Tables
def local_discomfort(table)
table.discomfort ||= DiscomfortCalculator.new(table:, hierarchy:).calculate
table.freeze
table.discomfort
end
end
end

View File

@ -12,19 +12,37 @@ module Tables
def each
@initial_solution.tables.permutation(2) do |table_a, table_b|
table_a.dup.each do |person|
original_discomfort_a = table_a.reset
original_discomfort_b = table_b.reset
table_a.delete(person)
table_b << person
new_solution = Distribution.new(
min_per_table: @initial_solution.min_per_table,
max_per_table: @initial_solution.max_per_table,
hierarchy: @initial_solution.hierarchy
)
yield(@initial_solution)
ensure
table_b.delete(person)
table_a << person
new_solution.tables = @initial_solution.tables.dup
table_a.discomfort = original_discomfort_a
table_b.discomfort = original_discomfort_b
new_solution.tables.delete(table_a)
new_solution.tables.delete(table_b)
modified_table_a = table_a.dup.tap(&:reset)
modified_table_b = table_b.dup.tap(&:reset)
new_solution.tables << modified_table_a
new_solution.tables << modified_table_b
# original_discomfort_a = table_a.reset
# original_discomfort_b = table_b.reset
modified_table_a.delete(person)
modified_table_b << person
yield(new_solution)
# ensure
# table_b.delete(person)
# table_a << person
# table_a.discomfort = original_discomfort_a
# table_b.discomfort = original_discomfort_b
end
end
end

View File

@ -12,25 +12,45 @@ module Tables
def each
@initial_solution.tables.combination(2) do |table_a, table_b|
table_a.to_a.product(table_b.to_a).each do |(person_a, person_b)|
original_discomfort_a = table_a.reset
original_discomfort_b = table_b.reset
table_a.delete(person_a)
table_b.delete(person_b)
new_solution = Distribution.new(
min_per_table: @initial_solution.min_per_table,
max_per_table: @initial_solution.max_per_table,
hierarchy: @initial_solution.hierarchy
)
table_a << person_b
table_b << person_a
new_solution.tables = @initial_solution.tables.dup
yield(@initial_solution)
ensure
table_a.delete(person_b)
table_b.delete(person_a)
new_solution.tables.delete(table_a)
new_solution.tables.delete(table_b)
table_a << person_a
table_b << person_b
table_a.discomfort = original_discomfort_a
table_b.discomfort = original_discomfort_b
modified_table_a = table_a.dup.tap(&:reset)
modified_table_b = table_b.dup.tap(&:reset)
new_solution.tables << modified_table_a
new_solution.tables << modified_table_b
# original_discomfort_a = table_a.reset
# original_discomfort_b = table_b.reset
modified_table_a.delete(person_a)
modified_table_b.delete(person_b)
modified_table_a << person_b
modified_table_b << person_a
yield(new_solution)
# ensure
# table_a.delete(person_b)
# table_b.delete(person_a)
# table_a << person_a
# table_b << person_b
# table_a.discomfort = original_discomfort_a
# table_b.discomfort = original_discomfort_b
end
end
end

View File

@ -20,7 +20,16 @@ module VNS
@perturbations << klass
end
attr_writer :initial_solution
def initialize_ractors(count: Concurrent.processor_count)
@ractors = count.times.map do |i|
Ractor.new(name: "VNS Ractor #{i}") do
# @target_function.call(Ractor.receive)
Ractor.receive.discomfort # Hard-coded for now, should be dynamic
end
end.cycle
end
attr_writer :initial_solution, :ractors
def run
raise 'No target function defined' unless @target_function
@ -30,6 +39,10 @@ module VNS
@best_solution = @initial_solution
@best_score = @target_function.call(@best_solution)
@best_solution.freeze
@best_solution.tables.freeze
# @best_solution.tables.each(&:freeze)
self.class.sequence(@perturbations).each do |perturbation|
optimize(perturbation)
end
@ -44,9 +57,27 @@ module VNS
optimized = false
perturbation_klass.new(@best_solution).each do |alternative_solution|
# original_score =
# ractor = @ractors.next
# Rails.logger.info("Processed by ractor #{ractor.name}")
# ractor.send(alternative_solution)
# new_score = ractor.take
# binding.pry if new_score != original_score
# score = new_score
score = @target_function.call(alternative_solution)
# Rails.logger.info("Evaluating alternative solution with score: #{score}")
next if score >= @best_score
# Rails.logger.info("Found better solution with score: #{score} (previous: #{@best_score})")
@best_solution = alternative_solution.deep_dup
@best_score = score
optimized = true