Changeset 13404 for branches/ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators

Timestamp:

11/26/15 09:30:43 (9 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

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators

Files:

• KnapsackMoveEvaluator.cs (modified) (2 diffs)
• KnapsackOneBitflipMoveEvaluator.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackMoveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -47 +46 @@
     public ILookupParameter<IntValue> KnapsackCapacityParameter {
       get { return (ILookupParameter<IntValue>)Parameters["KnapsackCapacity"]; }
-    }
-    public ILookupParameter<DoubleValue> PenaltyParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters["Penalty"]; }
     }
     public ILookupParameter<IntArray> WeightsParameter {

branches/ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackOneBitflipMoveEvaluator.cs

@@ -51 +51 @@
 
     public override IOperation Apply() {
-      BinaryVector binaryVector = BinaryVectorParameter.ActualValue;
-      OneBitflipMove move = OneBitflipMoveParameter.ActualValue;
+      var move = OneBitflipMoveParameter.ActualValue;
+      var solution = BinaryVectorParameter.ActualValue;
+      var weights = WeightsParameter.ActualValue;
+      var values = ValuesParameter.ActualValue;
+      var capacity = KnapsackCapacityParameter.ActualValue.Value;
 
-      BinaryVector newSolution = new BinaryVector(binaryVector);
-      newSolution[move.Index] = !newSolution[move.Index];
+      var totalWeight = !solution[move.Index] ? weights[move.Index] : 0.0;
+      var totalValue = !solution[move.Index] ? values[move.Index] : 0.0; ;
+      for (var i = 0; i < solution.Length; i++) {
+        if (i == move.Index || !solution[i]) continue;
+        totalWeight += weights[i];
+        totalValue += values[i];
+      }
 
-      DoubleValue quality = KnapsackEvaluator.Apply(newSolution,
-        KnapsackCapacityParameter.ActualValue,
-        PenaltyParameter.ActualValue,
-        WeightsParameter.ActualValue,
-        ValuesParameter.ActualValue).Quality;
-
-      double moveQuality = quality.Value;
+      var moveQuality = totalWeight > capacity ? capacity - totalWeight : totalValue;
 
       if (MoveQualityParameter.ActualValue == null) MoveQualityParameter.ActualValue = new DoubleValue(moveQuality);