Changeset 15338 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/AdaptiveSamplingAlgorithm.cs

Timestamp:

08/22/17 15:01:46 (7 years ago)

Author:

bwerth

Message:

#2745 fixed bug concerning new Start and StartAsync methods; passed CancellationToken to sub algorithms

File:

• branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/AdaptiveSamplingAlgorithm.cs (modified) (20 diffs)

branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/AdaptiveSamplingAlgorithm.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Algorithms.DataAnalysis;
 using HeuristicLab.Analysis;
@@ -49 +50 @@
     public IValueParameter<Algorithm> InfillOptimizationAlgorithmParameter => Parameters[InfillOptimizationAlgorithmParameterName] as IValueParameter<Algorithm>;
     public IValueParameter<IDataAnalysisAlgorithm<IRegressionProblem>> RegressionAlgorithmParameter => Parameters[RegressionAlgorithmParameterName] as IValueParameter<IDataAnalysisAlgorithm<IRegressionProblem>>;
-    private IFixedValueParameter<MultiAnalyzer> AnalyzerParameter => (IFixedValueParameter<MultiAnalyzer>)Parameters[AnalyzerParameterName];
+    public IFixedValueParameter<MultiAnalyzer> AnalyzerParameter => (IFixedValueParameter<MultiAnalyzer>)Parameters[AnalyzerParameterName];
     public IFixedValueParameter<BoolValue> RemoveDuplicatesParameter => (IFixedValueParameter<BoolValue>)Parameters[RemoveDuplicatesParamterName];
     public IFixedValueParameter<IntValue> MaxModelSizeParameter => (IFixedValueParameter<IntValue>)Parameters[MaxModelSizeParameterName];
@@ -65 +66 @@
     public bool RemoveDuplicates => RemoveDuplicatesParameter.Value.Value;
     public int MaxModelSize => MaxModelSizeParameter.Value.Value;
-    #endregion
-
-    #region Helper Properties
     private SolutionsCreator SolutionsCreator => OperatorGraph.Iterate().OfType<SolutionsCreator>().First();
     #endregion
 
+
+
+    #region Operators
+
+    [Storable]
+    private OperatorList Operators;
+
     #region Preconfigured Analyzers
     [Storable]
@@ -102 +107 @@
     [Storable]
     private SolutionsCreator infillSolutionsCreator;
+    #endregion
     #endregion
 
@@ -123 +129 @@
       modelAnalyzer = cloner.Clone(original.modelAnalyzer);
       fitnessClusterAnalyzer = cloner.Clone(original.fitnessClusterAnalyzer);
+
+      Operators = cloner.Clone(original.Operators);
       Initialize();
     }
@@ -163 +171 @@
 
       #region Create operators
+      Operators = new OperatorList();
+
       var randomCreator = new RandomCreator();
+      Operators.Add(randomCreator);
       var variableCreator = new VariableCreator { Name = "Initialize Variables" };
+      Operators.Add(variableCreator);
       var resultsCollector = new ResultsCollector();
+      Operators.Add(resultsCollector);
       var solutionCreator = new SolutionsCreator { Name = "Create Initial Solutions" };
+      Operators.Add(solutionCreator);
       var analyzerPlaceholder = new Placeholder { Name = "Analyzer (Placeholder)" };
+      Operators.Add(analyzerPlaceholder);
       var evaluationsCounter = new IntCounter { Name = "Increment EvaluatedSolutions" };
+      Operators.Add(evaluationsCounter);
       var solutionsCollectorProcessor = new UniformSubScopesProcessor { Name = "Collect Samples to Dataset" };
+      Operators.Add(solutionsCollectorProcessor);
       var phaseChecker = new ConditionalBranch { Name = "Inital Samples evaluated?" };
+      Operators.Add(phaseChecker);
       var initialPhaseChecker = new Comparator { Name = "Compare Initial Samples to evaluated Solutions" };
