Changeset 12286 for branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/ShakingOperators

Timestamp:

04/04/15 23:58:27 (10 years ago)

Author:

abeham

Message:

#2319:

• Removed LargestGroupFirstCrossover (slow and not mentioned in the literature)
• Added manipulators
• Added multi-operators

Location:

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/ShakingOperators

Files:

• LLEShakingOperator.cs (moved) (moved from branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/ShakingOperators/SplitGroupShakingOperator.cs) (2 diffs)
• SwapNShakingOperator.cs (deleted)

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/ShakingOperators/LLEShakingOperator.cs

@@ -34 +34 @@
   /// A shaking operator for VNS.
   /// </summary>
-  [Item("Split Group Shaking Operator", "A shaking operator for VNS which uses split group manipulators to perform the shaking.")]
+  [Item("LLE Shaking Operator", "A shaking operator for VNS which LLE manipulators to perform the shaking.")]
   [StorableClass]
-  public class SplitGroupShakingOperator : ShakingOperator<ILinearLinkageManipulator>, IStochasticOperator, ILinearLinkageShakingOperator {
+  public class LLEShakingOperator : ShakingOperator<ILinearLinkageManipulator>, IStochasticOperator, ILinearLinkageShakingOperator {
 
     public ILookupParameter<IRandom> RandomParameter {
@@ -51 +51 @@
 
     [StorableConstructor]
-    protected SplitGroupShakingOperator(bool deserializing) : base(deserializing) { }
-    protected SplitGroupShakingOperator(SplitGroupShakingOperator original, Cloner cloner) : base(original, cloner) { }
-    public SplitGroupShakingOperator()
+    protected LLEShakingOperator(bool deserializing) : base(deserializing) { }
+    protected LLEShakingOperator(LLEShakingOperator original, Cloner cloner) : base(original, cloner) { }
+    public LLEShakingOperator()
       : base() {
       Parameters.Add(new LookupParameter<LinearLinkage>("LLE", "The encoding to shake."));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator that will be used for stochastic shaking operators."));
-      for (var i = 1; i < 6; i++) Operators.Add(new SplitGroupManipulator(i));
+      for (var i = 1; i < 4; i++) {
+        Operators.Add(new MoveItemManipulator(i * 2));
+        Operators.Add(new SwapItemManipulator(i * 2));
+        Operators.Add(new SplitGroupManipulator(i * 2));
+        Operators.Add(new MergeGroupManipulator(i * 2));
+      }
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SplitGroupShakingOperator(this, cloner);
+      return new LLEShakingOperator(this, cloner);
     }