Changeset 11077

Timestamp:

07/02/14 18:28:44 (11 years ago)

Author:

gkronber

Message:

#2171: minor changes while reviewing the source code for the parameter optimization problem plugin

Location:

trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3

Files:

• BestSolutionAnalyzer.cs (modified) (2 diffs)
• BestSolutionsAnalyzer.cs (modified) (1 diff)
• ParameterOptimizationProblem.cs (modified) (4 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Properties/AssemblyInfo.cs.frame (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs

@@ -95 +95 @@
       DoubleValue bestKnownQuality = BestKnownQualityParameter.ActualValue;
 
-      int ind = -1;
-      if (!max) ind = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
-      else ind = qualities.Select((x, index) => new { index, x.Value }).OrderByDescending(x => x.Value).First().index;
+      int indexOfBest = -1;
+      if (!max) indexOfBest = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
+      else indexOfBest = qualities.Select((x, index) => new { index, x.Value }).OrderByDescending(x => x.Value).First().index;
 
-      var bestQuality = qualities[ind].Value;
-      var bestParameterVector = (RealVector)parameterVectors[ind].Clone();
+      var bestQuality = qualities[indexOfBest].Value;
+      var bestParameterVector = (RealVector)parameterVectors[indexOfBest].Clone();
       ResultCollection results = ResultsParameter.ActualValue;
 
@@ -123 +123 @@
 
       //update best known quality
-      if (bestKnownQuality == null || max && bestQuality > bestKnownQuality.Value
+      if (bestKnownQuality == null 
+        || max && bestQuality > bestKnownQuality.Value
         || !max && bestQuality < bestKnownQuality.Value) {
         BestKnownQualityParameter.ActualValue = new DoubleValue(bestQuality);

trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionsAnalyzer.cs

@@ -156 +156 @@
     public int GetHashCode(DoubleArray obj) {
       if (obj == null) return 0;
-      return obj.Aggregate(23, (current, item) => current ^ (int)item);
+      return (int)obj.Aggregate(23L, (current, item) => current ^ System.BitConverter.DoubleToInt64Bits(item));
     }
   }

trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs

@@ -94 +94 @@
       : base(evaluator, new UniformRandomRealVectorCreator()) {
       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<DoubleMatrix>(BoundsParameterName, "The bounds for each dimension of the parameter vector. If the number of bounds is smaller than the problem size then the bounds are reused in a cyclic manner.", new DoubleMatrix(new double[,] { { 0, 100 } }, new string[] { "LowerBound", "UpperBound" })));
       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" })));
 
@@ -121 +121 @@
     protected override void OnEvaluatorChanged() {
       base.OnEvaluatorChanged();
-      strategyVectorManipulator.GeneralLearningRateParameter.Value = new DoubleValue(1.0 / Math.Sqrt(2 * ProblemSize));
-      strategyVectorManipulator.LearningRateParameter.Value = new DoubleValue(1.0 / Math.Sqrt(2 * Math.Sqrt(ProblemSize)));
       UpdateParameters();
     }
@@ -136 +134 @@
       Evaluator.ParameterNamesParameter.ActualName = ParameterNamesParameter.Name;
 
-      var bestSolutionAnalyzer = Operators.OfType<BestSolutionAnalyzer>().First();
-      bestSolutionAnalyzer.ParameterVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-      bestSolutionAnalyzer.ParameterNamesParameter.ActualName = ParameterNamesParameter.Name;
-
+      foreach (var bestSolutionAnalyzer in Operators.OfType<BestSolutionAnalyzer>()) {
+        bestSolutionAnalyzer.ParameterVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        bestSolutionAnalyzer.ParameterNamesParameter.ActualName = ParameterNamesParameter.Name;
+      }
       Bounds = new DoubleMatrix(ProblemSize, 2);
       Bounds.RowNames = ParameterNames;
@@ -171 +169 @@
         if (string.IsNullOrEmpty(ParameterNames[i])) ParameterNames[i] = "Parameter" + i;
       }
+
+      strategyVectorManipulator.GeneralLearningRateParameter.Value = new DoubleValue(1.0 / Math.Sqrt(2 * ProblemSize));
+      strategyVectorManipulator.LearningRateParameter.Value = new DoubleValue(1.0 / Math.Sqrt(2 * Math.Sqrt(ProblemSize)));
     }
 

trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/Plugin.cs.frame

@@ -20 +20 @@
 #endregion
 
-using System;
 using HeuristicLab.PluginInfrastructure;
-using Microsoft.Win32;
 
 namespace HeuristicLab.Problems.ParameterOptimization {

trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/Properties/AssemblyInfo.cs.frame

@@ -27 +27 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("HeuristicLab.Problems.ParameterOptimization")]
-[assembly: AssemblyDescription("HeuristicLab problems for parameter optimization.")]
+[assembly: AssemblyDescription("HeuristicLab problem for parameter optimization.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]