+      Operators.Add(initialPhaseChecker);
       var modelbuilder = new ModelBuilder { Name = "Build Model" };
+      Operators.Add(modelbuilder);
+
       sampleCollector = new SampleCollector { Name = "Collect Sample" };
+      Operators.Add(sampleCollector);
       infillSolutionsCreator = new SolutionsCreator { Name = "Create Adaptive Solutions" };
+      Operators.Add(infillSolutionsCreator);
       infillSolver = new InfillSolver();
+      Operators.Add(infillSolver);
+
       var subScopesRemover = new SubScopesRemover();
+      Operators.Add(subScopesRemover);
       var iterationsCounter = new IntCounter { Name = "Increment Iterations" };
+      Operators.Add(iterationsCounter);
       var terminationOperator = new TerminationOperator();
+      Operators.Add(terminationOperator);
       #endregion
 
@@ -218 +246 @@
       modelbuilder.ModelParameter.ActualName = modelVariableName;
       modelbuilder.RegressionAlgorithmParameter.ActualName = RegressionAlgorithmParameter.Name;
-      ParameterizeStochasticOperator(modelbuilder);
+
       modelbuilder.Successor = infillSolutionsCreator;
       modelbuilder.MaxModelSizeParameter.ActualName = MaxModelSizeParameter.Name;
@@ -265 +293 @@
       iterationsCounter.Successor = terminationOperator;
 
-
-
       terminationOperator.TerminatorParameter.ActualName = TerminatorParameter.Name;
       terminationOperator.ContinueBranch = phaseChecker;
-
       #endregion
 
       #region Create analyzers
       singleObjectiveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      Operators.Add(singleObjectiveQualityAnalyzer);
+
       correlationAnalyzer = new CorrelationAnalyzer();
       correlationAnalyzer.ModelParameter.ActualName = modelVariableName;
+      Operators.Add(correlationAnalyzer);
 
       sampleAnalyzer = new EvaluatedSolutionsAnalyzer();
       sampleAnalyzer.PhaseParameter.ActualName = initialPhaseVariableName;
+      Operators.Add(sampleAnalyzer);
 
       modelAnalyzer = new ModelQualityAnalyzer();
       modelAnalyzer.ModelParameter.ActualName = modelVariableName;
+      Operators.Add(modelAnalyzer);
 
       variabilityAnalyzer = new VariableVariabilityAnalyzer();
       variabilityAnalyzer.DatasetParameter.ActualName = datasetVariableName;
       variabilityAnalyzer.InitialEvaluationsParameter.ActualName = InitialEvaluationsParameter.Name;
+      Operators.Add(variabilityAnalyzer);
 
       fitnessClusterAnalyzer = new FitnessClusteringAnalyzer();
       fitnessClusterAnalyzer.DatasetParameter.ActualName = datasetVariableName;
+      Operators.Add(fitnessClusterAnalyzer);
       #endregion
 
       #region Create terminators
 
-      evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less,
-        new IntValue(1000)) { Name = "Evaluated solutions." };
+      evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, new IntValue(1000)) { Name = "Evaluated solutions." };
+      Operators.Add(evaluationsTerminator);
       qualityTerminator = new SingleObjectiveQualityTerminator { Name = "Quality" };
+      Operators.Add(qualityTerminator);
       executionTimeTerminator = new ExecutionTimeTerminator(this, new TimeSpanValue(TimeSpan.FromMinutes(5)));
-
+      Operators.Add(executionTimeTerminator);
       #endregion
 
@@ -303 +336 @@
       UpdateAnalyzers();
       ParameterizeAnalyzers();
+      ParameterizeStochasticOperators(Operators);
       UpdateTerminators();
       #endregion
@@ -308 +342 @@
       Initialize();
     }
