Changeset 5372

Timestamp:

01/25/11 14:10:06 (14 years ago)

Author:

svonolfe

Message:

Implemented first version of success progress analysis (#1392)

Location:

branches/SuccessProgressAnalysis

Files:

• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/SuccessProgressAnalysis (added)
• HeuristicLab.Analysis/3.3/SuccessProgressAnalysis/SuccessProgressAnalyzer.cs (added)
• HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (3 diffs)

branches/SuccessProgressAnalysis/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -12 +12 @@
     <AssemblyName>HeuristicLab.Analysis-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -136 +137 @@
     <Compile Include="HeuristicLabAnalysisPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SuccessProgressAnalysis\SuccessProgressAnalyzer.cs" />
     <Compile Include="ValueAnalysis\MinAverageMaxValueAnalyzer.cs" />
     <Compile Include="ValueAnalysis\MinAverageMaxValueCalculator.cs" />

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

@@ -49 +49 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
+    public ValueLookupParameter<StringValue> ExecutedOperatorParameter {
+      get { return (ValueLookupParameter<StringValue>)Parameters["ExecutedOperator"]; }
+    }
 
     public DoubleArray Probabilities {
       get { return ProbabilitiesParameter.Value; }
       set { ProbabilitiesParameter.Value = value; }
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      #region Backwards Compatibility
+      if (!Parameters.ContainsKey("ExecutedOperator")) {
+        Parameters.Add(new ValueLookupParameter<StringValue>("ExecutedOperator", "The operator that was executed."));
+      }
+      #endregion
     }
 
@@ -68 +80 @@
       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."));
     }
 
@@ -133 +146 @@
       OperationCollection next = new OperationCollection(base.Apply());
       if (successor != null) {
+        ExecutedOperatorParameter.ActualValue = new StringValue(successor.GetType().Name);
+
         if (CreateChildOperation)
           next.Insert(0, ExecutionContext.CreateChildOperation(successor));
         else next.Insert(0, ExecutionContext.CreateOperation(successor));
+      } else {
+        ExecutedOperatorParameter.ActualValue = new StringValue("");
       }
       return next;