Changeset 3631 for trunk

Timestamp:

05/05/10 13:52:16 (15 years ago)

Author:

gkronber

Message:

Added best solution analyzer for artificial ant problem. #999 (Refactor algorithm analysis and tracing)

Location:

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3

Files:

• Analyzers (added)
• Analyzers/IAntTrailPopulationAnalyzer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/IAntTrailVisualizer.cs) (1 diff)
• Analyzers/PopulationBestAntTrailAnalyzer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/BestAntTrailVisualizer.cs) (3 diffs)
• ArtificialAntProblem.cs (modified) (8 diffs)
• BestSymbolicExpressionTreeVisualizer.cs (deleted)
• HeuristicLab.Problems.ArtificialAnt-3.3.csproj (modified) (1 diff)
• HeuristicLabProblemsArtificialAntPlugin.cs.frame (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/Analyzers/IAntTrailPopulationAnalyzer.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 
-namespace HeuristicLab.Problems.ArtificialAnt {
-  public interface IAntTrailVisualizer : IAnalyzer {
+namespace HeuristicLab.Problems.ArtificialAnt.Analyzers {
+  public interface IAntTrailPopulationAnalyzer : IPopulationAnalyzer {
+    ILookupParameter<ItemArray<DoubleValue>> QualityParameter { get; }
     ILookupParameter<ItemArray<SymbolicExpressionTree>> SymbolicExpressionTreeParameter { get; }
     ILookupParameter<BoolMatrix> WorldParameter { get; }

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/Analyzers/PopulationBestAntTrailAnalyzer.cs

@@ -30 +30 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 
-namespace HeuristicLab.Problems.ArtificialAnt {
+namespace HeuristicLab.Problems.ArtificialAnt.Analyzers {
   /// <summary>
   /// An operator for visualizing the best ant trail of an artificial ant problem.
   /// </summary>
-  [Item("BestAntTrailVisualizer", "An operator for visualizing the best ant trail of an artificial ant problem.")]
+  [Item("PopulationBestAntTrailAnalyzer", "An operator for visualizing the best ant trail of an artificial ant problem.")]
   [StorableClass]
-  public sealed class BestAntTrailVisualizer : SingleSuccessorOperator, IAntTrailVisualizer {
+  public sealed class PopulationBestAntTrailAnalyzer : SingleSuccessorOperator, IAntTrailPopulationAnalyzer {
     public ILookupParameter<BoolMatrix> WorldParameter {
       get { return (ILookupParameter<BoolMatrix>)Parameters["World"]; }
@@ -49 +49 @@
       get { return (ILookupParameter<IntValue>)Parameters["MaxTimeSteps"]; }
     }
-
-    public ILookupParameter<AntTrail> AntTrailParameter {
-      get { return (ILookupParameter<AntTrail>)Parameters["AntTrail"]; }
+    public ILookupParameter<AntTrail> BestSolutionParameter {
+      get { return (ILookupParameter<AntTrail>)Parameters["BestSolution"]; }
+    }
+    public ValueLookupParameter<ResultCollection> ResultsParameter {
+      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
 
-    public BestAntTrailVisualizer()
+    public PopulationBestAntTrailAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<BoolMatrix>("World", "The world with food items for the artificial ant."));
       Parameters.Add(new SubScopesLookupParameter<SymbolicExpressionTree>("SymbolicExpressionTree", "The artificial ant solutions from which the best solution should be visualized."));
       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The qualities of the artificial ant solutions which should be visualized."));
-      Parameters.Add(new LookupParameter<AntTrail>("AntTrail", "The visual representation of the best ant trail."));
+      Parameters.Add(new LookupParameter<AntTrail>("BestSolution", "The visual representation of the best ant trail."));
       Parameters.Add(new LookupParameter<IntValue>("MaxTimeSteps", "The maximal time steps that the artificial ant has available to collect all food items."));
+      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best artificial ant solution should be stored."));
     }
 
@@ -68 +71 @@
       BoolMatrix world = WorldParameter.ActualValue;
       IntValue maxTimeSteps = MaxTimeStepsParameter.ActualValue;
+      ResultCollection results = ResultsParameter.ActualValue;
 
       int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => -x.Value).First().index;
 
-      AntTrail antTrail = AntTrailParameter.ActualValue;
-      if (antTrail == null) AntTrailParameter.ActualValue = new AntTrail(world, expressions[i], maxTimeSteps);
-      else {
+      AntTrail antTrail = BestSolutionParameter.ActualValue;
+      if (antTrail == null) {
+        var bestAntTrail = new AntTrail(world, expressions[i], maxTimeSteps);
+        BestSolutionParameter.ActualValue = bestAntTrail;
+        results.Add(new Result("Best Artificial Ant Solution", bestAntTrail));
+      } else {
         antTrail.World = world;
         antTrail.SymbolicExpressionTree = expressions[i];
         antTrail.MaxTimeSteps = maxTimeSteps;
+        results["Best Artificial Ant Solution"].Value = antTrail;
       }
       return base.Apply();

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/ArtificialAntProblem.cs

@@ -37 +37 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ArchitectureManipulators;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Interfaces;
+using HeuristicLab.Problems.ArtificialAnt.Analyzers;
 
 namespace HeuristicLab.Problems.ArtificialAnt {
@@ -181 +182 @@
       get { return BestKnownQualityParameter.Value; }
     }
-    private List<ISymbolicExpressionTreeOperator> operators;
+    private List<IOperator> operators;
     public IEnumerable<IOperator> Operators {
-      get { return operators.Cast<IOperator>(); }
+      get { return operators; }
+    }
+
+    public IEnumerable<IAntTrailPopulationAnalyzer> AntTrailAnalyzers {
+      get { return operators.OfType<IAntTrailPopulationAnalyzer>(); }
     }
     #endregion
@@ -209 +214 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
-
       Initialize();
     }
@@ -248 +251 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
       OnSolutionCreatorChanged();
@@ -254 +257 @@
     private void SolutionCreator_SymbolicExpressionTreeParameter_ActualNameChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
     }
@@ -260 +263 @@
       Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       OnEvaluatorChanged();
     }
 
     private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
     }
 
@@ -293 +296 @@
 
     private void InitializeOperators() {
-      operators = new List<ISymbolicExpressionTreeOperator>();
-      operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeOperator>());
+      operators = new List<IOperator>();
+      operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeOperator>().OfType<IOperator>());
+      operators.Add(new PopulationBestAntTrailAnalyzer());
+      ParameterizeAnalyzers();
       ParameterizeOperators();
     }
@@ -308 +313 @@
       Evaluator.WorldParameter.ActualName = WorldParameter.Name;
     }
-    private void ParameterizeVisualizer() {
-      //if (Visualizer != null) {
-      //  Visualizer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      //  var antTrailVisualizer = Visualizer as IAntTrailVisualizer;
-      //  if (antTrailVisualizer != null) {
-      //    antTrailVisualizer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-      //    antTrailVisualizer.WorldParameter.ActualName = WorldParameter.Name;
-      //    antTrailVisualizer.MaxTimeStepsParameter.ActualName = MaxTimeStepsParameter.Name;
-      //  }
-      //  var bestSymExpressionVisualizer = Visualizer as BestSymbolicExpressionTreeVisualizer;
-      //  if (bestSymExpressionVisualizer != null) {
-      //    bestSymExpressionVisualizer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-      //  }
-      //}
+    private void ParameterizeAnalyzers() {
+      foreach (IAntTrailPopulationAnalyzer analyzer in AntTrailAnalyzers) {
+        analyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        analyzer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+        analyzer.WorldParameter.ActualName = WorldParameter.Name;
+        analyzer.MaxTimeStepsParameter.ActualName = MaxTimeStepsParameter.Name;
+      }
     }
 

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

@@ -81 +81 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\IAntTrailPopulationAnalyzer.cs" />
+    <Compile Include="Analyzers\PopulationBestAntTrailAnalyzer.cs" />
     <Compile Include="AntInterpreter.cs" />
-    <Compile Include="BestAntTrailVisualizer.cs" />
-    <Compile Include="BestSymbolicExpressionTreeVisualizer.cs" />
     <Compile Include="HeuristicLabProblemsArtificialAntPlugin.cs" />
-    <Compile Include="IAntTrailVisualizer.cs" />
     <Compile Include="Evaluator.cs" />
     <Compile Include="ArtificialAntExpressionGrammar.cs" />

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/HeuristicLabProblemsArtificialAntPlugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Problems.ArtificialAnt-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3.0.0")]
+  [PluginDependency("HeuristicLab.Common", "3.3.0.0")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.2.0.0")]
   [PluginDependency("HeuristicLab.Core", "3.3.0.0")]