Changeset 3681 for trunk/sources/HeuristicLab.Problems.ArtificialAnt

Timestamp:

05/06/10 19:02:45 (14 years ago)

Author:

gkronber

Message:

Adapted analyzers to use ScopeTreeLookupParameter and wire the depth setting correctly for

• SymbolicExpressionTreeEncoding
• ArtificialAntProblem
• SymbolicRegression

#999

Location:

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3

Files:

• Analyzers/BestAntTrailAnalyzer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/Analyzers/PopulationBestAntTrailAnalyzer.cs) (2 diffs)
• Analyzers/IAntTrailAnalyzer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/Analyzers/IAntTrailPopulationAnalyzer.cs) (1 diff)
• ArtificialAntProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.ArtificialAnt-3.3.csproj (modified) (1 diff)

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

@@ -32 +32 @@
 namespace HeuristicLab.Problems.ArtificialAnt.Analyzers {
   /// <summary>
-  /// An operator for visualizing the best ant trail of an artificial ant problem.
+  /// An operator for analyzing the best ant trail of an artificial ant problem.
   /// </summary>
-  [Item("PopulationBestAntTrailAnalyzer", "An operator for visualizing the best ant trail of an artificial ant problem.")]
+  [Item("BestAntTrailAnalyzer", "An operator for analyzing the best ant trail of an artificial ant problem.")]
   [StorableClass]
-  public sealed class PopulationBestAntTrailAnalyzer : SingleSuccessorOperator, IAntTrailPopulationAnalyzer {
+  public sealed class BestAntTrailAnalyzer : SingleSuccessorOperator, IAntTrailAnalyzer {
     public ILookupParameter<BoolMatrix> WorldParameter {
       get { return (ILookupParameter<BoolMatrix>)Parameters["World"]; }
     }
-    public ILookupParameter<ItemArray<SymbolicExpressionTree>> SymbolicExpressionTreeParameter {
-      get { return (ILookupParameter<ItemArray<SymbolicExpressionTree>>)Parameters["SymbolicExpressionTree"]; }
+    public ScopeTreeLookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter {
+      get { return (ScopeTreeLookupParameter<SymbolicExpressionTree>)Parameters["SymbolicExpressionTree"]; }
     }
-    public ILookupParameter<ItemArray<DoubleValue>> QualityParameter {
-      get { return (ILookupParameter<ItemArray<DoubleValue>>)Parameters["Quality"]; }
+    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
+      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
     public ILookupParameter<IntValue> MaxTimeStepsParameter {
@@ -56 +56 @@
     }
 
-    public PopulationBestAntTrailAnalyzer()
+    public BestAntTrailAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<BoolMatrix>("World", "The world with food items for the artificial ant."));

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

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Problems.ArtificialAnt.Analyzers {
-  public interface IAntTrailPopulationAnalyzer : IAnalyzer {
-    ILookupParameter<ItemArray<DoubleValue>> QualityParameter { get; }
-    ILookupParameter<ItemArray<SymbolicExpressionTree>> SymbolicExpressionTreeParameter { get; }
+  public interface IAntTrailAnalyzer : IAnalyzer {
+    ScopeTreeLookupParameter<DoubleValue> QualityParameter { get; }
+    ScopeTreeLookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }
     ILookupParameter<BoolMatrix> WorldParameter { get; }
     ILookupParameter<IntValue> MaxTimeStepsParameter { get; }

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

@@ -188 +188 @@
     }
 
-    public IEnumerable<IAntTrailPopulationAnalyzer> AntTrailAnalyzers {
-      get { return operators.OfType<IAntTrailPopulationAnalyzer>(); }
+    public IEnumerable<IAntTrailAnalyzer> AntTrailAnalyzers {
+      get { return operators.OfType<IAntTrailAnalyzer>(); }
     }
     #endregion
@@ -299 +299 @@
       operators = new List<IOperator>();
       operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeOperator>().OfType<IOperator>());
-      operators.Add(new PopulationBestAntTrailAnalyzer());
-      operators.Add(new PopulationMinAvgMaxTreeSizeAnalyzer());
+      operators.Add(new BestAntTrailAnalyzer());
+      operators.Add(new MinAvgMaxSymbolicExpressionTreeSizeAnalyzer());
       ParameterizeAnalyzers();
       ParameterizeOperators();
@@ -316 +316 @@
     }
     private void ParameterizeAnalyzers() {
-      foreach (IAntTrailPopulationAnalyzer analyzer in AntTrailAnalyzers) {
+      foreach (IAntTrailAnalyzer analyzer in AntTrailAnalyzers) {
         analyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
         analyzer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
@@ -322 +322 @@
         analyzer.MaxTimeStepsParameter.ActualName = MaxTimeStepsParameter.Name;
       }
-      foreach (ISymbolicExpressionTreePopulationAnalyzer analyzer in Operators.OfType<ISymbolicExpressionTreePopulationAnalyzer>()) {
+      foreach (ISymbolicExpressionTreeAnalyzer analyzer in Operators.OfType<ISymbolicExpressionTreeAnalyzer>()) {
         analyzer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
       }

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="Analyzers\BestAntTrailAnalyzer.cs" />
+    <Compile Include="Analyzers\IAntTrailAnalyzer.cs" />
     <Compile Include="AntInterpreter.cs" />
     <Compile Include="HeuristicLabProblemsArtificialAntPlugin.cs" />