Changeset 14058 for branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs

Timestamp:

07/13/16 10:51:56 (8 years ago)

Author:

abeham

Message:

#2431: Refactored ResultsParameter

File:

• branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs (modified) (5 diffs)

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
+using System.Drawing;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
@@ -31 +33 @@
   [StorableClass]
   [NonDiscoverableType]
-  public sealed class ResultParameter<T> : LookupParameter<ResultCollection>, IResultParameter<T> where T : class, IItem, new() {
+  public sealed class ResultParameter<T> : LookupParameter<T>, IResultParameter<T> where T : class, IItem {
+    public override Image ItemImage { get { return VSImageLibrary.Exception; } }
 
     [Storable]
-    private string resultName;
-    public string ResultName {
-      get { return resultName; }
+    private string resultCollectionName;
+    public string ResultCollectionName {
+      get { return resultCollectionName; }
       set {
         if (value == null) throw new ArgumentNullException();
-        if (string.IsNullOrWhiteSpace(value)) {
-          resultName = Name;
-          OnResultNameChanged();
-        } else if (!resultName.Equals(value)) {
-          resultName = value;
-          OnResultNameChanged();
+        if (string.IsNullOrWhiteSpace(value)) throw new ArgumentNullException();
+        else if (!resultCollectionName.Equals(value)) {
+          resultCollectionName = value;
+          OnResultCollectionNameChanged();
         }
       }
@@ -61 +62 @@
     }
 
-    public T ResultValue {
-      get { return GetResultValue(); }
-      set { SetResultValue(value); }
-    }
-
     [StorableConstructor]
     private ResultParameter(bool deserializing) : base(deserializing) { }
     private ResultParameter(ResultParameter<T> original, Cloner cloner)
       : base(original, cloner) {
-      resultName = original.resultName;
+      resultCollectionName = original.resultCollectionName;
       defaultValue = cloner.Clone(original.defaultValue);
     }
@@ -76 +72 @@
       return new ResultParameter<T>(this, cloner);
     }
-    public ResultParameter() : this("Anonymous") { }
-    public ResultParameter(string name)
-      : base(name, string.Empty, "Results") {
-      resultName = Name;
-      defaultValue = new T();
-    }
-    public ResultParameter(string name, string description) : this(name, description, new T()) { }
-    public ResultParameter(string name, string description, T defaultValue)
-      : base(name, description, "Results") {
+    public ResultParameter() : this("Anonymous", string.Empty, "Results") { }
+    public ResultParameter(string name) : this(name, string.Empty, "Results") { }
+    public ResultParameter(string name, string description) : this(name, description, "Results") { }
+    public ResultParameter(string name, string description, string resultCollectionName)
+      : base(name, description, string.Empty) {
+      if (string.IsNullOrEmpty(resultCollectionName)) throw new ArgumentException("resultCollectionName");
+      this.resultCollectionName = resultCollectionName;
+    } 
+    public ResultParameter(string name, string description, string resultCollectionName, T defaultValue)
+      : base(name, description, string.Empty) {
+      if (string.IsNullOrEmpty(resultCollectionName)) throw new ArgumentException("resultCollectionName");
       if (defaultValue == null) throw new ArgumentNullException("defaultValue");
-      resultName = Name;
+      this.resultCollectionName = resultCollectionName;
       this.defaultValue = defaultValue;
     }
-    public ResultParameter(string name, string description, string resultName) : this(name, description, new T(), resultName) { }
-    public ResultParameter(string name, string description, T defaultValue, string resultName)
-      : base(name, description, "Results") {
-      if (defaultValue == null) throw new ArgumentNullException("defaultValue");
-      this.resultName = string.IsNullOrWhiteSpace(resultName) ? Name : resultName;
-      this.defaultValue = defaultValue;
-    }
+    
+    protected override IItem GetActualValue() {
+      ResultCollection results;
+      if (CachedActualValue != null) {
+        results = CachedActualValue as ResultCollection;
+        if (results == null) throw new InvalidOperationException("ResultParameter (" + ActualName + "): ResultCollection not found.");
+      } else {
+        var tmp = ResultCollectionName;
+        // verifyType has to be disabled, because the ResultCollection may not be identical to the generic type of the parameter
+        results = GetValue(ExecutionContext, ref tmp) as ResultCollection;
+        if (results == null) throw new InvalidOperationException("ResultParameter (" + ActualName + "): ResultCollection with name " + tmp + " not found.");
+        CachedActualValue = results;
+      }
 
-    public override string ToString() {
-      if (Name.Equals(ResultName)) return Name;
-      return Name + ": " + ResultName;
-    }
+      IResult result;
+      if (!results.TryGetValue(ActualName, out result)) {
+        if (DefaultValue == null) throw new InvalidOperationException("ResultParameter (" + ActualName + "): Result not found and no default value specified.");
+        result = new Result(ActualName, (T)DefaultValue.Clone()); 
+        results.Add(result);
+      }
 
-    private T GetResultValue() {
-      var results = ActualValue;
-      if (results == null)
-        throw new InvalidOperationException("ResultParameter (" + ResultName + "): ResultCollection " + ActualName + " not found.");
-
-      if (!results.ContainsKey(ResultName)) results.Add(new Result(ResultName, (T)DefaultValue.Clone()));
-      var resultValue = results[ResultName].Value as T;
+      var resultValue = result.Value as T;
       if (resultValue == null)
-        throw new InvalidOperationException(string.Format("Type mismatch. Result \"{0}\" does not contain a \"{1}\".", ResultName, typeof(T).GetPrettyName()));
+        throw new InvalidOperationException(string.Format("Type mismatch. Result \"{0}\" does not contain a \"{1}\".", ActualName, typeof(T).GetPrettyName()));
 
       return resultValue;
     }
 
-    private void SetResultValue(T value) {
-      var results = ActualValue;
-      if (results == null)
-        throw new InvalidOperationException("ResultParameter (" + ResultName + "): ResultCollection " + ActualName + " not found.");
+    protected override void SetActualValue(IItem value) {
+      ResultCollection results;
+      if (CachedActualValue != null) {
+        results = CachedActualValue as ResultCollection;
+        if (results == null) throw new InvalidOperationException("ResultParameter (" + ActualName + "): ResultCollection not found.");
+      } else {
+        var tmp = ResultCollectionName;
+        results = GetValue(ExecutionContext, ref tmp) as ResultCollection;
+        if (results == null) throw new InvalidOperationException("ResultParameter (" + ActualName + "): ResultCollection with name " + tmp + " not found.");
+        CachedActualValue = results;
+      }
 
-      if (!results.ContainsKey(ResultName))
-        results.Add(new Result(ResultName, value));
-      else results[ResultName].Value = value;
+      IResult result;
+      if (!results.TryGetValue(ActualName, out result)) {
+        result = new Result(ActualName, value);
+        results.Add(result);
+      } else result.Value = value;
     }
 
-    public event EventHandler ResultNameChanged;
-    private void OnResultNameChanged() {
-      var handler = ResultNameChanged;
+
+    public event EventHandler ResultCollectionNameChanged;
+    private void OnResultCollectionNameChanged() {
+      var handler = ResultCollectionNameChanged;
       if (handler != null) handler(this, EventArgs.Empty);
       OnToStringChanged();