Changeset 9563 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence

Timestamp:

06/02/13 04:26:26 (11 years ago)

Author:

jhelm

Message:

#1966: Implemented additional Operator-Wrappers for PackingSequence and GroupingVector; Implemented additional problem-class for Rosenbauer-Problemstatement; Added marker-interfaces for decoder-types;

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence

Files:

• Moves (added)
• Moves/GroupingMoveHardTabuCriterion.cs (added)
• Moves/GroupingMoveMaker.cs (added)
• Moves/GroupingMoveSoftTabuCriterion.cs (added)
• Moves/Insertion (added)
• Moves/Insertion/ExhaustiveInsertionMoveGenerator.cs (added)
• Moves/Insertion/InsertionMove.cs (added)
• Moves/Insertion/InsertionMoveAttribute.cs (added)
• Moves/Insertion/InsertionMoveGenerator.cs (added)
• Moves/Insertion/StochasticInsertionMoveGenerator.cs (added)
• Moves/SequenceMove.cs (added)
• Moves/SequenceMoveAttribute.cs (added)
• Moves/SequenceTabuMaker.cs (added)
• Moves/Swap2 (added)
• Moves/Swap2/ExhaustiveSwap2MoveGenerator.cs (added)
• Moves/Swap2/StochasticSwap2MoveGenerator.cs (added)
• Moves/Swap2/Swap2Move.cs (added)
• Moves/Swap2/Swap2MoveAttribute.cs (added)
• Moves/Swap2/Swap2MoveGenerator.cs (added)
• PackingSequenceCrossover.cs (modified) (2 diffs)
• PackingSequenceEncoding.cs (modified) (3 diffs)
• PackingSequenceInsertionManipulator.cs (added)
• PackingSequenceManipulator.cs (modified) (2 diffs)
• PackingSequenceOrderCrossover.cs (added)
• PackingSequencePartiallyMatchedCrossover.cs (added)
• PackingSequenceRandomCreator.cs (modified) (1 diff)
• PackingSequenceSwap2Manipulator.cs (added)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceCrossover.cs

@@ -29 +29 @@
   [Item("PackingSequenceCrossover", "An operator which crosses two PackingSequence representations.")]
   [StorableClass]
-  public class PackingSequenceCrossover : PackingSolutionCrossover, IPackingSequenceOperator {
+  public abstract class PackingSequenceCrossover : PackingSolutionCrossover, IPackingSequenceOperator {
 
     [StorableConstructor]
@@ -39 +39 @@
         ChildParameter.ActualName = "PackingSequence";
     }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingSequenceCrossover(this, cloner);
-    }
 
-    public PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2) {
-      PackingSequenceEncoding result = new PackingSequenceEncoding();
-      result.PackingSequence = CosaCrossover.Apply(random, parent1.PackingSequence, parent2.PackingSequence);
-      return result;
-    }
+    public abstract PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2);
 
     public override IOperation Apply() {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceEncoding.cs

@@ -30 +30 @@
   [Item("Packing Sequence Encoding", "Represents an encoding for a bin packing problem using permutation of item-indexes to define the packing sequence.")]
   [StorableClass]
-  public class PackingSequenceEncoding : Item, IPackingSolutionEncoding{
+  public class PackingSequenceEncoding : Item, IPackingSolutionEncoding {
 
     [Storable]
@@ -39 +39 @@
     protected PackingSequenceEncoding(PackingSequenceEncoding original, Cloner cloner)
       : base(original, cloner) {
-        this.PackingSequence = cloner.Clone(original.PackingSequence);
+      this.PackingSequence = cloner.Clone(original.PackingSequence);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -53 +53 @@
       StringBuilder sb = new StringBuilder();
       sb.Append("[ ");
-      sb.Append(PackingSequence.ToString() + " \n");         
+      sb.Append(PackingSequence.ToString() + " \n");
       sb.Append("]");
       return sb.ToString();

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceManipulator.cs

@@ -30 +30 @@
   [Item("PackingSequenceManipulator", "An operator which manipulates a PackingSequence representation.")]
   [StorableClass]
-  public class PackingSequenceManipulator : PackingSolutionManipulator, IPackingSequenceOperator {
+  public abstract class PackingSequenceManipulator : PackingSolutionManipulator, IPackingSequenceOperator {
     [StorableConstructor]
     protected PackingSequenceManipulator(bool deserializing) : base(deserializing) { }
@@ -38 +38 @@
         EncodedSolutionParameter.ActualName = "PackingSequence";
     }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingSequenceManipulator(this, cloner);
-    }
 
-    protected void Manipulate(IRandom random, PackingSequenceEncoding individual) {
-      Swap2Manipulator.Apply(random, individual.PackingSequence);
-    }
+    protected abstract void Manipulate(IRandom random, PackingSequenceEncoding individual);
 
     public override IOperation Apply() {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceRandomCreator.cs

@@ -60 +60 @@
     public static PackingSequenceEncoding Apply(int items, IRandom random) {
       var solution = new PackingSequenceEncoding();
-      solution.PackingSequence = new Permutation(PermutationTypes.Absolute, items, random);
-      return solution;
-    }
+      solution.PackingSequence = new Permutation(PermutationTypes.Absolute, items, random);
+      return solution;
+    }
 
-    protected override IPackingSolutionEncoding CreateSolution() {
+    protected override IItem CreateSolution() {
       return Apply(PackingItemsParameter.ActualValue.Value, RandomParameter.ActualValue);
     }