Changeset 16949

Timestamp:

05/13/19 16:20:11 (6 years ago)

Author:

abeham

Message:

#2521: Adapted test function problems to new real vector problem

• Made encoding readonly in symbolic expression tree problem

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorMultiObjectiveProblem.cs (added)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorProblem.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (7 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj

@@ -115 +115 @@
   <ItemGroup>
     <Compile Include="Creators\NormalDistributedRealVectorCreator.cs" />
+    <Compile Include="RealVectorMultiObjectiveProblem.cs" />
+    <Compile Include="RealVectorProblem.cs" />
     <Compile Include="Interfaces\IRealVectorAdditiveMoveQualityOperator.cs" />
     <Compile Include="Interfaces\IRealVectorBoundedOperator.cs" />
@@ -205 +207 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
+      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
+      <Name>HeuristicLab.Analysis-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs

@@ -46 +46 @@
     }
 
-    protected SymbolicExpressionTreeProblem(SymbolicExpressionTreeEncoding encoding) : base(encoding) { }
+    protected SymbolicExpressionTreeProblem(SymbolicExpressionTreeEncoding encoding)
+      : base(encoding) {
+      EncodingParameter.ReadOnly = true;
+    }
 
     public override void Analyze(ISymbolicExpressionTree[] trees, double[] qualities, ResultCollection results,

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

@@ -35 +35 @@
   [Creatable(CreatableAttribute.Categories.Problems, Priority = 95)]
   [Item("Test Function (multi-objective)", "Test functions with real valued inputs and multiple objectives.")]
-  public class MultiObjectiveTestFunctionProblem : MultiObjectiveProblem<RealVectorEncoding, RealVector>, IProblemInstanceConsumer<MOTFData> {
+  public class MultiObjectiveTestFunctionProblem : RealVectorMultiObjectiveProblem,
+    IProblemInstanceConsumer<MOTFData> {
 
     #region Parameter Properties

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.TestFunctions {
+  // BackwardsCompatibility3.3
+  #region Backwards compatible code, remove with 3.4
   /// <summary>
   /// An operator for analyzing the best solution for a SingleObjectiveTestFunction problem.
@@ -36 +40 @@
   [Item("BestSingleObjectiveTestFunctionSolutionAnalyzer", "An operator for analyzing the best solution for a SingleObjectiveTestFunction problem.")]
   [StorableType("A0F04F9F-DD27-44D8-A1F6-B289F1F40DE2")]
+  [NonDiscoverableType]
+  [Obsolete("Use the Analyze method of the test function problem class")]
   public class BestSingleObjectiveTestFunctionSolutionAnalyzer : SingleSuccessorOperator, IBestSingleObjectiveTestFunctionSolutionAnalyzer {
     public virtual bool EnabledByDefault {
@@ -145 +151 @@
     }
   }
+  #endregion
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -29 +30 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.Instances;
 
@@ -38 +37 @@
   [StorableType("F0AB7236-2C9B-49DC-9D4F-A3558FD9E992")]
   [Creatable(CreatableAttribute.Categories.Problems, Priority = 90)]
-  public sealed class SingleObjectiveTestFunctionProblem :
-    SingleObjectiveProblem<RealVectorEncoding, RealVector>,
+  public sealed class SingleObjectiveTestFunctionProblem : RealVectorProblem,
     IProblemInstanceConsumer<SOTFData> {
 
@@ -73 +71 @@
       get { return TestFunctionParameter.Value; }
       set { TestFunctionParameter.Value = value; }
-    }
-
-    private BestSingleObjectiveTestFunctionSolutionAnalyzer BestSingleObjectiveTestFunctionSolutionAnalyzer {
-      get { return Operators.OfType<BestSingleObjectiveTestFunctionSolutionAnalyzer>().FirstOrDefault(); }
     }
     #endregion
@@ -121 +115 @@
     }
 
+    public override void Analyze(RealVector[] realVectors, double[] qualities, ResultCollection results, IRandom random) {
+
+      bool max = Maximization;
+      DoubleValue bestKnownQuality = BestKnownQualityParameter.Value;
+      SingleObjectiveTestFunctionSolution solution = null;
+      if (results.TryGetValue("Best Solution", out var res)) {
+        solution = (SingleObjectiveTestFunctionSolution)res.Value;
+      }
+
+      int i = -1;
+      if (!max) i = qualities.Select((x, index) => new { index, quality = x }).OrderBy(x => x.quality).First().index;
+      else i = qualities.Select((x, index) => new { index, quality = x }).OrderByDescending(x => x.quality).First().index;
+
+      if (bestKnownQuality == null ||
+          max && qualities[i] > bestKnownQuality.Value
+          || !max && qualities[i] < bestKnownQuality.Value) {
+        BestKnownQualityParameter.Value = new DoubleValue(qualities[i]);
+        BestKnownSolutionParameter.Value = (RealVector)realVectors[i].Clone();
+        if (solution != null)
+          solution.BestKnownRealVector = BestKnownSolutionParameter.Value;
+      }
+
+      if (solution == null) {
+        solution = new SingleObjectiveTestFunctionSolution((RealVector)realVectors[i].Clone(),
+                                                           new DoubleValue(qualities[i]),
+                                                           TestFunctionParameter.Value);
+        solution.Population = realVectors[i].Length == 2
+          ? new ItemArray<RealVector>(realVectors.Select(x => x.Clone()).Cast<RealVector>())
+          : null;
+        solution.BestKnownRealVector = BestKnownSolutionParameter.Value;
+        solution.Bounds = BoundsParameter.Value;
+        results.Add(new Result("Best Solution", solution));
+      } else {
+        if (max && qualities[i] > solution.BestQuality.Value
+          || !max && qualities[i] < solution.BestQuality.Value) {
+          solution.BestRealVector = (RealVector)realVectors[i].Clone();
+          solution.BestQuality = new DoubleValue(qualities[i]);
+        }
+        solution.Population = realVectors[i].Length == 2
+          ? new ItemArray<RealVector>(realVectors.Select(x => x.Clone()).Cast<RealVector>())
+          : null;
+      }
+    }
+
     #region Events
     protected override void OnEncodingChanged() {
@@ -162 +200 @@
       Operators.Add(new SingleObjectiveTestFunctionPathRelinker());
       Operators.Add(new SingleObjectiveTestFunctionSimilarityCalculator());
-      Operators.Add(new HammingSimilarityCalculator());
       Operators.Add(new EuclideanSimilarityCalculator());
-      Operators.Add(new QualitySimilarityCalculator());
       Operators.Add(new AdditiveMoveEvaluator());
 
-      Operators.Add(new BestSingleObjectiveTestFunctionSolutionAnalyzer());
-      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
       Parameterize();
     }
@@ -174 +208 @@
     private void Parameterize() {
       var operators = new List<IItem>();
-      if (BestSingleObjectiveTestFunctionSolutionAnalyzer != null) {
-        operators.Add(BestSingleObjectiveTestFunctionSolutionAnalyzer);
-        BestSingleObjectiveTestFunctionSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-        BestSingleObjectiveTestFunctionSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
-        BestSingleObjectiveTestFunctionSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
-        BestSingleObjectiveTestFunctionSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-        BestSingleObjectiveTestFunctionSolutionAnalyzer.TestFunctionParameter.ActualName = TestFunctionParameter.Name;
+      foreach (var op in Operators.OfType<PopulationSimilarityAnalyzer>()) {
+        var calcs = Operators.OfType<ISolutionSimilarityCalculator>().ToArray();
+        op.SimilarityCalculatorParameter.ValidValues.Clear();
+        foreach (var c in calcs) {
+          // TODO: unified encoding parameters
+          c.SolutionVariableName = ((IRealVectorSolutionOperator)Encoding.SolutionCreator).RealVectorParameter.ActualName;
+          c.QualityVariableName = Evaluator.QualityParameter.ActualName;
+          op.SimilarityCalculatorParameter.ValidValues.Add(c);
+        }
       }
       foreach (var op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {