Changeset 13613

Timestamp:

02/08/16 21:54:26 (9 years ago)

Author:

gkronber

Message:

#1966: started work on PackingSequenceEncoding

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3

Files:

• Encodings/GroupingVector/GroupingVectorEncoding.cs (modified) (1 diff)
• Encodings/PackingSequence/IPackingSequenceCreator.cs (added)
• Encodings/PackingSequence/PackingSequence.cs (added)
• Encodings/PackingSequence/PackingSequenceEncoding.cs (modified) (2 diffs)
• Encodings/PackingSequence/PackingSequenceRandomCreator.cs (modified) (3 diffs)
• HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (2 diffs)
• PackingSolutionDecoder.cs (modified) (1 diff)

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

@@ -33 +33 @@
   [Item("Grouping Vector Encoding", "Represents an encoding for a bin packing problem using an array of group-assignments for every packing-item.")]
   [StorableClass]
-  public class GroupingVectorEncoding : Item, IPackingSolutionEncoding{
+  public class GroupingVectorEncoding : Item, IPackingSolutionEncoding {
 
     [Storable]

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

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.BinPacking.Interfaces;
@@ -31 +32 @@
   [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 : Encoding<PackingSequenceRandomCreator> {
 
     [Storable]

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

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -30 +31 @@
 
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
-  [Item("PackingSequenceCreator", "Creator class used to create PackingSequence solutions for bin packing problems.")]
-  [StorableClass]
-  public class PackingSequenceRandomCreator : PackingSolutionCreator, IStochasticOperator {
+  [Item("PackingSequenceCreator", "Creator class used to create PackingSequence solutions for bin packing problems.")]
+  [StorableClass]
+  public class PackingSequenceRandomCreator : SingleSuccessorOperator, IPackingSequenceCreator, IStochasticOperator {
 
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-    public IValueLookupParameter<IntValue> PackingItemsParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["PackingItems"]; }
-    }
+    public ILookupParameter<IRandom> RandomParameter {
+      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
+    }
+    public IValueLookupParameter<IntValue> PackingItemsParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["PackingItems"]; }
+    }
 
-    [StorableConstructor]
-    protected PackingSequenceRandomCreator(bool deserializing) : base(deserializing) { }
-    protected PackingSequenceRandomCreator(PackingSequenceRandomCreator original, Cloner cloner) : base(original, cloner) {
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingSequenceRandomCreator(this, cloner);
-    }
+    public ILookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence> SolutionParameter {
+      get { return (ILookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence>)Parameters["PackingItems"]; }
+    }
+
+    [StorableConstructor]
+    protected PackingSequenceRandomCreator(bool deserializing) : base(deserializing) { }
+    protected PackingSequenceRandomCreator(PackingSequenceRandomCreator original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PackingSequenceRandomCreator(this, cloner);
+    }
 
     public PackingSequenceRandomCreator()
-      : base() {
-      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("PackingItems", "The number of packing-items handled in this problem instance."));
+      : base() {
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("PackingItems", "The number of packing-items handled in this problem instance."));
+      Parameters.Add(new LookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence>("PackingSequence"));
 
-      EncodedSolutionParameter.ActualName = "PackingSequence";
-    }
+      SolutionParameter.ActualName = "PackingSequence";
+    }
 
+    public override IOperation Apply() {
+      Apply(PackingItemsParameter.ActualValue.Value, RandomParameter.ActualValue);
+      return base.Apply();
+    }
 
     public static PackingSequenceEncoding Apply(int items, IRandom random) {
@@ -64 +75 @@
     }
 
-    protected override IItem CreateSolution() {
-      return Apply(PackingItemsParameter.ActualValue.Value, RandomParameter.ActualValue);
-    }
-  }
+  }
 }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

@@ -217 +217 @@
     <Compile Include="Encodings\PackingPlans\BinPacking.cs" />
     <Compile Include="Encodings\PackingPlans\PackingPlan.cs" />
+    <Compile Include="Encodings\PackingSequence\IPackingSequenceCreator.cs" />
     <Compile Include="Encodings\PackingSequence\Moves\Insertion\ExhaustiveInsertionMoveGenerator.cs" />
     <Compile Include="Encodings\PackingSequence\Moves\Insertion\StochasticInsertionMoveGenerator.cs" />
@@ -222 +223 @@
     <Compile Include="Encodings\PackingSequence\Moves\Insertion\InsertionMoveAttribute.cs" />
     <Compile Include="Encodings\PackingSequence\Moves\Insertion\InsertionMoveGenerator.cs" />
+    <Compile Include="Encodings\PackingSequence\PackingSequence.cs" />
     <Compile Include="Encodings\PackingSequence\PackingSequenceInversionManipulator.cs" />
     <Compile Include="Encodings\PackingSequence\PackingSequencePartiallyMatchedCrossover.cs" />

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingSolutionDecoder.cs

@@ -66 +66 @@
       Parameters.Add(new LookupParameter<ItemList<I>>("PackingItemMeasures", "Packing-item data taken from the bin-packing problem-instance."));
       Parameters.Add(new LookupParameter<B>("PackingBinMeasures", "Packing-bin data taken from the bin-packing problem-instance."));
-      Parameters.Add(new ValueParameter<BoolValue>("StackingConstraint", "A flag determining whether stackingconstraints should be enforced or not.", new BoolValue(true)));
+      Parameters.Add(new ValueParameter<BoolValue>("StackingConstraint", "A flag determining whether stacking constraints should be enforced or not.", new BoolValue(true)));
     }