Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/12/17 21:02:01 (5 years ago)
Author:
abeham
Message:

#2666, #2706, #2730, #2736: merged revisions 14412, 14475, 14476, 14659, 14660, 14663, 14779, 14780, 14912, 15050, 15067, 15069, 15079, 15162, 15166, 15172, 15173 to stable

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs

    r14186 r15217  
    2222using System;
    2323using System.Linq;
     24using HeuristicLab.Analysis;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    2728using HeuristicLab.Encodings.RealVectorEncoding;
    2829using HeuristicLab.Optimization;
     30using HeuristicLab.Optimization.Operators;
    2931using HeuristicLab.Parameters;
    3032using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    113115      Operators.Add(new BestSolutionAnalyzer());
    114116      Operators.Add(new BestSolutionsAnalyzer());
     117
     118      Operators.Add(new HammingSimilarityCalculator());
     119      Operators.Add(new EuclideanSimilarityCalculator());
     120      Operators.Add(new QualitySimilarityCalculator());
     121      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
     122
    115123      UpdateParameters();
    116124      UpdateStrategyVectorBounds();
     
    147155      foreach (var op in Operators.OfType<IRealVectorManipulator>())
    148156        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     157
     158      foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
     159        similarityCalculator.SolutionVariableName = SolutionCreator.RealVectorParameter.ActualName;
     160        similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
     161      }
    149162    }
    150163
Note: See TracChangeset for help on using the changeset viewer.