Changeset 5379

Timestamp:

01/26/11 13:18:26 (14 years ago)

Author:

svonolfe

Message:

Implemented review comments by abeham for the SuccessProgressAnalysis (#1392)

Location:

branches/SuccessProgressAnalysis

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SuccessProgressAnalysis (added)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SuccessProgressAnalysis/SuccessProgressAnalyzer.cs (copied) (copied from branches/SuccessProgressAnalysis/HeuristicLab.Analysis/3.3/SuccessProgressAnalysis/SuccessProgressAnalyzer.cs) (1 diff)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis/3.3/SuccessProgressAnalysis (deleted)
• HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (3 diffs)

branches/SuccessProgressAnalysis/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj

@@ -12 +12 @@
     <AssemblyName>HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -115 +116 @@
     <Compile Include="OffspringSelectionGeneticAlgorithmMainOperator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SuccessProgressAnalysis\SuccessProgressAnalyzer.cs" />
   </ItemGroup>
   <ItemGroup>

branches/SuccessProgressAnalysis/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SuccessProgressAnalysis/SuccessProgressAnalyzer.cs

@@ -31 +31 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Data;
+using HeuristicLab.Analysis;
 
-namespace HeuristicLab.Analysis.SuccessProgressAnalysis {
+namespace HeuristicLab.Algorithms.OffspringSelectionAlgorithm.SuccessProgressAnalysis {
   /// <summary>
   /// An operator for analyzing the solution diversity in a population.

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

@@ -137 +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 ValueParameter<BoolValue> ReportExecutedOperatorParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["ReportExecutedOperator"]; }
+    }
     public ValueLookupParameter<StringValue> ExecutedOperatorParameter {
       get { return (ValueLookupParameter<StringValue>)Parameters["ExecutedOperator"]; }
@@ -63 +66 @@
       if (!Parameters.ContainsKey("ExecutedOperator")) {
         Parameters.Add(new ValueLookupParameter<StringValue>("ExecutedOperator", "The operator that was executed."));
+      }
+      if (!Parameters.ContainsKey("ReportExecutedOperator")) {
+        Parameters.Add(new ValueParameter<BoolValue>("ReportExecutedOperator", "Report the executed operator", new BoolValue(false)));
       }
       #endregion
@@ -81 +87 @@
       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)));
     }