Changeset 17261

Timestamp:

09/17/19 16:49:35 (5 years ago)

Author:

mkommend

Message:

#2521: Refactored multi-obj test functions and CMA-ES.

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/MOCMAEvolutionStrategy.cs (modified) (7 diffs)
• HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers (deleted)
• HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Calculators (deleted)
• HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Interfaces/IMultiObjectiveTestFunctionAnalyzer.cs (deleted)
• HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs (modified) (6 diffs)
• HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/NonDominatedSelect.cs (deleted)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/MOCMAEvolutionStrategy.cs

@@ -33 +33 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Problems.TestFunctions.MultiObjective;
 using HeuristicLab.Random;
 
@@ -327 +326 @@
       solutions = new Individual[PopulationSize];
       for (var i = 0; i < PopulationSize; i++) {
-        var x = new RealVector(Encoding.Length); // Uniform distibution in all dimensions assumed.
+        var x = new RealVector(Encoding.Length); // Uniform distribution in all dimensions assumed.
         var bounds = Encoding.Bounds;
         for (var j = 0; j < Encoding.Length; j++) {
@@ -350 +349 @@
     }
     private void InitResults() {
-      Results.Add(new Result(IterationsResultName, "The number of gererations evaluated", new IntValue(0)));
-      Results.Add(new Result(EvaluationsResultName, "The number of function evaltions performed", new IntValue(0)));
-      Results.Add(new Result(HypervolumeResultName, "The hypervolume of the current front considering the Referencepoint defined in the Problem", new DoubleValue(0.0)));
-      Results.Add(new Result(BestHypervolumeResultName, "The best hypervolume of the current run considering the Referencepoint defined in the Problem", new DoubleValue(0.0)));
-      Results.Add(new Result(BestKnownHypervolumeResultName, "The best knwon hypervolume considering the Referencepoint defined in the Problem", new DoubleValue(double.NaN)));
-      Results.Add(new Result(DifferenceToBestKnownHypervolumeResultName, "The difference between the current and the best known hypervolume", new DoubleValue(double.NaN)));
-      Results.Add(new Result(GenerationalDistanceResultName, "The generational distance to an optimal pareto front defined in the Problem", new DoubleValue(double.NaN)));
-      Results.Add(new Result(InvertedGenerationalDistanceResultName, "The inverted generational distance to an optimal pareto front defined in the Problem", new DoubleValue(double.NaN)));
+      Results.Add(new Result(IterationsResultName, "The number of generations evaluated", new IntValue(0)));
+      Results.Add(new Result(EvaluationsResultName, "The number of function evaluations performed", new IntValue(0)));
+      Results.Add(new Result(HypervolumeResultName, "The hyper volume of the current front considering the reference point defined in the Problem", new DoubleValue(0.0)));
+      Results.Add(new Result(BestHypervolumeResultName, "The best hyper volume of the current run considering the reference point defined in the Problem", new DoubleValue(0.0)));
+      Results.Add(new Result(BestKnownHypervolumeResultName, "The best known hyper volume considering the reference point defined in the Problem", new DoubleValue(double.NaN)));
+      Results.Add(new Result(DifferenceToBestKnownHypervolumeResultName, "The difference between the current and the best known hyper volume", new DoubleValue(double.NaN)));
+      Results.Add(new Result(GenerationalDistanceResultName, "The generational distance to an optimal Pareto front defined in the Problem", new DoubleValue(double.NaN)));
+      Results.Add(new Result(InvertedGenerationalDistanceResultName, "The inverted generational distance to an optimal Pareto front defined in the Problem", new DoubleValue(double.NaN)));
       Results.Add(new Result(CrowdingResultName, "The average crowding value for the current front (excluding infinities)", new DoubleValue(0.0)));
       Results.Add(new Result(SpacingResultName, "The spacing for the current front (excluding infinities)", new DoubleValue(0.0)));
@@ -369 +368 @@
       table.Rows.Add(new DataRow(DifferenceToBestKnownHypervolumeResultName));
       table.Rows.Add(new DataRow(SpacingResultName));
-      Results.Add(new Result(TimetableResultName, "Different quality meassures in a timeseries", table));
+      Results.Add(new Result(TimetableResultName, "Different quality measures in a time series", table));
       Results.Add(new Result(CurrentFrontResultName, "The current front", new DoubleMatrix()));
-      Results.Add(new Result(ScatterPlotResultName, "A scatterplot displaying the evaluated solutions and (if available) the analytically optimal front", new ParetoFrontScatterPlot()));
+      Results.Add(new Result(ScatterPlotResultName, "A scatter plot displaying the evaluated solutions and (if available) the analytically optimal front", new ParetoFrontScatterPlot()));
 
       var problem = Problem;
@@ -455 +454 @@
 
     private void SelectParents(IReadOnlyList<Individual> parents, int length) {
-      //perform a nondominated sort to assign the rank to every element
+      //perform a non-dominated sort to assign the rank to every element
       int[] ranks;
       var fronts = DominationCalculator.CalculateAllParetoFronts(parents.ToArray(), parents.Select(i => i.PenalizedFitness).ToArray(), Problem.Maximization, out ranks);
@@ -469 +468 @@
       }
 
-      //now use the indicator to deselect the approximatingly worst elements of the last selected front
+      //now use the indicator to deselect the approximately worst elements of the last selected front
       var front1 = fronts[rank].OrderBy(x => x.Item1.PenalizedFitness[0]).ToList();
       for (; popSize > length; popSize--) {
@@ -501 +500 @@
       if (qualities.Length == 0) return;
       ResultsCrowding = CrowdingCalculator.CalculateCrowding(qualities);
-      ResultsSpacing = Spacing.Calculate(qualities);
-
-
-      ResultsGenerationalDistance = problem.BestKnownFront != null ? GenerationalDistance.Calculate(qualities, problem.BestKnownFront, 1) : double.NaN;
-      ResultsInvertedGenerationalDistance = problem.BestKnownFront != null ? InvertedGenerationalDistance.Calculate(qualities, problem.BestKnownFront, 1) : double.NaN;
+      ResultsSpacing = SpacingAnalyzer.CalculateSpacing(qualities);
+
+
+      ResultsGenerationalDistance = problem.BestKnownFront != null ? GenerationalDistanceAnalyzer.CalculateGenerationalDistance(qualities, problem.BestKnownFront, 1) : double.NaN;
+      ResultsInvertedGenerationalDistance = problem.BestKnownFront != null ? GenerationalDistanceAnalyzer.CalculateInverseGenerationalDistance(qualities, problem.BestKnownFront, 1) : double.NaN;
       ResultsHypervolume = problem.ReferencePoint != null ? HypervolumeCalculator.CalculateHypervolume(qualities, problem.ReferencePoint, Problem.Maximization) : double.NaN;
       ResultsBestHypervolume = Math.Max(ResultsHypervolume, ResultsBestHypervolume);

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj

@@ -96 +96 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Analyzers\ScatterPlotAnalyzer.cs" />
-    <Compile Include="Analyzers\CrowdingAnalyzer.cs" />
-    <Compile Include="Analyzers\InvertedGenerationalDistanceAnalyzer.cs" />
-    <Compile Include="Analyzers\HypervolumeAnalyzer.cs" />
-    <Compile Include="Analyzers\MOTFAnalyzer.cs" />
-    <Compile Include="Analyzers\GenerationalDistanceAnalyzer.cs" />
-    <Compile Include="Analyzers\SpacingAnalyzer.cs" />
     <Compile Include="Instances\IHRInstanceProvider.cs" />
     <Compile Include="Interfaces\IConstrainedTestFunction.cs" />
-    <Compile Include="Interfaces\IMultiObjectiveTestFunctionAnalyzer.cs" />
-    <Compile Include="Calculators\Crowding.cs" />
-    <Compile Include="Calculators\Spacing.cs" />
-    <Compile Include="Calculators\HyperVolume.cs" />
-    <Compile Include="Calculators\InvertedGenerationalDistance.cs" />
-    <Compile Include="Calculators\GenerationalDistance.cs" />
     <Compile Include="Utilities.cs" />
     <Compile Include="Instances\MISCInstanceProvider.cs" />
@@ -125 +112 @@
     <Compile Include="TestFunctions\IHR\IHR2.cs" />
     <Compile Include="TestFunctions\Misc\ELLI1.cs" />
-    <Compile Include="NonDominatedSelect.cs" />
     <Compile Include="Interfaces\IMultiObjectiveTestFunction.cs" />
     <Compile Include="MultiObjectiveTestFunctionProblem.cs" />

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs

@@ -20 +20 @@
 #endregion
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -148 +147 @@
       var front = TestFunction.OptimalParetoFront(Objectives);
       var bkf = front != null ? (DoubleMatrix)Utilities.ToMatrix(front).AsReadOnly() : null;
-      Parameters.Add(new FixedValueParameter<DoubleMatrix>(BestKnownFrontParameterName, "A double matrix representing the best known qualites for this problem (aka points on the Pareto front). Points are to be given in a row-wise fashion.", bkf));
+      Parameters.Add(new FixedValueParameter<DoubleMatrix>(BestKnownFrontParameterName, "A double matrix representing the best known qualities for this problem (aka points on the Pareto front). Points are to be given in a row-wise fashion.", bkf));
 
       Parameters.Remove(ReferencePointParameterName);
-      Parameters.Add(new FixedValueParameter<DoubleArray>(ReferencePointParameterName, "The refrence point for hypervolume calculations on this problem", new DoubleArray(TestFunction.ReferencePoint(Objectives))));
+      Parameters.Add(new FixedValueParameter<DoubleArray>(ReferencePointParameterName, "The reference point for hypervolume calculations on this problem", new DoubleArray(TestFunction.ReferencePoint(Objectives))));
 
       BoundsParameter.Value = new DoubleMatrix(TestFunction.Bounds(Objectives));
@@ -159 +158 @@
       base.OnEncodingChanged();
       UpdateParameterValues();
-      ParameterizeAnalyzers();
     }
 
@@ -165 +163 @@
       base.OnEvaluatorChanged();
       UpdateParameterValues();
-      ParameterizeAnalyzers();
     }
 
@@ -172 +169 @@
       Objectives = Math.Max(TestFunction.MinimumObjectives, Math.Min(Objectives, TestFunction.MaximumObjectives));
       Parameters.Remove(ReferencePointParameterName);
-      Parameters.Add(new FixedValueParameter<DoubleArray>(ReferencePointParameterName, "The refrence point for hypervolume calculations on this problem", new DoubleArray(TestFunction.ReferencePoint(Objectives))));
-      ParameterizeAnalyzers();
+      Parameters.Add(new FixedValueParameter<DoubleArray>(ReferencePointParameterName, "The reference point for hypervolume calculations on this problem", new DoubleArray(TestFunction.ReferencePoint(Objectives))));
       UpdateParameterValues();
       OnReset();
@@ -197 +193 @@
       Operators.Add(new SpacingAnalyzer());
       Operators.Add(new TimelineAnalyzer());
-      Operators.Add(new ScatterPlotAnalyzer());
-      ParameterizeAnalyzers();
-    }
-
-    private IEnumerable<IMultiObjectiveTestFunctionAnalyzer> Analyzers {
-      get { return Operators.OfType<IMultiObjectiveTestFunctionAnalyzer>(); }
-    }
-
-    private void ParameterizeAnalyzers() {
-      foreach (var analyzer in Analyzers) {
-        analyzer.ResultsParameter.ActualName = "Results";
-        analyzer.QualitiesParameter.ActualName = Evaluator.QualitiesParameter.ActualName;
-        analyzer.TestFunctionParameter.ActualName = TestFunctionParameter.Name;
-        analyzer.BestKnownFrontParameter.ActualName = BestKnownFrontParameter.Name;
-        var scatterPlotAnalyzer = analyzer as ScatterPlotAnalyzer;
-        if (scatterPlotAnalyzer != null)
-          scatterPlotAnalyzer.IndividualsParameter.ActualName = Encoding.Name;
-      }
     }
     #endregion