Changeset 7579 for trunk/sources

Timestamp:

03/07/12 14:00:45 (13 years ago)

Author:

abeham

Message:

#1695
I solved this issue now. I found that CollectParameterValues was too monolithic in that you have to overwrite and re-implement the same method again if you wanted to change just a detail (in that case that operators are stored by their name). So I split CollectParameterValues into two separate logical parts:

• CollectParameterValues is iterating over the parameters
• GetCollectedValues decides what values are collected from the given parameter value

Algorithm and Problem now overwrite only GetCollectedValues, but reuse the implementation of the base class in that they only filter the values. When they see an IOperator they will instead convert it to its name. Using IEnumerable and yield I think that's a nice solution.

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.3/ParameterizedNamedItem.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -84 +85 @@
     public virtual void CollectParameterValues(IDictionary<string, IItem> values) {
       foreach (IValueParameter param in parameters.OfType<IValueParameter>()) {
-        if (param.GetsCollected && param.Value != null) values.Add(param.Name, param.Value);
-        if (param.Value is IParameterizedItem) {
-          Dictionary<string, IItem> children = new Dictionary<string, IItem>();
-          ((IParameterizedItem)param.Value).CollectParameterValues(children);
-          foreach (string key in children.Keys)
-            values.Add(param.Name + "." + key, children[key]);
+        if (param.GetsCollected) {
+          var children = GetCollectedValues(param.Value);
+          foreach (var c in children) {
+            if (String.IsNullOrEmpty(c.Key))
+              values.Add(param.Name, c.Value);
+            else values.Add(param.Name + "." + c.Key, c.Value);
+          }
         }
+      }
+    }
+
+    protected virtual IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IItem value) {
+      if (value == null) yield break;
+      yield return new KeyValuePair<string, IItem>(String.Empty, value);
+      var parameterizedItem = value as IParameterizedItem;
+      if (parameterizedItem != null) {
+        var children = new Dictionary<string, IItem>();
+        parameterizedItem.CollectParameterValues(children);
+        foreach (var child in children) yield return child;
       }
     }

trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -240 +240 @@
     }
 
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IItem value) {
+      var children = base.GetCollectedValues(value);
+      foreach (var child in children) {
+        if (child.Value is IOperator)
+          yield return new KeyValuePair<string, IItem>(child.Key, new StringValue(((IOperator)child.Value).Name));
+        else yield return child;
+      }
+    }
+
     #region Events
     public event EventHandler ExecutionStateChanged;

trunk/sources/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -97 +98 @@
     #endregion
 
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IItem value) {
+      var children = base.GetCollectedValues(value);
+      foreach (var child in children) {
+        if (child.Value is IOperator)
+          yield return new KeyValuePair<string, IItem>(child.Key, new StringValue(((IOperator)child.Value).Name));
+        else yield return child;
+      }
+    }
+
     #region events
     private void Operators_Changed(object sender, EventArgs e) {