Changeset 14048 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingPosition.cs

Timestamp:

07/12/16 19:54:35 (8 years ago)

Author:

gkronber

Message:

#1966: renamed *PackingDimension -> PackingPosition

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingPosition.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/TwoDimensionalPacking.cs) (6 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingPosition.cs

@@ -20 +20 @@
 #endregion
 
-using System.Text;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Core;
 using HeuristicLab.Common;
-using HeuristicLab.Problems.BinPacking;
 
 namespace HeuristicLab.Problems.BinPacking2D {
-  [Item("Two Dimensional Packing", "Represents a packing-position associated with a two dimensional packing-problem.")]
+  [Item("Packing Position (2d)", "Represents a packing-position associated with a two dimensional packing-problem.")]
   [StorableClass]
-  // TwoDimensionalPacking is an immutable class (and handled as value type concerning Equals and GetHashCode())
-  public class TwoDimensionalPacking : PackingDimensions {
+  // PackingPosition is an immutable class (and handled as value type concerning Equals and GetHashCode())
+  public class PackingPosition : BinPacking.PackingPosition {
     [Storable]
     private readonly int x;
@@ -40 +38 @@
 
     [StorableConstructor]
-    protected TwoDimensionalPacking(bool deserializing) : base(deserializing) { }
-    protected TwoDimensionalPacking(TwoDimensionalPacking original, Cloner cloner)
+    protected PackingPosition(bool deserializing) : base(deserializing) { }
+    protected PackingPosition(PackingPosition original, Cloner cloner)
       : base(original, cloner) {
       x = original.X;
@@ -47 +45 @@
     }
 
-    public TwoDimensionalPacking(int assignedBin, int x, int y, bool rotated = false)
+    public PackingPosition(int assignedBin, int x, int y, bool rotated = false)
       : base(assignedBin, rotated) {
       this.x = x;
@@ -54 +52 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new TwoDimensionalPacking(this, cloner);
+      return new PackingPosition(this, cloner);
     }
     
@@ -62 +60 @@
 
     public override bool Equals(object obj) {
-      var other = obj as TwoDimensionalPacking;
+      var other = obj as PackingPosition;
       if (other != null)
         return (other.X == this.X && other.Y == this.Y && base.Equals(other));
@@ -72 +70 @@
     }
 
-    public static TwoDimensionalPacking MoveLeft(TwoDimensionalPacking original) {
-      return new TwoDimensionalPacking(original.AssignedBin, original.X - 1, original.Y, original.Rotated);
+    public static PackingPosition MoveLeft(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X - 1, original.Y, original.Rotated);
     }
-    public static TwoDimensionalPacking MoveDown(TwoDimensionalPacking original) {
-      return new TwoDimensionalPacking(original.AssignedBin, original.X, original.Y - 1, original.Rotated);
+    public static PackingPosition MoveDown(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X, original.Y - 1, original.Rotated);
     }
 
-    public static TwoDimensionalPacking MoveRight(TwoDimensionalPacking original) {
-      return new TwoDimensionalPacking(original.AssignedBin, original.X + 1, original.Y, original.Rotated);
+    public static PackingPosition MoveRight(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X + 1, original.Y, original.Rotated);
     }
-    public static TwoDimensionalPacking MoveUp(TwoDimensionalPacking original) {
-      return new TwoDimensionalPacking(original.AssignedBin, original.X, original.Y + 1, original.Rotated);
+    public static PackingPosition MoveUp(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X, original.Y + 1, original.Rotated);
     }