Changeset 17747 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization

Timestamp:

09/15/20 17:09:10 (4 years ago)

Author:

abeham

Message:

#2521: worked on refactoring

• add results to problem base classes
• fix external evaluation problem
• Add result descriptions

Location:

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

Files:

• Result.cs (modified) (1 diff)
• ResultCollection.cs (modified) (1 diff)
• ResultParameter.cs (modified) (2 diffs)

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

@@ -151 +151 @@
     }
 
-    public Result(string name) : this(name, typeof(T)) { }
-    public Result(string name, Type dataType) : this(name, string.Empty, dataType) { }
-    public Result(string name, string description, Type dataType) : base(name, description, dataType) { }
-
-    public Result(string name, T value) : this(name, string.Empty, value.GetType(), value) { }
-    public Result(string name, string description, T value) : this(name, description, value.GetType(), value) { }
-    public Result(string name, string description, Type dataType, IItem value) : base(name, description, dataType, value) { }
+    //public Result(string name) : this(name, string.Empty) { }
+    public Result(string name, string description) : base(name, description, typeof(T)) { }
+    
+    //public Result(string name, T value) : this(name, string.Empty, value) { }
+    public Result(string name, string description, T value) : base(name, description, typeof(T), value) { }
   }
 }

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

@@ -75 +75 @@
     }
 
-    public void AddOrUpdateResult(string name, IItem value) {
+    public void AddOrUpdateResult(string name, IItem value, string description = null) {
       IResult res;
       if (!TryGetValue(name, out res)) {
-        res = new Result(name, value);
+        res = new Result(name, description ?? string.Empty, value);
         Add(res);
       } else res.Value = value;

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

@@ -114 +114 @@
       if (!results.TryGetValue(ActualName, out result)) {
         if (DefaultValue == null) return null;
-        result = ItemDescription == Description ? new Result(ActualName, (T)DefaultValue.Clone()) : new Result(ActualName, Description, (T)DefaultValue.Clone());
+        result = new Result(ActualName, Description, (T)DefaultValue.Clone());
         results.Add(result);
       }
@@ -143 +143 @@
       IResult result;
       if (!results.TryGetValue(ActualName, out result)) {
-        result = ItemDescription == Description ? new Result(ActualName, value) : new Result(ActualName, Description, value);
+        result = new Result(ActualName, Description, value);
         results.Add(result);
       } else result.Value = value;