Changeset 7706

Timestamp:

04/04/12 17:21:22 (13 years ago)

Author:

abeham

Message:

#1695: fixed bug in parameter collection

Location:

trunk/sources

Files:

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

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

@@ -85 +85 @@
     public virtual void CollectParameterValues(IDictionary<string, IItem> values) {
       foreach (IValueParameter param in parameters.OfType<IValueParameter>()) {
-        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);
-          }
+        var children = GetCollectedValues(param);
+        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;
+    protected virtual IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IValueParameter param) {
+      if (param.Value == null) yield break;
+      if (param.GetsCollected) yield return new KeyValuePair<string, IItem>(String.Empty, param.Value);
+      var parameterizedItem = param.Value as IParameterizedItem;
       if (parameterizedItem != null) {
         var children = new Dictionary<string, IItem>();

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);
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IValueParameter param) {
+      var children = base.GetCollectedValues(param);
       foreach (var child in children) {
         if (child.Value is IOperator)

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

@@ -98 +98 @@
     #endregion
 
-    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IItem value) {
-      var children = base.GetCollectedValues(value);
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IValueParameter param) {
+      var children = base.GetCollectedValues(param);
       foreach (var child in children) {
         if (child.Value is IOperator)