Changeset 17513 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems

Timestamp:

04/20/20 14:40:24 (5 years ago)

Author:

mkommend

Message:

#2521: Splitted problems into several problem and encoded problems.

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems

Files:

• HeuristicOptimizationProblem.cs (modified) (1 diff)
• Problem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
   [Item("Heuristic Optimization Problem", "Represents the base class for a heuristic optimization problem.")]
   [StorableType("DE0478BA-3797-4AC3-9A89-3734D2643823")]
-  public abstract class HeuristicOptimizationProblem<T, U> : Problem, IHeuristicOptimizationProblem
-    where T : class,IEvaluator
-    where U : class,ISolutionCreator {
+  public abstract class HeuristicOptimizationProblem<T, U> : EncodedProblem, IHeuristicOptimizationProblem
+    where T : class, IEvaluator
+    where U : class, ISolutionCreator {
     private const string EvaluatorParameterName = "Evaluator";
     private const string SolutionCreateParameterName = "SolutionCreator";

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Optimization {
+  [StorableType("C213CE21-A970-4886-BC4C-9790B9897738")]
+  public abstract class Problem : ParameterizedNamedItem, IProblem {
+    public string Filename { get; set; }
+
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
+    }
+
+
+
+    [StorableConstructor]
+    protected Problem(StorableConstructorFlag _) : base(_) { }
+    protected Problem(Problem original, Cloner cloner) : base(original, cloner) { }
+    public Problem() : base() { }
+
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IValueParameter param) {
+      var children = base.GetCollectedValues(param);
+      foreach (var child in children) {
+        if (child.Value is IOperator)
+          yield return new KeyValuePair<string, IItem>(child.Key, new StringValue(((IOperator)child.Value).Name));
+        else yield return child;
+      }
+    }
+
+    public event EventHandler Reset;
+    protected virtual void OnReset() {
+      EventHandler handler = Reset;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
+    }
+  }
+
+
+
   [Item("Problem", "Represents the base class for a problem.")]
   [StorableType("6DC97432-9BD1-4304-802A-1FC48A0E0468")]
-  public abstract class Problem : ParameterizedNamedItem, IProblem {
-    public string Filename { get; set; } 
+  public abstract class EncodedProblem : Problem, IEncodedProblem {
 
     private const string OperatorsParameterName = "Operators";
@@ -41 +74 @@
     }
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
-    }
-
     [StorableConstructor]
-    protected Problem(StorableConstructorFlag _) : base(_) { }
-    protected Problem(Problem original, Cloner cloner)
+    protected EncodedProblem(StorableConstructorFlag _) : base(_) { }
+    protected EncodedProblem(EncodedProblem original, Cloner cloner)
       : base(original, cloner) {
       RegisterEventHandlers();
     }
 
-    protected Problem()
+    protected EncodedProblem()
       : base() {
       Parameters.Add(new FixedValueParameter<ItemCollection<IItem>>(OperatorsParameterName, "The operators and items that the problem provides to the algorithms.", new ItemCollection<IItem>()) { GetsCollected = false });
@@ -116 +145 @@
       }
     }
-    IEnumerable<IItem> IProblem.Operators { get { return GetOperators(); } }
+    IEnumerable<IItem> IEncodedProblem.Operators { get { return GetOperators(); } }
 
     protected virtual IEnumerable<IItem> GetOperators() {
@@ -127 +156 @@
     #endregion
 
-    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IValueParameter param) {
-      var children = base.GetCollectedValues(param);
-      foreach (var child in children) {
-        if (child.Value is IOperator)
-          yield return new KeyValuePair<string, IItem>(child.Key, new StringValue(((IOperator)child.Value).Name));
-        else yield return child;
-      }
-    }
+
 
     #region events
@@ -146 +168 @@
         handler(this, EventArgs.Empty);
     }
-
-    public event EventHandler Reset;
-    protected virtual void OnReset() {
-      EventHandler handler = Reset;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
-    }
     #endregion
   }