Changeset 6594 for branches/QAPAlgorithms

Timestamp:

07/25/11 23:27:44 (13 years ago)

Author:

abeham

Message:

#1541

• fixed some bugs

Location:

branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3

Files:

• RobustTabooSeachOperator.cs (modified) (1 diff)
• RobustTabooSearch.cs (modified) (2 diffs)

branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSeachOperator.cs

@@ -187 +187 @@
       if (useNewAdaptionScheme) {
         double r = random.NextDouble();
+        if (r == 0) r = 1; // transform to (0;1]
         shortTermMemory[bestMove.Index1, solution[bestMove.Index1]] = (int)(iteration + r * r * r * maxTenure);
         r = random.NextDouble();
+        if (r == 0) r = 1; // transform to (0;1]
         shortTermMemory[bestMove.Index2, solution[bestMove.Index2]] = (int)(iteration + r * r * r * maxTenure);
       } else {

branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs

@@ -139 +139 @@
       Parameters.Add(new FixedValueParameter<IntValue>("MaximumTabuTenure", "The maximum tabu tenure.", new IntValue(20)));
       Parameters.Add(new FixedValueParameter<BoolValue>("UseAlternativeAspiration", "True if the alternative aspiration condition should be used that takes moves that have not been made for some time above others.", new BoolValue(false)));
-      Parameters.Add(new FixedValueParameter<IntValue>("AlternativeAspirationTenure", "The time t that a move will be remembered for the alternative aspiration condition.", new IntValue(10000)));
+      Parameters.Add(new FixedValueParameter<IntValue>("AlternativeAspirationTenure", "The time t that a move will be remembered for the alternative aspiration condition.", new IntValue(int.MaxValue)));
       Parameters.Add(new FixedValueParameter<BoolValue>("TerminateOnOptimalSolution", "True when the algorithm should stop if it reached a quality equal or smaller to the BestKnownQuality.", new BoolValue(true)));
       Parameters.Add(new FixedValueParameter<BoolValue>("UseNewTabuTenureAdaptionScheme", @"In an updated version of his implementation, Eric Taillard introduced a different way to change the tabu tenure.
@@ -284 +284 @@
 
     private void MaximumIterationsParameter_ValueChanged(object sender, EventArgs e) {
-      if (MaximumIterations >= AlternativeAspirationTenure && UseAlternativeAspiration) {
+      if (MaximumIterations < AlternativeAspirationTenure && UseAlternativeAspiration) {
         SetSilentlyUseAlternativeAspirationParameter(false);
-      } else if (MaximumIterations < AlternativeAspirationTenure && !UseAlternativeAspiration) {
+      } else if (MaximumIterations >= AlternativeAspirationTenure && !UseAlternativeAspiration) {
         SetSilentlyUseAlternativeAspirationParameter(true);
       }