Changeset 14966 for stable

Timestamp:

05/11/17 13:58:36 (8 years ago)

Author:

abeham

Message:

#2785: merged 14916 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs (modified) (1 diff)

stable/HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.cs

@@ -83 +83 @@
         rotated ? item.Height : item.Width,
         rotated ? item.Width : item.Height,
-        item.TargetBin);
+        item.TargetBin) {
+        Material = item.Material,
+        Weight = item.Weight
+      };
 
       int epIndex = 0;

stable/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs

@@ -137 +137 @@
         item.Height,
         rotated ? item.Width : item.Depth,
-        item.TargetBin);
+        item.TargetBin, item.Weight, item.Material);
 
       int epIndex = 0;