Changeset 14691 for branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch

Timestamp:

02/23/17 10:42:58 (8 years ago)

Author:

abeham

Message:

#2457: working on identification of problem instances

Location:

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch

Files:

• ExhaustiveHillClimb.cs (modified) (2 diffs)
• ExhaustiveHillClimbSubspace.cs (modified) (2 diffs)

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch/ExhaustiveHillClimb.cs

@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.QuadraticAssignment;
 
 namespace HeuristicLab.Algorithms.MemPR.Permutation.LocalSearch {
@@ -54 +55 @@
       var quality = context.Solution.Fitness;
       try {
+
+        var min = 0.0;
+        var max = 1.0;
+        var qap = context.Problem as QuadraticAssignmentProblem;
+        if (qap != null) {
+          min = qap.LowerBound.Value;
+          max = qap.AverageQuality.Value;
+        }
+
         var path = new List<Tuple<Encodings.PermutationEncoding.Permutation, double>>();
-        path.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)context.Solution.Solution.Clone(), quality));
+        path.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)context.Solution.Solution.Clone(), (quality - min) / (max - min)));
 
         var result = Exhaustive.HillClimb(context.Random, context.Solution.Solution, quality,
           context.Maximization, context.Evaluate, CancellationToken.None);
-
-        Tuple<Encodings.PermutationEncoding.Permutation, double, int> last = null;
+        
+        var evaluations = 0;
         foreach (var step in result) {
-          path.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)step.Item1.Clone(), step.Item2));
-          last = step;
+          path.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)step.Item1.Clone(), (step.Item2 - min) / (max - min)));
+          evaluations = step.Item3; // last one will be actual evaluations
         }
         context.LocalSearchPaths.AddPath(path);
-        context.IncrementEvaluatedSolutions(last.Item3);
+        context.IncrementEvaluatedSolutions(evaluations);
         context.Iterations = path.Count - 2;
       } finally {

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch/ExhaustiveHillClimbSubspace.cs

@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.QuadraticAssignment;
 
 namespace HeuristicLab.Algorithms.MemPR.Permutation.LocalSearch {
@@ -54 +55 @@
       var quality = context.Solution.Fitness;
       try {
+        var min = 0.0;
+        var max = 1.0;
+        var qap = context.Problem as QuadraticAssignmentProblem;
+        if (qap != null) {
+          min = qap.LowerBound.Value;
+          max = qap.AverageQuality.Value;
+        }
+
         var path = new List<Tuple<Encodings.PermutationEncoding.Permutation, double>>();
-        path.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)context.Solution.Solution.Clone(), quality));
+        path.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)context.Solution.Solution.Clone(), (quality - min) / (max - min)));
 
         var result = Exhaustive.HillClimb(context.Random, context.Solution.Solution, quality,
           context.Maximization, context.Evaluate, CancellationToken.None, context.Subspace.Subspace);
 
-        Tuple<Encodings.PermutationEncoding.Permutation, double, int> last = null;
+        var evaluations = 0;
         foreach (var step in result) {
-          path.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)step.Item1.Clone(), step.Item2));
-          last = step;
+          path.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)step.Item1.Clone(), (step.Item2 - min) / (max - min)));
+          evaluations = step.Item3; // last one will be actual evaluations
         }
         context.LocalSearchPaths.AddPath(path);
-        context.IncrementEvaluatedSolutions(last.Item3);
+        context.IncrementEvaluatedSolutions(evaluations);
         context.Iterations = path.Count - 2;
       } finally {