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

Timestamp:

03/16/21 15:26:50 (4 years ago)

Author:

gkronber

Message:

#3073 bugfixing

Location:

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

Files:

• MultiObjective/NMSEConstraintsEvaluator.cs (modified) (1 diff)
• ShapeConstraintsAnalyzer.cs (modified) (2 diffs)
• SingleObjective/Evaluators/NMSEConstraintsEvaluator.cs (modified) (1 diff)

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

@@ -33 +33 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.MultiObjective {
-  [Item("NMSE Evaluator (multi-objective, with shape-constraints)",
+  [Item("NMSE Evaluator with shape-constraints",
     "Calculates the NMSE and the constraints violations of a symbolic regression solution as objectives.")]
   [StorableType("8E9D76B7-ED9C-43E7-9898-01FBD3633880")]

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("Shape-constraints analyser", "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";
@@ -106 +106 @@
       var estimator = new IntervalArithBoundsEstimator();
 
-      if (constraintViolationsTable.Rows.Any())
+      if (!constraintViolationsTable.Rows.Any())
         foreach (var constraint in constraints)
           constraintViolationsTable.Rows.Add(new DataRow(constraint.ToString()));

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSEConstraintsEvaluator.cs

@@ -32 +32 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
-  [Item("NMSE Evaluator (single-objective, with shape-constraints)", "Calculates NMSE of a symbolic regression solution and checks constraints the fitness is a combination of NMSE and constraint violations.")]
+  [Item("NMSE Evaluator with shape-constraints", "Calculates NMSE of a symbolic regression solution and checks constraints the fitness is a combination of NMSE and constraint violations.")]
   [StorableType("27473973-DD8D-4375-997D-942E2280AE8E")]
   public class NMSEConstraintsEvaluator : SymbolicRegressionSingleObjectiveEvaluator {