Changeset 15064 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/ExpectedQuality.cs

Timestamp:

06/26/17 09:10:56 (7 years ago)

Author:

bwerth

Message:

#2745 implemented EGO as EngineAlgorithm + some simplifications in the IInfillCriterion interface

File:

• branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/ExpectedQuality.cs (modified) (2 diffs)

branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/ExpectedQuality.cs

@@ -29 +29 @@
 
   [StorableClass]
-  [Item("ExpectedQualityMeassure", "Use simply the qualitypredicted by the model")]
+  [Item("ExpectedQualityMeassure", "Use the quality predicted by the model")]
   public class ExpectedQuality : InfillCriterionBase {
-    #region HL-Constructors, Serialization and Cloning 
+    #region Constructors, Serialization and Cloning 
     [StorableConstructor]
-    private ExpectedQuality(bool deserializing) : base(deserializing) { }
-    private ExpectedQuality(ExpectedQuality original, Cloner cloner) : base(original, cloner) { }
+    protected ExpectedQuality(bool deserializing) : base(deserializing) { }
+    protected ExpectedQuality(ExpectedQuality original, Cloner cloner) : base(original, cloner) { }
     public ExpectedQuality() { }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -42 +42 @@
 
     public override double Evaluate(RealVector vector) {
-      return RegressionSolution.Model.GetEstimation(vector);
+      return ExpensiveMaximization ? RegressionSolution.Model.GetEstimation(vector) : -RegressionSolution.Model.GetEstimation(vector);
     }
 
-    public override bool Maximization() {
-      return ExpensiveMaximization;
-    }
-
-    protected override void Initialize() {
+    public override void Initialize() {
     }
   }