Changeset 17901

Timestamp:

03/16/21 14:00:33 (3 years ago)

Author:

gkronber

Message:

#3076: prepare for trunk reintegration

Location:

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• ShapeConstraintsAnalyzer.cs (moved) (moved from branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionConstraintAnalyzer.cs) (2 diffs)
• SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -165 +165 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MultiObjective\NMSEConstraintsEvaluator.cs" />
     <Compile Include="MultiObjective\PearsonRSquaredNestedTreeSizeEvaluator.cs" />
     <Compile Include="MultiObjective\PearsonRSquaredNumberOfVariablesEvaluator.cs" />
     <Compile Include="MultiObjective\PearsonRSquaredAverageSimilarityEvaluator.cs" />
     <Compile Include="MultiObjective\PearsonRSquaredTreeComplexityEvaluator.cs" />
-    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.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\SymbolicRegressionMeanRelativeErrorEvaluator.cs" />
-    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveConstraintEvaluator.cs" />
     <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" />
-    <Compile Include="SymbolicRegressionConstraintAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPruningAnalyzer.cs" />

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ShapeConstraintsAnalyzer.cs

@@ -32 +32 @@
   [StorableType("4318C6BD-E0A1-45FE-AC30-96E7F73B51FB")]
   [Item("Shape-constraints analyser", "Analyzes the number of shape-constraint violations of symbolic regression models.")]
-  public class SymbolicRegressionConstraintAnalyzer : SymbolicDataAnalysisAnalyzer, ISymbolicExpressionTreeAnalyzer {
+  public class ShapeConstraintsAnalyzer : SymbolicDataAnalysisAnalyzer, ISymbolicExpressionTreeAnalyzer {
     private const string ProblemDataParameterName = "ProblemData";
     private const string ConstraintViolationsParameterName = "ConstraintViolations";
@@ -59 +59 @@
 
     [StorableConstructor]
-    protected SymbolicRegressionConstraintAnalyzer(StorableConstructorFlag _) : base(_) { }
+    protected ShapeConstraintsAnalyzer(StorableConstructorFlag _) : base(_) { }
 
-    protected SymbolicRegressionConstraintAnalyzer(SymbolicRegressionConstraintAnalyzer original, Cloner cloner) :
+    protected ShapeConstraintsAnalyzer(ShapeConstraintsAnalyzer original, Cloner cloner) :
       base(original, cloner) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicRegressionConstraintAnalyzer(this, cloner);
+      return new ShapeConstraintsAnalyzer(this, cloner);
     }
 
-    public SymbolicRegressionConstraintAnalyzer() {
+    public ShapeConstraintsAnalyzer() {
       Parameters.Add(new LookupParameter<IRegressionProblemData>(ProblemDataParameterName,
         "The problem data of the symbolic data analysis problem."));

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -92 +92 @@
       }
 
-      if (!Operators.OfType<SymbolicRegressionConstraintAnalyzer>().Any()) {
-        Operators.Add(new SymbolicRegressionConstraintAnalyzer());
+      if (!Operators.OfType<ShapeConstraintsAnalyzer>().Any()) {
+        Operators.Add(new ShapeConstraintsAnalyzer());
         changed = true;
       }
@@ -118 +118 @@
       Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
       Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator());
-      Operators.Add(new SymbolicRegressionConstraintAnalyzer());
+      Operators.Add(new ShapeConstraintsAnalyzer());
       Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) { DiversityResultName = "Phenotypic Diversity" });
       ParameterizeOperators();