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

Timestamp:

03/19/10 14:24:11 (15 years ago)

Author:

svonolfe

Message:

Further implemented review comments (#917)

Location:

trunk/sources/HeuristicLab.Problems.Knapsack/3.3

Files:

• HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (1 diff)
• Interfaces/IKnapsackSolutionsVisualizer.cs (added)
• Knapsack.cs (modified) (5 diffs)

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

@@ -84 +84 @@
     <Compile Include="HeuristicLabProblemsKnapsackPlugin.cs" />
     <Compile Include="Interfaces\IKnapsackEvaluator.cs" />
+    <Compile Include="Interfaces\IKnapsackSolutionsVisualizer.cs" />
     <Compile Include="Knapsack.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -73 +73 @@
       get { return EvaluatorParameter; }
     }
+    public OptionalValueParameter<IKnapsackSolutionsVisualizer> VisualizerParameter {
+      get { return (OptionalValueParameter<IKnapsackSolutionsVisualizer>)Parameters["Visualizer"]; }
+    }
     IParameter IProblem.VisualizerParameter {
-      get { throw new NotImplementedException(); }
-    }
+      get { return VisualizerParameter; }
+    }  
     public OptionalValueParameter<DoubleValue> BestKnownQualityParameter {
       get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
@@ -118 +121 @@
       get { return EvaluatorParameter.Value; }
     }
+    public IKnapsackSolutionsVisualizer Visualizer {
+      get { return VisualizerParameter.Value; }
+      set { VisualizerParameter.Value = value; }
+    }
     ISolutionsVisualizer IProblem.Visualizer {
-      get { throw new NotImplementedException(); }
-    }
+      get { return VisualizerParameter.Value; }
+    } 
     public DoubleValue BestKnownQuality {
       get { return BestKnownQualityParameter.Value; }
@@ -144 +151 @@
       Parameters.Add(new ValueParameter<IKnapsackEvaluator>("Evaluator", "The operator which should be used to evaluate Knapsack solutions.", evaluator));
       Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this Knapsack instance."));
+      Parameters.Add(new ValueParameter<IKnapsackSolutionsVisualizer>("Visualizer", "The operator which should be used to visualize Knapsack solutions.", null));
 
       creator.BinaryVectorParameter.ActualName = "KnapsackSolution";
@@ -223 +231 @@
     void PenaltyParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
+    }
+    void VisualizerParameter_ValueChanged(object sender, EventArgs e) {
+      OnVisualizerChanged();
     }
     #endregion
@@ -239 +250 @@
       ValuesParameter.Value.Reset += new EventHandler(ValuesValue_Reset);
       PenaltyParameter.ValueChanged += new EventHandler(PenaltyParameter_ValueChanged);
+      VisualizerParameter.ValueChanged += new EventHandler(VisualizerParameter_ValueChanged);
     }
     private void ParameterizeSolutionCreator() {