Changeset 7615 for branches/HeuristicLab.TimeSeries/HeuristicLab.Core/3.3

Timestamp:

03/15/12 09:11:17 (12 years ago)

Author:

gkronber

Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/ParameterizedNamedItem.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/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;
       }
     }