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

Timestamp:

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

Author:

gkronber

Message:

#3073: refactoring ShapeConstrainedRegressionProblem as discussed with MKo and CHa

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• MultiObjective/NMSEConstraintsEvaluator.cs (deleted)
• MultiObjective/NMSEMultiObjectiveConstraintsEvaluator.cs (added)
• MultiObjective/ShapeConstrainedRegressionMultiObjectiveProblem.cs (added)
• MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs (modified) (1 diff)
• ShapeConstraintsAnalyzer.cs (modified) (3 diffs)
• SingleObjective/Evaluators/NMSEConstraintsEvaluator.cs (deleted)
• SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs (added)
• SingleObjective/ShapeConstrainedRegressionSingleObjectiveProblem.cs (added)
• SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -119 +119 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MultiObjective\NMSEConstraintsEvaluator.cs" />
+    <Compile Include="Interfaces\IMultiObjectiveConstaintsEvaluator.cs" />
+    <Compile Include="MultiObjective\NMSEMultiObjectiveConstraintsEvaluator.cs" />
     <Compile Include="MultiObjective\PearsonRSquaredNestedTreeSizeEvaluator.cs" />
     <Compile Include="MultiObjective\PearsonRSquaredNumberOfVariablesEvaluator.cs" />
     <Compile Include="MultiObjective\PearsonRSquaredAverageSimilarityEvaluator.cs" />
     <Compile Include="MultiObjective\PearsonRSquaredTreeComplexityEvaluator.cs" />
+    <Compile Include="MultiObjective\ShapeConstrainedRegressionMultiObjectiveProblem.cs" />
     <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="ShapeConstraintsAnalyzer.cs" />
     <Compile Include="SingleObjective\ConstantOptimizationAnalyzer.cs" />
-    <Compile Include="SingleObjective\Evaluators\NMSEConstraintsEvaluator.cs" />
+    <Compile Include="SingleObjective\Evaluators\NMSESingleObjectiveConstraintsEvaluator.cs" />
     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionMeanRelativeErrorEvaluator.cs" />
+    <Compile Include="SingleObjective\ShapeConstrainedRegressionSingleObjectiveProblem.cs" />
     <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />

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));
 

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ShapeConstraintsAnalyzer.cs

@@ -31 +31 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
   [StorableType("4318C6BD-E0A1-45FE-AC30-96E7F73B51FB")]
-  [Item("ShapeConstraintsAnalyzer", "Analyzes the number of shape-constraint violations of symbolic regression models.")]
+  [Item("ShapeConstraintsAnalyzer", "Analyzes the number of shape constraint violations of symbolic regression models.")]
   public class ShapeConstraintsAnalyzer : SymbolicDataAnalysisAnalyzer, ISymbolicExpressionTreeAnalyzer {
     private const string ProblemDataParameterName = "ProblemData";
@@ -97 +97 @@
 
     public override IOperation Apply() {
-      var problemData = RegressionProblemData;
+      var problemData = (IShapeConstrainedRegressionProblemData)RegressionProblemData;
       var trees = SymbolicExpressionTree.ToArray();
 
@@ -115 +115 @@
       }
 
-      var constraintUnsatisfiedSolutionsDataTable = InfeasibleSolutions;
-      if (constraintUnsatisfiedSolutionsDataTable.Rows.Count == 0)
-        constraintUnsatisfiedSolutionsDataTable.Rows.Add(new DataRow(InfeasibleSolutionsParameterName));
+      var infeasibleSolutionsDataTable = InfeasibleSolutions;
+      if (infeasibleSolutionsDataTable.Rows.Count == 0)
+        infeasibleSolutionsDataTable.Rows.Add(new DataRow(InfeasibleSolutionsParameterName));
 
-      constraintUnsatisfiedSolutionsDataTable.Rows[InfeasibleSolutionsParameterName]
+      infeasibleSolutionsDataTable.Rows[InfeasibleSolutionsParameterName]
         .Values
         .Add(trees.Count(t => IntervalUtil.GetConstraintViolations(constraints, estimator, variableRanges, t).Any(x => x > 0.0)));

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

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