Refactor local search

jMetal · May 8, 2024 · 383fd5d · 383fd5d
1 parent 1d40ddf
commit 383fd5d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 35 deletions.
diff --git a/src/algorithm.jl → src/algorithm/algorithm.jl b/src/algorithm.jl → src/algorithm/algorithm.jl
@@ -2,41 +2,6 @@ using Dates
 
 ###################################
 
-mutable struct LocalSearch <: Algorithm
-  startingSolution::Solution
-  problem::Problem
-  numberOfIterations::Int
-  mutation::Function
-  mutationParameters::NamedTuple
-  foundSolution::Solution
-
-  LocalSearch() = new()
-end
-
-function optimize(algorithm :: LocalSearch)
-  algorithm.foundSolution = localSearch(algorithm.startingSolution, algorithm.problem,
-  algorithm.numberOfIterations, algorithm.mutation, algorithm.mutationParameters)
-
-  return Nothing
-end
-
-function localSearch(currentSolution::Solution, problem::Problem, numberOfIterations::Int, mutationOperator::Function, mutationParameters)::Solution
-  for i in 1:numberOfIterations
-    mutatedSolution = copySolution(currentSolution)
-    mutatedSolution.variables = mutationOperator(mutatedSolution.variables, mutationParameters)
-
-    mutatedSolution = evaluate(mutatedSolution, problem)
-
-    if (mutatedSolution.objectives[1] < currentSolution.objectives[1])
-      currentSolution = mutatedSolution
-    end
-  end
-
-  return currentSolution
-end
-
-#################################
-
 mutable struct EvolutionaryAlgorithm <: Algorithm
   name::String
   problem::Problem

diff --git a/src/algorithm/localSearch.jl b/src/algorithm/localSearch.jl
@@ -0,0 +1,29 @@
+mutable struct LocalSearch <: Algorithm
+  startingSolution::Solution
+  problem::Problem
+  numberOfIterations::Int
+  mutation::MutationOperator
+  foundSolution::Solution
+end
+
+function optimize(algorithm::LocalSearch)::Solution
+  currentSolution = algorithm.startingSolution
+  problem = algorithm.problem
+  numberOfIterations = algorithm.numberOfIterations
+  mutation = algorithm.mutation
+
+  for _ in 1:numberOfIterations
+    mutatedSolution = copySolution(algorithm.startingSolution)
+    mutatedSolution.variables = mutate(mutatedSolution.variables, mutation)
+
+    mutatedSolution = evaluate(mutatedSolution, problem)
+
+    if (mutatedSolution.objectives[1] < currentSolution.objectives[1])
+      currentSolution = mutatedSolution
+    end
+  end
+
+  algorithm.foundSolution = foundSolution
+
+  return currentSolution
+end