Changeset 3232 for trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs

Timestamp:

03/29/10 18:49:55 (14 years ago)

Author:

abeham

Message:

Renamed operators according to the underlying operation #889

File:

• trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPThreeOptPathMoveEvaluator.cs) (2 diffs)

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs

@@ -30 +30 @@
 namespace HeuristicLab.Problems.TravelingSalesman {
   /// <summary>
-  /// An operator to evaluate 3-opt moves.
+  /// An operator to evaluate a translocation or insertion move.
   /// </summary>
-  [Item("TSPThreeOptPathMoveEvaluator", "Evaluates a 3-opt move by summing up the length of all added edges and subtracting the length of all deleted edges.")]
+  [Item("TSPTranslocationMovePathEvaluator", "Evaluates a translocation or insertion move (3-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
   [StorableClass]
-  public abstract class TSPThreeOptPathMoveEvaluator : TSPPathMoveEvaluator, IThreeOptPermutationMoveOperator {
-    public ILookupParameter<ThreeOptMove> ThreeOptMoveParameter {
-      get { return (ILookupParameter<ThreeOptMove>)Parameters["ThreeOptMove"]; }
+  public abstract class TSPTranslocationMovePathEvaluator : TSPPathMoveEvaluator, IPermutationTranslocationMoveOperator {
+    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
+      get { return (ILookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
     }
 
-    public TSPThreeOptPathMoveEvaluator()
+    public TSPTranslocationMovePathEvaluator()
       : base() {
-      Parameters.Add(new LookupParameter<ThreeOptMove>("ThreeOptMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move to evaluate."));
     }
 
     protected override double EvaluateByCoordinates(Permutation permutation, DoubleMatrix coordinates) {
-      ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
+      TranslocationMove move = TranslocationMoveParameter.ActualValue;
       int edge1source = permutation.GetCircular(move.Index1 - 1);
       int edge1target = permutation[move.Index1];
@@ -81 +81 @@
 
     protected override double EvaluateByDistanceMatrix(Permutation permutation, DoubleMatrix distanceMatrix) {
-      ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
+      TranslocationMove move = TranslocationMoveParameter.ActualValue;
       int edge1source = permutation.GetCircular(move.Index1 - 1);
       int edge1target = permutation[move.Index1];