Changeset 3641 for trunk/sources

Timestamp:

05/05/10 16:36:32 (15 years ago)

Author:

svonolfe

Message:

Added anaylzers for the knapsack problem (#999)

Location:

trunk/sources/HeuristicLab.Problems.Knapsack/3.3

Files:

• Analyzers (added)
• Analyzers/BestKnapsackSolutionAnalyzer.cs (added)
• Analyzers/MultiPopulationBestKnapsackSolutionAnalyzer.cs (added)
• Analyzers/PopulationBestKnapsackSolutionAnalyzer.cs (added)
• HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (2 diffs)
• Interfaces/IBestKnapsackSolutionAnalyzer.cs (added)
• Interfaces/IKnapsackSolutionsVisualizer.cs (deleted)
• KnapsackProblem.cs (modified) (7 diffs)
• KnapsackSolution.cs (modified) (7 diffs)
• Visualizers (deleted)

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\IKnapsackSolutionsVisualizer.cs" />
     <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" />
     <Compile Include="KnapsackProblem.cs" />
@@ -91 +93 @@
     <Compile Include="MoveEvaluators\KnapsackOneBitflipMoveEvaluator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Visualizers\BestKnapsackVisualizer.cs" />
+    <Compile Include="Analyzers\BestKnapsackSolutionAnalyzer.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Problems.Knapsack.Visualizers;
+using HeuristicLab.Problems.Knapsack.Analyzers;
 
 namespace HeuristicLab.Problems.Knapsack {
@@ -120 +120 @@
       set { BestKnownQualityParameter.Value = value; }
     }
-    private List<IBinaryVectorOperator> operators;
+    private List<IOperator> operators;
     public IEnumerable<IOperator> Operators {
       get { return operators.Cast<IOperator>(); }
+    }
+    private IEnumerable<IBestKnapsackSolutionAnalyzer> BestKnapsackSolutionAnalyzers {
+      get { return operators.OfType<IBestKnapsackSolutionAnalyzer>(); }
     }
     #endregion
@@ -168 +171 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
 
       Initialize();
@@ -201 +203 @@
 
     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
-      SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_PermutationParameter_ActualNameChanged);
-      ParameterizeSolutionCreator();
-      ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_BinaryVectorParameter_ActualNameChanged);
+      ParameterizeSolutionCreator();
+      ParameterizeEvaluator();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
       OnSolutionCreatorChanged();
     }
-    private void SolutionCreator_PermutationParameter_ActualNameChanged(object sender, EventArgs e) {
-      ParameterizeEvaluator();
-      ParameterizeVisualizer();
+    private void SolutionCreator_BinaryVectorParameter_ActualNameChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       OnEvaluatorChanged();
     }
     void KnapsackCapacityParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
     }
     void WeightsParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       ParameterizeSolutionCreator();
 
@@ -237 +239 @@
     void ValuesParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       ParameterizeSolutionCreator();
 
@@ -264 +266 @@
       InitializeOperators();
       SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
-      SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_PermutationParameter_ActualNameChanged);
+      SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_BinaryVectorParameter_ActualNameChanged);
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
       KnapsackCapacityParameter.ValueChanged += new EventHandler(KnapsackCapacityParameter_ValueChanged);
@@ -289 +291 @@
       }
     }
-    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;
-      //}
+    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 InitializeOperators() {
-      operators = new List<IBinaryVectorOperator>();
+      operators = new List<IOperator>();
+      operators.Add(new BestKnapsackSolutionAnalyzer());
+      operators.Add(new PopulationBestKnapsackSolutionAnalyzer());
+      operators.Add(new MultiPopulationBestKnapsackSolutionAnalyzer());
+      ParameterizeAnalyzers();
       foreach (IBinaryVectorOperator op in ApplicationManager.Manager.GetInstances<IBinaryVectorOperator>()) {
         if (!(op is ISingleObjectiveMoveEvaluator) || (op is IKnapsackMoveEvaluator)) {

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

@@ -98 +98 @@
     }
 
+    [Storable]
+    private DoubleValue quality;
+    public DoubleValue Quality {
+      get { return quality; }
+      set {
+        if (quality != value) {
+          if (quality != null) DeregisterQualityEvents();
+          quality = value;
+          if (quality != null) RegisterQualityEvents();
+          OnQualityChanged();
+        }
+      }
+    }
+
     public KnapsackSolution() : base() { }
-    public KnapsackSolution(BinaryVector binaryVector, IntValue capacity, IntArray weights, IntArray values)
+    public KnapsackSolution(BinaryVector binaryVector, DoubleValue quality, IntValue capacity, IntArray weights, IntArray values)
       : base() {
       this.binaryVector = binaryVector;
@@ -105 +119 @@
       this.weights = weights;
       this.values = values;
+      this.quality = quality;
       Initialize();
     }
@@ -113 +128 @@
     private void Initialize() {
       if (binaryVector != null) RegisterBinaryVectorEvents();
+      if (quality != null) RegisterQualityEvents();
       if (capacity != null) RegisterCapacityEvents();
       if (weights != null) RegisterWeightsEvents();
@@ -122 +138 @@
       cloner.RegisterClonedObject(this, clone);
       clone.binaryVector = (BinaryVector)cloner.Clone(binaryVector);
+      clone.quality = (DoubleValue)cloner.Clone(quality);
       clone.capacity = (IntValue)cloner.Clone(capacity);
       clone.weights = (IntArray)cloner.Clone(weights);
@@ -158 +175 @@
     }
 
+    public event EventHandler QualityChanged;
+    private void OnQualityChanged() {
+      var changed = QualityChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
     private void RegisterBinaryVectorEvents() {
       BinaryVector.ItemChanged += new EventHandler<EventArgs<int>>(BinaryVector_ItemChanged);
@@ -196 +220 @@
     }
 
+    private void RegisterQualityEvents() {
+      Quality.ValueChanged += new EventHandler(Quality_ValueChanged);
+    }
+    private void DeregisterQualityEvents() {
+      Quality.ValueChanged -= new EventHandler(Quality_ValueChanged);
+    }
+
     private void BinaryVector_ItemChanged(object sender, EventArgs<int> e) {
       OnBinaryVectorChanged();
@@ -216 +247 @@
     private void Values_Reset(object sender, EventArgs e) {
       OnValuesChanged();
+    }
+    private void Quality_ValueChanged(object sender, EventArgs e) {
+      OnQualityChanged();
     }
     #endregion