-    #endregion
 
     private void Initialize() {
       if (SingleObjectiveProblem != null) {
-        SingleObjectiveProblem.Evaluator.QualityParameter.ActualNameChanged +=
-         Evaluator_QualityParameter_ActualNameChanged;
+        SingleObjectiveProblem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
       }
-
-      singleObjectiveQualityAnalyzer.CurrentBestQualityParameter.NameChanged +=
-        QualityAnalyzer_CurrentBestQualityParameter_NameChanged;
+      singleObjectiveQualityAnalyzer.CurrentBestQualityParameter.NameChanged += QualityAnalyzer_CurrentBestQualityParameter_NameChanged;
       RegisterParameterEvents();
+    }
+    #endregion
+
+    public override void Start(CancellationToken cancellationToken) {
+      ParameterizeProblemSpecificOperators();
+      ((InfillProblem)InfillOptimizationAlgorithm.Problem).InfillCriterion = InfillCriterion;
+      ParameterizeCancellableOperators(cancellationToken);
+      base.Start(cancellationToken);
+    }
+    public override void Stop() {
+      if (InfillOptimizationAlgorithm.ExecutionState == ExecutionState.Started || InfillOptimizationAlgorithm.ExecutionState == ExecutionState.Paused)
+        InfillOptimizationAlgorithm.Stop();
+      if (RegressionAlgorithm.ExecutionState == ExecutionState.Started || RegressionAlgorithm.ExecutionState == ExecutionState.Paused)
+        RegressionAlgorithm.Stop();
+      base.Stop();
+    }
+    public override void Pause() {
+      if (InfillOptimizationAlgorithm.ExecutionState == ExecutionState.Started) InfillOptimizationAlgorithm.Pause();
+      if (RegressionAlgorithm.ExecutionState == ExecutionState.Started) RegressionAlgorithm.Pause();
+      base.Pause();
     }
 
@@ -328 +378 @@
     }
     private void ParameterizeAnalyzers() {
-      //TODO how to guarantee ResultsParameters and QualityParameters are really there? This seems hardcoded
+      foreach (var op in Operators.OfType<IResultsOperator>()) {
+        op.ResultsParameter.ActualName = "Results";
+        op.ResultsParameter.Hidden = true;
+      }
+
       singleObjectiveQualityAnalyzer.ResultsParameter.ActualName = "Results";
       singleObjectiveQualityAnalyzer.ResultsParameter.Hidden = true;
       singleObjectiveQualityAnalyzer.QualityParameter.Depth = 1;
-      correlationAnalyzer.ResultsParameter.ActualName = "Results";
-      correlationAnalyzer.ResultsParameter.Hidden = true;
       correlationAnalyzer.QualityParameter.Depth = 1;
       correlationAnalyzer.RealVectorParameter.Depth = 1;
-      sampleAnalyzer.ResultsParameter.ActualName = "Results";
-      sampleAnalyzer.ResultsParameter.Hidden = true;
       sampleAnalyzer.QualityParameter.Depth = 1;
       sampleAnalyzer.RealVectorParameter.Depth = 1;
-      modelAnalyzer.ResultsParameter.ActualName = "Results";
-      modelAnalyzer.ResultsParameter.Hidden = true;
-      fitnessClusterAnalyzer.ResultsParameter.ActualName = "Results";
-      fitnessClusterAnalyzer.ResultsParameter.Hidden = true;
-
 
       if (SingleObjectiveProblem == null) return;
@@ -362 +407 @@
       SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
       infillSolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
-    }
-    private void ParameterizeStochasticOperator(IOperator @operator) {
-      var stochasticOperator = @operator as IStochasticOperator;
-      if (stochasticOperator == null) return;
-      stochasticOperator.RandomParameter.ActualName = "Random";
-      stochasticOperator.RandomParameter.Hidden = true;
+      ParameterizeStochasticOperators(new[] { SolutionsCreator, infillSolutionsCreator });
+    }
+    private static void ParameterizeStochasticOperators(IEnumerable<IItem> operators) {
+      foreach (var op in operators.OfType<IStochasticOperator>()) {
+        op.RandomParameter.ActualName = "Random";
+        op.RandomParameter.Hidden = true;
+      }
     }
     private void ParameterizeProblemSpecificOperators() {
@@ -374 +420 @@
       var rcreator = Problem.SolutionCreator as IRealVectorCreator;
       if (rcreator == null) throw new ArgumentException("Adaptive sampling requires real vectors as solution candidates");
+
       infillSolver.LengthParameter.ActualName = rcreator.LengthParameter.ActualName;
       infillSolver.BoundsParameter.ActualName = rcreator.BoundsParameter.ActualName;
-      // if (rcreator.LengthParameter.Value != null)
       infillSolver.LengthParameter.Value = rcreator.LengthParameter.Value;
-      // if (rcreator.BoundsParameter.Value != null)
       infillSolver.BoundsParameter.Value = rcreator.BoundsParameter.Value;
       infillSolver.RealVectorParameter.ActualName = rcreator.RealVectorParameter.ActualName;
@@ -388 +433 @@
       sampleAnalyzer.RealVectorParameter.ActualName = rcreator.RealVectorParameter.ActualName;
     }
