Changeset 14818 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Problems

Timestamp:

04/04/17 12:37:52 (8 years ago)

Author:

bwerth

Message:

#2745 added several new InfillCriteria and moved Parameters from the InfillProblem to the Criteria themselves; added Sanitiy checks for GaussianProcessRegression

File:

• branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Problems/InfillProblem.cs (modified) (7 diffs)

branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Problems/InfillProblem.cs

@@ -27 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Algorithms.EGO {
@@ -34 +33 @@
   public sealed class InfillProblem : SingleObjectiveBasicProblem<RealVectorEncoding> {
 
-    public override bool Maximization => true;
+    public override bool Maximization => true;  //This is necessary because algorithms do not expect the maximization to change
 
     #region Properties;
@@ -41 +40 @@
     [Storable]
     private SingleObjectiveBasicProblem<IEncoding> problem;
-    [Storable]
-    private IRegressionSolution regressionSolution;
-
 
     public IInfillCriterion InfillCriterion
@@ -57 +53 @@
         problem = value;
         if (problem == null) return;
-        Encoding = problem.Encoding as RealVectorEncoding;
+        var enc = problem.Encoding as RealVectorEncoding;
+        if (enc == null) throw new ArgumentException("EGO can not be performed on non-RealVectorEncodings");
+        Encoding = enc;
         SolutionCreator = new UniformRandomRealVectorCreator();//ignore Problem specific Solution Creation
-        if (Encoding == null) throw new ArgumentException("EGO can not be performed on non-RealVectorEncodings");
+
       }
-    }
-    public IRegressionSolution RegressionSolution
-    {
-      get { return regressionSolution; }
-      set { regressionSolution = value; }
     }
     #endregion
@@ -75 +68 @@
       infillCriterion = cloner.Clone(original.InfillCriterion);
       problem = cloner.Clone(original.Problem);
-      regressionSolution = cloner.Clone(original.regressionSolution);
     }
     public InfillProblem() { }
@@ -82 +74 @@
 
     public override double Evaluate(Individual individual, IRandom r) {
-      var q = InfillCriterion.Evaluate(RegressionSolution, individual.RealVector(), Problem.Maximization);
-      return InfillCriterion.Maximization(Problem.Maximization) ? q : -q; //This is necessary because Maximization is not supposed to change on a normal problem
+      var q = InfillCriterion.Evaluate(individual.RealVector());
+      return InfillCriterion.Maximization() ? q : -q;
     }
     public override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
       base.Analyze(individuals, qualities, results, random);
       var best = qualities.ArgMax(x => x);
-      var qnew = InfillCriterion.Maximization(Problem.Maximization) ? qualities[best] : -qualities[best];
-      //var best = Maximization ? qualities.ArgMax(x => x) : qualities.ArgMin(x => x);
+      var qnew = InfillCriterion.Maximization() ? qualities[best] : -qualities[best];
       const string qname = EfficientGlobalOptimizationAlgorithm.BestInfillQualityResultName;
       const string sname = EfficientGlobalOptimizationAlgorithm.BestInfillSolutionResultName;
@@ -99 +90 @@
       var qold = results[qname].Value as DoubleValue;
       if (qold == null) throw new ArgumentException("Old best quality is not a double value. Conflicting Analyzers?");
-      if (qold.Value >= qnew == InfillCriterion.Maximization(Problem.Maximization)) return;
+      if (qold.Value >= qnew == InfillCriterion.Maximization()) return;
       results[sname].Value = (RealVector)individuals[best].RealVector().Clone();
       qold.Value = qnew;
-
     }
   }