Changeset 13412 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMoveGenerator.cs

Timestamp:

11/28/15 23:38:51 (9 years ago)

Author:

abeham

Message:

#2221:

• Completely refactored PTSP branch
  • Added two sets of problem instances based on TSPLIB: homogeneous and heterogeneous
  • Implemented missing EvaluateByCoordinates for 1-shift moves
  • Made it clear that move evaluators are for estimated PTSP only
  • Changed parameter realization from a rather strange list of list of ints to a list of bool arrays
  • Reusing code of the 2-opt and 1-shift move evaluators in 2.5 move evaluator
  • Introducing distance calculators to properly handle the case when no distance matrix is given (previous code only worked with distance matrix and without only with euclidean distance in some settings)
  • Fixed several smaller code issues: protected, static, method parameters, copy & paste, interfaces, naming, parameters, serialization hooks, license headers, doc comments, data types

File:

• branches/PTSP/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMoveGenerator.cs (copied) (copied from branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveGenerators/TwoPointFiveMoveGenerator.cs) (3 diffs)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMoveGenerator.cs

@@ -32 +32 @@
   [Item("TwoPointFiveMoveGenerator", "Base class for all inversion and shift (2.5-opt) move generators.")]
   [StorableClass]
-  public abstract class TwoPointFiveMoveGenerator : SingleSuccessorOperator, I25MoveOperator, IMoveGenerator {
+  public abstract class TwoPointFiveMoveGenerator : SingleSuccessorOperator, ITwoPointFiveMoveOperator, IMoveGenerator {
     public override bool CanChangeName {
       get { return false; }
     }
+
     public ILookupParameter<Permutation> PermutationParameter {
       get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
@@ -42 +43 @@
       get { return (LookupParameter<TwoPointFiveMove>)Parameters["TwoPointFiveMove"]; }
     }
-    protected ScopeParameter CurrentScopeParameter {
-      get { return (ScopeParameter)Parameters["CurrentScope"]; }
-    }
 
     [StorableConstructor]
     protected TwoPointFiveMoveGenerator(bool deserializing) : base(deserializing) { }
     protected TwoPointFiveMoveGenerator(TwoPointFiveMoveGenerator original, Cloner cloner) : base(original, cloner) { }
-    public TwoPointFiveMoveGenerator()
+    protected TwoPointFiveMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The permutation for which moves should be generated."));
@@ -57 +55 @@
 
     public override IOperation Apply() {
-      Permutation p = PermutationParameter.ActualValue;
-      TwoPointFiveMove[] moves = GenerateMoves(p);
-      Scope[] moveScopes = new Scope[moves.Length];
+      var p = PermutationParameter.ActualValue;
+      var moves = GenerateMoves(p);
+      var moveScopes = new Scope[moves.Length];
       for (int i = 0; i < moveScopes.Length; i++) {
         moveScopes[i] = new Scope(i.ToString());
         moveScopes[i].Variables.Add(new Variable(TwoPointFiveMoveParameter.ActualName, moves[i]));
       }
-      CurrentScopeParameter.ActualValue.SubScopes.AddRange(moveScopes);
+      ExecutionContext.Scope.SubScopes.AddRange(moveScopes);
       return base.Apply();
     }