Changeset 12396 for branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Manipulators

Timestamp:

05/21/15 16:30:14 (9 years ago)

Author:

abeham

Message:

#2319: Added SinglePointCrossover

Location:

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

Files:

• GraftManipulator.cs (modified) (5 diffs)
• MergeGroupManipulator.cs (modified) (1 diff)
• MoveItemManipulator.cs (modified) (1 diff)
• SplitGroupManipulator.cs (modified) (1 diff)
• SwapItemManipulator.cs (modified) (1 diff)

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Manipulators/GraftManipulator.cs

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -33 +31 @@
   public sealed class GraftManipulator : LinearLinkageManipulator {
 
-    public IValueLookupParameter<IntValue> MaxGroupsParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["MaxGroups"]; }
-    }
-
     [StorableConstructor]
     private GraftManipulator(bool deserializing) : base(deserializing) { }
     private GraftManipulator(GraftManipulator original, Cloner cloner) : base(original, cloner) { }
-    public GraftManipulator() {
-      Parameters.Add(new ValueLookupParameter<IntValue>("MaxGroups", "The maximum number of groups. If a value less or equal than 0 is used the number of groups is not limited.", new IntValue(-1)));
-    }
-    public GraftManipulator(int maxGroups)
-      : this() {
-      MaxGroupsParameter.Value = new IntValue(maxGroups);
-    }
+    public GraftManipulator() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -52 +40 @@
     }
 
-    public static void Apply(IRandom random, LinearLinkage lle, int maxGroups) {
+    public static void Apply(IRandom random, LinearLinkage lle) {
       int tries = lle.Length;
       var index = random.Next(lle.Length);
@@ -59 +47 @@
         tries--;
       }
-      if (lle[index] != index) Apply(random, lle, maxGroups, index);
+      if (lle[index] != index) Apply(random, lle, index);
     }
 
-    public static void Apply(IRandom random, LinearLinkage lle, int maxGroups, int index) {
+    public static void Apply(IRandom random, LinearLinkage lle, int index) {
       var groups = lle.Select((val, idx) => Tuple.Create(idx, val))
                       .Where(x => x.Item1 == x.Item2)
@@ -84 +72 @@
 
     protected override void Manipulate(IRandom random, LinearLinkage lle) {
-      var maxGroups = MaxGroupsParameter.ActualValue.Value;
-      Apply(random, lle, maxGroups <= 0 ? int.MaxValue : maxGroups);
+      Apply(random, lle);
     }
   }

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Manipulators/MergeGroupManipulator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
-  [Item("Merge Group Manipulator", "Performs a maximum of N merge operations on the groups. Groups may be merged multiple times.")]
+  [Item("Merge Group Manipulator", "Performs a maximum of N merge operations on the groups. An already merged group may be merged again.")]
   [StorableClass]
   public sealed class MergeGroupManipulator : LinearLinkageManipulator {

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Manipulators/MoveItemManipulator.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
-  [Item("Move Item Manipulator", "Performs a maximum of N move operations between groups or to new groups. Items may be moved multiple times.")]
+  [Item("Move Item Manipulator", "Performs a maximum of N move operations between groups or to new groups. An already moved item may be moved again.")]
   [StorableClass]
   public sealed class MoveItemManipulator : LinearLinkageManipulator {

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Manipulators/SplitGroupManipulator.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
-  [Item("Split Group Manipulator", "Performs a maximum of N split operations on the groups. Groups may be split multiple times.")]
+  [Item("Split Group Manipulator", "Performs a maximum of N split operations on the groups. An already split group may be split again.")]
   [StorableClass]
   public sealed class SplitGroupManipulator : LinearLinkageManipulator {

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Manipulators/SwapItemManipulator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
-  [Item("Swap Item Manipulator", "Swaps items between groups. Items may be swapped multiple times.")]
+  [Item("Swap Item Manipulator", "Performs N swaps operations of two items each. The same items may be swapped multiple times, at least two groups need to be present.")]
   [StorableClass]
   public sealed class SwapItemManipulator : LinearLinkageManipulator {