-    #endregion
-
-    public override void Start() {
-      ParameterizeProblemSpecificOperators();
-      ((InfillProblem)InfillOptimizationAlgorithm.Problem).InfillCriterion = InfillCriterion;
-      base.Start();
-    }
-    public override void Stop() {
-      if (InfillOptimizationAlgorithm.ExecutionState == ExecutionState.Started || InfillOptimizationAlgorithm.ExecutionState == ExecutionState.Paused)
-        InfillOptimizationAlgorithm.Stop();
-      if (RegressionAlgorithm.ExecutionState == ExecutionState.Started || RegressionAlgorithm.ExecutionState == ExecutionState.Paused)
-        RegressionAlgorithm.Stop();
-      base.Stop();
-    }
-    public override void Pause() {
-      if (InfillOptimizationAlgorithm.ExecutionState == ExecutionState.Started) InfillOptimizationAlgorithm.Pause();
-      if (RegressionAlgorithm.ExecutionState == ExecutionState.Started) RegressionAlgorithm.Pause();
-      base.Pause();
-    }
-
-    #region events
+    private void ParameterizeCancellableOperators(CancellationToken cancellation) {
+      foreach (var op in Operators.OfType<ICancellableOperator>())
+        op.Cancellation = cancellation;
+    }
+
+    private void UnParameterizeCancellableOperators(CancellationToken cancellation) {
+      foreach (var op in Operators.OfType<ICancellableOperator>())
+        op.Cancellation = CancellationToken.None;
+    }
+    #endregion
+
+    #region Events
     private void RegisterParameterEvents() {
       InfillOptimizationAlgorithmParameter.ValueChanged += OnInfillAlgorithmChanged;
@@ -428 +464 @@
       InfillOptimizationAlgorithm.ProblemChanged += OnInfillProblemChanged;
     }
