Changeset 3663


Ignore:
Timestamp:
05/06/10 03:24:43 (12 years ago)
Author:
swagner
Message:

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

  • adapted analyzers
Location:
trunk/sources
Files:
1 added
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

    r3662 r3663  
    355355      if (Problem != null) {
    356356        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) {
     357          foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
     358            param.Depth = 1;
    357359          Analyzer.Operators.Add(analyzer);
    358360        }
  • trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

    r3628 r3663  
    136136    <Compile Include="Constraints\IConstraint.cs" />
    137137    <Compile Include="Constraints\TypeCompatibilityConstraint.cs" />
     138    <Compile Include="Interfaces\IScopeTreeLookupParameter.cs" />
    138139    <Compile Include="Interfaces\ICheckedItemList.cs" />
    139140    <Compile Include="Interfaces\ICheckedItemCollection.cs" />
  • trunk/sources/HeuristicLab.Parameters/3.3/ScopeTreeLookupParameter.cs

    r3660 r3663  
    3333  [Item("ScopeTreeLookupParameter<T>", "A generic parameter representing instances of type T which are collected from or written to scope tree.")]
    3434  [StorableClass]
    35   public class ScopeTreeLookupParameter<T> : LookupParameter<ItemArray<T>> where T : class, IItem {
     35  public class ScopeTreeLookupParameter<T> : LookupParameter<ItemArray<T>>, IScopeTreeLookupParameter<T> where T : class, IItem {
    3636    [Storable]
    3737    private int depth;
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs

    r3662 r3663  
    3434  /// An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.
    3535  /// </summary>
    36   [Item("PopulationBestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
     36  [Item("BestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
    3737  [StorableClass]
    38   public sealed class PopulationBestTSPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
     38  public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
    3939    public LookupParameter<DoubleMatrix> CoordinatesParameter {
    4040      get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     
    5353    }
    5454
    55     public PopulationBestTSPSolutionAnalyzer()
     55    public BestTSPSolutionAnalyzer()
    5656      : base() {
    5757      Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities."));
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

    r3662 r3663  
    8484  </ItemGroup>
    8585  <ItemGroup>
    86     <Compile Include="Analyzers\PopulationBestTSPSolutionAnalyzer.cs" />
     86    <Compile Include="Analyzers\BestTSPSolutionAnalyzer.cs" />
    8787    <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
    8888    <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r3662 r3663  
    124124      get { return operators; }
    125125    }
    126     private PopulationBestTSPSolutionAnalyzer BestTSPSolutionAnalyzer {
    127       get { return operators.OfType<PopulationBestTSPSolutionAnalyzer>().FirstOrDefault(); }
     126    private BestTSPSolutionAnalyzer BestTSPSolutionAnalyzer {
     127      get { return operators.OfType<BestTSPSolutionAnalyzer>().FirstOrDefault(); }
    128128    }
    129129    #endregion
     
    280280    private void InitializeOperators() {
    281281      operators = new List<IOperator>();
    282       operators.Add(new PopulationBestTSPSolutionAnalyzer());
     282      operators.Add(new BestTSPSolutionAnalyzer());
    283283      ParameterizeAnalyzer();
    284284      operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Cast<IOperator>());
Note: See TracChangeset for help on using the changeset viewer.