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

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.BinPacking2D {
-  [Item("RectangularPackingItem", "Represents a rectangular packing-item for bin-packing problems.")]
+  [Item("PackingItem (2d)", "Represents a rectangular packing-item for bin-packing problems.")]
   [StorableClass]
-  public class RectangularPackingItem : RectangularPackingShape, IPackingItem {
+  public class PackingItem : PackingShape, IPackingItem {
 
-    public RectangularPackingShape TargetBin {
-      get { return ((IValueParameter<RectangularPackingShape>)Parameters["TargetBin"]).Value; }
-      set { ((IValueParameter<RectangularPackingShape>)Parameters["TargetBin"]).Value = value; }
+    public PackingShape TargetBin {
+      get { return ((IValueParameter<PackingShape>)Parameters["TargetBin"]).Value; }
+      set { ((IValueParameter<PackingShape>)Parameters["TargetBin"]).Value = value; }
     }
 
@@ -49 +49 @@
 
     [StorableConstructor]
-    protected RectangularPackingItem(bool deserializing) : base(deserializing) { }
-    protected RectangularPackingItem(RectangularPackingItem original, Cloner cloner)
+    protected PackingItem(bool deserializing) : base(deserializing) { }
+    protected PackingItem(PackingItem original, Cloner cloner)
       : base(original, cloner) {
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new RectangularPackingItem(this, cloner);
+      return new PackingItem(this, cloner);
     }
 
-    public RectangularPackingItem()
+    public PackingItem()
       : base() {
-      Parameters.Add(new ValueParameter<RectangularPackingShape>("TargetBin"));
+      Parameters.Add(new ValueParameter<PackingShape>("TargetBin"));
       Parameters.Add(new FixedValueParameter<DoubleValue>("Weight"));
       Parameters.Add(new FixedValueParameter<IntValue>("Material"));
     }
 
-    public RectangularPackingItem(int width, int height, RectangularPackingShape targetBin)
+    public PackingItem(int width, int height, PackingShape targetBin)
       : this() {
       this.Width = width;
       this.Height = height;
-      this.TargetBin = (RectangularPackingShape)targetBin.Clone();
+      this.TargetBin = (PackingShape)targetBin.Clone();
     }