Changeset 14049 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/PackingShape.cs

Timestamp:

07/12/16 20:03:45 (8 years ago)

Author:

gkronber

Message:

#1966: simplified class names

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/PackingShape.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/CuboidPackingShape.cs) (9 diffs)

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.BinPacking3D {
-  [Item("CuboidPackingShape", "Represents the cuboid measures (width, height, depth) of a three-dimensional cuboidic bin-packing object.")]
+  [Item("PackingShape (3d)", "Represents the cuboid measures (width, height, depth) of a three-dimensional cuboidic bin-packing object.")]
   [StorableClass]
-  public class CuboidPackingShape : PackingShape<PackingPosition>, IComparable<CuboidPackingShape> {
+  public class PackingShape : PackingShape<PackingPosition>, IComparable<PackingShape> {
     public IFixedValueParameter<IntValue> HeightParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["Height"]; }
@@ -58 +58 @@
 
     [StorableConstructor]
-    protected CuboidPackingShape(bool deserializing) : base(deserializing) { }
-    protected CuboidPackingShape(CuboidPackingShape original, Cloner cloner)
+    protected PackingShape(bool deserializing) : base(deserializing) { }
+    protected PackingShape(PackingShape original, Cloner cloner)
       : base(original, cloner) {
       RegisterEvents();
     }
-    public CuboidPackingShape()
+    public PackingShape()
       : base() {
       Parameters.Add(new FixedValueParameter<IntValue>("Width"));
@@ -72 +72 @@
     }
 
-    public CuboidPackingShape(int width, int height, int depth)
+    public PackingShape(int width, int height, int depth)
       : this() {
       this.Width = width;
@@ -80 +80 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new CuboidPackingShape(this, cloner);
+      return new PackingShape(this, cloner);
     }
 
@@ -101 +101 @@
     #region IComparable Members
 
-    public int CompareTo(CuboidPackingShape other) {
+    public int CompareTo(PackingShape other) {
       //Using "Clustered-Area-Height"-comparison as descr
 
@@ -114 +114 @@
 
     public override int CompareTo(object obj) {
-      var other = (CuboidPackingShape)obj;
+      var other = (PackingShape)obj;
       if (other != null) return CompareTo(other);
       else throw new ArgumentException(string.Format("Cannot compare with object {0}", obj), "obj");
@@ -128 +128 @@
       public int y2;
       public int z2;
-      public CuboidDiagonal(CuboidPackingShape myShape) : this(new PackingPosition(0, 0, 0, 0), myShape) { }
-      public CuboidDiagonal(PackingPosition myPosition, CuboidPackingShape myShape) {
+      public CuboidDiagonal(PackingShape myShape) : this(new PackingPosition(0, 0, 0, 0), myShape) { }
+      public CuboidDiagonal(PackingPosition myPosition, PackingShape myShape) {
         x1 = myPosition.X;
         y1 = myPosition.Y;
@@ -153 +153 @@
     }
     public override bool Encloses(PackingPosition checkedPosition, PackingShape<PackingPosition> checkedShape) {
-      return Encloses(checkedPosition, (CuboidPackingShape)checkedShape);
+      return Encloses(checkedPosition, (PackingShape)checkedShape);
     }
-    private bool Encloses(PackingPosition checkedPosition, CuboidPackingShape checkedShape) {
+    private bool Encloses(PackingPosition checkedPosition, PackingShape checkedShape) {
       return Encloses(new CuboidDiagonal(this), new CuboidDiagonal(checkedPosition, checkedShape));
     }
@@ -168 +168 @@
 
     public override bool Overlaps(PackingPosition myPosition, PackingPosition checkedPosition, PackingShape<PackingPosition> checkedShape) {
-      return Overlaps(myPosition, checkedPosition, (CuboidPackingShape)checkedShape);
+      return Overlaps(myPosition, checkedPosition, (PackingShape)checkedShape);
     }
-    private bool Overlaps(PackingPosition myPosition, PackingPosition checkedPosition, CuboidPackingShape checkedShape) {
+    private bool Overlaps(PackingPosition myPosition, PackingPosition checkedPosition, PackingShape checkedShape) {
       return Overlaps(new CuboidDiagonal(myPosition, this), new CuboidDiagonal(checkedPosition, checkedShape));
     }