Changeset 14048 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/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.3D/3.3/PackingPosition.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/ThreeDimensionalPacking.cs) (5 diffs)

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

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Common;
-using HeuristicLab.Problems.BinPacking;
 
 namespace HeuristicLab.Problems.BinPacking3D {
-  [Item("Three Dimensional Packing", "Represents a packing-position associated with a three dimensional packing-problem.")]
+  [Item("Packing Position (3d)", "Represents a packing-position associated with a three dimensional packing-problem.")]
   [StorableClass]
-  // ThreeDimensionalPacking is immutable (and handled as value type concerning Equals and GetHashCode)
-  public class ThreeDimensionalPacking : PackingDimensions {
+  // PackingPosition is immutable (and handled as value type concerning Equals and GetHashCode)
+  public class PackingPosition : BinPacking.PackingPosition {
     [Storable]
     private readonly int x;
@@ -43 +42 @@
 
     [StorableConstructor]
-    protected ThreeDimensionalPacking(bool deserializing) : base(deserializing) { }
-    protected ThreeDimensionalPacking(ThreeDimensionalPacking original, Cloner cloner)
+    protected PackingPosition(bool deserializing) : base(deserializing) { }
+    protected PackingPosition(PackingPosition original, Cloner cloner)
       : base(original, cloner) {
       x = original.X;
@@ -51 +50 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ThreeDimensionalPacking(this, cloner);
+      return new PackingPosition(this, cloner);
     }
 
-    public ThreeDimensionalPacking(int assignedBin, int x, int y, int z, bool rotated = false)
+    public PackingPosition(int assignedBin, int x, int y, int z, bool rotated = false)
       : base(assignedBin, rotated) {
       this.x = x;
@@ -67 +66 @@
 
     public override bool Equals(object obj) {
-      var tdp = obj as ThreeDimensionalPacking;
+      var tdp = obj as PackingPosition;
       if (tdp != null)
         return (tdp.X == this.X && tdp.Y == this.Y && tdp.Z == this.Z);
@@ -77 +76 @@
     }
 
-    public static ThreeDimensionalPacking MoveLeft(ThreeDimensionalPacking original) {
-      return new ThreeDimensionalPacking(original.AssignedBin, original.X - 1, original.Y, original.Z, original.Rotated);
+    public static PackingPosition MoveLeft(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X - 1, original.Y, original.Z, original.Rotated);
     }
-    public static ThreeDimensionalPacking MoveDown(ThreeDimensionalPacking original) {
-      return new ThreeDimensionalPacking(original.AssignedBin, original.X, original.Y - 1, original.Z, original.Rotated);
+    public static PackingPosition MoveDown(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X, original.Y - 1, original.Z, original.Rotated);
     }
-    public static ThreeDimensionalPacking MoveBack(ThreeDimensionalPacking original) {
-      return new ThreeDimensionalPacking(original.AssignedBin, original.X, original.Y, original.Z - 1, original.Rotated);
+    public static PackingPosition MoveBack(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X, original.Y, original.Z - 1, original.Rotated);
     }
 
-    public static ThreeDimensionalPacking MoveRight(ThreeDimensionalPacking original) {
-      return new ThreeDimensionalPacking(original.AssignedBin, original.X + 1, original.Y, original.Z, original.Rotated);
+    public static PackingPosition MoveRight(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X + 1, original.Y, original.Z, original.Rotated);
     }
-    public static ThreeDimensionalPacking MoveUp(ThreeDimensionalPacking original) {
-      return new ThreeDimensionalPacking(original.AssignedBin, original.X, original.Y + 1, original.Z, original.Rotated);
+    public static PackingPosition MoveUp(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X, original.Y + 1, original.Z, original.Rotated);
     }
-    public static ThreeDimensionalPacking MoveFront(ThreeDimensionalPacking original) {
-      return new ThreeDimensionalPacking(original.AssignedBin, original.X, original.Y, original.Z + 1, original.Rotated);
+    public static PackingPosition MoveFront(PackingPosition original) {
+      return new PackingPosition(original.AssignedBin, original.X, original.Y, original.Z + 1, original.Rotated);
     }
   }