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

Timestamp:

06/19/20 16:38:33 (4 years ago)

Author:

mkommend

Message:

#2521: Added first version of problem results.

Location:

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

Files:

• Problem.cs (modified) (2 diffs)
• UserDefinedProblem.cs (modified) (2 diffs)

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

@@ -39 +39 @@
     }
 
-
+    [Storable]
+    public ResultCollection Results { get; } = new ResultCollection();
 
     [StorableConstructor]
     protected Problem(StorableConstructorFlag _) : base(_) { }
-    protected Problem(Problem original, Cloner cloner) : base(original, cloner) { }
+    protected Problem(Problem original, Cloner cloner) : base(original, cloner) {
+      Results = cloner.Clone(original.Results);
+    }
     public Problem() : base() { }
 
@@ -157 +160 @@
 
 
-    protected virtual void ParameterizeOperators() {
-
-    }
+    protected virtual void ParameterizeOperators() { }
 
 

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

@@ -40 +40 @@
   [Creatable(CreatableAttribute.Categories.Problems, Priority = 120)]
   [StorableType("9F18A098-A8B8-4F70-93CF-79FF1496AC8A")]
-  public sealed class UserDefinedProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
-    public string Filename { get; set; }
+  public sealed class UserDefinedProblem : Problem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
 
     public static new Image StaticItemImage {
@@ -170 +169 @@
     private void OnOperatorsChanged() {
       EventHandler handler = OperatorsChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler Reset;
-    private void OnReset() {
-      EventHandler handler = Reset;
       if (handler != null) handler(this, EventArgs.Empty);
     }