Changeset 17261 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3

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/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3

Files:

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

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