Changeset 5838 for branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPSwapMoveEvaluator.cs

Timestamp:

03/28/11 15:34:30 (13 years ago)

Author:

abeham

Message:

#1330

• Renamed the DistanceMatrix parameter to Distances
• Renamed the SwapMove to Swap2Move and renamed operators accordingly
• Integrated changes in HeuristicLab.Analysis.Views regarding description text box

File:

• branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPSwapMoveEvaluator.cs (modified) (2 diffs)

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPSwapMoveEvaluator.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.QuadraticAssignment {
-  [Item("QAPSwapMoveEvaluator", "Evaluated a swap move on a QAP solution.")]
+  [Item("QAPSwap2MoveEvaluator", "Evaluated a swap-2 move on a QAP solution.")]
   [StorableClass]
-  public class QAPSwapMoveEvaluator : QAPMoveEvaluator, IPermutationSwapMoveOperator {
-    public ILookupParameter<SwapMove> SwapMoveParameter {
-      get { return (ILookupParameter<SwapMove>)Parameters["SwapMove"]; }
+  public class QAPSwap2MoveEvaluator : QAPMoveEvaluator, IPermutationSwap2MoveOperator {
+    public ILookupParameter<Swap2Move> Swap2MoveParameter {
+      get { return (ILookupParameter<Swap2Move>)Parameters["Swap2Move"]; }
     }
 
     [StorableConstructor]
-    protected QAPSwapMoveEvaluator(bool deserializing) : base(deserializing) { }
-    protected QAPSwapMoveEvaluator(QAPSwapMoveEvaluator original, Cloner cloner)
+    protected QAPSwap2MoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected QAPSwap2MoveEvaluator(QAPSwap2MoveEvaluator original, Cloner cloner)
       : base(original, cloner) {
     }
-    public QAPSwapMoveEvaluator() {
-      Parameters.Add(new LookupParameter<SwapMove>("SwapMove", "The move to evaluate."));
+    public QAPSwap2MoveEvaluator() {
+      Parameters.Add(new LookupParameter<Swap2Move>("Swap2Move", "The move to evaluate."));
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new QAPSwapMoveEvaluator(this, cloner);
+      return new QAPSwap2MoveEvaluator(this, cloner);
     }
 
-    public static double Apply(Permutation assignment, SwapMove move, DoubleMatrix weights, DoubleMatrix distances) {
+    public static double Apply(Permutation assignment, Swap2Move move, DoubleMatrix weights, DoubleMatrix distances) {
       if (move.Index1 == move.Index2) return 0;
       double moveQuality = 0;
@@ -70 +70 @@
 
     public override IOperation Apply() {
-      SwapMove move = SwapMoveParameter.ActualValue;
-      if (move == null) throw new InvalidOperationException("Swap move is not found.");
+      Swap2Move move = Swap2MoveParameter.ActualValue;
+      if (move == null) throw new InvalidOperationException("Swap-2 move is not found.");
       Permutation assignment = PermutationParameter.ActualValue;
-      DoubleMatrix distances = DistanceMatrixParameter.ActualValue;
+      DoubleMatrix distances = DistancesParameter.ActualValue;
       DoubleMatrix weights = WeightsParameter.ActualValue;