Changeset 11669 for branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/Problems

Timestamp:

12/07/14 17:25:50 (10 years ago)

Author:

bgoldman

Message:

#2282 Code cleanup, added Deceptive Step Trap problem.

Location:

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

Files:

• DeceptiveStepTrapProblem.cs (added)
• DeceptiveTrapProblem.cs (modified) (3 diffs)
• EvaluationTracker.cs (modified) (3 diffs)
• HIFFProblem.cs (modified) (2 diffs)
• IBinaryVectorProblem.cs (modified) (1 diff)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -59 +56 @@
       set { TrapSizeParameter.Value.Value = value; }
     }
+
+    protected virtual int TrapMaximum {
+      get { return TrapSize;  }
+    }
+
     public DeceptiveTrapProblem()
       : base() {
-      Parameters.Add(new FixedValueParameter<IntValue>(TrapSizeParameterName, "", new IntValue(5)));
+      Parameters.Add(new FixedValueParameter<IntValue>(TrapSizeParameterName, "", new IntValue(7)));
+      Length = 49;
+    }
+
+    protected virtual int Score(bool[] individual, int trapIndex) {
+      int result = 0;
+      for (int index = trapIndex; index < trapIndex + TrapSize; index++) {
+        if (individual[index]) result++;
+      }
+
+      // Make it deceptive
+      if (result < TrapSize) {
+        result = TrapSize - result - 1;
+      }
+      return result;
     }
 
@@ -68 +84 @@
       int total = 0;
       for (int i = 0; i < individual.Length; i += TrapSize) {
-        int partial = 0;
-        for (int index = i; index < i + TrapSize; index++) {
-          if (individual[index]) partial++;
-        }
-
-        // Make it deceptive
-        if (partial < TrapSize) {
-          partial = TrapSize - partial - 1;
-        }
-        total += partial;
+        total += Score(individual, i);
       }
-      return total;
+      return (double)(total * TrapSize) / (TrapMaximum * individual.Length);
     }
   }

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.Algorithms.ParameterlessPopulationPyramid {
   public class EvaluationTracker : IBinaryVectorProblem {
     private readonly IBinaryVectorProblem problem;
+
     private int maxEvaluations;
 
-    private double bestQuality = double.NaN;
+    #region Properties
     public double BestQuality {
-      get { return bestQuality; }
+      get;
+      private set;
     }
 
-    private int evaluations = 0;
     public int Evaluations {
-      get { return evaluations; }
+      get;
+      private set;
     }
 
-    private int bestFoundOnEvaluation = 0;
     public int BestFoundOnEvaluation {
-      get { return bestFoundOnEvaluation; }
+      get;
+      private set;
     }
 
     public bool[] BestSolution {
-      get; private set;
+      get;
+      private set;
     }
+    #endregion
 
     public EvaluationTracker(IBinaryVectorProblem problem, int maxEvaluations) {
@@ -54 +55 @@
       this.maxEvaluations = maxEvaluations;
       BestSolution = new bool[0];
+      BestQuality = double.NaN;
+      Evaluations = 0;
+      BestFoundOnEvaluation = 0;
     }
 
     public double Evaluate(bool[] individual) {
-      if (evaluations >= maxEvaluations) throw new OperationCanceledException("Maximum Evaluation Limit Reached");
-      evaluations++;
+      if (Evaluations >= maxEvaluations) throw new OperationCanceledException("Maximum Evaluation Limit Reached");
+      Evaluations++;
       double fitness = problem.Evaluate(individual);
-      if (double.IsNaN(bestQuality) || problem.IsBetter(fitness, bestQuality)) {
-        bestQuality = fitness;
+      if (double.IsNaN(BestQuality) || problem.IsBetter(fitness, BestQuality)) {
+        BestQuality = fitness;
         BestSolution = (bool[])individual.Clone();
-        bestFoundOnEvaluation = evaluations;
+        BestFoundOnEvaluation = Evaluations;
       }
       return fitness;
     }
 
-
+    #region ForwardedInteraface
     public int Length {
       get { return problem.Length; }
@@ -77 +81 @@
     public bool IsBetter(double quality, double bestQuality) {
       return problem.IsBetter(quality, bestQuality);
-    }    
+    }
+    #endregion
   }
 }

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -48 +45 @@
 
     public HIFFProblem() : base() {
-      Length = 32;
+      Length = 64;
     }
 

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace HeuristicLab.Algorithms.ParameterlessPopulationPyramid {
   public interface IBinaryVectorProblem {