Changeset 15838 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/ExtremePointCreation

Timestamp:

03/12/18 14:19:06 (7 years ago)

Author:

rhanghof

Message:

#2817:

• Fixed a bug at creating the extreme points with the point projection based method.

Location:

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

Files:

• ExtremePointCreator.cs (modified) (8 diffs)
• ExtremePointCreatorFactory.cs (modified) (1 diff)
• PointProjectionBasedEPCreator.cs (modified) (1 diff)

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

@@ -232 +232 @@
     /// <returns></returns>
     protected bool IsWithinResidualSpaceOfAnotherExtremePoint(BinPacking3D binPacking, Vector3D pos, IEnumerable<ResidualSpace> residualSpaces) {
-      foreach (var residualSpace in residualSpaces) {
-        if (IsWithinResidualSpaceOfAnotherExtremePoint(binPacking, pos, residualSpace)) {
-          return true;
-        }
-      }
-      return false;
+      return residualSpaces.Any(x => IsWithinResidualSpaceOfAnotherExtremePoint(binPacking, pos, x));
     }
 
@@ -262 +257 @@
     /// <returns></returns>
     protected virtual bool IsWithinResidualSpaceOfAnotherExtremePoint(Vector3D pos, ResidualSpace rsPos, PackingPosition ep, ResidualSpace rsEp) {
-      /*old implementation
-      return rsEp.Width >= pos.X - ep.X + rsPos.Width
-          && rsEp.Height >= pos.Y - ep.Y + rsPos.Height
-          && rsEp.Depth >= pos.Z - ep.Z + rsPos.Depth;*/
-
       var x = pos.X >= ep.X && pos.X + rsPos.Width <= ep.X + rsEp.Width;
       var y = pos.Y >= ep.Y && pos.Y + rsPos.Height <= ep.Y + rsEp.Height;
@@ -294 +284 @@
                              .Select(x => x.Intersect(line))
                              .Where(x => x != null && x.Z <= pos.Z);
-      if (m.Where(x => x != null).Any()) {
-        return m.MaxItems(x => x.Y).First();
+      if (m.Any(x => x != null)) {
+        return m.MaxItems(x => x.Z).FirstOrDefault();
       }
       return null;
@@ -307 +297 @@
                   .Select(x => x.Intersect(line))
                   .Where(x => x != null && x.X <= pos.X);
-      if (m.Where(x => x != null).Any()) {
-        return m.MaxItems(x => x.Y).First();
+      if (m.Any(x => x != null)) {
+        return m.MaxItems(x => x.X).FirstOrDefault();
       }
       return null;
@@ -320 +310 @@
                   .Select(x => x.Intersect(line))
                   .Where(x => x != null && x.Y <= pos.Y);
-      if (m.Where(x => x != null).Any()) {
-        return m.MaxItems(x => x.Y).First();
+      if (m.Any(x => x != null)) {
+        return m.MaxItems(x => x.Y).FirstOrDefault();
       }
       return null;
@@ -333 +323 @@
                   .Select(x => x.Intersect(line))
                   .Where(x => x != null && x.Z >= pos.Z);
-      if (m.Where(x => x != null).Any()) {
-        return m.MaxItems(x => x.Y).First();
+      if (m.Any(x => x != null)) {
+        return m.MinItems(x => x.Z).FirstOrDefault();
       }
       return null;
@@ -346 +336 @@
                   .Select(x => x.Intersect(line))
                   .Where(x => x != null && x.X >= pos.X);
-      if (m.Where(x => x != null).Any()) {
-        return m.MaxItems(x => x.Y).First();
+      if (m.Any(x => x != null)) {
+        return m.MinItems(x => x.X).FirstOrDefault();
       }
       return null;
@@ -359 +349 @@
                   .Select(x => x.Intersect(line))
                   .Where(x => x != null && x.Y >= pos.Y);
-      if (m.Where(x => x != null).Any()) {
-        return m.MaxItems(x => x.Y).First();
+      if (m.Any(x => x != null)) {
+        return m.MinItems(x => x.Y).FirstOrDefault();
       }
       return null;

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

@@ -28 +28 @@
 namespace HeuristicLab.Problems.BinPacking3D.ExtremePointCreation {
   public static class ExtremePointCreatorFactory {
-    public static IExtremePointCreator CreateExtremePointCreator(ExtremePointCreationMethod epGenerationMethod, bool useStackingConstraints) {
-      if (epGenerationMethod == ExtremePointCreationMethod.PointProjection) {
+    
+    /// <summary>
+    /// Returns an extreme point creator depending on the given creation method.
+    /// </summary>
+    /// <param name="epCreationMethod"></param>
+    /// <param name="useStackingConstraints"></param>
+    /// <returns></returns>
+    public static IExtremePointCreator CreateExtremePointCreator(ExtremePointCreationMethod epCreationMethod, bool useStackingConstraints) {
+      if (epCreationMethod == ExtremePointCreationMethod.PointProjection) {
         return new PointProjectionBasedEPCreator();
-      } else if (epGenerationMethod == ExtremePointCreationMethod.LineProjection) {
+      } else if (epCreationMethod == ExtremePointCreationMethod.LineProjection) {
         return new LineProjectionBasedEPCreator();
       }

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

@@ -56 +56 @@
         GenerateNewExtremePointsForItem(binPacking, it, pos);
       });
-
+      
       // remove not needed extreme points.
       foreach (var extremePoint in binPacking.ExtremePoints.ToList()) {