Changeset 17902 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs

Timestamp:

03/16/21 14:23:41 (3 years ago)

Author:

gkronber

Message:

#3073 merged reintegration branch to trunk

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4/IntervalUtil.cs (copied) (copied from branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs) (4 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs

@@ -1 @@
-using System;
+#region License Information
+
+/* HeuristicLab
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6 +28 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public static class IntervalUtil {
-    public static double IntervalConstraintViolation(
-      IntervalConstraint 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(IntervalConstraintsParser));
+          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 +55 @@
       }
 
-      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 +66 @@
         }
 
-        error = estimator.CheckConstraint(tree, regionRanges, constraint);
+        return estimator.GetConstraintViolation(tree, regionRanges, constraint);
       }
-
-      return error;
-    }
-
-    public static IEnumerable<double> IntervalConstraintsViolation(
-      IEnumerable<IntervalConstraint> constraints, IBoundsEstimator estimator, IntervalCollection intervalCollection,
-      ISymbolicExpressionTree solution) {
-      return constraints.Select(constraint => IntervalConstraintViolation(constraint, estimator, intervalCollection, solution)).ToList();
     }
   }