Changeset 17891 for branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs

Timestamp:

03/12/21 16:41:42 (3 years ago)

Author:

gkronber

Message:

#3073 refactoring to prepare for trunk reintegration

Location:

branches/3073_IA_constraint_splitting_reintegration

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs (modified) (3 diffs)

branches/3073_IA_constraint_splitting_reintegration

@@ -1 +1 @@
 bin
+TestResults

@@ -1 +1 @@
 bin
+TestResults

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs

@@ -6 +6 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public static class IntervalUtil {
-    public static double IntervalConstraintViolation(
-      ShapeConstraint constraint, IBoundsEstimator estimator, IntervalCollection intervalCollection,
+    public static IEnumerable<double> GetConstraintViolations(
+      IEnumerable<ShapeConstraint> constraints, IBoundsEstimator estimator, IntervalCollection intervalCollection,
       ISymbolicExpressionTree solution) {
-      var variableRanges = intervalCollection.GetReadonlyDictionary();
+      return constraints.Select(constraint => GetConstraintViolation(constraint, estimator, intervalCollection, solution)).ToList();
+    }
 
-      if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable)) {
+    public static double GetConstraintViolation(
+      ShapeConstraint constraint, IBoundsEstimator estimator, IntervalCollection variableRanges,
+      ISymbolicExpressionTree tree) {
+      var varRanges = variableRanges.GetReadonlyDictionary();
+
+      if (constraint.Variable != null && !varRanges.ContainsKey(constraint.Variable)) {
         throw new ArgumentException(
           $"The given variable {constraint.Variable} in the constraint does not exist in the model.",
-          nameof(ShapeConstraintsParser));
+          nameof(constraint));
       }
 
-      //Create new variable ranges for defined regions
+      // Create new variable ranges for defined regions
       var regionRanges = new IntervalCollection();
-      foreach (var kvp in variableRanges) {
-        if (kvp.Key != constraint.Target && constraint.Regions.GetReadonlyDictionary().TryGetValue(kvp.Key, out var val)) {
+      foreach (var kvp in varRanges) {
+        if (constraint.Regions.GetReadonlyDictionary().TryGetValue(kvp.Key, out var val)) {
           regionRanges.AddInterval(kvp.Key, val);
         } else {
@@ -27 +33 @@
       }
 
-      var error = 0.0;
       if (!constraint.IsDerivative) {
-        error = estimator.CheckConstraint(solution, regionRanges, constraint);
+        return estimator.GetConstraintViolation(tree, regionRanges, constraint);
       } else {
-        var tree = solution;
         for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
           if (!estimator.IsCompatible(tree) || !DerivativeCalculator.IsCompatible(tree)) {
-            throw new ArgumentException("Cube, Root, Power symbols are not supported.");
+            throw new ArgumentException("The tree contains an unsupported symbol.");
           }
 
@@ -40 +44 @@
         }
 
-        error = estimator.CheckConstraint(tree, regionRanges, constraint);
+        return estimator.GetConstraintViolation(tree, regionRanges, constraint);
       }
-
-      return error;
     }
 
-    public static IEnumerable<double> IntervalConstraintsViolation(
-      IEnumerable<ShapeConstraint> constraints, IBoundsEstimator estimator, IntervalCollection intervalCollection,
-      ISymbolicExpressionTree solution) {
-      return constraints.Select(constraint => IntervalConstraintViolation(constraint, estimator, intervalCollection, solution)).ToList();
-    }
   }
 }

@@ -1 +1 @@
 bin
+TestResults