Changeset 3537 for trunk/sources

Timestamp:

04/26/10 18:58:32 (14 years ago)

Author:

svonolfe

Message:

Implemented reviewers comments for the KnapsackProblem (#917)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Knapsack.Views/3.3/KnapsackSolutionView.cs (modified) (2 diffs)
• HeuristicLab.Problems.Knapsack/3.3/Evaluators/KnapsackEvaluator.cs (modified) (6 diffs)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackOneBitflipMoveEvaluator.cs (modified) (1 diff)

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

@@ -154 +154 @@
               //draw knapsack
               graphics.DrawRectangle(Pens.Black,
-                borderX - 1, borderY - 1, width + 2, knapsackHeight + 2);
+                borderX - 1, pictureBox.Height - borderY - knapsackHeight - 1, width + 2, knapsackHeight + 2);
 
               //draw items sorted by value
@@ -180 +180 @@
                   double weight = Content.Weights[i];
                   double factor = weight / capacity;
-                  int elementHeight = (int)Math.Round(height * factor);
+                  int elementHeight = (int)Math.Floor(knapsackHeight * factor);
 
                   double value = Content.Values[i];

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

@@ -39 +39 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
+
+    public ILookupParameter<DoubleValue> SumWeightsParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["SumWeights"]; }
+    }
+
+    public ILookupParameter<DoubleValue> SumValuesParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["SumValues"]; }
+    }
+
+    public ILookupParameter<DoubleValue> AppliedPenaltyParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["AppliedPenalty"]; }
+    }
     
     public ILookupParameter<BinaryVector> BinaryVectorParameter {
@@ -60 +72 @@
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The evaluated quality of the OneMax solution."));
+      Parameters.Add(new LookupParameter<DoubleValue>("SumWeights", "The evaluated quality of the OneMax solution."));
+      Parameters.Add(new LookupParameter<DoubleValue>("SumValues", "The evaluated quality of the OneMax solution."));
+      Parameters.Add(new LookupParameter<DoubleValue>("AppliedPenalty", "The evaluated quality of the OneMax solution."));
       Parameters.Add(new LookupParameter<BinaryVector>("BinaryVector", "The OneMax solution given in path representation which should be evaluated."));
       Parameters.Add(new LookupParameter<IntValue>("KnapsackCapacity", "Capacity of the Knapsack."));
@@ -67 +82 @@
     }
 
-    public static DoubleValue Apply(BinaryVector v, IntValue capacity, DoubleValue penalty, IntArray weights, IntArray values) {
+    public struct KnapsackEvaluation {
+      public DoubleValue Quality;
+      public DoubleValue SumWeights;
+      public DoubleValue SumValues;
+      public DoubleValue AppliedPenalty;
+    }
+
+    public static KnapsackEvaluation 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"); 
-      
+        throw new InvalidOperationException("The weights and values parameters of the Knapsack problem have different sizes");
+
+      KnapsackEvaluation result = new KnapsackEvaluation();
+
       double quality = 0;
 
       int weight = 0;
       int value = 0;
+      double appliedPenalty = 0;
 
       for (int i = 0; i < v.Length; i++) {
@@ -84 +109 @@
 
       if (weight > capacity.Value) {
-        quality =
-          value - penalty.Value * (weight - capacity.Value);
-      } else {
-        quality = value;
-      }
+        appliedPenalty = penalty.Value * (weight - capacity.Value);
+      } 
 
-      return new DoubleValue(quality);
+      quality =  value - appliedPenalty;
+
+      result.AppliedPenalty = new DoubleValue(appliedPenalty);
+      result.SumWeights = new DoubleValue(weight);
+      result.SumValues = new DoubleValue(value);
+      result.Quality = new DoubleValue(quality);
+
+      return result;
     }
 
@@ -96 +125 @@
       BinaryVector v = BinaryVectorParameter.ActualValue;
 
-      DoubleValue quality = Apply(BinaryVectorParameter.ActualValue,
+      KnapsackEvaluation evaluation = Apply(BinaryVectorParameter.ActualValue,
         KnapsackCapacityParameter.ActualValue, 
         PenaltyParameter.ActualValue, 
@@ -102 +131 @@
         ValuesParameter.ActualValue);
 
-      QualityParameter.ActualValue = quality;
+      QualityParameter.ActualValue = evaluation.Quality;
+      SumWeightsParameter.ActualValue = evaluation.SumWeights;
+      SumValuesParameter.ActualValue = evaluation.SumValues;
+      AppliedPenaltyParameter.ActualValue = evaluation.AppliedPenalty;
 
       return base.Apply();

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

@@ -143 +143 @@
 
       int itemCount = rand.Next(10, 100);
-      int capacity = itemCount * 5;
-
-      KnapsackCapacity = new IntValue(capacity);
       Weights = new IntArray(itemCount);
       Values = new IntArray(itemCount);
+
+      double totalWeight = 0;
 
       for (int i = 0; i < itemCount; i++ ) {
@@ -155 +154 @@
         Values[i] = value;
         Weights[i] = weight;
-      }
+        totalWeight += weight;
+      }
+
+      int capacity = (int)Math.Round(0.7 * totalWeight);
+      KnapsackCapacity = new IntValue(capacity);
     }
 
@@ -175 +178 @@
 
       creator.BinaryVectorParameter.ActualName = "KnapsackSolution";
-      evaluator.QualityParameter.ActualName = "NumberOfOnes";
 
       InitializeRandomKnapsackInstance();

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

@@ -56 +56 @@
         PenaltyParameter.ActualValue,
         WeightsParameter.ActualValue,
-        ValuesParameter.ActualValue);
+        ValuesParameter.ActualValue).Quality;
 
       double moveQuality = quality.Value;