Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB

Timestamp:

07/23/20 16:21:55 (4 years ago)

Author:

abeham

Message:

#2521:

• Moving solution creator parameter from problems to algorithms (breaking wiring in some HeuristicOptimizationProblems)
• Disallowing evaluator or encoding changes in encoding-specific base problems (to avoid confusion in derived problems whether this needs to be handled or not)
• Added private set to ReferenceParameter property (serialization)

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation

Files:

• EmptyMultiObjectiveProblem.cs (modified) (3 diffs)
• EmptyProblem.cs (modified) (3 diffs)
• EmptySingleObjectiveProblem.cs (modified) (3 diffs)
• OKBProblem.cs (modified) (6 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptyMultiObjectiveProblem.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 
@@ -30 +30 @@
   [StorableType("1AD8A6B9-1B3E-40BA-BAE2-8EAD31793B7D")]
   [NonDiscoverableType]
-  public sealed class EmptyMultiObjectiveProblem : MultiObjectiveHeuristicOptimizationProblem<EmptyMultiObjectiveEvaluator, EmptySolutionCreator> {
+  public sealed class EmptyMultiObjectiveProblem : MultiObjectiveHeuristicOptimizationProblem<EmptyMultiObjectiveEvaluator> {
     public override bool CanChangeName {
       get { return false; }
@@ -41 +41 @@
     private EmptyMultiObjectiveProblem(StorableConstructorFlag _) : base(_) { }
     private EmptyMultiObjectiveProblem(EmptyMultiObjectiveProblem original, Cloner cloner) : base(original, cloner) { }
-    public EmptyMultiObjectiveProblem() : base(new EmptyMultiObjectiveEvaluator(), new EmptySolutionCreator()) { }
-    public EmptyMultiObjectiveProblem(string exceptionMessage) : base(new EmptyMultiObjectiveEvaluator(exceptionMessage), new EmptySolutionCreator(exceptionMessage)) { }
+    public EmptyMultiObjectiveProblem() : base(new EmptyMultiObjectiveEvaluator()) { }
+    public EmptyMultiObjectiveProblem(string exceptionMessage) : base(new EmptyMultiObjectiveEvaluator(exceptionMessage)) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptyProblem.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 
@@ -30 +30 @@
   [StorableType("10132D57-7177-42A2-97B9-B77D89AADE6A")]
   [NonDiscoverableType]
-  public sealed class EmptyProblem : HeuristicOptimizationProblem<EmptyEvaluator, EmptySolutionCreator> {
+  public sealed class EmptyProblem : HeuristicOptimizationProblem<EmptyEvaluator> {
     public override bool CanChangeName {
       get { return false; }
@@ -43 +43 @@
     public EmptyProblem()
       : base() {
-      SolutionCreator = new EmptySolutionCreator();
       Evaluator = new EmptyEvaluator();
     }
     public EmptyProblem(string exceptionMessage)
       : base() {
-      SolutionCreator = new EmptySolutionCreator(exceptionMessage);
       Evaluator = new EmptyEvaluator(exceptionMessage);
     }

branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptySingleObjectiveProblem.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 
@@ -30 +30 @@
   [StorableType("12D022A4-6DC4-4840-9EE7-F1EEB7A408F6")]
   [NonDiscoverableType]
-  public sealed class EmptySingleObjectiveProblem : SingleObjectiveHeuristicOptimizationProblem<EmptySingleObjectiveEvaluator, EmptySolutionCreator> {
+  public sealed class EmptySingleObjectiveProblem : SingleObjectiveHeuristicOptimizationProblem<EmptySingleObjectiveEvaluator> {
     public override bool CanChangeName {
       get { return false; }
@@ -41 +41 @@
     private EmptySingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
     private EmptySingleObjectiveProblem(EmptySingleObjectiveProblem original, Cloner cloner) : base(original, cloner) { }
-    public EmptySingleObjectiveProblem() : base(new EmptySingleObjectiveEvaluator(), new EmptySolutionCreator()) { }
-    public EmptySingleObjectiveProblem(string exceptionMessage) : base(new EmptySingleObjectiveEvaluator(exceptionMessage), new EmptySolutionCreator(exceptionMessage)) { }
+    public EmptySingleObjectiveProblem() : base(new EmptySingleObjectiveEvaluator()) { }
+    public EmptySingleObjectiveProblem(string exceptionMessage) : base(new EmptySingleObjectiveEvaluator(exceptionMessage)) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBProblem.cs

@@ -61 +61 @@
             OnDescriptionChanged();
             OnProblemChanged();
-            OnSolutionCreatorChanged();
             OnEvaluatorChanged();
             OnOperatorsChanged();
@@ -105 +104 @@
     public IKeyedItemCollection<string, IParameter> Parameters {
       get { return Problem.Parameters; }
-    }
-
-    public IParameter SolutionCreatorParameter {
-      get { return Problem.SolutionCreatorParameter; }
-    }
-    public ISolutionCreator SolutionCreator {
-      get { return Problem.SolutionCreator; }
     }
     public IParameter EvaluatorParameter {
@@ -210 +202 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    public event EventHandler SolutionCreatorChanged;
-    protected virtual void OnSolutionCreatorChanged() {
-      var handler = SolutionCreatorChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
     public event EventHandler EvaluatorChanged;
     protected virtual void OnEvaluatorChanged() {
@@ -238 +225 @@
         Problem.NameChanged += new EventHandler(Problem_NameChanged);
         Problem.DescriptionChanged += new EventHandler(Problem_DescriptionChanged);
-        Problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);
         Problem.EvaluatorChanged += new EventHandler(Problem_EvaluatorChanged);
         Problem.OperatorsChanged += new EventHandler(Problem_OperatorsChanged);
@@ -251 +237 @@
         Problem.NameChanged -= new EventHandler(Problem_NameChanged);
         Problem.DescriptionChanged -= new EventHandler(Problem_DescriptionChanged);
-        Problem.SolutionCreatorChanged -= new EventHandler(Problem_SolutionCreatorChanged);
         Problem.EvaluatorChanged -= new EventHandler(Problem_EvaluatorChanged);
         Problem.OperatorsChanged -= new EventHandler(Problem_OperatorsChanged);
@@ -273 +258 @@
       OnDescriptionChanged();
     }
-    private void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
-      OnSolutionCreatorChanged();
-    }
     private void Problem_EvaluatorChanged(object sender, EventArgs e) {
       OnEvaluatorChanged();