Changeset 3195 for trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.cs

Timestamp:

03/23/10 01:48:44 (14 years ago)

Author:

abeham

Message:

fixed algorithm when neighborhood contains only tabu moves. It will now terminate correctly. #840

File:

• trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.cs (modified) (3 diffs)

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

@@ -72 +72 @@
       get { return (IValueLookupParameter<BoolValue>)Parameters["CopySelected"]; }
     }
+    public ILookupParameter<BoolValue> EmptyNeighborhoodParameter {
+      get { return (ILookupParameter<BoolValue>)Parameters["EmptyNeighborhood"]; }
+    }
 
     public BoolValue CopySelected {
@@ -90 +93 @@
       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.", new BoolValue(false)));
+      Parameters.Add(new LookupParameter<BoolValue>("EmptyNeighborhood", "Will be set to true if the neighborhood didn't contain any non-tabu moves. It is not set to false."));
     }
 
@@ -120 +124 @@
       }
 
-      if (selected[0] == null) throw new InvalidOperationException("TabuSelector: The neighborhood contained no or too little moves that are not tabu.");
+      if (selected[0] == null) {
+        EmptyNeighborhoodParameter.ActualValue = new BoolValue(true);
+        selected[0] = new Scope("All moves are tabu.");
+      }
 
       // remove from last to first so that the stored indices remain the same