Changeset 14049 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/PackingItem.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/PackingItem.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/CuboidPackingItem.cs) (6 diffs)

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.BinPacking3D {
-  [Item("CuboidPackingItem", "Represents a cuboidic packing-item for bin-packing problems.")]
+  [Item("PackingItem (3d)", "Represents a cuboidic packing-item for bin-packing problems.")]
   [StorableClass]
-  public class CuboidPackingItem : CuboidPackingShape, IPackingItem {
-    public IValueParameter<CuboidPackingShape> TargetBinParameter {
-      get { return (IValueParameter<CuboidPackingShape>)Parameters["TargetBin"]; }
+  public class PackingItem : PackingShape, IPackingItem {
+    public IValueParameter<PackingShape> TargetBinParameter {
+      get { return (IValueParameter<PackingShape>)Parameters["TargetBin"]; }
     }
     public IFixedValueParameter<DoubleValue> WeightParameter {
@@ -41 +41 @@
     }
 
-    public CuboidPackingShape TargetBin {
+    public PackingShape TargetBin {
       get { return TargetBinParameter.Value; }
       set { TargetBinParameter.Value = value; }
@@ -61 +61 @@
 
     [StorableConstructor]
-    protected CuboidPackingItem(bool deserializing) : base(deserializing) { }
-    protected CuboidPackingItem(CuboidPackingItem original, Cloner cloner)
+    protected PackingItem(bool deserializing) : base(deserializing) { }
+    protected PackingItem(PackingItem original, Cloner cloner)
       : base(original, cloner) {
       RegisterEvents();
     }
-    public CuboidPackingItem()
+    public PackingItem()
       : base() {
-      Parameters.Add(new ValueParameter<CuboidPackingShape>("TargetBin"));
+      Parameters.Add(new ValueParameter<PackingShape>("TargetBin"));
       Parameters.Add(new FixedValueParameter<DoubleValue>("Weight"));
       Parameters.Add(new FixedValueParameter<IntValue>("Material"));
@@ -75 +75 @@
     }
 
-    public CuboidPackingItem(int width, int height, int depth, CuboidPackingShape targetBin, double weight, int material)
+    public PackingItem(int width, int height, int depth, PackingShape targetBin, double weight, int material)
       : this() {
       this.Width = width;
@@ -82 +82 @@
       this.Weight = weight;
       this.Material = material;
-      this.TargetBin = (CuboidPackingShape)targetBin.Clone();
+      this.TargetBin = (PackingShape)targetBin.Clone();
     }
 
-    public CuboidPackingItem(int width, int height, int depth, CuboidPackingShape targetBin)
+    public PackingItem(int width, int height, int depth, PackingShape targetBin)
       : this() {
       this.Width = width;
       this.Height = height;
       this.Depth = depth;
-      this.TargetBin = (CuboidPackingShape)targetBin.Clone();
+      this.TargetBin = (PackingShape)targetBin.Clone();
     }
 
@@ -99 +99 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new CuboidPackingItem(this, cloner);
+      return new PackingItem(this, cloner);
     }