Changeset 14173


Ignore:
Timestamp:
07/22/16 06:34:07 (15 months ago)
Author:
abeham
Message:

#2527: merged 13402,13964 to stable

Location:
stable
Files:
3 edited
4 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.ALPS

  • stable/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs

    r13402 r14173  
    284284    [Storable]
    285285    private ComparisonTerminator<IntValue> generationsTerminator;
    286     //[Storable]
    287     //private ComparisonTerminator<DoubleValue> selectionPressureTerminator;
    288286    [Storable]
    289287    private ComparisonTerminator<IntValue> evaluationsTerminator;
     
    314312      currentSuccessRatioAnalyzer = cloner.Clone(original.currentSuccessRatioAnalyzer);
    315313      generationsTerminator = cloner.Clone(original.generationsTerminator);
    316       //selectionPressureTerminator = cloner.Clone(original.selectionPressureTerminator);
    317314      evaluationsTerminator = cloner.Clone(original.evaluationsTerminator);
    318315      qualityTerminator = cloner.Clone(original.qualityTerminator);
     
    470467      #region Create terminators
    471468      generationsTerminator = new ComparisonTerminator<IntValue>("Generations", ComparisonType.Less, new IntValue(1000)) { Name = "Generations" };
    472       //selectionPressureTerminator = new ComparisonTerminator<DoubleValue>("SelectionPressure", ComparisonType.Less, MaximumSelectionPressureParameter);
    473469      evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, new IntValue(int.MaxValue)) { Name = "Evaluations" };
    474470      qualityTerminator = new SingleObjectiveQualityTerminator() { Name = "Quality" };
     
    722718      Analyzer.Operators.Add(ageAnalyzer, ageAnalyzer.EnabledByDefault);
    723719      Analyzer.Operators.Add(ageDistributionAnalyzer, ageDistributionAnalyzer.EnabledByDefault);
    724       Analyzer.Operators.Add(selectionPressureAnalyzer, false); // find way to make history "pretty"
     720      Analyzer.Operators.Add(selectionPressureAnalyzer, false);
    725721      selectionPressureAnalyzer.ValueParameter.Depth = 1; // Adding analyzer sets depth to 2
    726722      Analyzer.Operators.Add(currentSuccessRatioAnalyzer, false);
     
    774770      var newTerminators = new Dictionary<ITerminator, bool> {
    775771        {generationsTerminator, !Terminators.Operators.Contains(generationsTerminator) || Terminators.Operators.ItemChecked(generationsTerminator)},
    776         //{selectionPressureTerminator, !Terminators.Operators.Contains(selectionPressureTerminator) || Terminators.Operators.ItemChecked(selectionPressureTerminator)},
    777772        {evaluationsTerminator, Terminators.Operators.Contains(evaluationsTerminator) && Terminators.Operators.ItemChecked(evaluationsTerminator)},
    778773        {qualityTerminator, Terminators.Operators.Contains(qualityTerminator) && Terminators.Operators.ItemChecked(qualityTerminator) },
  • stable/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

    r13285 r14173  
    8585  </ItemGroup>
    8686  <ItemGroup>
     87    <Compile Include="AlpsOffspringSelectionGeneticAlgorithmMainLoop.cs" />
     88    <Compile Include="AlpsOffspringSelectionGeneticAlgorithm.cs" />
    8789    <Compile Include="AlpsGeneticAlgorithmMainOperator.cs" />
     90    <Compile Include="AlpsOffspringSelectionGeneticAlgorithmMainOperator.cs" />
     91    <Compile Include="AlpsOffspringSelector.cs" />
    8892    <Compile Include="ReseedingController.cs" />
    8993    <Compile Include="ResultsHistoryWiper.cs" />
Note: See TracChangeset for help on using the changeset viewer.