Changeset 12996


Ignore:
Timestamp:
10/09/15 15:37:58 (4 years ago)
Author:
pfleck
Message:

#2269

  • Added age progression and distribution analyzers per default but disabled.
  • Added all regular analyzers as layer analyzers but disabled.
  • Removed obsolete EvaluatedSolutionsHistoryAnalyzer.
Location:
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

    r12994 r12996  
    238238    [Storable]
    239239    private BestAverageWorstQualityAnalyzer layerQualityAnalyzer;
     240    [Storable]
     241    private OldestAverageYoungestAgeAnalyzer ageAnalyzer;
     242    [Storable]
     243    private OldestAverageYoungestAgeAnalyzer layerAgeAnalyzer;
     244    [Storable]
     245    private AgeDistributionAnalyzer ageDistributionAnalyzer;
     246    [Storable]
     247    private AgeDistributionAnalyzer layerAgeDistributionAnalyzer;
    240248    #endregion
    241249
     
    251259    #endregion
    252260
     261    #region Constructors
    253262    [StorableConstructor]
    254263    private AlpsGeneticAlgorithm(bool deserializing)
     
    262271      qualityAnalyzer = cloner.Clone(original.qualityAnalyzer);
    263272      layerQualityAnalyzer = cloner.Clone(original.layerQualityAnalyzer);
     273      ageAnalyzer = cloner.Clone(original.ageAnalyzer);
     274      layerAgeAnalyzer = cloner.Clone(original.layerAgeAnalyzer);
     275      ageDistributionAnalyzer = cloner.Clone(original.ageDistributionAnalyzer);
     276      layerAgeDistributionAnalyzer = cloner.Clone(original.layerAgeDistributionAnalyzer);
    264277      generationsTerminator = cloner.Clone(original.generationsTerminator);
    265278      evaluationsTerminator = cloner.Clone(original.evaluationsTerminator);
     
    377390      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
    378391      layerQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
     392      ageAnalyzer = new OldestAverageYoungestAgeAnalyzer();
     393      layerAgeAnalyzer = new OldestAverageYoungestAgeAnalyzer();
     394      ageDistributionAnalyzer = new AgeDistributionAnalyzer();
     395      layerAgeDistributionAnalyzer = new AgeDistributionAnalyzer();
    379396      #endregion
    380397
     
    400417      Initialize();
    401418    }
     419    #endregion
    402420
    403421    #region Events
     
    569587      qualityAnalyzer.ResultsParameter.Hidden = true;
    570588      qualityAnalyzer.QualityParameter.Depth = 2;
    571       layerQualityAnalyzer.ResultsParameter.ActualName = "Results";
     589      layerQualityAnalyzer.ResultsParameter.ActualName = "LayerResults";
    572590      layerQualityAnalyzer.ResultsParameter.Hidden = true;
    573591      layerQualityAnalyzer.QualityParameter.Depth = 1;
     
    659677
    660678      Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
    661       LayerAnalyzer.Operators.Add(layerQualityAnalyzer, layerQualityAnalyzer.EnabledByDefault);
     679      Analyzer.Operators.Add(ageAnalyzer, ageAnalyzer.EnabledByDefault);
     680      Analyzer.Operators.Add(ageDistributionAnalyzer, ageDistributionAnalyzer.EnabledByDefault);
     681      LayerAnalyzer.Operators.Add(layerQualityAnalyzer, false);
     682      LayerAnalyzer.Operators.Add(layerAgeAnalyzer, false);
     683      LayerAnalyzer.Operators.Add(layerAgeDistributionAnalyzer, false);
    662684
    663685      if (Problem != null) {
    664686        foreach (var analyzer in Problem.Operators.OfType<IAnalyzer>()) {
    665687          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
     688          LayerAnalyzer.Operators.Add((IAnalyzer)analyzer.Clone(), false);
    666689        }
    667690      }
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Analyzers/OldestAverageYoungestAgeAnalyzer.cs

    r12048 r12996  
    5858    #region Properties
    5959    public bool EnabledByDefault {
    60       get { return true; }
     60      get { return false; }
    6161    }
    6262    private OldestAverageYoungestAgeCalculator OldestAverageYoungestAgeCalculator {
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

    r12993 r12996  
    133133  <ItemGroup>
    134134    <Compile Include="AgeInheritance.cs" />
    135     <Compile Include="Analyzers\EvaluatedSolutionsHistoryAnalyzer.cs" />
    136135    <Compile Include="Analyzers\OldestAverageYoungestAgeAnalyzer.cs" />
    137136    <Compile Include="Analyzers\AgeDistributionAnalyzer.cs" />
Note: See TracChangeset for help on using the changeset viewer.