Changeset 18219 for branches

Timestamp:

02/19/22 01:02:08 (3 years ago)

Author:

dpiringe

Message:

#3138

• fixed a bug with NaN values for constraint validations
• added a result collection for all shape constraint violations in SymbolicRegressionSolution

Location:

branches/3138_Shape_Constraints_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs (modified) (3 diffs)
• SymbolicRegressionSolution.cs (modified) (5 diffs)

branches/3138_Shape_Constraints_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs

@@ -210 +210 @@
 
     public static IEnumerable<Tuple<ShapeConstraint, double>> CalculateShapeConstraintsViolations(
+      IShapeConstrainedRegressionProblemData problemData, ISymbolicExpressionTree tree) =>
+      CalculateShapeConstraintsViolations(problemData, tree,
+        new SymbolicDataAnalysisExpressionTreeLinearInterpreter(),
+        new IntervalArithBoundsEstimator(),
+        new MersenneTwister());
+
+    public static IEnumerable<Tuple<ShapeConstraint, double>> CalculateShapeConstraintsViolations(
       IShapeConstrainedRegressionProblemData problemData, ISymbolicExpressionTree tree, 
       ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, IBoundsEstimator estimator,
@@ -234 +241 @@
         var enabledConstraints = extendedConstraint.ShapeConstraints.EnabledConstraints;
         if (enabledConstraints.Any()) {
-          var extendedConstraintExprValues = interpreter.GetSymbolicExpressionTreeValues(extendedConstraint.Tree, tmpDataset, problemData.AllIndices);
+          var extendedConstraintExprValues = interpreter.GetSymbolicExpressionTreeValues(extendedConstraint.Tree, tmpDataset, problemData.AllIndices)
+                                                        .Where(x => !double.IsNaN(x));
+          extendedConstraintExprValues = !extendedConstraintExprValues.Any() ? 
+            new double[] {double.NegativeInfinity, double.PositiveInfinity} : 
+            extendedConstraintExprValues;
           var extendedConstraintExprInterval = new Interval(extendedConstraintExprValues.Min(), extendedConstraintExprValues.Max());
 
@@ -258 +269 @@
               dict[problemData.TargetVariable] = allEstimatedValues.ToList();
               tmpDataset = new Dataset(dict.Keys, dict.Values);
-              extendedConstraintExprValues = interpreter.GetSymbolicExpressionTreeValues(extendedConstraint.Tree, tmpDataset, problemData.AllIndices);
+              extendedConstraintExprValues = interpreter.GetSymbolicExpressionTreeValues(extendedConstraint.Tree, tmpDataset, problemData.AllIndices)
+                                                        .Where(x => !double.IsNaN(x));
+              extendedConstraintExprValues = !extendedConstraintExprValues.Any() ?
+                new double[] { double.NegativeInfinity, double.PositiveInfinity } :
+                extendedConstraintExprValues;
               extendedConstraintExprInterval = new Interval(extendedConstraintExprValues.Min(), extendedConstraintExprValues.Max());
             }

branches/3138_Shape_Constraints_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

@@ -47 +47 @@
     private const string TestNaNEvaluationsResultName = "Test NaN Evaluations";
 
+    private const string ConstraintViolationsResultsResultName = "Constraint Violations";
+
     private const string ModelBoundsResultName = "Model Bounds";
 
@@ -64 +66 @@
       get { return ((IntValue)this[ModelDepthResultName].Value).Value; }
       private set { ((IntValue)this[ModelDepthResultName].Value).Value = value; }
+    }
+
+    private ResultCollection ConstraintViolationsResultCollection {
+      get => (ResultCollection)this[ConstraintViolationsResultsResultName].Value;
     }
 
@@ -136 +142 @@
       estimationLimitResults.Add(new Result(TestNaNEvaluationsResultName, "", new IntValue()));
       Add(new Result(EstimationLimitsResultsResultName, "Results concerning the estimation limits of symbolic regression solution", estimationLimitResults));
+
+      Add(new Result(ConstraintViolationsResultsResultName, "Constraint Violations", new ResultCollection()));
 
       if (IntervalInterpreter.IsCompatible(Model.SymbolicExpressionTree))
@@ -168 +176 @@
         }
       }
+
+      if(!ContainsKey(ConstraintViolationsResultsResultName)) {
+        Add(new Result(ConstraintViolationsResultsResultName, "Constraint Violations", new ResultCollection()));
+        CalculateResults();
+      }
     }
 
@@ -192 +205 @@
       if (IntervalInterpreter.IsCompatible(Model.SymbolicExpressionTree))
         ModelBoundsCollection = CalculateModelIntervals(this);
+
+      if(ProblemData is IShapeConstrainedRegressionProblemData scpd) {
+        var violations = NMSESingleObjectiveConstraintsEvaluator.CalculateShapeConstraintsViolations(scpd, Model.SymbolicExpressionTree);
+        foreach (var violation in violations) {
+          ConstraintViolationsResultCollection.Add(new Result(violation.Item1.ToString(), new DoubleValue(violation.Item2)));
+        }
+      }
     }