Changeset 3212 for trunk/sources/HeuristicLab.Operators

Timestamp:

03/25/10 03:05:28 (14 years ago)

Author:

swagner

Message:

Fixed parameter update in MultipleCallsOperator (#950).

File:

• trunk/sources/HeuristicLab.Operators/3.3/MultipleCallsOperator.cs (modified) (5 diffs)

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

@@ -35 +35 @@
   [StorableClass]
   public abstract class MultipleCallsOperator : SingleSuccessorOperator {
-    private List<OperatorParameter> operatorParameters;
+    private List<IValueParameter<IOperator>> operatorParameters;
 
     private OperatorList operators;
@@ -56 +56 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      operatorParameters = new List<OperatorParameter>();
+      operatorParameters = new List<IValueParameter<IOperator>>();
       for (int i = 0; i < Operators.Count; i++) {
-        OperatorParameter opParam = (OperatorParameter)Parameters[i.ToString()];
+        IValueParameter<IOperator> opParam = (IValueParameter<IOperator>)Parameters[i.ToString()];
         operatorParameters.Add(opParam);
         opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
@@ -72 +72 @@
 
     private void UpdateOperatorParameters() {
-      foreach (OperatorParameter opParam in operatorParameters) {
+      foreach (IValueParameter<IOperator> opParam in operatorParameters) {
         opParam.ValueChanged -= new EventHandler(opParam_ValueChanged);
         Parameters.Remove(opParam.Name);
@@ -78 +78 @@
       operatorParameters.Clear();
       for (int i = 0; i < Operators.Count; i++) {
-        OperatorParameter opParam = new OperatorParameter(i.ToString(), string.Empty, Operators[i]);
+        IValueParameter<IOperator> opParam = new ValueParameter<IOperator>(i.ToString(), string.Empty, Operators[i]);
         opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
         Parameters.Add(opParam);
@@ -118 +118 @@
     }
     private void opParam_ValueChanged(object sender, EventArgs e) {
-      OperatorParameter opParam = (OperatorParameter)sender;
+      IValueParameter<IOperator> opParam = (IValueParameter<IOperator>)sender;
       operators[operatorParameters.IndexOf(opParam)] = opParam.Value;
     }