Changeset 12069 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

02/25/15 10:07:54 (10 years ago)

Author:

jkarder

Message:

#2332: refactored operators and analyzers

• removed quality and maximization parameters in SingleObjectivePopulationDiversityAnalyzer
• renamed SingleObjectivePopulationDiversityAnalyzer to PopulationSimilarityAnalyzer
• added ConstrainedValueParameter for similarity calculators of analyzer
• added ValueLookupParameter for similarity calculator of the following operators:
  • DuplicatesSelector, ProgressiveOffspringPreserver, ReferenceSetUpdateMethod, SolutionPoolUpdateMethod
• removed some wiring code in specific problems

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -233 +233 @@
       Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
-      Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
+      Operators.Add(new PopulationSimilarityAnalyzer(new[] { new SymbolicExpressionTreeBottomUpSimilarityCalculator() }));
       ParameterizeOperators();
     }
@@ -357 +357 @@
         op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
       }
-      foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
-        op.SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
-      }
     }