Changeset 17337 for branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO

Timestamp:

10/18/19 08:51:36 (5 years ago)

Author:

bwerth

Message:

#2745 forgot to add Storable Tags to Interfaces

Location:

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO

Files:

• DiscreteAdaptiveSamplingAlgorithm.cs (modified) (1 diff)
• DiscreteInfillSolver.cs (modified) (2 diffs)

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteAdaptiveSamplingAlgorithm.cs

@@ -492 +492 @@
       base.Problem_SolutionCreatorChanged(sender, e);
       ParameterizeStochasticOperators(Problem.SolutionCreator.ToEnumerable());
-      SingleObjectiveProblem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
+      var qParameter = SingleObjectiveProblem?.Evaluator?.QualityParameter;
+      if(qParameter!= null)
+       qParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
       ParameterizeSolutionsCreators();
       ParameterizeAnalyzers();

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteInfillSolver.cs

@@ -94 +94 @@
         var dim = dims[i];
         dims.RemoveAt(i);
-        var step = bounds[dim % bounds.Rows, 2] * steps;
+        var step = bounds.Columns>2?bounds[dim % bounds.Rows, 2]:1 * steps;
+        
         var low = checkIntBounds(bounds, dim, res[dim] - step);
         var high = checkIntBounds(bounds, dim, res[dim] + step);
@@ -111 +112 @@
       var l = b[bi, 0];
       var h = b[bi, 1];
-      var s = b[bi, 2];
+      var s = b.Columns>2?b[bi, 2]:1;
       return l <= value && h >= value && (value - l) % s == 0;
     }