Changeset 17253 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/PTSPEstimatedTwoPointFiveMoveEvaluator.cs

Timestamp:

09/16/19 16:12:21 (5 years ago)

Author:

abeham

Message:

#2521: worked on refactoring PTSP

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/PTSPEstimatedTwoPointFiveMoveEvaluator.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/PTSPEstimatedTwoPointFiveMoveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
+using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +27 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.PTSP {
@@ -49 +49 @@
     }
 
-    protected override double EvaluateMove(Permutation permutation, Func<int, int, double> distance, ItemList<BoolArray> realizations) {
-      return EvaluateMove(permutation, TwoPointFiveMoveParameter.ActualValue, distance, realizations);
+    protected override double EvaluateMove(Permutation permutation, IProbabilisticTSPData data, ReadOnlyItemList<BoolArray> realizations) {
+      return EvaluateMove(permutation, TwoPointFiveMoveParameter.ActualValue, data, realizations);
     }
 
-    public static double EvaluateMove(Permutation permutation, TwoPointFiveMove move, Func<int, int, double> distance, ItemList<BoolArray> realizations) {
+    public static double EvaluateMove(Permutation permutation, TwoPointFiveMove move, IProbabilisticTSPData data, IEnumerable<BoolArray> realizations) {
       if (move.IsInvert) {
         return PTSPEstimatedInversionMoveEvaluator.EvaluateMove(permutation,
-          new InversionMove(move.Index1, move.Index2, move.Permutation), distance, realizations);
+          new InversionMove(move.Index1, move.Index2, move.Permutation), data, realizations);
       } else {
         return PTSPEstimatedInsertionMoveEvaluator.EvaluateMove(permutation,
-          new TranslocationMove(move.Index1, move.Index1, move.Index2), distance, realizations);
+          new TranslocationMove(move.Index1, move.Index1, move.Index2), data, realizations);
       }
     }