Changeset 14818 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/InfillCriterionBase.cs

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/InfillCriteria/InfillCriterionBase.cs (modified) (1 diff)

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

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
 
 // ReSharper disable once CheckNamespace
 namespace HeuristicLab.Algorithms.EGO {
-
+  [StorableClass]
   public abstract class InfillCriterionBase : ParameterizedNamedItem, IInfillCriterion {
 
+    [Storable]
+    protected IRegressionSolution RegressionSolution;
+    [Storable]
+    protected bool ExpensiveMaximization;
+    [Storable]
+    protected RealVectorEncoding Encoding;
+
     protected InfillCriterionBase(bool deserializing) : base(deserializing) { }
-    protected InfillCriterionBase(InfillCriterionBase original, Cloner cloner) : base(original, cloner) { }
+
+    protected InfillCriterionBase(InfillCriterionBase original, Cloner cloner) : base(original, cloner) {
+      RegressionSolution = cloner.Clone(original.RegressionSolution);
+      ExpensiveMaximization = original.ExpensiveMaximization;
+      Encoding = cloner.Clone(original.Encoding);
+    }
     protected InfillCriterionBase() { }
 
-    public abstract double Evaluate(IRegressionSolution model, RealVector vector, bool maximization);
-    public virtual bool Maximization(bool expensiveProblemMaximization) {
-      return expensiveProblemMaximization;
+    public abstract double Evaluate(RealVector vector);
+    public abstract bool Maximization();
+
+    public void Initialize(IRegressionSolution solution, bool expensiveMaximization, RealVectorEncoding encoding) {
+      RegressionSolution = solution;
+      ExpensiveMaximization = expensiveMaximization;
+      Encoding = encoding;
+      Initialize();
     }
+
+    protected abstract void Initialize();
+
   }
 }