Changeset 17970 for branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs
- Timestamp:
- 04/30/21 12:18:19 (3 years ago)
- Location:
- branches/3106_AnalyticContinuedFractionsRegression
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3106_AnalyticContinuedFractionsRegression
- Property svn:mergeinfo changed
-
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
-
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
- Property svn:mergeinfo changed
-
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs
r17180 r17970 56 56 public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicRegressionSingleObjectiveProblem(this, cloner); } 57 57 58 public SymbolicRegressionSingleObjectiveProblem() 59 : base(new RegressionProblemData(), new SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) { 58 public SymbolicRegressionSingleObjectiveProblem() : this(new RegressionProblemData(), new SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) { 59 } 60 public SymbolicRegressionSingleObjectiveProblem(IRegressionProblemData problemData, ISymbolicRegressionSingleObjectiveEvaluator evaluator, ISymbolicDataAnalysisSolutionCreator solutionCreator) : 61 base(problemData, evaluator, solutionCreator) { 62 60 63 Parameters.Add(new FixedValueParameter<DoubleLimit>(EstimationLimitsParameterName, EstimationLimitsParameterDescription)); 61 64 … … 91 94 changed = true; 92 95 } 96 97 if (!Operators.OfType<ShapeConstraintsAnalyzer>().Any()) { 98 Operators.Add(new ShapeConstraintsAnalyzer()); 99 changed = true; 100 } 93 101 if (changed) { 94 102 ParameterizeOperators(); … … 113 121 Operators.Add(new SymbolicRegressionSolutionsAnalyzer()); 114 122 Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator()); 123 Operators.Add(new ShapeConstraintsAnalyzer()); 115 124 Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) { DiversityResultName = "Phenotypic Diversity" }); 116 125 ParameterizeOperators();
Note: See TracChangeset
for help on using the changeset viewer.