Changeset 17337 for branches

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

Files:

• DiscreteEGO/DiscreteAdaptiveSamplingAlgorithm.cs (modified) (1 diff)
• DiscreteEGO/DiscreteInfillSolver.cs (modified) (2 diffs)
• Interfaces/ICancellableOperator.cs (modified) (1 diff)
• Interfaces/IInfillCriterion.cs (modified) (2 diffs)
• Interfaces/IInitialSampling.cs (modified) (1 diff)
• Interfaces/IResultsOperator.cs (modified) (1 diff)
• Interfaces/ISurrogateAlgorithm.cs (modified) (1 diff)
• SamplingMethods/LatinHyperCubeDesignCreator.cs (modified) (1 diff)

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;
     }

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Interfaces/ICancellableOperator.cs

@@ -22 +22 @@
 // ReSharper disable once CheckNamespace
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.EGO {
+  [StorableType("d80fee60-f9a1-4daf-94d3-3e07b1c68769")]
   public interface ICancellableOperator : IOperator {
 

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Interfaces/IInfillCriterion.cs

@@ -21 +21 @@
 
 // ReSharper disable once CheckNamespace
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
@@ -26 +27 @@
 
 namespace HeuristicLab.Algorithms.EGO {
+  [StorableType("c38ba956-5089-4589-b7ef-d48887ec9fbc")]
   public interface IInfillCriterion : INamedItem {
 

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Interfaces/IInitialSampling.cs

@@ -21 +21 @@
 
 // ReSharper disable once CheckNamespace
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Algorithms.EGO {
+  [StorableType("ac71b779-b208-4427-8a4b-da8b72f76bde")]
   public interface IInitialSampling<T> : INamedItem where T : class {
     T[] GetSamples(int noSamples, T[] existingSamples, IEncoding encoding, IRandom random);

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Interfaces/IResultsOperator.cs

@@ -21 +21 @@
 
 // ReSharper disable once CheckNamespace
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Algorithms.EGO {
+  [StorableType("1bc84c6e-6178-46b3-98c5-a505011c0db1")]
   public interface IResultsOperator : IOperator {
     ILookupParameter<ResultCollection> ResultsParameter { get; }

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Interfaces/ISurrogateAlgorithm.cs

@@ -21 +21 @@
 
 // ReSharper disable once CheckNamespace
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Algorithms.EGO {
+  [StorableType("28cb2019-1dee-4912-857f-060f0f3d671f")]
   public interface ISurrogateAlgorithm<T> : IAlgorithm where T : IDeepCloneable {
     void SetInitialSamples(T[] solutions, double[] qualities);

branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/SamplingMethods/LatinHyperCubeDesignCreator.cs

@@ -31 +31 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 // ReSharper disable once CheckNamespace