Changeset 13404 for branches/ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Improvers/KnapsackImprovementOperator.cs

Timestamp:

11/26/15 09:30:43 (8 years ago)

Author:

abeham

Message:

#2521:

• Adapted Knapsack problem to new problem infrastructure
• Introduced additional interfaces in binary vector encoding
• Improved KnapsackImprovementOperator which requires less evaluated solutions in case of an infeasible start solution

Loosely related change:

• All LookupParameters are now shown by default
• Wiring code should make sure that wired parameters are hidden

File:

• branches/ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Improvers/KnapsackImprovementOperator.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Improvers/KnapsackImprovementOperator.cs

@@ -125 +125 @@
       int evaluatedSolutions = 0;
       int j = sol.Length - 1;
-      while (KnapsackEvaluator.Apply(sol, KnapsackCapacity, Penalty, Weights, Values)
-                              .SumWeights.Value > KnapsackCapacity.Value && j >= 0) {
+      var totalWeight = 0.0;
+      for (var i = 0; i < sol.Length; i++) {
+        if (sol[i]) totalWeight += Weights[i];
+      }
+      evaluatedSolutions++;
+
+      while (totalWeight > KnapsackCapacity.Value && j >= 0) {
+        totalWeight -= Weights[order[j]];
         sol[order[j--]] = false;
-        evaluatedSolutions++;
       }