Changeset 10190

Timestamp:

12/04/13 15:01:26 (11 years ago)

Author:

mkommend

Message:

#2082: Added BestSolutionsAnalyzer for ParameterOptimizationProblems.

Location:

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ParameterOptimization/3.3

Files:

• BestSolutionAnalyzer.cs (modified) (2 diffs)
• BestSolutionsAnalyzer.cs (added)
• HeuristicLab.Problems.ParameterOptimization.csproj (modified) (1 diff)
• ParameterOptimizationProblem.cs (modified) (2 diffs)

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs

@@ -44 +44 @@
     private const string BestSolutionResultName = "Best Solution";
 
-
     public virtual bool EnabledByDefault {
       get { return true; }
@@ -83 +82 @@
       Parameters.Add(new LookupParameter<BoolValue>(MaximizationParameterName, "True if the problem is a maximization problem."));
       Parameters.Add(new ScopeTreeLookupParameter<RealVector>(ParameterVectorParameterName, "The parameter vector which should be evaluated."));
-      Parameters.Add(new LookupParameter<StringArray>(ParameterNamesParameterName, "The names which are used within the SciLab script to calculate the quality of a parameter vector."));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>(QualityParameterName, "The quality name for the SciLab parameter vectors."));
+      Parameters.Add(new LookupParameter<StringArray>(ParameterNamesParameterName, "The names of the elements in the parameter vector."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>(QualityParameterName, "The quality name for the parameter vectors."));
       Parameters.Add(new LookupParameter<DoubleValue>(BestQualityParameterName, "The best quality found so far."));
       Parameters.Add(new LookupParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution."));
-      Parameters.Add(new ValueLookupParameter<ResultCollection>(ResultsParameterName, "The result collection where the SciLab parameter should be stored."));
+      Parameters.Add(new ValueLookupParameter<ResultCollection>(ResultsParameterName, "The result collection where the results should be stored."));
     }
 

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ParameterOptimization/3.3/HeuristicLab.Problems.ParameterOptimization.csproj

@@ -88 +88 @@
   <ItemGroup>
     <Compile Include="BestSolutionAnalyzer.cs" />
+    <Compile Include="BestSolutionsAnalyzer.cs" />
     <Compile Include="IParameterVectorEvaluator.cs" />
     <Compile Include="ParameterOptimizationProblem.cs" />

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs

@@ -95 +95 @@
       Parameters.Add(new FixedValueParameter<IntValue>(ProblemSizeParameterName, "The dimension of the parameter vector that is to be optimized.", new IntValue(1)));
       Parameters.Add(new ValueParameter<DoubleMatrix>(BoundsParameterName, "The bounds for each dimension of the parameter vector. If fewer bounds are", new DoubleMatrix(new double[,] { { 0, 100 } }, new string[] { "LowerBound", "UpperBound" })));
-      Parameters.Add(new ValueParameter<StringArray>(ParameterNamesParameterName, "The names which are used within the SciLab script to calculate the quality of a parameter vector.", new StringArray(new string[] { "Parameter0" })));
+      Parameters.Add(new ValueParameter<StringArray>(ParameterNamesParameterName, "The element names which are used to calculate the quality of a parameter vector.", new StringArray(new string[] { "Parameter0" })));
 
       SolutionCreator.LengthParameter.ActualName = "ProblemSize";
@@ -112 +112 @@
       Operators.Add(strategyVectorManipulator);
       Operators.Add(new BestSolutionAnalyzer());
+      Operators.Add(new BestSolutionsAnalyzer());
       UpdateParameters();
       UpdateStrategyVectorBounds();