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

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.

File:

• branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Algorithms/ExtremePointAlgorithm.cs (modified) (4 diffs)

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

@@ -247 +247 @@
             }
 
-
-            var x = Problem.SolutionEvaluator.Evaluate1(solution);
-
-            /*
-            if (double.IsNaN(result.Item2) || double.IsInfinity(result.Item2)) {
-              continue;
-            }
-
-            if (double.IsNaN(best) || Problem.Maximization && result.Item2 > best || !Problem.Maximization && result.Item2 < best) {
-              bestSolution = result.Item1;
-              best = result.Item2;
-              bestSorting = sort;
-              bestFitting = fit;
-              bestEPCreation = epCreation;
-            }
-            return true;*/
-
             if (token.IsCancellationRequested) {
               return Tuple.Create(bestSolution, best, bestSorting, bestFitting, bestEPCreation);
@@ -277 +260 @@
 
     /// <summary>
-    /// Returns a tuple with the solution and the packing ratio depending on the given parameters
+    /// Returns a solution depending on the given parameters
     /// </summary>
     /// <param name="parameters"></param>
@@ -284 +267 @@
 
       var sol = parameters.Decoder.Decode(parameters.SortedItems, parameters.Bin, parameters.Items, parameters.StackingConstraints);
-      //var fit = parameters.Evaluator.Evaluate(sol);
-
-      return sol; //Tuple.Create(sol, fit);
+
+      return sol; 
     }
 
@@ -298 +280 @@
       public ExtremePointCreationMethod ExtremePointGeneration { get; set; }
     }
-
-
+    
     /// <summary>
     /// Returns a new permutation of the given items depending on the sorting method