Changeset 17821 for branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator.cs

Timestamp:

01/19/21 10:22:50 (3 years ago)

Author:

chaider

Message:

#3076 Refactoring Evaluators and Analyzers

File:

• branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator.cs (modified) (6 diffs)

branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator.cs

@@ -11 +11 @@
   [StorableType("9397A63D-0C6B-4733-BD1A-59AAE9A9F006")]
   public class SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator : SymbolicRegressionMultiObjectiveEvaluator {
+    private const string BoundsEstimatorParameterName = "Bounds estimator";
+    public IValueParameter<IBoundsEstimator> BoundsEstimatorParameter =>
+      (IValueParameter<IBoundsEstimator>)Parameters[BoundsEstimatorParameterName];
+
+    public IBoundsEstimator BoundsEstimator {
+      get => BoundsEstimatorParameter.Value;
+      set => BoundsEstimatorParameter.Value = value;
+    }
+
     #region Constructors
 
@@ -47 +56 @@
 
       var qualities = Calculate(interpreter, solution, estimationLimits.Lower, estimationLimits.Upper, problemData,
-                                rows, applyLinearScaling, DecimalPlaces);
+                                rows, applyLinearScaling, DecimalPlaces, BoundsEstimator);
       QualitiesParameter.ActualValue = new DoubleArray(qualities);
       return base.InstrumentedApply();
@@ -62 +71 @@
                               EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper,
                               problemData, rows,
-                              ApplyLinearScalingParameter.ActualValue.Value, DecimalPlaces);
+                              ApplyLinearScalingParameter.ActualValue.Value, DecimalPlaces, BoundsEstimator);
 
       SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
@@ -75 +84 @@
                                      double upperEstimationLimit,
                                      IRegressionProblemData problemData, IEnumerable<int> rows, bool applyLinearScaling,
-                                     int decimalPlaces) {
+                                     int decimalPlaces, IBoundsEstimator estimator) {
       OnlineCalculatorError errorState;
       var estimatedValues =
@@ -91 +100 @@
 
       var constraints    = problemData.IntervalConstraints.Constraints.Where(c => c.Enabled);
-      var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
+      var intervalCollection = problemData.VariableRanges;
 
       var objectives = new List<double> {nmse}; //Add r² to resultlist
       var constraintObjectives = constraints.Select(constraint =>
-                                                      ConstraintExceeded(constraint, new IntervalInterpreter(),
-                                                                         variableRanges, solution));
+        IntervalUtil.IntervalConstraintViolation(constraint, estimator, intervalCollection, solution) > 0 ? 0.0 : 1.0);
+
       objectives.AddRange(constraintObjectives); //Add hardconstraints for each constraint
 
@@ -102 +111 @@
     }
 
-    private static double ConstraintExceeded(IntervalConstraint constraint, IntervalInterpreter intervalInterpreter,
-                                             IReadOnlyDictionary<string, Interval> variableRanges,
-                                             ISymbolicExpressionTree solution) {
-      return SymbolicRegressionConstraintAnalyzer.ConstraintSatisfied(constraint, new IntervalInterpreter(),
-                                                                      variableRanges, solution, out double error) ? 0 : 1;
-    }
 
     /*