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

Timestamp:

06/02/13 04:26:26 (12 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/GroupingVector

Files:

• GroupingVectorCrossover.cs (modified) (2 diffs)
• GroupingVectorDiscreteCrossover.cs (added)
• GroupingVectorOnePositionManipulator.cs (added)
• GroupingVectorRandomCreator.cs (modified) (1 diff)
• GroupingVectorSinglePointCrossover.cs (added)
• GroupingVectorSwap2Manipulator.cs (added)
• Moves/ChangeGrouping (added)
• Moves/ChangeGrouping/ChangeGroupingMove.cs (added)
• Moves/ChangeGrouping/ChangeGroupingMoveAttribute.cs (added)
• Moves/ChangeGrouping/ChangeGroupingMoveGenerator.cs (added)
• Moves/ChangeGrouping/ExhaustiveChangeGroupingMoveGenerator.cs (added)
• Moves/ChangeGrouping/StochasticChangeGroupingMoveGenerator.cs (added)
• Moves/GroupingMove.cs (added)
• Moves/GroupingMoveAttribute.cs (added)
• Moves/GroupingMoveHardTabuCriterion.cs (added)
• Moves/GroupingMoveMaker.cs (added)
• Moves/GroupingMoveSoftTabuCriterion.cs (added)
• Moves/GroupingTabuMaker.cs (added)
• Moves/SingleGrouping (deleted)
• Moves/SwapGrouping (added)
• Moves/SwapGrouping/ExhaustiveSwapGroupingMoveGenerator.cs (added)
• Moves/SwapGrouping/StochasticSwapGroupingMoveGenerator.cs (added)
• Moves/SwapGrouping/SwapGroupingMove.cs (added)
• Moves/SwapGrouping/SwapGroupingMoveAttribute.cs (added)
• Moves/SwapGrouping/SwapGroupingMoveGenerator.cs (added)
• UniformGroupingVectorManipulator.cs (deleted)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorCrossover.cs

@@ -30 +30 @@
   [Item("Grouping Vector Crossover", "An operator which crosses two GroupingVector representations.")]
   [StorableClass]
-  public class GroupingVectorCrossover : PackingSolutionCrossover, IGroupingVectorOperator {
+  public abstract class GroupingVectorCrossover : PackingSolutionCrossover, IGroupingVectorOperator {
 
     [StorableConstructor]
@@ -40 +40 @@
         ChildParameter.ActualName = "GroupingVector";
     }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new GroupingVectorCrossover(this, cloner);
-    }
 
-    public GroupingVectorEncoding Cross(IRandom random, GroupingVectorEncoding parent1, GroupingVectorEncoding parent2) {
-      GroupingVectorEncoding result = new GroupingVectorEncoding();
-      result.GroupingVector = SinglePointCrossover.Apply(random, parent1.GroupingVector, parent2.GroupingVector);
-      return result;
-    }
+    public abstract GroupingVectorEncoding Cross(IRandom random, GroupingVectorEncoding parent1, GroupingVectorEncoding parent2);
 
     public override IOperation Apply() {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorRandomCreator.cs

@@ -68 +68 @@
     }
 
-    protected override IPackingSolutionEncoding CreateSolution() {
+    protected override IItem CreateSolution() {
       return Apply(PackingItemsParameter.ActualValue.Value, LowerBoundParameter.ActualValue.Value, RandomParameter.ActualValue);
     }