Changeset 3340 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveRelativeAttribute.cs

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

File:

• trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveRelativeAttribute.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveAttribute.cs) (3 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveRelativeAttribute.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
-  [Item("TranslocationMoveAttribute", "Specifies the tabu attributes for a translocation and insertion move (3-opt).")]
+  [Item("TranslocationMoveRelativeAttribute", "Specifies the tabu attributes for a translocation and insertion move (3-opt) on relative permutation encodings.")]
   [StorableClass]
-  public class TranslocationMoveAttribute : Item {
+  public class TranslocationMoveRelativeAttribute : PermutationMoveAttribute {
     [Storable]
     public int Edge1Source { get; private set; }
@@ -41 +41 @@
 
     [StorableConstructor]
-    private TranslocationMoveAttribute(bool deserializing)
+    private TranslocationMoveRelativeAttribute(bool deserializing)
       : base() {
     }
 
-    public TranslocationMoveAttribute()
-      : this(-1, -1, -1, -1, -1, -1) { }
+    public TranslocationMoveRelativeAttribute()
+      : this(-1, -1, -1, -1, -1, -1, -1) { }
 
-    public TranslocationMoveAttribute(int edge1Source, int edge1Target, int edge2Source, int edge2Target, int edge3Source, int edge3Target)
-      : base() {
+    public TranslocationMoveRelativeAttribute(int edge1Source, int edge1Target, int edge2Source, int edge2Target, int edge3Source, int edge3Target, double moveQuality)
+      : base(moveQuality) {
       Edge1Source = edge1Source;
       Edge1Target = edge1Target;
@@ -59 +59 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      TranslocationMoveAttribute clone = (TranslocationMoveAttribute)base.Clone(cloner);
+      TranslocationMoveRelativeAttribute clone = (TranslocationMoveRelativeAttribute)base.Clone(cloner);
       clone.Edge1Source = Edge1Source;
       clone.Edge1Target = Edge1Target;