Changeset 5682 for branches/SuccessProgressAnalysis/HeuristicLab.Operators

Timestamp:

03/15/11 09:51:22 (14 years ago)

Author:

svonolfe

Message:

Implemented review comments from swagner (#1392)

File:

• branches/SuccessProgressAnalysis/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (7 diffs)

branches/SuccessProgressAnalysis/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs

@@ -49 +49 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public ValueParameter<BoolValue> ReportExecutedOperatorParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["ReportExecutedOperator"]; }
+    public ValueParameter<BoolValue> TraceSelectedOperatorParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["TraceSelectedOperator"]; }
     }
-    public ValueLookupParameter<StringValue> ExecutedOperatorParameter {
-      get { return (ValueLookupParameter<StringValue>)Parameters["ExecutedOperator"]; }
+    public ValueLookupParameter<StringValue> SelectedOperatorParameter {
+      get { return (ValueLookupParameter<StringValue>)Parameters["SelectedOperator"]; }
     }
 
@@ -64 +64 @@
     private void AfterDeserializationHook() {
       #region Backwards Compatibility
-      if (!Parameters.ContainsKey("ExecutedOperator")) {
-        Parameters.Add(new ValueLookupParameter<StringValue>("ExecutedOperator", "The operator that was executed."));
+      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("ReportExecutedOperator")) {
-        Parameters.Add(new ValueParameter<BoolValue>("ReportExecutedOperator", "Report the executed operator", new BoolValue(false)));
+      if (!Parameters.ContainsKey("TraceSelectedOperator")) {
+        Parameters.Add(new ValueParameter<BoolValue>("TraceSelectedOperator", "Indicates, if the selected operator should be traced.", new BoolValue(false)));
       }
       #endregion
@@ -86 +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>("ExecutedOperator", "The operator that was executed."));
-      Parameters.Add(new ValueParameter<BoolValue>("ReportExecutedOperator", "Report the executed operator", new BoolValue(false)));
+      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)));
     }
 
@@ -136 +136 @@
       }
       IOperator successor = null;
+      int index = -1;
       var checkedOperators = Operators.CheckedItems;
       if (checkedOperators.Count() > 0) {
@@ -147 +148 @@
           if (sum > r) {
             successor = indexedItem.Value;
+            index = indexedItem.Index;
             break;
           }
@@ -153 +155 @@
       OperationCollection next = new OperationCollection(base.Apply());
       if (successor != null) {
-        if(ReportExecutedOperatorParameter.Value.Value)
-          ExecutedOperatorParameter.ActualValue = new StringValue(successor.Name);
+        if (TraceSelectedOperatorParameter.Value.Value)
+          SelectedOperatorParameter.ActualValue = new StringValue(index + ": " + successor.Name);
 
         if (CreateChildOperation)
@@ -160 +162 @@
         else next.Insert(0, ExecutionContext.CreateOperation(successor));
       } else {
-        if (ReportExecutedOperatorParameter.Value.Value)
-          ExecutedOperatorParameter.ActualValue = new StringValue("");
+        if (TraceSelectedOperatorParameter.Value.Value)
+          SelectedOperatorParameter.ActualValue = new StringValue("");
       }
       return next;