Changeset 3124

Timestamp:

03/19/10 16:05:27 (14 years ago)

Author:

svonolfe

Message:

Added MoveEvaluator to the Knapsack problem (#917)

Location:

trunk/sources/HeuristicLab.Problems.Knapsack/3.3

Files:

• Evaluators/KnapsackEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (1 diff)
• Interfaces/IKnapsackMoveEvaluator.cs (added)
• Knapsack.cs (modified) (3 diffs)
• MoveEvaluators (added)
• MoveEvaluators/KnapsackMoveEvaluator.cs (added)
• MoveEvaluators/KnapsackOneBitflipMoveEvaluator.cs (added)

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Evaluators/KnapsackEvaluator.cs

@@ -66 +66 @@
     }
 
-    public sealed override IOperation Apply() {
-      BinaryVector v = BinaryVectorParameter.ActualValue;
-      int capacity = KnapsackCapacityParameter.ActualValue.Value;
-      double penalty = PenaltyParameter.ActualValue.Value;
-
-      if (WeightsParameter.ActualValue.Length != ValuesParameter.ActualValue.Length)
+    public static DoubleValue Apply(BinaryVector v, IntValue capacity, DoubleValue penalty, IntArray weights, IntArray values) {
+      if (weights.Length != values.Length)
         throw new InvalidOperationException("The weights and values parameters of the Knapsack problem have different sizes"); 
+      
+      double quality = 0;
 
       int weight = 0;
       int value = 0;
-      double quality = 0;
 
       for (int i = 0; i < v.Length; i++) {
         if (v[i]) {
-          weight += WeightsParameter.ActualValue[i];
-          value += ValuesParameter.ActualValue[i];
+          weight += weights[i];
+          value += values[i];
         }
       }
 
-      if (weight > capacity) {
+      if (weight > capacity.Value) {
         quality =
-          value - penalty * (weight - capacity);
+          value - penalty.Value * (weight - capacity.Value);
       } else {
         quality = value;
       }
 
-      QualityParameter.ActualValue = new DoubleValue(quality);
+      return new DoubleValue(quality);
+    }
+
+    public sealed override IOperation Apply() {
+      BinaryVector v = BinaryVectorParameter.ActualValue;
+
+      DoubleValue quality = Apply(BinaryVectorParameter.ActualValue,
+        KnapsackCapacityParameter.ActualValue, 
+        PenaltyParameter.ActualValue, 
+        WeightsParameter.ActualValue, 
+        ValuesParameter.ActualValue);
+
+      QualityParameter.ActualValue = quality;
 
       return base.Apply();

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj

@@ -85 +85 @@
     <Compile Include="Interfaces\IKnapsackEvaluator.cs" />
     <Compile Include="Interfaces\IKnapsackSolutionsVisualizer.cs" />
+    <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" />
     <Compile Include="Knapsack.cs" />
+    <Compile Include="MoveEvaluators\KnapsackMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\KnapsackOneBitflipMoveEvaluator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Knapsack.cs

@@ -235 +235 @@
       OnVisualizerChanged();
     }
+    void OneBitflipMoveParameter_ActualNameChanged(object sender, EventArgs e) {
+      string name = ((ILookupParameter<OneBitflipMove>)sender).ActualName;
+      foreach (IOneBitflipMoveOperator op in Operators.OfType<IOneBitflipMoveOperator>()) {
+        op.OneBitflipMoveParameter.ActualName = name;
+      }
+    }
     #endregion
 
@@ -274 +280 @@
         ParameterizeOperators();
       }
+
+      InitializeMoveGenerators();
+    }
+    private void InitializeMoveGenerators() {
+      foreach (IOneBitflipMoveOperator op in Operators.OfType<IOneBitflipMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.OneBitflipMoveParameter.ActualNameChanged += new EventHandler(OneBitflipMoveParameter_ActualNameChanged);
+        }
+      }
     }
     private void ParameterizeOperators() {
@@ -283 +298 @@
         op.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
       }
+      foreach (IBinaryVectorMoveOperator op in Operators.OfType<IBinaryVectorMoveOperator>()) {
+        op.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+      }
+      foreach (IKnapsackMoveEvaluator op in Operators.OfType<IKnapsackMoveEvaluator>()) {
+        op.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
+        op.PenaltyParameter.ActualName = PenaltyParameter.Name;
+        op.WeightsParameter.ActualName = WeightsParameter.Name;
+        op.ValuesParameter.ActualName = ValuesParameter.Name;
+      }
     }
     #endregion