Changeset 13566

Timestamp:

01/25/16 17:34:49 (9 years ago)

Author:

abeham

Message:

#2566: improved collection of parameter values in InstrumentedOperator

File:

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

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

@@ -61 +61 @@
       Parameters.Add(new FixedValueParameter<OperatorList>(AfterExecutionOperatorsParameterName, "Actions that are executed after the execution of the operator", new OperatorList()));
       BeforeExecutionOperatorsParameter.Hidden = true;
+      BeforeExecutionOperatorsParameter.GetsCollected = false;
       AfterExecutionOperatorsParameter.Hidden = true;
+      AfterExecutionOperatorsParameter.GetsCollected = false;
     }
 
@@ -77 +79 @@
       }
       #endregion
+    }
+
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IValueParameter param) {
+      foreach (var b in base.GetCollectedValues(param)) yield return b;
+      if (param != BeforeExecutionOperatorsParameter && param != AfterExecutionOperatorsParameter) yield break;
+      var operatorList = param.Value as OperatorList;
+      if (operatorList != null) {
+        var counter = 0;
+        foreach (var op in operatorList) {
+          yield return new KeyValuePair<string, IItem>(counter.ToString(), op);
+          var children = new Dictionary<string, IItem>();
+          op.CollectParameterValues(children);
+          foreach (var c in children) yield return new KeyValuePair<string, IItem>(counter + "." + c.Key, c.Value);
+          counter++;
+        }
+      }
     }