Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/05/15 23:16:30 (9 years ago)
Author:
bburlacu
Message:

#1772: Merged trunk changes.

Location:
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r11291 r11926  
    2323using System.Drawing;
    2424using System.Linq;
     25using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Common.Resources;
     
    2930using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    3031using HeuristicLab.Optimization;
     32using HeuristicLab.Optimization.Operators;
    3133using HeuristicLab.Parameters;
    3234using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    232234      Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
    233235      Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
    234       Operators.Add(new SymbolicDataAnalysisPhenotypicDiversityAnalyzer());
    235       Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
    236       Operators.Add(new SymbolicDataAnalysisGenealogyAnalyzer());
     236      Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
    237237      ParameterizeOperators();
    238238    }
     
    354354        op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
    355355      }
    356       // add tracking analyzer
    357       foreach (var op in operators.OfType<SymbolicDataAnalysisGenealogyAnalyzer>()) {
    358         op.BeforeCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
    359         op.AfterCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
    360         op.BeforeManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeManipulatorOperator();
    361         op.AfterManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterManipulatorOperator();
    362         // get crossover parameter names
    363         var crossover = operators.OfType<ISymbolicExpressionTreeCrossover>().FirstOrDefault();
    364         if (crossover != null) {
    365           op.BeforeCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
    366           op.AfterCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
    367           op.BeforeCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
    368           op.AfterCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
    369         }
    370         // get manipulator parameter names
    371         var manipulator = operators.OfType<ISymbolicExpressionTreeManipulator>().FirstOrDefault();
    372         if (manipulator != null) {
    373           op.BeforeManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
    374           op.AfterManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
    375         }
    376         var creator = operators.OfType<ISymbolicExpressionTreeCreator>().FirstOrDefault();
    377         if (creator != null) {
    378           op.PopulationParameter.ActualName = creator.SymbolicExpressionTreeParameter.ActualName;
    379         }
     356      foreach (var op in operators.OfType<SingleObjectiveSolutionSimilarityCalculator>()) {
     357        op.QualityVariableName = "Quality";
     358        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
     359      }
     360      foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
     361        op.SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
    380362      }
    381363    }
Note: See TracChangeset for help on using the changeset viewer.