Changeset 17743 for branches

Timestamp:

09/13/20 22:37:36 (4 years ago)

Author:

chaider

Message:

#3076 Added parameter to use smart splitting and extended constraint checking method for splitting

File:

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

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

@@ -118 +118 @@
 
       var qualities = Calculate(interpreter, solution, estimationLimits.Lower, estimationLimits.Upper, problemData,
-        rows, DecimalPlaces, minIntervalWidth, maxIntervalSplitDepth);
+        rows, UseIntervalSplitting);
       QualitiesParameter.ActualValue = new DoubleArray(qualities);
       return base.InstrumentedApply();
@@ -132 +132 @@
       var quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree,
         EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper,
-        problemData, rows, DecimalPlaces, MinSplittingWidth,
-        MaxSplittingDepth);
+        problemData, rows, UseIntervalSplitting);
 
       SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
@@ -146 +145 @@
                                      ISymbolicExpressionTree solution, double lowerEstimationLimit,
                                      double upperEstimationLimit,
-                                     IRegressionProblemData problemData, IEnumerable<int> rows,
-                                     int decimalPlaces, double minIntervalSplitWidth, int maxIntervalSplitDepth) {
+                                     IRegressionProblemData problemData, IEnumerable<int> rows, bool splitting) {
       OnlineCalculatorError errorState;
       var estimatedValues =
@@ -166 +164 @@
 
       var objectives          = new List<double> {nmse};
-      var intervalInterpreter = new IntervalInterpreter();
-      /*{MinIntervalSplitWidth = minIntervalSplitWidth, MaxIntervalSplitDepth = maxIntervalSplitDetph};*/
+      var intervalInterpreter = new IntervalInterpreter(){UseIntervalSplitting = splitting};
 
       var constraintObjectives = new List<double>();
       foreach (var c in constraints) {
         var penalty = ConstraintExceeded(c, intervalInterpreter, variableRanges,
-          solution /*, problemData.IntervalSplitting*/);
+          solution);
         var maxP = 0.1;
 
@@ -188 +185 @@
     public static double ConstraintExceeded(IntervalConstraint constraint, IntervalInterpreter intervalInterpreter,
                                             IReadOnlyDictionary<string, Interval> variableRanges,
-                                            ISymbolicExpressionTree solution /*, bool splitting*/) {
+                                            ISymbolicExpressionTree solution) {
       if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))
         throw new ArgumentException(
@@ -196 +193 @@
       if (!constraint.IsDerivative) {
         resultInterval =
-          intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges /*, splitting:splitting*/);
+          intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges, 0);
       }
       else {
@@ -204 +201 @@
 
         resultInterval =
-          intervalInterpreter.GetSymbolicExpressionTreeInterval(tree, variableRanges /*, splitting: splitting*/);
+          intervalInterpreter.GetSymbolicExpressionTreeInterval(tree, variableRanges, 0);
       }