Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Encoding.cs

Timestamp:

07/20/16 14:02:36 (7 years ago)

Author:

gkronber

Message:

#1966: refactoring of bin packing implementation

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Encoding.cs (modified) (3 diffs)

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

@@ -6 +6 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -13 +14 @@
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
   [StorableClass]
-  internal class Encoding : HeuristicLab.Optimization.Encoding<PackingSolutionCreator> {
+  public class Encoding : HeuristicLab.Optimization.Encoding<IPackingSolutionCreator> {
     [StorableConstructor]
     private Encoding(bool deserializing) : base(deserializing) { }
-    public Encoding() : base("PackingSequence") {
+    public Encoding()
+      : base("PackingSequence") {
       SolutionCreator = new PackingSequenceRandomCreator();
       RegisterParameterEvents();
@@ -64 +66 @@
 
   public static class IndividualExtensionMethods {
-    public static PackingSequence PackingSequence(this Individual individual) {
+    public static Permutation PackingSequence(this Individual individual) {
       var encoding = individual.GetEncoding<Encoding>();
       return individual.PackingSequence(encoding.Name);
     }
 
-    public static PackingSequence PackingSequence(this Individual individual, string name) {
-      return (PackingSequence)individual[name];
+    public static Permutation PackingSequence(this Individual individual, string name) {
+      return (Permutation)individual[name];
     }
   }