Changeset 17517 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

Timestamp:

04/20/20 17:31:31 (4 years ago)

Author:

abeham

Message:

#2521: Worked on ResultParameter for Problem and Algorithms

• Add ResultParameter to TSP, BinaryVectorProblem, and HillClimber
• Refactor ResultParameter to allow presetting the ResultCollection instead of having to discover it (e.g. for use in BasicAlgorithms)
• Unify Results property among EngineAlgorithm and BasicAlgorithm
  • There is now only a single instance which is storable

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

@@ -46 +46 @@
     private IRandom random;
 
-    private const string IterationsParameterName = "Iterations";
-    private const string BestQualityResultName = "Best quality";
-    private const string IterationsResultName = "Iterations";
+    [Storable] public IFixedValueParameter<IntValue> MaximumIterationsParameter { get; private set; }
+    [Storable] public IResultParameter<DoubleValue> BestQualityResultParameter { get; private set; }
+    [Storable] public IResultParameter<IntValue> IterationsResultParameter { get; private set; }
 
     public override Type ProblemType {
@@ -60 +60 @@
     public override bool SupportsPause { get { return false; } }
 
-    public IFixedValueParameter<IntValue> IterationsParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[IterationsParameterName]; }
+    public int MaximumIterations {
+      get { return MaximumIterationsParameter.Value.Value; }
+      set { MaximumIterationsParameter.Value.Value = value; }
     }
-
-    public int Iterations {
-      get { return IterationsParameter.Value.Value; }
-      set { IterationsParameter.Value.Value = value; }
-    }
-
-    #region ResultsProperties
-    private double ResultsBestQuality {
-      get { return ((DoubleValue)Results[BestQualityResultName].Value).Value; }
-      set { ((DoubleValue)Results[BestQualityResultName].Value).Value = value; }
-    }
-    private int ResultsIterations {
-      get { return ((IntValue)Results[IterationsResultName].Value).Value; }
-      set { ((IntValue)Results[IterationsResultName].Value).Value = value; }
-    }
-    #endregion
 
     [StorableConstructor]
@@ -84 +69 @@
     protected HillClimber(HillClimber original, Cloner cloner)
       : base(original, cloner) {
+      MaximumIterationsParameter = cloner.Clone(original.MaximumIterationsParameter);
+      BestQualityResultParameter = cloner.Clone(original.BestQualityResultParameter);
+      IterationsResultParameter = cloner.Clone(original.IterationsResultParameter);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -92 +80 @@
       : base() {
       random = new MersenneTwister();
-      Parameters.Add(new FixedValueParameter<IntValue>(IterationsParameterName, "", new IntValue(100)));
+      Parameters.Add(MaximumIterationsParameter = new FixedValueParameter<IntValue>("Maximum Iterations", "", new IntValue(100)));
+      Parameters.Add(BestQualityResultParameter = new ResultParameter<DoubleValue>("Best Quality", "", "Results", new DoubleValue(double.NaN)));
+      Parameters.Add(IterationsResultParameter = new ResultParameter<IntValue>("Iterations", "", "Results", new IntValue(0)));
     }
 
-
-    protected override void Initialize(CancellationToken cancellationToken) {
-      Results.Add(new Result(BestQualityResultName, new DoubleValue(double.NaN)));
-      Results.Add(new Result(IterationsResultName, new IntValue(0)));
-      base.Initialize(cancellationToken);
-    }
     protected override void Run(CancellationToken cancellationToken) {
-      while (ResultsIterations < Iterations) {
+      while (IterationsResultParameter.ActualValue.Value < MaximumIterations) {
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -114 +98 @@
 
         fitness = ImproveToLocalOptimum(Problem, solution, fitness, random);
-        if (double.IsNaN(ResultsBestQuality) || Problem.IsBetter(fitness, ResultsBestQuality)) {
-          ResultsBestQuality = fitness;
+        var bestSoFar = BestQualityResultParameter.ActualValue.Value;
+        if (double.IsNaN(bestSoFar) || Problem.IsBetter(fitness, bestSoFar)) {
+          BestQualityResultParameter.ActualValue.Value = fitness;
         }
 
-        ResultsIterations++;
+        IterationsResultParameter.ActualValue.Value++;
       }
     }