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

Timestamp:

05/05/10 00:48:18 (14 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• adapted GA and TSP
• removed stuff related to visualizers

Location:

trunk/sources/HeuristicLab.Problems.Knapsack/3.3

Files:

• Interfaces/IKnapsackSolutionsVisualizer.cs (modified) (1 diff)
• KnapsackProblem.cs (modified) (8 diffs)
• Visualizers/BestKnapsackVisualizer.cs (modified) (1 diff)

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

@@ -29 +29 @@
   /// An interface which represents an operator for visualizing solutions of Knapsack Problems.
   /// </summary>
-  public interface IKnapsackSolutionsVisualizer : ISingleObjectiveSolutionsVisualizer {
+  public interface IKnapsackSolutionsVisualizer : IAnalyzer {
     ILookupParameter<ItemArray<BinaryVector>> BinaryVectorParameter { get; }
     ILookupParameter<IntValue> KnapsackCapacityParameter { get; }

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

@@ -74 +74 @@
       get { return EvaluatorParameter; }
     }
-    public OptionalValueParameter<IKnapsackSolutionsVisualizer> VisualizerParameter {
-      get { return (OptionalValueParameter<IKnapsackSolutionsVisualizer>)Parameters["Visualizer"]; }
-    }
-    IParameter IProblem.VisualizerParameter {
-      get { return VisualizerParameter; }
-    }  
     public OptionalValueParameter<DoubleValue> BestKnownQualityParameter {
       get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
@@ -122 +116 @@
       get { return EvaluatorParameter.Value; }
     }
-    public IKnapsackSolutionsVisualizer Visualizer {
-      get { return VisualizerParameter.Value; }
-      set { VisualizerParameter.Value = value; }
-    }
-    ISolutionsVisualizer IProblem.Visualizer {
-      get { return VisualizerParameter.Value; }
-    } 
     public DoubleValue BestKnownQuality {
       get { return BestKnownQualityParameter.Value; }
@@ -165 +152 @@
       RandomBinaryVectorCreator creator = new RandomBinaryVectorCreator();
       KnapsackEvaluator evaluator = new KnapsackEvaluator();
-      IKnapsackSolutionsVisualizer visualizer = new BestKnapsackVisualizer();
 
       Parameters.Add(new ValueParameter<BoolValue>("Maximization", "Set to true as the Knapsack Problem is a maximization problem.", new BoolValue(true)));
@@ -175 +161 @@
       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.", visualizer));
 
       creator.BinaryVectorParameter.ActualName = "KnapsackSolution";
@@ -208 +193 @@
         EvaluatorChanged(this, EventArgs.Empty);
     }
-    public event EventHandler VisualizerChanged;
-    private void OnVisualizerChanged() {
-      if (VisualizerChanged != null)
-        VisualizerChanged(this, EventArgs.Empty);
-    }
 
     public event EventHandler OperatorsChanged;
@@ -270 +250 @@
     void PenaltyParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-    }
-    void VisualizerParameter_ValueChanged(object sender, EventArgs e) {
-      OnVisualizerChanged();
     }
     void OneBitflipMoveParameter_ActualNameChanged(object sender, EventArgs e) {
@@ -295 +272 @@
       ValuesParameter.Value.Reset += new EventHandler(ValuesValue_Reset);
       PenaltyParameter.ValueChanged += new EventHandler(PenaltyParameter_ValueChanged);
-      VisualizerParameter.ValueChanged += new EventHandler(VisualizerParameter_ValueChanged);
     }
     private void ParameterizeSolutionCreator() {
@@ -314 +290 @@
     }
     private void ParameterizeVisualizer() {
-      if (Visualizer is IKnapsackSolutionsVisualizer) {
-        IKnapsackSolutionsVisualizer visualizer =
-          (IKnapsackSolutionsVisualizer)Visualizer;
-        visualizer.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
-        visualizer.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
-        visualizer.WeightsParameter.ActualName = WeightsParameter.Name;
-        visualizer.ValuesParameter.ActualName = ValuesParameter.Name;
-      }
+      //if (Visualizer is IKnapsackSolutionsVisualizer) {
+      //  IKnapsackSolutionsVisualizer visualizer =
+      //    (IKnapsackSolutionsVisualizer)Visualizer;
+      //  visualizer.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+      //  visualizer.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
+      //  visualizer.WeightsParameter.ActualName = WeightsParameter.Name;
+      //  visualizer.ValuesParameter.ActualName = ValuesParameter.Name;
+      //}
     }
     private void InitializeOperators() {

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

@@ -59 +59 @@
     }
 
-    ILookupParameter ISolutionsVisualizer.VisualizationParameter {
-      get { return KnapsackSolutionParameter; }
-    }
-
     public BestKnapsackVisualizer()
       : base() {