Changeset 3340 for trunk/sources/HeuristicLab.Optimization

Timestamp:

04/14/10 03:52:07 (15 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.Optimization/3.3

Files:

• Interfaces/ITabuChecker.cs (modified) (1 diff)
• Interfaces/ITabuMaker.cs (modified) (1 diff)
• TabuMaker.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ITabuChecker.cs

@@ -26 +26 @@
   public interface ITabuChecker : IOperator {
     ILookupParameter<BoolValue> MoveTabuParameter { get; }
+    ILookupParameter<DoubleValue> MoveQualityParameter { get; }
+    IValueLookupParameter<BoolValue> MaximizationParameter { get; }
   }
 }

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ITabuMaker.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {
   public interface ITabuMaker : IOperator {
+    ILookupParameter<DoubleValue> MoveQualityParameter { get; }
+    ILookupParameter<DoubleValue> QualityParameter { get; }
+    IValueLookupParameter<BoolValue> MaximizationParameter { get; }
   }
 }

trunk/sources/HeuristicLab.Optimization/3.3/TabuMaker.cs

@@ -36 +36 @@
       get { return (ValueLookupParameter<IntValue>)Parameters["TabuTenure"]; }
     }
+    public ILookupParameter<DoubleValue> MoveQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
+    }
+    public ILookupParameter<DoubleValue> QualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
+    }
+    public IValueLookupParameter<BoolValue> MaximizationParameter {
+      get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
+    }
 
     protected TabuMaker()
@@ -41 +50 @@
       Parameters.Add(new LookupParameter<ItemList<IItem>>("TabuList", "The tabu list where move attributes are stored."));
       Parameters.Add(new ValueLookupParameter<IntValue>("TabuTenure", "The tenure of the tabu list."));
+      Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The quality of the move."));
+      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, else if it is a minimization problem."));
     }
 
@@ -55 +67 @@
       }
 
-      tabuList.Add(GetTabuAttribute());
+      tabuList.Add(GetTabuAttribute(MaximizationParameter.ActualValue.Value, QualityParameter.ActualValue.Value, MoveQualityParameter.ActualValue.Value));
       return base.Apply();
     }
 
-    protected abstract IItem GetTabuAttribute();
+    protected abstract IItem GetTabuAttribute(bool maximization, double quality, double moveQuality);
   }
 }