Changeset 14977

Timestamp:

05/12/17 14:55:52 (8 years ago)

Author:

dsouravl

Message:

#2762: worked on best fit heuristics, update of residual space heuristic

File:

• branches/BinPackingExtension/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs (modified) (2 diffs)

branches/BinPackingExtension/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs

@@ -349 +349 @@
       foreach (var ep in ExtremePoints) {
         if (ep.Z >= pos.Z && ep.Z <= pos.Z + item.Depth) {
-          if (ep.X <= pos.X && ep.Y >= pos.Y && ep.Y <= pos.Y + item.Height) {
+          if (ep.X <= pos.X && ep.Y > pos.Y && ep.Y < pos.Y + item.Height) {
             var diff = pos.X - ep.X;
             var newRSX = ResidualSpace[ep].Item1 < diff ? ResidualSpace[ep].Item1 : diff;
             ResidualSpace[ep] = Tuple.Create(newRSX, ResidualSpace[ep].Item2, ResidualSpace[ep].Item3);
           }
-          if (ep.Y <= pos.Y && ep.X >= pos.X && ep.X <= pos.X + item.Width) {
+          if (ep.Y <= pos.Y && ep.X > pos.X && ep.X < pos.X + item.Width) {
             var diff = pos.Y - ep.Y;
             var newRSY = ResidualSpace[ep].Item2 < diff ? ResidualSpace[ep].Item2 : diff;
@@ -361 +361 @@
         }
         if (ep.Z <= pos.Z && 
-          ep.Y >= pos.Y && ep.Y <= pos.Y + item.Height &&
-          ep.X >= pos.X && ep.X <= pos.X + item.Width) {
+          ep.Y > pos.Y && ep.Y < pos.Y + item.Height &&
+          ep.X > pos.X && ep.X < pos.X + item.Width) {
             var diff = pos.Z - ep.Z;
             var newRSZ = ResidualSpace[ep].Item3 < diff ? ResidualSpace[ep].Item3 : diff;