+
     protected override void OnProblemChanged() {
       base.OnProblemChanged();
-      ParameterizeStochasticOperator(Problem.SolutionCreator);
-      foreach (var @operator in Problem.Operators.OfType<IOperator>())
-        ParameterizeStochasticOperator(@operator);
-
-      //TODO ParameterizeIterationBasedOperators();
-
-      ParameterizeSolutionsCreators();
-      ParameterizeAnalyzers();
-      ParameterizeTerminators();
-
-      if (SingleObjectiveProblem != null)
-        SingleObjectiveProblem.Evaluator.QualityParameter.ActualNameChanged +=
-          Evaluator_QualityParameter_ActualNameChanged;
-
+      ParameterizeStochasticOperators(Problem.Operators);
       UpdateAnalyzers();
       UpdateTerminators();
+      ParameterizeSolutionsCreators();
+      if (SingleObjectiveProblem != null)
+        SingleObjectiveProblem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
     }
     protected override void RegisterProblemEvents() {
@@ -460 +487 @@
     protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
       base.Problem_SolutionCreatorChanged(sender, e);
-      ParameterizeStochasticOperator(Problem.SolutionCreator);
-
-      if (SingleObjectiveProblem != null) SingleObjectiveProblem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
-
+      ParameterizeStochasticOperators(Problem.SolutionCreator.ToEnumerable());
+      SingleObjectiveProblem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
       ParameterizeSolutionsCreators();
       ParameterizeAnalyzers();
@@ -469 +494 @@
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
       base.Problem_EvaluatorChanged(sender, e);
-      foreach (var @operator in Problem.Operators.OfType<IOperator>())
-        ParameterizeStochasticOperator(@operator);
-
-      UpdateAnalyzers();
-
+      ParameterizeStochasticOperators(Problem.Operators);
       ParameterizeSolutionsCreators();
     }
     protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
       base.Problem_OperatorsChanged(sender, e);
-      //TODO ParameterizeIterationBasedOperators();
+      UpdateAnalyzers();
       UpdateTerminators();
     }
     private void MaximizationParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeAnalyzers();
       ParameterizeTerminators();
     }
@@ -490 +512 @@
       ParameterizeTerminators();
     }
+
     #endregion
 
@@ -495 +518 @@
     private void UpdateAnalyzers() {
       Analyzer.Operators.Clear();
-      if (Problem == null) return;
-      if (SingleObjectiveProblem != null) {
-        Analyzer.Operators.Add(singleObjectiveQualityAnalyzer, singleObjectiveQualityAnalyzer.EnabledByDefault);
-        Analyzer.Operators.Add(correlationAnalyzer, correlationAnalyzer.EnabledByDefault);
-        Analyzer.Operators.Add(sampleAnalyzer, sampleAnalyzer.EnabledByDefault);
-        Analyzer.Operators.Add(modelAnalyzer, modelAnalyzer.EnabledByDefault);
-        Analyzer.Operators.Add(variabilityAnalyzer, variabilityAnalyzer.EnabledByDefault);
-        Analyzer.Operators.Add(fitnessClusterAnalyzer, fitnessClusterAnalyzer.EnabledByDefault);
-      }
-      foreach (var analyzer in Problem.Operators.OfType<IAnalyzer>())
+      if (SingleObjectiveProblem == null) return;
+      foreach (var analyzer in Operators.OfType<IAnalyzer>().Concat(SingleObjectiveProblem.Operators.OfType<IAnalyzer>()))
         Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
+      ParameterizeAnalyzers();
     }
     private void UpdateTerminators() {
@@ -519 +535 @@
         }
       };
-      if (Problem != null) {
-        if (SingleObjectiveProblem != null)
-          newTerminators.Add(qualityTerminator,
-            Terminator.Operators.Contains(qualityTerminator) && Terminator.Operators.ItemChecked(qualityTerminator));
+      if (SingleObjectiveProblem != null) {
+        newTerminators.Add(qualityTerminator, Terminator.Operators.Contains(qualityTerminator) && Terminator.Operators.ItemChecked(qualityTerminator));
         foreach (var terminator in Problem.Operators.OfType<ITerminator>())
-          newTerminators.Add(terminator,
-            !Terminator.Operators.Contains(terminator) || Terminator.Operators.ItemChecked(terminator));
+          newTerminators.Add(terminator, !Terminator.Operators.Contains(terminator) || Terminator.Operators.ItemChecked(terminator));
       }
-
       Terminator.Operators.Clear();
       foreach (var newTerminator in newTerminators)
         Terminator.Operators.Add(newTerminator.Key, newTerminator.Value);
-    }
-    #endregion
-
+      ParameterizeTerminators();
+    }
+    #endregion
   }