Changeset 5683 for trunk/sources/HeuristicLab.Operators

Timestamp:

03/15/11 10:55:15 (14 years ago)

Author:

svonolfe

Message:

Integrated successful offspring analysis into trunk (#1392)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (5 diffs)

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

@@ -49 +49 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
+    public ValueParameter<BoolValue> TraceSelectedOperatorParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["TraceSelectedOperator"]; }
+    }
+    public ValueLookupParameter<StringValue> SelectedOperatorParameter {
+      get { return (ValueLookupParameter<StringValue>)Parameters["SelectedOperator"]; }
+    }
 
     public DoubleArray Probabilities {
       get { return ProbabilitiesParameter.Value; }
       set { ProbabilitiesParameter.Value = value; }
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      #region Backwards Compatibility
+      if (!Parameters.ContainsKey("SelectedOperator")) {
+        Parameters.Add(new ValueLookupParameter<StringValue>("SelectedOperator", "If the TraceSelectedOperator flag is set, the name of the operator is traced in this parameter."));
+      }
+      if (!Parameters.ContainsKey("TraceSelectedOperator")) {
+        Parameters.Add(new ValueParameter<BoolValue>("TraceSelectedOperator", "Indicates, if the selected operator should be traced.", new BoolValue(false)));
+      }
+      #endregion
     }
 
@@ -68 +86 @@
       Parameters.Add(new ValueLookupParameter<DoubleArray>("Probabilities", "The array of relative probabilities for each operator.", new DoubleArray()));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
+      Parameters.Add(new ValueLookupParameter<StringValue>("SelectedOperator", "If the TraceSelectedOperator flag is set, the name of the operator is traced in this parameter."));
+      Parameters.Add(new ValueParameter<BoolValue>("TraceSelectedOperator", "Indicates, if the selected operator should be traced.", new BoolValue(false)));
     }
 
@@ -116 +136 @@
       }
       IOperator successor = null;
+      int index = -1;
       var checkedOperators = Operators.CheckedItems;
       if (checkedOperators.Count() > 0) {
@@ -127 +148 @@
           if (sum > r) {
             successor = indexedItem.Value;
+            index = indexedItem.Index;
             break;
           }
@@ -133 +155 @@
       OperationCollection next = new OperationCollection(base.Apply());
       if (successor != null) {
+        if (TraceSelectedOperatorParameter.Value.Value)
+          SelectedOperatorParameter.ActualValue = new StringValue(index + ": " + successor.Name);
+
         if (CreateChildOperation)
           next.Insert(0, ExecutionContext.CreateChildOperation(successor));
         else next.Insert(0, ExecutionContext.CreateOperation(successor));
+      } else {
+        if (TraceSelectedOperatorParameter.Value.Value)
+          SelectedOperatorParameter.ActualValue = new StringValue("");
       }
       return next;