Changeset 15064 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/InfillCriterionBase.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/InfillCriterionBase.cs (modified) (2 diffs)

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

@@ -30 +30 @@
   [StorableClass]
   public abstract class InfillCriterionBase : ParameterizedNamedItem, IInfillCriterion {
-
     [Storable]
-    protected IRegressionSolution RegressionSolution;
+    public IRegressionSolution RegressionSolution { get; set; }
     [Storable]
-    protected bool ExpensiveMaximization;
+    public bool ExpensiveMaximization { get; set; }
     [Storable]
-    protected RealVectorEncoding Encoding;
+    public RealVectorEncoding Encoding { get; set; }
 
     protected InfillCriterionBase(bool deserializing) : base(deserializing) { }
-
     protected InfillCriterionBase(InfillCriterionBase original, Cloner cloner) : base(original, cloner) {
       RegressionSolution = cloner.Clone(original.RegressionSolution);
@@ -48 +46 @@
 
     public abstract double Evaluate(RealVector vector);
-    public abstract bool Maximization();
+    //public abstract bool Maximization();
 
-    public void Initialize(IRegressionSolution solution, bool expensiveMaximization, RealVectorEncoding encoding) {
-      RegressionSolution = solution;
-      ExpensiveMaximization = expensiveMaximization;
-      Encoding = encoding;
-      Initialize();
-    }
-
-    protected abstract void Initialize();
-
+    public abstract void Initialize();
   }
 }