Ticket #2281: ResultsParameter3.patch

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

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
   public interface IResultParameter : ILookupParameter {
-    string ResultName { get; set; }
-    event EventHandler ResultNameChanged;
+    //string ResultName { get; set; }
+    //event EventHandler ResultNameChanged;
   }
 
-  public interface IResultParameter<T> : ILookupParameter<ResultCollection>, IResultParameter where T : class, IItem, new() {
+  public interface IResultParameter<T> : ILookupParameter<T>, IResultParameter where T : class, IItem, new() {
+    string ResultCollectionName { get; set; }
+
     T DefaultValue { get; set; }
-    T ResultValue { get; set; }
+    event EventHandler DefaultValueChanged;
   }
 }

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

@@ -30 +30 @@
   [Item("ResultParameter", "A parameter whose value is written to a result collection.")]
   [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, new() {
 
     [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();
         }
       }
     }
@@ -60 +58 @@
       }
     }
 
-    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);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       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", new T()) { }
+
+    public ResultParameter(string name, string description, string resultCollectionName, T defaultValue)
+      : base(name, description, string.Empty) {
       if (defaultValue == null) throw new ArgumentNullException("defaultValue");
-      resultName = Name;
+      if (resultCollectionName == null) throw new ArgumentNullException("resultCollectionName");
+      if (string.IsNullOrEmpty(resultCollectionName)) throw new ArgumentException("resultCollectionName");
+
+      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;
-    }
 
-    public override string ToString() {
-      if (Name.Equals(ResultName)) return Name;
-      return Name + ": " + ResultName;
-    }
 
-    private T GetResultValue() {
-      var results = ActualValue;
+    protected override IItem GetActualValue() {
+      ResultCollection results;
+      if (CachedActualValue != null) results = (ResultCollection)CachedActualValue;
+
+      //TODO name & type checks
+      else results = (ResultCollection)GetActualValue(ExecutionContext, ResultCollectionName);
+
+      CachedActualValue = results;
+
       if (results == null)
-        throw new InvalidOperationException("ResultParameter (" + ResultName + "): ResultCollection " + ActualName + " not found.");
+        throw new InvalidOperationException("ResultParameter (" + Name + "): ResultCollection not found.");
 
-      if (!results.ContainsKey(ResultName)) results.Add(new Result(ResultName, (T)DefaultValue.Clone()));
-      var resultValue = results[ResultName].Value as T;
+      //null check for default value
+      if (!results.ContainsKey(Name)) results.Add(new Result(Name, (T)DefaultValue.Clone()));
+
+      var resultValue = results[Name].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}\".", Name, typeof(T).GetPrettyName()));
 
       return resultValue;
     }
+    protected override void SetActualValue(IItem value) {
+      ResultCollection results;
+      if (CachedActualValue != null) results = (ResultCollection)CachedActualValue;
 
-    private void SetResultValue(T value) {
-      var results = ActualValue;
+
+      else //TODO name & type checks
+        results = (ResultCollection)GetActualValue(ExecutionContext, ResultCollectionName);
+
+      CachedActualValue = results;
+
       if (results == null)
-        throw new InvalidOperationException("ResultParameter (" + ResultName + "): ResultCollection " + ActualName + " not found.");
+        throw new InvalidOperationException("ResultParameter (" + Name + "): ResultCollection not found.");
 
-      if (!results.ContainsKey(ResultName))
-        results.Add(new Result(ResultName, value));
-      else results[ResultName].Value = value;
+      if (!results.ContainsKey(Name))
+        results.Add(new Result(Name, value));
+      else results[Name].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();
     }