Changeset 9934 for trunk/sources/HeuristicLab.Operators

Timestamp:

09/03/13 16:15:24 (11 years ago)

Author:

abeham

Message:

#1833:

• Changed behavior to output results only of those operators that have been checked
• Removed additional "Checked" result

File:

• trunk/sources/HeuristicLab.Operators/3.3/CheckedMultiOperator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Operators/3.3/CheckedMultiOperator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -55 +56 @@
 
     public override void CollectParameterValues(IDictionary<string, IItem> values) {
-      base.CollectParameterValues(values);
+      foreach (var param in Parameters.OfType<IValueParameter>().Except(OperatorParameters)) {
+        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);
+        }
+      }
       foreach (var opParam in OperatorParameters) {
         var op = opParam.Value;
         var @checked = Operators.ItemChecked(op);
-        values.Add(opParam.Name + ".Checked", new BoolValue(@checked));
+        if (!@checked) continue;
+        var children = GetCollectedValues(opParam);
+        foreach (var c in children) {
+          if (String.IsNullOrEmpty(c.Key))
+            values.Add(opParam.Name, c.Value);
+          else values.Add(opParam.Name + "." + c.Key, c.Value);
+        }
       }
     }