Update examples

jMetal · Dec 5, 2024 · 9ca33c9 · 9ca33c9
1 parent 4c068dc
commit 9ca33c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/examples/MOEADAsAnEvolutionaryAlgorithm.jl b/examples/MOEADAsAnEvolutionaryAlgorithm.jl
@@ -9,11 +9,11 @@ function main()
     solver::EvolutionaryAlgorithm = EvolutionaryAlgorithm()
     solver.name = "MOEA/D"
 
-    populationSize = 91
+    populationSize = 100
     neighborhoodSize = 20
     offspringPopulationSize = 1
     maximumNumberOfReplacedSolutions = 2
-    normalizeObjectives = false
+    normalizeObjectives = true
 
     solver.solutionsCreation = DefaultSolutionsCreation(problem, populationSize)
     solver.evaluation = SequentialEvaluation(problem)
@@ -32,10 +32,12 @@ function main()
     neighborhood = WeightVectorNeighborhood(populationSize, neighborhoodSize)
 
     sequenceGenerator = IntegerPermutationGenerator(populationSize)
-
-    solver.selection = PopulationAndNeighborhoodSelection(solver.variation.matingPoolSize, sequenceGenerator, neighborhood, 0.9, true)
 
-    aggregationFunction = PenaltyBoundaryIntersection(5.0, false)
+    selectCurrentSolution = true
+    solver.selection = PopulationAndNeighborhoodSelection(solver.variation.matingPoolSize, sequenceGenerator, neighborhood, 0.9, selectCurrentSolution)
+
+    aggregationFunction = PenaltyBoundaryIntersection(5.0, normalizeObjectives)
+    #aggregationFunction = Tschebyscheff()
 
     solver.replacement = MOEADReplacement(solver.selection, neighborhood, aggregationFunction, sequenceGenerator, maximumNumberOfReplacedSolutions, normalizeObjectives)
 

diff --git a/examples/NSGAIIAsAnEvolutionaryAlgorithm.jl b/examples/NSGAIIAsAnEvolutionaryAlgorithm.jl
@@ -45,4 +45,4 @@ function main()
 
     println("Variables stored in file ", variablesFileName)
     printVariablesToCSVFile(variablesFileName, foundSolutions)
-end
+end
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,4 +45,4 @@ function main() @@
         println("Variables stored in file ", variablesFileName)
         printVariablesToCSVFile(variablesFileName, foundSolutions)
-    end
+    end