Changeset 16532 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack

Timestamp:

01/14/19 22:33:44 (6 years ago)

Author:

abeham

Message:

#2521: reverted r14429

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3

Files:

• Analyzers/BestKnapsackSolutionAnalyzer.cs (modified) (2 diffs)
• KnapsackProblem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.cs

@@ -60 +60 @@
     }
     public ILookupParameter<KnapsackSolution> BestSolutionParameter {
-      get { return (ILookupParameter<KnapsackSolution>)Parameters["BestKnapsackSolution"]; }
+      get { return (ILookupParameter<KnapsackSolution>)Parameters["BestSolution"]; }
     }
     public IValueLookupParameter<ResultCollection> ResultsParameter {
@@ -84 +84 @@
 
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the Knapsack solutions which should be visualized."));
-      Parameters.Add(new LookupParameter<KnapsackSolution>("BestKnapsackSolution", "The best Knapsack solution."));
+      Parameters.Add(new LookupParameter<KnapsackSolution>("BestSolution", "The best Knapsack solution."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the knapsack solution should be stored."));
       Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution."));

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -91 +91 @@
 
       InitializeRandomKnapsackInstance();
-      Encoding.Length = Weights.Length;
 
       InitializeOperators();
@@ -98 +97 @@
 
     public override double Evaluate(BinaryVector solution, IRandom random) {
-      var weights = Weights;
-      var values = Values;
       var totalWeight = 0.0;
       var totalValue = 0.0;
       for (var i = 0; i < solution.Length; i++) {
         if (!solution[i]) continue;
-        totalWeight += weights[i];
-        totalValue += values[i];
+        totalWeight += Weights[i];
+        totalValue += Values[i];
       }
       return totalWeight > KnapsackCapacity ? KnapsackCapacity - totalWeight : totalValue;
@@ -256 +253 @@
       var sysrand = new System.Random();
 
-      var power = sysrand.Next(5, 11);
-      var itemCount = (int)Math.Pow(2, power);
+      var itemCount = sysrand.Next(10, 100);
       Weights = new IntArray(itemCount);
       Values = new IntArray(itemCount);
@@ -264 +260 @@
 
       for (int i = 0; i < itemCount; i++) {
-        var value = sysrand.Next(1, 30);
-        var weight = sysrand.Next(1, 30);
+        var value = sysrand.Next(1, 10);
+        var weight = sysrand.Next(1, 10);
 
         Values[i] = value;
@@ -272 +268 @@
       }
 
-      KnapsackCapacity = (int)Math.Round(0.5 * totalWeight);
+      KnapsackCapacity = (int)Math.Round(0.7 * totalWeight);
     }
   }