Changeset 9942 for stable

Timestamp:

09/10/13 15:21:36 (11 years ago)

Author:

abeham

Message:

#1833: merged into stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators/3.3/CheckedMultiOperator.cs (modified) (2 diffs)
• HeuristicLab.Operators/3.3/MultiOperator.cs (modified) (3 diffs)

stable/HeuristicLab.Operators/3.3/CheckedMultiOperator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -51 +54 @@
       Operators = new CheckedItemList<T>();
     }
+
+    public override void CollectParameterValues(IDictionary<string, IItem> 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);
+        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);
+        }
+      }
+    }
   }
 }

stable/HeuristicLab.Operators/3.3/MultiOperator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -25 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Operators {
@@ -36 +36 @@
   public abstract class MultiOperator<T> : SingleSuccessorOperator, IMultiOperator<T> where T : class, IOperator {
     private List<IValueParameter<T>> operatorParameters;
+    protected IEnumerable<IValueParameter<T>> OperatorParameters { get { return operatorParameters; } }
 
     [Storable]