Changeset 3667 for trunk/sources/HeuristicLab.Problems.Knapsack

Timestamp:

05/06/10 12:49:05 (15 years ago)

Author:

svonolfe

Message:

• Updated OneMax analyzer
• Updated Knapsack analyzer
• Fixed bug in OneMax and TF analyzer views

(#999)

Location:

trunk/sources/HeuristicLab.Problems.Knapsack/3.3

Files:

• Analyzers/BestKnapsackSolutionAnalyzer.cs (modified) (2 diffs)
• Analyzers/MultiPopulationBestKnapsackSolutionAnalyzer.cs (deleted)
• Analyzers/PopulationBestKnapsackSolutionAnalyzer.cs (deleted)
• HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (1 diff)
• Interfaces/IBestKnapsackSolutionAnalyzer.cs (deleted)
• KnapsackProblem.cs (modified) (5 diffs)

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

@@ -38 +38 @@
   [Item("BestKnapsackSolutionAnalyzer", "An operator for analyzing the best solution for a knapsack problem.")]
   [StorableClass]
-  class BestKnapsackSolutionAnalyzer : SingleSuccessorOperator, IBestKnapsackSolutionAnalyzer, IAnalyzer {
+  class BestKnapsackSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
 
-    public ILookupParameter<BinaryVector> BinaryVectorParameter {
-      get { return (ILookupParameter<BinaryVector>)Parameters["BinaryVector"]; }
+    public ScopeTreeLookupParameter<BinaryVector> BinaryVectorParameter {
+      get { return (ScopeTreeLookupParameter<BinaryVector>)Parameters["BinaryVector"]; }
     }
-    ILookupParameter IBestKnapsackSolutionAnalyzer.BinaryVectorParameter {
-      get { return BinaryVectorParameter; }
+    public LookupParameter<IntValue> KnapsackCapacityParameter {
+      get { return (LookupParameter<IntValue>)Parameters["KnapsackCapacity"]; }
     }
-    public ILookupParameter<IntValue> KnapsackCapacityParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["KnapsackCapacity"]; }
+    public LookupParameter<IntArray> WeightsParameter {
+      get { return (LookupParameter<IntArray>)Parameters["Weights"]; }
     }
-    public ILookupParameter<IntArray> WeightsParameter {
-      get { return (ILookupParameter<IntArray>)Parameters["Weights"]; }
+    public LookupParameter<IntArray> ValuesParameter {
+      get { return (LookupParameter<IntArray>)Parameters["Values"]; }
     }
-    public ILookupParameter<IntArray> ValuesParameter {
-      get { return (ILookupParameter<IntArray>)Parameters["Values"]; }
+    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
+      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public ILookupParameter<DoubleValue> QualityParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
+    public LookupParameter<KnapsackSolution> BestSolutionParameter {
+      get { return (LookupParameter<KnapsackSolution>)Parameters["BestSolution"]; }
     }
-    ILookupParameter IBestKnapsackSolutionAnalyzer.QualityParameter {
-      get { return QualityParameter; }
-    }
-    public ILookupParameter<KnapsackSolution> BestSolutionParameter {
-      get { return (ILookupParameter<KnapsackSolution>)Parameters["BestSolution"]; }
-    }
-    public IValueLookupParameter<ResultCollection> ResultsParameter {
-      get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
+    public ValueLookupParameter<ResultCollection> ResultsParameter {
+      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
 
     public BestKnapsackSolutionAnalyzer()
       : base() {
-      Parameters.Add(new LookupParameter<BinaryVector>("BinaryVector", "The knapsack solutions from which the best solution should be visualized."));
+      Parameters.Add(new ScopeTreeLookupParameter<BinaryVector>("BinaryVector", "The knapsack solutions from which the best solution should be visualized."));
       Parameters.Add(new LookupParameter<IntValue>("KnapsackCapacity", "Capacity of the Knapsack."));
       Parameters.Add(new LookupParameter<IntArray>("Weights", "The weights of the items."));
       Parameters.Add(new LookupParameter<IntArray>("Values", "The values of the items."));
 
-      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The qualities of the knapsack solutions which should be visualized."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the knapsack solutions which should be visualized."));
       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."));
@@ -81 +75 @@
 
     public override IOperation Apply() {
-      BinaryVector binaryVector = BinaryVectorParameter.ActualValue;
-      DoubleValue quality = QualityParameter.ActualValue;
+      ItemArray<BinaryVector> binaryVectors = BinaryVectorParameter.ActualValue;
+      ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
       ResultCollection results = ResultsParameter.ActualValue;
+
+      int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
 
       KnapsackSolution solution = BestSolutionParameter.ActualValue;
       if (solution == null) {
-        solution = new KnapsackSolution(binaryVector, QualityParameter.ActualValue,
+        solution = new KnapsackSolution(binaryVectors[i], qualities[i],
           KnapsackCapacityParameter.ActualValue, WeightsParameter.ActualValue, ValuesParameter.ActualValue);
         BestSolutionParameter.ActualValue = solution;
         results.Add(new Result("Best Knapsack Solution", solution));
       }  else {
-        solution.BinaryVector = binaryVector;
-        solution.Quality = QualityParameter.ActualValue;
+        solution.BinaryVector = binaryVectors[i];
+        solution.Quality = qualities[i];
         solution.Capacity = KnapsackCapacityParameter.ActualValue;
         solution.Weights = WeightsParameter.ActualValue;

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

@@ -81 +81 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Analyzers\MultiPopulationBestKnapsackSolutionAnalyzer.cs" />
-    <Compile Include="Analyzers\PopulationBestKnapsackSolutionAnalyzer.cs" />
     <Compile Include="Evaluators\KnapsackEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsKnapsackPlugin.cs" />
-    <Compile Include="Interfaces\IBestKnapsackSolutionAnalyzer.cs" />
     <Compile Include="Interfaces\IKnapsackEvaluator.cs" />
     <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" />

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

@@ -124 +124 @@
       get { return operators.Cast<IOperator>(); }
     }
-    private IEnumerable<IBestKnapsackSolutionAnalyzer> BestKnapsackSolutionAnalyzers {
-      get { return operators.OfType<IBestKnapsackSolutionAnalyzer>(); }
+    private BestKnapsackSolutionAnalyzer BestKnapsackSolutionAnalyzer {
+      get { return operators.OfType<BestKnapsackSolutionAnalyzer>().FirstOrDefault(); }
     }
     #endregion
@@ -206 +206 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       ParameterizeOperators();
       OnSolutionCreatorChanged();
@@ -212 +212 @@
     private void SolutionCreator_BinaryVectorParameter_ActualNameChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       ParameterizeOperators();
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       OnEvaluatorChanged();
     }
     void KnapsackCapacityParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
     }
     void WeightsParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       ParameterizeSolutionCreator();
 
@@ -239 +239 @@
     void ValuesParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       ParameterizeSolutionCreator();
 
@@ -291 +291 @@
       }
     }
-    private void ParameterizeAnalyzers() {
-      foreach (IBestKnapsackSolutionAnalyzer analyzer in BestKnapsackSolutionAnalyzers) {
-        analyzer.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
-        analyzer.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
-        analyzer.WeightsParameter.ActualName = WeightsParameter.Name;
-        analyzer.ValuesParameter.ActualName = ValuesParameter.Name;
-        analyzer.ResultsParameter.ActualName = "Results";
-      }
+    private void ParameterizeAnalyzer() {
+      BestKnapsackSolutionAnalyzer.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+      BestKnapsackSolutionAnalyzer.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
+      BestKnapsackSolutionAnalyzer.WeightsParameter.ActualName = WeightsParameter.Name;
+      BestKnapsackSolutionAnalyzer.ValuesParameter.ActualName = ValuesParameter.Name;
+      BestKnapsackSolutionAnalyzer.ResultsParameter.ActualName = "Results";
     }
     private void InitializeOperators() {
       operators = new List<IOperator>();
       operators.Add(new BestKnapsackSolutionAnalyzer());
-      operators.Add(new PopulationBestKnapsackSolutionAnalyzer());
-      operators.Add(new MultiPopulationBestKnapsackSolutionAnalyzer());
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       foreach (IBinaryVectorOperator op in ApplicationManager.Manager.GetInstances<IBinaryVectorOperator>()) {
         if (!(op is ISingleObjectiveMoveEvaluator) || (op is IKnapsackMoveEvaluator)) {