Changeset 15276

Timestamp:

07/20/17 22:54:54 (7 years ago)

Author:

abeham

Message:

#2762:

• (hopefully) fixed unit test (the instances' items were loaded on sort, this was removed and thus the instance changed)
• corrected license header of newly created decoders
• changed a small query in BinPacking3D

Location:

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D

Files:

• BinPacking3D.cs (modified) (1 diff)
• PermutationEncoding/ExtremePointPermutationDecoderBase.cs (modified) (1 diff)
• PermutationEncoding/FreeVolumeBestFitExtremePointPermutationDecoder.cs (modified) (1 diff)
• PermutationEncoding/ResidualSpaceBestFitExtremePointPermutationDecoder.cs (modified) (1 diff)
• ProblemBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs

@@ -237 +237 @@
         if (positionFound != null) {
           PackItem(itemID, item, positionFound);
-          if (!(positionFound.X == 0 && positionFound.Y == 0 && positionFound.Z == 0)) {
+          if (Items.Count > 1)
             UpdateResidualSpace(item, positionFound);
-          }
           sequence.Remove(itemID);
         }

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoderBase.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Joseph Helm and Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/FreeVolumeBestFitExtremePointPermutationDecoder.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Joseph Helm and Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ResidualSpaceBestFitExtremePointPermutationDecoder.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Joseph Helm and Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/ProblemBase.cs

@@ -236 +236 @@
       BinShape = data.BinShape;
       var items = new ItemList<PackingItem>(data.Items);
+      items.Sort((x, y) => y.CompareTo(x));
       Items = items.AsReadOnly();