Changeset 14466 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/LocalSearch/ExhaustiveSubspace.cs

Timestamp:

12/07/16 23:46:29 (8 years ago)

Author:

abeham

Message:

#2701:

• Added MemPR for linear linkage (tabu walk still missing)
• Added graph coloring problem

Location:

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage

Files:

• . (added)
• LocalSearch (added)
• LocalSearch/ExhaustiveSubspace.cs (copied) (copied from branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary/LocalSearch/ExhaustiveBitflipSubspace.cs) (3 diffs)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/LocalSearch/ExhaustiveSubspace.cs

@@ -22 +22 @@
 using System.Threading;
 using HeuristicLab.Algorithms.MemPR.Interfaces;
+using HeuristicLab.Algorithms.MemPR.Util;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.Binary.LocalSearch;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Encodings.LinearLinkageEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Algorithms.MemPR.Binary.LocalSearch {
-  [Item("Exhaustive Bitflip Local (Subspace) Search (binary)", "", ExcludeGenericTypeInfo = true)]
+namespace HeuristicLab.Algorithms.MemPR.LinearLinkage.LocalSearch {
+  [Item("Exhaustive Local (Subspace) Search (linear linkage)", "", ExcludeGenericTypeInfo = true)]
   [StorableClass]
-  public class ExhaustiveBitflipSubspace<TContext> : NamedItem, ILocalSearch<TContext>
-      where TContext : ISingleSolutionHeuristicAlgorithmContext<SingleObjectiveBasicProblem<BinaryVectorEncoding>, BinaryVector>, IBinaryVectorSubspaceContext {
+  public class ExhaustiveSubspace<TContext> : NamedItem, ILocalSearch<TContext>
+      where TContext : ISingleSolutionHeuristicAlgorithmContext<SingleObjectiveBasicProblem<LinearLinkageEncoding>, Encodings.LinearLinkageEncoding.LinearLinkage>, ILinearLinkageSubspaceContext {
 
     [StorableConstructor]
-    protected ExhaustiveBitflipSubspace(bool deserializing) : base(deserializing) { }
-    protected ExhaustiveBitflipSubspace(ExhaustiveBitflipSubspace<TContext> original, Cloner cloner) : base(original, cloner) { }
-    public ExhaustiveBitflipSubspace() {
+    protected ExhaustiveSubspace(bool deserializing) : base(deserializing) { }
+    protected ExhaustiveSubspace(ExhaustiveSubspace<TContext> original, Cloner cloner) : base(original, cloner) { }
+    public ExhaustiveSubspace() {
       Name = ItemName;
       Description = ItemDescription;
@@ -44 +44 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ExhaustiveBitflipSubspace<TContext>(this, cloner);
+      return new ExhaustiveSubspace<TContext>(this, cloner);
     }
 
     public void Optimize(TContext context) {
-      var evalWrapper = new EvaluationWrapper(context);
+      var evalWrapper = new EvaluationWrapper<Encodings.LinearLinkageEncoding.LinearLinkage>(context.Problem, context.Solution);
       var quality = context.Solution.Fitness;
       try {
-        var result = ExhaustiveBitflip.Optimize(context.Random, context.Solution.Solution, ref quality,
+        var result = ExhaustiveLocalSearch.Optimize(context.Random, context.Solution.Solution, ref quality,
           context.Problem.Maximization, evalWrapper.Evaluate, CancellationToken.None, context.Subspace.Subspace);
         context.IncrementEvaluatedSolutions(result.Item1);
@@ -59 +59 @@
       }
     }
-
-    public sealed class EvaluationWrapper {
-      private readonly TContext context;
-      private readonly ISingleObjectiveSolutionScope<BinaryVector> scope;
-      private readonly SingleEncodingIndividual individual;
-
-      public EvaluationWrapper(TContext context) {
-        this.context = context;
-        // don't clone the solution, which is thrown away again
-        var cloner = new Cloner();
-        cloner.RegisterClonedObject(context.Solution.Solution, null);
-        this.scope = (ISingleObjectiveSolutionScope<BinaryVector>)context.Solution.Clone(cloner);
-        this.individual = new SingleEncodingIndividual(context.Problem.Encoding, this.scope);
-      }
-
-      public double Evaluate(BinaryVector b) {
-        scope.Solution = b;
-        return context.Problem.Evaluate(individual, null);
-      }
-    }
   }
 }