Changeset 14556 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch

Timestamp:

01/11/17 01:53:44 (8 years ago)

Author:

abeham

Message:

#2701:

• fixed bug with breeding
• fixed permutation sub-space hillclimber
• improved speed of inversion by calling Array.Reverse(int, int) instead of using a for-loop
• added delinking for relative-undirected permutations

Location:

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

Files:

• ExhaustiveHillClimbSubspace.cs (modified) (2 diffs)
• StaticAPI/Exhaustive2Opt.cs (modified) (2 diffs)

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

@@ -33 +33 @@
   [StorableClass]
   public class ExhaustiveHillClimbSubspace<TContext> : NamedItem, ILocalSearch<TContext>
-      where TContext : ISingleSolutionHeuristicAlgorithmContext<SingleObjectiveBasicProblem<PermutationEncoding>, Encodings.PermutationEncoding.Permutation>,
+      where TContext : ISingleSolutionHeuristicAlgorithmContext<ISingleObjectiveHeuristicOptimizationProblem, Encodings.PermutationEncoding.Permutation>,
                        IPermutationSubspaceContext, IEvaluationServiceContext<Encodings.PermutationEncoding.Permutation> {
 
@@ -52 +52 @@
       try {
         var result = Exhaustive.HillClimb(context.Random, context.Solution.Solution, ref quality,
-          context.Problem.Maximization, context.Evaluate, CancellationToken.None, context.Subspace.Subspace);
+          context.Maximization, context.Evaluate, CancellationToken.None, context.Subspace.Subspace);
         context.IncrementEvaluatedSolutions(result.Item1);
         context.Iterations = result.Item2;

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Permutation/LocalSearch/StaticAPI/Exhaustive2Opt.cs

@@ -55 +55 @@
             continue;
 
-          InversionManipulator.Apply(current, opt.Index1, opt.Index2);
+          current.Reverse(opt.Index1, opt.Index2 - opt.Index1 + 1);
           var q = eval(current, token);
           evaluations++;
@@ -62 +62 @@
             quality = q;
             lastSuccessMove = opt;
-          } else InversionManipulator.Apply(current, opt.Index1, opt.Index2);
+          } else current.Reverse(opt.Index1, opt.Index2 - opt.Index1 + 1);
 
           if (token.IsCancellationRequested) {