Changeset 17958 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective

Timestamp:

04/22/21 14:59:58 (3 years ago)

Author:

gkronber

Message:

#3073: refactoring ShapeConstrainedRegressionProblem as discussed with MKo and CHa

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective

Files:

• NMSEConstraintsEvaluator.cs (deleted)
• NMSEMultiObjectiveConstraintsEvaluator.cs (added)
• ShapeConstrainedRegressionMultiObjectiveProblem.cs (added)
• SymbolicRegressionMultiObjectiveProblem.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs

@@ -60 +60 @@
     public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicRegressionMultiObjectiveProblem(this, cloner); }
 
-    public SymbolicRegressionMultiObjectiveProblem()
-      : base(new RegressionProblemData(), new SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) {
+    public SymbolicRegressionMultiObjectiveProblem() : this(new RegressionProblemData(), new SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) { }
+    public SymbolicRegressionMultiObjectiveProblem(IRegressionProblemData problemData, ISymbolicRegressionMultiObjectiveEvaluator evaluator, ISymbolicDataAnalysisSolutionCreator solutionCreator)
+      : base(problemData, evaluator, solutionCreator) {
       Parameters.Add(new FixedValueParameter<DoubleLimit>(EstimationLimitsParameterName, EstimationLimitsParameterDescription));