Changeset 15705 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/PackingItem.cs

Timestamp:

02/01/18 12:21:34 (6 years ago)

Author:

rhanghof

Message:

#2817

• Former material is now the layer.
• Added material enumeration
• Modification at the minimum residual space left bin packer

File:

• branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/PackingItem.cs (modified) (9 diffs)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/PackingItem.cs

@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.BinPacking;
+using HeuristicLab.Problems.BinPacking3D.Material;
 
 namespace HeuristicLab.Problems.BinPacking3D {
@@ -40 +41 @@
       get { return (IFixedValueParameter<DoubleValue>)Parameters["Weight"]; }
     }
-    public IFixedValueParameter<IntValue> MaterialParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["Material"]; }
+    public IFixedValueParameter<IntValue> LayerParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Layer"]; }
     }
 
@@ -54 +55 @@
     }
 
-    public int Material {
-      get { return MaterialParameter.Value.Value; }
-      set { MaterialParameter.Value.Value = value; }
-    }
-
+    public int Layer {
+      get { return LayerParameter.Value.Value; }
+      set { LayerParameter.Value.Value = value; }
+    }
+
+    #region Material
+    public IFixedValueParameter<EnumValue<MaterialType>> MaterialBottomParameter {
+      get { return (IFixedValueParameter<EnumValue<MaterialType>>)Parameters["MaterialBottom"]; }
+    }
+    public MaterialType MaterialBottom {
+      get { return MaterialBottomParameter.Value.Value; }
+      set { MaterialBottomParameter.Value.Value = value; }
+    }
+
+    public IFixedValueParameter<EnumValue<MaterialType>> MaterialTopParameter {
+      get { return (IFixedValueParameter<EnumValue<MaterialType>>)Parameters["MaterialTop"]; }
+    }
+    public MaterialType MaterialTop {
+      get { return MaterialTopParameter.Value.Value; }
+      set { MaterialTopParameter.Value.Value = value; }
+    }
+    #endregion
 
     public IFixedValueParameter<DoubleValue> SupportedWeightParameter {
@@ -277 +295 @@
 
     public bool SupportsStacking(IPackingItem other) {
-      return ((other.Material < this.Material) || (other.Material.Equals(this.Material) && other.Weight <= this.Weight));
+      return ((other.Layer < this.Layer) || (other.Layer.Equals(this.Layer) && other.Weight <= this.Weight));
     }
     #endregion
@@ -292 +310 @@
       Parameters.Add(new ValueParameter<PackingShape>("TargetBin"));
       Parameters.Add(new FixedValueParameter<DoubleValue>("Weight"));
-      Parameters.Add(new FixedValueParameter<IntValue>("Material"));
-
-      Parameters.Add(new FixedValueParameter<DoubleValue>("SupportedWeight"));      
+      Parameters.Add(new FixedValueParameter<IntValue>("Layer"));
+
+
+      Parameters.Add(new FixedValueParameter<EnumValue<MaterialType>>("MaterialTop"));
+      Parameters.Add(new FixedValueParameter<EnumValue<MaterialType>>("MaterialBottom"));
+
+      Parameters.Add(new FixedValueParameter<DoubleValue>("SupportedWeight"));
 
       Parameters.Add(new FixedValueParameter<BoolValue>("RotateEnabled"));
@@ -319 +341 @@
     }
 
-    public PackingItem(int width, int height, int depth, PackingShape targetBin, double weight, int material)
+    public PackingItem(int width, int height, int depth, PackingShape targetBin, double weight, int layer)
       : this(width, height, depth, targetBin) {
       this.Weight = weight;
-      this.Material = material;
+      this.Layer = layer;
     }
 
@@ -333 +355 @@
       TargetBin = (PackingShape)packingItem.TargetBin.Clone();
       Weight = packingItem.Weight;
-      Material = packingItem.Material;
+      Layer = packingItem.Layer;
       Rotated = packingItem.Rotated;
       Tilted = packingItem.Tilted;
       IsStackabel = packingItem.IsStackabel;
+      MaterialTop = packingItem.MaterialTop;
+      MaterialBottom = packingItem.MaterialBottom;
 
       LoadSecuringDepth = packingItem.LoadSecuringDepth;
@@ -355 +379 @@
       // NOTE: only because of ToString override
       WeightParameter.Value.ValueChanged += (sender, args) => OnToStringChanged();
-      MaterialParameter.Value.ValueChanged += (sender, args) => OnToStringChanged();
+      LayerParameter.Value.ValueChanged += (sender, args) => OnToStringChanged();
 
       // target bin does not occur in ToString()
@@ -361 +385 @@
 
     public override string ToString() {
-      return string.Format("CuboidPackingItem ({0}, {1}, {2}; weight={3}, mat={4})", this.Width, this.Height, this.Depth, this.Weight, this.Material);
+      return string.Format("CuboidPackingItem ({0}, {1}, {2}; weight={3}, layer={4})", this.Width, this.Height, this.Depth, this.Weight, this.Layer);
     }