Changeset 3340 for trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves

Timestamp:

04/14/10 03:52:07 (14 years ago)

Author:

abeham

Message:

Updated Tabu search, permutation move operators, real vector move operators, binary vector move operators #840
Added a Tabu Search TSP workbench

Location:

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves

Files:

• AdditiveMoveTabuAttribute.cs (modified) (3 diffs)
• AdditiveMoveTabuChecker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveTabuMoveEvaluator.cs) (4 diffs)
• AdditiveMoveTabuMaker.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveTabuMoveMaker.cs) (3 diffs)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuAttribute.cs

@@ -33 +33 @@
     [Storable]
     public double MovedPosition { get; protected set; }
+    [Storable]
+    public double MoveQuality { get; protected set; }
 
     [StorableConstructor]
@@ -43 +45 @@
       OriginalPosition = 0;
       MovedPosition = 0;
+      MoveQuality = 0;
     }
 
-    public AdditiveMoveTabuAttribute(int dimension, double originalPosition, double movedPosition)
+    public AdditiveMoveTabuAttribute(int dimension, double originalPosition, double movedPosition, double moveQuality)
       : base() {
       Dimension = dimension;
       OriginalPosition = originalPosition;
       MovedPosition = movedPosition;
+      MoveQuality = moveQuality;
     }
 
@@ -57 +61 @@
       clone.OriginalPosition = OriginalPosition;
       clone.MovedPosition = MovedPosition;
+      clone.MoveQuality = MoveQuality;
       return clone;
     }

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuChecker.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.RealVectorEncoding {
-  [Item("PreventFallBackToSkippedPositions", "Prevents falling back into ranges that have been moved over before.")]
+  [Item("AdditiveMoveTabuChecker", "Prevents falling back into ranges that have been moved over before.")]
   [StorableClass]
-  public class PreventFallBackToSkippedPositions : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, ITabuChecker {
+  public class AdditiveMoveTabuChecker : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, ITabuChecker {
     public ILookupParameter<AdditiveMove> AdditiveMoveParameter {
       get { return (LookupParameter<AdditiveMove>)Parameters["AdditiveMove"]; }
@@ -44 +44 @@
       get { return (ILookupParameter<BoolValue>)Parameters["MoveTabu"]; }
     }
-    private ScopeParameter CurrentScopeParameter {
-      get { return (ScopeParameter)Parameters["CurrentScope"]; }
+    public IValueLookupParameter<BoolValue> MaximizationParameter {
+      get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
+    }
+    public ILookupParameter<DoubleValue> MoveQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
+    }
+    public ValueParameter<BoolValue> UseAspirationCriterionParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["UseAspirationCriterion"]; }
     }
 
-    public PreventFallBackToSkippedPositions()
+    public BoolValue UseAspirationCriterion {
+      get { return UseAspirationCriterionParameter.Value; }
+      set { UseAspirationCriterionParameter.Value = value; }
+    }
+
+
+    public AdditiveMoveTabuChecker()
       : base() {
       Parameters.Add(new LookupParameter<AdditiveMove>("AdditiveMove", "The move to evaluate."));
@@ -54 +66 @@
       Parameters.Add(new LookupParameter<RealVector>("RealVector", "The solution as real vector."));
       Parameters.Add(new LookupParameter<ItemList<IItem>>("TabuList", "The tabu list."));
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope."));
+      Parameters.Add(new ValueParameter<BoolValue>("UseAspirationCriterion", "Whether to use the aspiration criterion or not.", new BoolValue(true)));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, else if it is a minimization problem."));
+      Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The quality of the current move."));
     }
 
@@ -61 +75 @@
       AdditiveMove move = AdditiveMoveParameter.ActualValue;
       RealVector vector = RealVectorParameter.ActualValue;
+      double moveQuality = MoveQualityParameter.ActualValue.Value;
+      bool maximization = MaximizationParameter.ActualValue.Value;
+      bool useAspiration = UseAspirationCriterion.Value;
       bool isTabu = false;
       foreach (IItem tabuMove in tabuList) {
         AdditiveMoveTabuAttribute attribute = (tabuMove as AdditiveMoveTabuAttribute);
         if (attribute != null && attribute.Dimension == move.Dimension) {
-          double newPos = vector[move.Dimension] + move.MoveDistance;
-          if (Math.Min(attribute.MovedPosition, attribute.OriginalPosition) < newPos
-            && newPos < Math.Max(attribute.MovedPosition, attribute.OriginalPosition)) {
-            isTabu = true;
-            break;
+          if (!useAspiration
+            || maximization && moveQuality <= attribute.MoveQuality
+            || !maximization && moveQuality >= attribute.MoveQuality) {
+
+            double newPos = vector[move.Dimension] + move.MoveDistance;
+            if (Math.Min(attribute.MovedPosition, attribute.OriginalPosition) < newPos
+              && newPos < Math.Max(attribute.MovedPosition, attribute.OriginalPosition)) {
+              isTabu = true;
+              break;
+            }
           }
         }

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuMaker.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.RealVectorEncoding {
-  [Item("AdditiveTabuMoveMaker", "Sets the move tabu.")]
+  [Item("AdditiveMoveTabuMaker", "Sets the move tabu.")]
   [StorableClass]
-  public class AdditiveTabuMoveMaker : TabuMaker, IAdditiveRealVectorMoveOperator {
+  public class AdditiveMoveTabuMaker : TabuMaker, IAdditiveRealVectorMoveOperator {
     public ILookupParameter<AdditiveMove> AdditiveMoveParameter {
       get { return (ILookupParameter<AdditiveMove>)Parameters["AdditiveMove"]; }
@@ -39 +39 @@
     }
 
-    public AdditiveTabuMoveMaker()
+    public AdditiveMoveTabuMaker()
       : base() {
       Parameters.Add(new LookupParameter<AdditiveMove>("AdditiveMove", "The move to evaluate."));
@@ -45 +45 @@
     }
 
-    protected override IItem GetTabuAttribute() {
+    protected override IItem GetTabuAttribute(bool maximization, double quality, double moveQuality) {
       AdditiveMove move = AdditiveMoveParameter.ActualValue;
       RealVector vector = RealVectorParameter.ActualValue;
-      return new AdditiveMoveTabuAttribute(move.Dimension, vector[move.Dimension], vector[move.Dimension] + move.MoveDistance);
+      double baseQuality = moveQuality;
+      if (maximization && quality > moveQuality || !maximization && quality < moveQuality) baseQuality = quality;
+      return new AdditiveMoveTabuAttribute(move.Dimension, vector[move.Dimension], vector[move.Dimension] + move.MoveDistance, baseQuality);
     }