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

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

File:

• trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/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/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);
     }