Changeset 11791

Timestamp:

01/16/15 14:39:15 (9 years ago)

Author:

mkommend

Message:

#2282: Implemented stop button in PPP and adapted to new BasicAlgorithm.

Location:

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3

Files:

• AlgorithmBase.cs (deleted)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj (modified) (1 diff)
• HillClimber.cs (modified) (3 diffs)
• ParameterlessPopulationPyramid.cs (modified) (8 diffs)

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj

@@ -103 +103 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AlgorithmBase.cs" />
     <Compile Include="EnumerableBoolEqualityComparer.cs" />
     <Compile Include="LinkageCrossover.cs" />

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -37 +38 @@
   [Creatable("Parameterless Population Pyramid")]
   // In the GECCO paper, Section 2.1
-  public class HillClimber : AlgorithmBase {
+  public class HillClimber : BasicAlgorithm {
     [Storable]
     private IRandom random;
 
     private const string IterationsParameterName = "Iterations";
+
+    public override Type ProblemType {
+      get { return typeof(BinaryVectorProblem); }
+    }
+    public new BinaryVectorProblem Problem {
+      get { return (BinaryVectorProblem)base.Problem; }
+      set { base.Problem = value; }
+    }
 
     public IFixedValueParameter<IntValue> IterationsParameter {
@@ -66 +75 @@
       Parameters.Add(new FixedValueParameter<IntValue>(IterationsParameterName, "", new IntValue(100)));
     }
-    protected override void Run() {
+    protected override void Run(CancellationToken cancellationToken) {
       var BestQuality = new DoubleValue(double.NaN);
       Results.Add(new Result("Best quality", BestQuality));

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -39 +37 @@
   [StorableClass]
   [Creatable("Parameterless Population Pyramid")]
-
-  public class ParameterlessPopulationPyramid : AlgorithmBase {
+  public class ParameterlessPopulationPyramid : BasicAlgorithm {
+    public override Type ProblemType {
+      get { return typeof(BinaryVectorProblem); }
+    }
+    public new BinaryVectorProblem Problem {
+      get { return (BinaryVectorProblem)base.Problem; }
+      set { base.Problem = value; }
+    }
+
     private readonly IRandom random = new MersenneTwister();
     private List<Population> pyramid;
@@ -51 +56 @@
     private const string MaximumIterationsParameterName = "Maximum Iterations";
     private const string MaximumEvaluationsParameterName = "Maximum Evaluations";
+    private const string MaximumRuntimeParameterName = "Maximum Runtime";
     private const string SeedParameterName = "Seed";
     private const string SetSeedRandomlyParameterName = "SetSeedRandomly";
@@ -61 +67 @@
     public IFixedValueParameter<IntValue> MaximumEvaluationsParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters[MaximumEvaluationsParameterName]; }
+    }
+    public IFixedValueParameter<IntValue> MaximumRuntimeParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters[MaximumRuntimeParameterName]; }
     }
     public IFixedValueParameter<IntValue> SeedParameter {
@@ -75 +84 @@
       set { MaximumIterationsParameter.Value.Value = value; }
     }
-
     public int MaximumEvaluations {
       get { return MaximumEvaluationsParameter.Value.Value; }
       set { MaximumEvaluationsParameter.Value.Value = value; }
     }
-
+    public int MaximumRuntime {
+      get { return MaximumRuntimeParameter.Value.Value; }
+      set { MaximumRuntimeParameter.Value.Value = value; }
+    }
     public int Seed {
       get { return SeedParameter.Value.Value; }
       set { SeedParameter.Value.Value = value; }
     }
-
     public bool SetSeedRandomly {
       get { return SetSeedRandomlyParameter.Value.Value; }
@@ -151 +161 @@
     public ParameterlessPopulationPyramid() {
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumIterationsParameterName, "", new IntValue(Int32.MaxValue)));
-      Parameters.Add(new FixedValueParameter<IntValue>(MaximumEvaluationsParameterName, "", new IntValue(10000)));
+      Parameters.Add(new FixedValueParameter<IntValue>(MaximumEvaluationsParameterName, "", new IntValue(Int32.MaxValue)));
+      Parameters.Add(new FixedValueParameter<IntValue>(MaximumRuntimeParameterName, "The maximum runtime in seconds after which the algorithm stops. Use -1 to specify no limit for the runtime", new IntValue(3600)));
       Parameters.Add(new FixedValueParameter<IntValue>(SeedParameterName, "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
       Parameters.Add(new FixedValueParameter<BoolValue>(SetSeedRandomlyParameterName, "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
+    }
+
+    protected override void OnExecutionTimeChanged() {
+      base.OnExecutionTimeChanged();
+      if (CancellationTokenSource == null) return;
+      if (MaximumRuntime == -1) return;
+      if (ExecutionTime.TotalSeconds > MaximumRuntime) CancellationTokenSource.Cancel();
     }
 
@@ -190 +208 @@
     }
 
-    protected override void Run() {
+    protected override void Run(CancellationToken cancellationToken) {
       // Set up the algorithm
       if (SetSeedRandomly) Seed = new System.Random().Next();
@@ -225 +243 @@
         try {
           fitness = iterate();
-        }
-        catch (OperationCanceledException) {
-          throw;
+          cancellationToken.ThrowIfCancellationRequested();
         }
         finally {