Changeset 7878 for trunk/sources/HeuristicLab.Problems.QuadraticAssignment

Timestamp:

05/23/12 16:28:05 (13 years ago)

Author:

abeham

Message:

#1722:

• In QAPExhaustiveSwap2LocalImprovement moved local search code to a static method
• Otherwise minor changes to the QAP

File:

• trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPExhaustiveSwap2LocalImprovement.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPExhaustiveSwap2LocalImprovement.cs

@@ -100 +100 @@
     }
 
-    public override IOperation Apply() {
-      int maxIterations = MaximumIterationsParameter.ActualValue.Value;
-      Permutation assignment = AssignmentParameter.ActualValue;
-      bool maximization = MaximizationParameter.ActualValue.Value;
-      DoubleMatrix weights = WeightsParameter.ActualValue;
-      DoubleMatrix distances = DistancesParameter.ActualValue;
-
-      double evaluatedSolutions = 0.0;
+    public static double Improve(Permutation assignment, double quality, DoubleMatrix weights, DoubleMatrix distances, bool maximization, int maxIterations, out double evaluatedSolutions) {
+      evaluatedSolutions = 0.0;
       double evalSolPerMove = 4.0 / assignment.Length;
 
@@ -124 +118 @@
         if (bestMove == null) break;
         Swap2Manipulator.Apply(assignment, bestMove.Index1, bestMove.Index2);
-        QualityParameter.ActualValue.Value += bestQuality;
+        quality += bestQuality;
       }
-      EvaluatedSolutionsParameter.ActualValue.Value += (int)Math.Ceiling(evaluatedSolutions);
+      return quality;
+    }
+
+    public override IOperation Apply() {
+      int maxIterations = MaximumIterationsParameter.ActualValue.Value;
+      Permutation assignment = AssignmentParameter.ActualValue;
+      bool maximization = MaximizationParameter.ActualValue.Value;
+      DoubleMatrix weights = WeightsParameter.ActualValue;
+      DoubleMatrix distances = DistancesParameter.ActualValue;
+      double quality = QualityParameter.ActualValue.Value;
+
+      double evaluations;
+      QualityParameter.ActualValue.Value = Improve(assignment, quality, weights, distances, maximization, maxIterations, out evaluations);
+      EvaluatedSolutionsParameter.ActualValue.Value += (int)Math.Ceiling(evaluations);
       return base.Apply();
     }