Changeset 3132 for trunk/sources/HeuristicLab.Algorithms.TabuSearch

Timestamp:

03/19/10 18:21:24 (14 years ago)

Author:

abeham

Message:

fixed TabuSelector #840

Location:

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3

Files:

• TabuSearchMainLoop.cs (modified) (1 diff)
• TabuSelector.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

@@ -162 +162 @@
       bestAverageWorstMoveQualityCalculator.QualityParameter.ActualName = "MoveQuality";
       bestAverageWorstMoveQualityCalculator.WorstQualityParameter.ActualName = "Worst Move Quality";
-
-      tabuSelector.NumberOfSelectedSubScopes = new IntValue(1);
 
       moveMakingProcessor.Name = "MoveMaking processor (UniformSequentialSubScopesProcessor)";

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.cs

@@ -69 +69 @@
       get { return (ILookupParameter<ItemArray<BoolValue>>)Parameters["MoveTabu"]; }
     }
-
-    public IntValue NumberOfSelectedSubScopes {
-      set { NumberOfSelectedSubScopesParameter.Value = value; }
+    public IValueLookupParameter<BoolValue> CopySelectedParameter {
+      get { return (IValueLookupParameter<BoolValue>)Parameters["CopySelected"]; }
     }
 
@@ -85 +84 @@
       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("MoveQuality", "The quality of the move."));
       Parameters.Add(new SubScopesLookupParameter<BoolValue>("MoveTabu", "The tabu status of the move."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("CopySelected", "True if the selected move should be copied."));
     }
 
@@ -94 +94 @@
     /// <returns>The selected scopes.</returns>
     protected override IScope[] Select(List<IScope> scopes) {
-      int count = NumberOfSelectedSubScopesParameter.ActualValue.Value;
       bool copy = CopySelectedParameter.Value.Value;
       bool aspiration = AspirationParameter.ActualValue.Value;
@@ -102 +101 @@
       ItemArray<BoolValue> moveTabus = MoveTabuParameter.ActualValue;
 
-      IScope[] selected = new IScope[count];
+      IScope[] selected = new IScope[1];
 
       // remember scopes that should be removed
       List<int> scopesToRemove = new List<int>();
       for (int i = 0; i < scopes.Count; i++) {
-        if (count > 0 && (!moveTabus[i].Value
-          || aspiration && IsBetter(maximization, moveQualities[i].Value, bestQuality))) {
+        if (!moveTabus[i].Value
+          || aspiration && IsBetter(maximization, moveQualities[i].Value, bestQuality)) {
           scopesToRemove.Add(i);
-          if (copy) selected[selected.Length - count] = (IScope)scopes[i].Clone();
-          else selected[selected.Length - count] = scopes[i];
-          count--;
-          if (count == 0) break;
+          if (copy) selected[0] = (IScope)scopes[i].Clone();
+          else selected[0] = scopes[i];
+          break;
         }
       }
 
-      if (count > 0) throw new InvalidOperationException("TabuSelector: The neighborhood contained no or too little moves that are not tabu.");
+      if (selected[0] == null) throw new InvalidOperationException("TabuSelector: The neighborhood contained no or too little moves that are not tabu.");
 
       // remove from last to first so that the stored indices remain the same