Changeset 17225 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems

Timestamp:

08/29/19 13:53:26 (6 years ago)

Author:

mkommend

Message:

#2521: Integrated changes of #2943 into problem refactoring branch.

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems

Files:

• Interfaces/IMultiObjectiveProblem.cs (modified) (2 diffs)
• Interfaces/IMultiObjectiveProblemDefinition.cs (modified) (1 diff)
• Interfaces/ISingleObjectiveProblem.cs (modified) (2 diffs)
• Interfaces/ISingleObjectiveProblemDefinition.cs (modified) (1 diff)
• MultiObjectiveProblem.cs (modified) (5 diffs)
• Operators/MultiEncodingCreator.cs (modified) (1 diff)
• Operators/MultiEncodingCrossover.cs (modified) (1 diff)
• Operators/MultiEncodingManipulator.cs (modified) (1 diff)
• Problem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblem.cs

@@ -1 +1 @@
 #region License Information
-
 /* HeuristicLab
  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -19 +18 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #endregion
 
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+
 namespace HeuristicLab.Optimization {
-  public interface IMultiObjectiveProblem<TEncoding, TEncodedSolution> : IProblem<TEncoding, TEncodedSolution>, IMultiObjectiveHeuristicOptimizationProblem
-    where TEncoding : class, IEncoding<TEncodedSolution>
-    where TEncodedSolution : class, IEncodedSolution {
+  public interface IMultiObjectiveProblem : IProblem, IMultiObjectiveHeuristicOptimizationProblem {
 
   }
+
+  public interface IMultiObjectiveProblem<TEncoding, TEncodedSolution> : IMultiObjectiveProblem, IProblem<TEncoding, TEncodedSolution>
+    where TEncoding : class, IEncoding<TEncodedSolution>
+    where TEncodedSolution : class, IEncodedSolution { }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections;
+using System.Collections.Generic;
 using HEAL.Attic;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {
+  public interface IMultiObjectiveProblemDefinition {
+    int Objectives { get; }
+    bool[] Maximization { get; }
+    IReadOnlyList<double[]> BestKnownFront { get; }
+    double[] ReferencePoint { get; }
+  }
+
   [StorableType("39eacdb5-80a0-425d-902a-00eb3e1d6610")]
-  public interface IMultiObjectiveProblemDefinition<TEncoding, TEncodedSolution> : IProblemDefinition<TEncoding, TEncodedSolution>
+  public interface IMultiObjectiveProblemDefinition<TEncoding, TEncodedSolution> : IMultiObjectiveProblemDefinition, IProblemDefinition<TEncoding, TEncodedSolution>
     where TEncoding : class, IEncoding<TEncodedSolution>
     where TEncodedSolution : class, IEncodedSolution {
-
-    int Objectives { get; }
-    bool[] Maximization { get; }
     double[] Evaluate(TEncodedSolution solution, IRandom random);
     void Analyze(TEncodedSolution[] solutions, double[][] qualities, ResultCollection results, IRandom random);

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblem.cs

@@ -1 +1 @@
 #region License Information
-
 /* HeuristicLab
  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -19 +18 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #endregion
 
 
 namespace HeuristicLab.Optimization {
-  public interface ISingleObjectiveProblem<TEncoding, TEncodedSolution> : IProblem<TEncoding, TEncodedSolution>, ISingleObjectiveHeuristicOptimizationProblem
-    where TEncoding : class, IEncoding<TEncodedSolution>
-    where TEncodedSolution : class, IEncodedSolution {
+  public interface ISingleObjectiveProblem : ISingleObjectiveHeuristicOptimizationProblem {
 
   }
+
+  public interface ISingleObjectiveProblem<TEncoding, TEncodedSolution> : ISingleObjectiveProblem, IProblem<TEncoding, TEncodedSolution>
+    where TEncoding : class, IEncoding<TEncodedSolution>
+    where TEncodedSolution : class, IEncodedSolution { }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Optimization {
+  public interface ISingleObjectiveProblemDefinition {
+    bool Maximization { get; }
+    bool IsBetter(double quality, double bestQuality);
+  }
+
   [StorableType("7ec7bf7e-aaa7-4681-828b-3401cf67e2b3")]
-  public interface ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution> : IProblemDefinition<TEncoding, TEncodedSolution>
+  public interface ISingleObjectiveProblemDefinition<TEncoding, TEncodedSolution> : ISingleObjectiveProblemDefinition, IProblemDefinition<TEncoding, TEncodedSolution>
     where TEncoding : class, IEncoding<TEncodedSolution>
     where TEncodedSolution : class, IEncodedSolution {
-    bool Maximization { get; }
     double Evaluate(TEncodedSolution solution, IRandom random);
     void Analyze(TEncodedSolution[] solutions, double[] qualities, ResultCollection results, IRandom random);
     IEnumerable<TEncodedSolution> GetNeighbors(TEncodedSolution solution, IRandom random);
-    bool IsBetter(double quality, double bestQuality);
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -35 +37 @@
     where TEncoding : class, IEncoding<TEncodedSolution>
     where TEncodedSolution : class, IEncodedSolution {
+    #region Parameternames
+    public const string MaximizationParameterName = "Maximization";
+    public const string BestKnownFrontParameterName = "BestKnownFront";
+    public const string ReferencePointParameterName = "ReferencePoint";
+    #endregion
 
-    protected IValueParameter<BoolArray> MaximizationParameter {
-      get { return (IValueParameter<BoolArray>)Parameters["Maximization"]; }
+    #region Parameterproperties
+    public IValueParameter<BoolArray> MaximizationParameter {
+      get { return (IValueParameter<BoolArray>)Parameters[MaximizationParameterName]; }
     }
+    public IValueParameter<DoubleMatrix> BestKnownFrontParameter {
+      get { return (IValueParameter<DoubleMatrix>)Parameters[BestKnownFrontParameterName]; }
+    }
+    public IValueParameter<DoubleArray> ReferencePointParameter {
+      get { return (IValueParameter<DoubleArray>)Parameters[ReferencePointParameterName]; }
+    }
+    #endregion
+
 
     [StorableConstructor]
@@ -49 +65 @@
 
     protected MultiObjectiveProblem() : base() {
-      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
-
+      Parameters.Add(new ValueParameter<BoolArray>(MaximizationParameterName, "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
+      Parameters.Add(new OptionalValueParameter<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."));
+      Parameters.Add(new OptionalValueParameter<DoubleArray>(ReferencePointParameterName, "The refrence point for hypervolume calculations on this problem"));
       Operators.Add(Evaluator);
       Operators.Add(new MultiObjectiveAnalyzer<TEncodedSolution>());
-
       ParameterizeOperators();
     }
 
     protected MultiObjectiveProblem(TEncoding encoding) : base(encoding) {
-      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
-
+      Parameters.Add(new ValueParameter<BoolArray>(MaximizationParameterName, "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
+      Parameters.Add(new OptionalValueParameter<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."));
+      Parameters.Add(new OptionalValueParameter<DoubleArray>(ReferencePointParameterName, "The refrence point for hypervolume calculations on this problem"));
       Operators.Add(Evaluator);
       Operators.Add(new MultiObjectiveAnalyzer<TEncodedSolution>());
-
       ParameterizeOperators();
     }
@@ -71 +87 @@
     }
 
-    public int Objectives => Maximization.Length;
+    public int Objectives {
+      get { return Maximization.Length; }
+    }
     public abstract bool[] Maximization { get; }
+
+    public virtual IReadOnlyList<double[]> BestKnownFront {
+      get {
+        if (!Parameters.ContainsKey(BestKnownFrontParameterName)) return null;
+        var mat = BestKnownFrontParameter.Value;
+        if (mat == null) return null;
+        var v = new double[mat.Rows][];
+        for (var i = 0; i < mat.Rows; i++) {
+          var r = v[i] = new double[mat.Columns];
+          for (var j = 0; j < mat.Columns; j++) {
+            r[j] = mat[i, j];
+          }
+        }
+        return v;
+      }
+      set {
+        if (value == null || value.Count == 0) {
+          BestKnownFrontParameter.Value = new DoubleMatrix();
+          return;
+        }
+        var mat = new DoubleMatrix(value.Count, value[0].Length);
+        for (int i = 0; i < value.Count; i++) {
+          for (int j = 0; j < value[i].Length; j++) {
+            mat[i, j] = value[i][j];
+          }
+        }
+
+        BestKnownFrontParameter.Value = mat;
+      }
+    }
+    public virtual double[] ReferencePoint {
+      get { return ReferencePointParameter.Value != null ? ReferencePointParameter.Value.CloneAsArray() : null; }
+      set { ReferencePointParameter.Value = new DoubleArray(value); }
+    }
+
     public abstract double[] Evaluate(TEncodedSolution solution, IRandom random);
     public virtual void Analyze(TEncodedSolution[] solutions, double[][] qualities, ResultCollection results, IRandom random) { }
+
 
     protected override void OnOperatorsChanged() {
@@ -115 +169 @@
     #region IMultiObjectiveHeuristicOptimizationProblem Members
     IParameter IMultiObjectiveHeuristicOptimizationProblem.MaximizationParameter {
-      get { return Parameters["Maximization"]; }
+      get { return Parameters[MaximizationParameterName]; }
     }
     IMultiObjectiveEvaluator IMultiObjectiveHeuristicOptimizationProblem.Evaluator {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCreator.cs

@@ -35 +35 @@
     }
 
-    public override string OperatorPrefix => "Creator";
+    public override string OperatorPrefix {
+      get { return "Creator"; }
+    }
 
     [StorableConstructor]

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCrossover.cs

@@ -33 +33 @@
     }
 
-    public override string OperatorPrefix => "Crossover";
+    public override string OperatorPrefix {
+      get { return "Crossover"; }
+    }
 
     [StorableConstructor]

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingManipulator.cs

@@ -33 +33 @@
     }
 
-    public override string OperatorPrefix => "Manipulator";
+    public override string OperatorPrefix {
+      get { return "Manipulator"; }
+    }
     [StorableConstructor]
     private MultiEncodingManipulator(StorableConstructorFlag _) : base(_) { }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

@@ -36 +36 @@
     where TEncodedSolution : class, IEncodedSolution
     where TEvaluator : class, IEvaluator {
-
     public string Filename { get; set; } // TODO: Really okay here? should be in Problem (non-generic)
 
@@ -60 +59 @@
     }
     event EventHandler IHeuristicOptimizationProblem.SolutionCreatorChanged {
-      add { Encoding.SolutionCreatorChanged += value; }
-      remove { Encoding.SolutionCreatorChanged -= value; }
+      add {
+        if (Encoding != null) Encoding.SolutionCreatorChanged += value;
+      }
+      remove {
+        if (Encoding != null) Encoding.SolutionCreatorChanged -= value;
+      }
     }
 
@@ -72 +75 @@
       protected set { EvaluatorParameter.Value = value; }
     }
-    IEvaluator IHeuristicOptimizationProblem.Evaluator { get { return Evaluator; } }
-    IParameter IHeuristicOptimizationProblem.EvaluatorParameter { get { return EvaluatorParameter; } }
+    IEvaluator IHeuristicOptimizationProblem.Evaluator {
+      get { return Evaluator; }
+    }
+    IParameter IHeuristicOptimizationProblem.EvaluatorParameter {
+      get { return EvaluatorParameter; }
+    }
 
     public event EventHandler EvaluatorChanged;
@@ -90 +97 @@
       get {
         if (Encoding == null) return base.ExecutionContextItems;
-        return base.ExecutionContextItems.Concat(new[] { Encoding });
+        return base.ExecutionContextItems.Concat(new[] {Encoding});
       }
     }
@@ -173 +180 @@
         if (!oldMultiEncoding.Encodings.SequenceEqual(newMultiEncoding.Encodings, new TypeEqualityComparer<IEncoding>())) return;
 
-        var nestedEncodings = oldMultiEncoding.Encodings.Zip(newMultiEncoding.Encodings, (o, n) => new { oldEnc = o, newEnc = n });
+        var nestedEncodings = oldMultiEncoding.Encodings.Zip(newMultiEncoding.Encodings, (o, n) => new {oldEnc = o, newEnc = n});
         foreach (var multi in nestedEncodings)
           AdaptEncodingOperators(multi.oldEnc, multi.newEnc);