Changeset 18103 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveEvaluator.cs

Timestamp:

12/02/21 17:23:10 (2 years ago)

Author:

dpiringe

Message:

#3136

• refactor the evaluation logic of NMSESingleObjectiveConstraintsEvaluator
• refactor the new method Evaluate for PearsonRSquaredAverageSimilarityEvaluator
• change the parameter order of some evaluate/calculate methods

File:

• branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveEvaluator.cs (modified) (1 diff)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveEvaluator.cs

@@ -33 +33 @@
     protected SymbolicRegressionSingleObjectiveEvaluator(): base() {}
     public abstract double Evaluate(
+      ISymbolicExpressionTree tree,
       IRegressionProblemData problemData,
-      ISymbolicExpressionTree tree,
+      IEnumerable<int> rows,
       ISymbolicDataAnalysisExpressionTreeInterpreter interpreter,
-      IEnumerable<int> rows = null,
       bool applyLinearScaling = true,
       double lowerEstimationLimit = double.MinValue,