Changeset 12272 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

Timestamp:

03/31/15 16:57:05 (9 years ago)

Author:

apolidur

Message:

#2221: Adding 2.5-opt-EEs operators to PTSP

File:

• branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs (modified) (2 diffs)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

@@ -95 +95 @@
       Operators.Add(new PTSPExhaustiveInversionLocalImprovement());
       Operators.Add(new PTSPExhaustiveInsertionLocalImprovement());
+
+      Operators.Add(new Exhaustive25MoveGenerator());
+      Operators.Add(new Stochastic25MultiMoveGenerator());
+      Operators.Add(new Stochastic25SingleMoveGenerator());
+      Operators.Add(new TwoPointFiveMoveMaker());
+      Operators.Add(new PTSP25MoveEvaluator());
+
       Encoding.ConfigureOperators(Operators.OfType<IOperator>());
+      foreach (var twopointfiveMoveOperator in Operators.OfType<I25MoveOperator>()) {
+        twopointfiveMoveOperator.TwoPointFiveMoveParameter.ActualName = "Permutation.TwoPointFiveMove";
+      }
     }
 
@@ -156 +166 @@
         op.RealizationsParameter.Value = realizations;
       }
+      foreach (var op in Operators.OfType<PTSP25MoveEvaluator>()) {
+        op.RealizationsParameter.Value = realizations;
+      }
+
     }
   }