Changeset 17995 for branches/3119_AdditionalShapeConstraintFeatures/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

06/22/21 18:28:36 (3 years ago)

Author:

dpiringe

Message:

#3119

• added additional parameters to enable different evaluation options
• added additive restrictions
• added additional implementations for dynamic restrictions:
  • dynamic intervalls
  • exponatial smoothing
  • rising multiplier
• adapted IntervalUtil to get model bounds and refactored some sections
• adapted ShapeConstraintsParser for added features
• added a ResultCollection in SymbolicRegressionSolution for shape constraint violations

File:

• branches/3119_AdditionalShapeConstraintFeatures/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs (modified) (3 diffs)

branches/3119_AdditionalShapeConstraintFeatures/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public static class IntervalUtil {
+    public static IEnumerable<Interval> GetModelBounds(
+      IEnumerable<ShapeConstraint> constraints, IBoundsEstimator estimator, IntervalCollection intervalCollection,
+      ISymbolicExpressionTree solution) {
+      return constraints.Select(constraint => GetModelBound(constraint, estimator, intervalCollection, solution)).ToList();
+    }
+
+    public static Interval GetModelBound(
+      ShapeConstraint constraint, IBoundsEstimator estimator, IntervalCollection variableRanges,
+      ISymbolicExpressionTree tree) {
+      var regionRanges = GetRegionRanges(constraint, variableRanges);
+      tree = DeriveTree(tree, constraint, estimator);
+      return estimator.GetModelBound(tree, regionRanges);
+    }
+
     public static IEnumerable<double> GetConstraintViolations(
       IEnumerable<ShapeConstraint> constraints, IBoundsEstimator estimator, IntervalCollection intervalCollection,
@@ -37 +51 @@
       ShapeConstraint constraint, IBoundsEstimator estimator, IntervalCollection variableRanges,
       ISymbolicExpressionTree tree) {
+
+      var regionRanges = GetRegionRanges(constraint, variableRanges);
+      tree = DeriveTree(tree, constraint, estimator);
+      return estimator.GetConstraintViolation(tree, regionRanges, constraint);
+      /*
+      if (!constraint.IsDerivative) {
+        return estimator.GetConstraintViolation(tree, regionRanges, constraint);
+      } else {
+        for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
+          if (!estimator.IsCompatible(tree) || !DerivativeCalculator.IsCompatible(tree)) {
+            throw new ArgumentException("The tree contains an unsupported symbol.");
+          }
+
+          tree = DerivativeCalculator.Derive(tree, constraint.Variable);
+        }
+
+        return estimator.GetConstraintViolation(tree, regionRanges, constraint);
+      }
+      */
+    }
+
+    private static ISymbolicExpressionTree DeriveTree(ISymbolicExpressionTree tree, ShapeConstraint constraint, IBoundsEstimator estimator) {
+      if (constraint.IsDerivative) {
+        for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
+          if (!estimator.IsCompatible(tree) || !DerivativeCalculator.IsCompatible(tree))
+            throw new ArgumentException("The tree contains an unsupported symbol.");
+          tree = DerivativeCalculator.Derive(tree, constraint.Variable);
+        }
+      }
+      return tree;
+    }
+
+    private static IntervalCollection GetRegionRanges(ShapeConstraint constraint, IntervalCollection variableRanges) {
       var varRanges = variableRanges.GetReadonlyDictionary();
 
@@ -55 +102 @@
       }
 
-      if (!constraint.IsDerivative) {
-        return estimator.GetConstraintViolation(tree, regionRanges, constraint);
-      } else {
-        for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
-          if (!estimator.IsCompatible(tree) || !DerivativeCalculator.IsCompatible(tree)) {
-            throw new ArgumentException("The tree contains an unsupported symbol.");
-          }
-
-          tree = DerivativeCalculator.Derive(tree, constraint.Variable);
-        }
-
-        return estimator.GetConstraintViolation(tree, regionRanges, constraint);
-      }
+      return regionRanges;
     }
   }