Changeset 17522 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Results

Timestamp:

04/27/20 18:12:39 (5 years ago)

Author:

abeham

Message:

#2521 WIP refactoring:

1. Introduce nicer type IResultDefinition for API users to avoid complex IParameter interface (hide ActualValue)
2. Change result parameter to contexts (need quality and solution): only implemented for BinaryVectorProblem

Location:

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

Files:

• IResultParameter.cs (modified) (2 diffs)
• ResultParameter.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Results/IResultParameter.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
+  [StorableType("986fa3d0-38f8-43aa-820e-e67d09a29025")]
+  public interface IResultDefinition {
+    string Name { get; set; }
+  }
+
+  [StorableType("4c0c854b-676d-4ccd-96c4-b06a3d7f2fa1")]
+  public interface IResultDefinition<T> : IResultDefinition where T : class, IItem {
+    T Get(ResultCollection results);
+  }
+
   [StorableType("af5d3f60-6f3a-4a44-a906-688ac8296fe3")]
-  public interface IResultParameter : ILookupParameter {
+  public interface IResultParameter : ILookupParameter, IResultDefinition {
     string ResultCollectionName { get; set; }
     ResultCollection ResultCollection { get; set; }
@@ -34 +44 @@
 
   [StorableType("803e6ad6-dd9d-497a-ad1c-7cd3dc5b0d3c")]
-  public interface IResultParameter<T> : ILookupParameter<T>, IResultParameter where T : class, IItem {
+  public interface IResultParameter<T> : ILookupParameter<T>, IResultParameter, IResultDefinition<T> where T : class, IItem {
     T DefaultValue { get; set; }
     event EventHandler DefaultValueChanged;

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs

@@ -62 +62 @@
     [Storable]
     public ResultCollection ResultCollection { get; set; }
+
+    string IResultDefinition.Name { get => ActualName; set => ActualName = value; }
+    T IResultDefinition<T>.Get(ResultCollection results) => results[ActualName].Value as T;
 
     [StorableConstructor]