Changeset 14894 for branches/SAPBA/HeuristicLab.Algorithms.SAPBA/Strategies

Timestamp:

04/27/17 13:45:01 (7 years ago)

Author:

bwerth

Message:

#2780 worked on SAPBA; added IndividualStrategy

Location:

branches/SAPBA/HeuristicLab.Algorithms.SAPBA

Files:

• . (modified) (2 props)
• Strategies/GenerationalStrategy.cs (modified) (1 diff)
• Strategies/IndividualStrategy.cs (added)
• Strategies/StrategyBase.cs (modified) (4 diffs)

branches/SAPBA/HeuristicLab.Algorithms.SAPBA/Strategies/GenerationalStrategy.cs

@@ -37 +37 @@
       if (RegressionSolution != null && Generations < NoGenerations.Value) Generations++;
       else {
-        foreach (var indi in individuals) Evaluate(indi.RealVector(), random);
+        foreach (var indi in individuals) EvaluateSample(indi.RealVector(), random);
         BuildRegressionSolution(random);
         Generations = 0;

branches/SAPBA/HeuristicLab.Algorithms.SAPBA/Strategies/StrategyBase.cs

@@ -38 +38 @@
     #region Properties
     [Storable]
-    private SurrogateAssistedPopulationBasedAlgorithm Algorithm;
+    protected SurrogateAssistedPopulationBasedAlgorithm Algorithm;
     [Storable]
     private List<Tuple<RealVector, double>> Samples;
@@ -92 +92 @@
 
         if (!globalResults.ContainsKey(BestQualityResultName)) globalResults.Add(new Result(BestQualityResultName, new DoubleValue(0.0)));
-        ((DoubleValue)globalResults[BestQualityResultName].Value).Value = qualities[bestIdx];
-        if (!globalResults.ContainsKey(BestSolutionResultName)) globalResults.Add(new Result(BestQualityResultName, new RealVector()));
-        globalResults[BestSolutionResultName].Value = individuals[bestIdx].RealVector();
+        ((DoubleValue)globalResults[BestQualityResultName].Value).Value = Samples[bestIdx].Item2;
+        if (!globalResults.ContainsKey(BestSolutionResultName)) globalResults.Add(new Result(BestSolutionResultName, new RealVector()));
+        globalResults[BestSolutionResultName].Value = Samples[bestIdx].Item1;
 
         DataTable table;
@@ -135 +135 @@
     }
     protected Tuple<RealVector, double> EvaluateSample(RealVector point, IRandom random) {
+      Cancellation.ThrowIfCancellationRequested();
+      if (Samples.Count >= Algorithm.MaximumEvaluations) { Algorithm.OptimizationAlgorithm.Stop(); return new Tuple<RealVector, double>(point, 0.0); }
       var p = new Tuple<RealVector, double>(point, Algorithm.Problem.Evaluate(GetIndividual(point), random));
       Samples.Add(p);
@@ -140 +142 @@
     }
     protected Tuple<RealVector, double> EstimateSample(RealVector point, IRandom random) {
+      if (Samples.Count == Algorithm.InitialEvaluations && RegressionSolution == null) BuildRegressionSolution(random);
       return Samples.Count < Algorithm.InitialEvaluations ? EvaluateSample(point, random) : new Tuple<RealVector, double>(point, RegressionSolution.Model.GetEstimation(point));
     }