Changeset 17892 for branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionConstraintAnalyzer.cs

Timestamp:

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

Author:

gkronber

Message:

#3076: refactoring to prepare for trunk reintegration

File:

• branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionConstraintAnalyzer.cs (modified) (4 diffs)

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionConstraintAnalyzer.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading;
+using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 
@@ -37 +31 @@
     public static int Iterations { get; set; } = 0;
 
-    public IBoundsEstimator BoundsEstimator { get; set; } = new IABoundsEstimator();
+    public IBoundsEstimator BoundsEstimator { get; set; } = new IntervalArithBoundsEstimator();
 
     [StorableConstructor]
@@ -105 +99 @@
 
       var results = ResultCollectionParameter.ActualValue;
-      var constraints = problemData.IntervalConstraints.EnabledConstraints;
+      var constraints = problemData.ShapeConstraints.EnabledConstraints;
       var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
       var intervalCollection = problemData.VariableRanges;
       var newDataTable = ConstraintViolationParameter.ActualValue;
-      var solutions = this.SymbolicExpressionTree.ToArray();
+      var solutions = SymbolicExpressionTree.ToArray();
 
       if (newDataTable.Rows.Count == 0)
         foreach (var constraint in constraints)
-          newDataTable.Rows.Add(new DataRow(constraint.Expression));
+          newDataTable.Rows.Add(new DataRow(constraint.ToString()));
 
       foreach (var constraint in constraints) {
-        var violations = trees.Count(tree => IntervalUtil.IntervalConstraintViolation(constraint, BoundsEstimator, intervalCollection, tree) > 0.0);
+        var violations = trees.Count(tree => IntervalUtil.GetConstraintViolation(constraint, BoundsEstimator, intervalCollection, tree) > 0.0);
 
-        newDataTable.Rows[constraint.Expression].Values.Add(violations);
+        newDataTable.Rows[constraint.ToString()].Values.Add(violations);
       }
 
@@ -127 +121 @@
       constraintUnsatisfiedSolutionsDataTable.Rows[ConstraintUnsatisfiedSolutionsParameterName]
         .Values
-        .Add(solutions.Count(s => IntervalUtil.IntervalConstraintsViolation(constraints, BoundsEstimator, intervalCollection, s).Any(x => x != 0.0)));
+        .Add(solutions.Count(s => IntervalUtil.GetConstraintViolations(constraints, BoundsEstimator, intervalCollection, s).Any(x => x != 0.0)));
 
       return base.Apply();