Changeset 16713 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators

Timestamp:

03/26/19 11:37:29 (6 years ago)

Author:

bburlacu

Message:

#2971: Make IntervalConstraintsParser class static, adapt code. Add SymbolicRegressionConstraintSatisfactionEvaluator.

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators

Files:

• SymbolicRegressionConstraintSatisfactionEvaluator.cs (added)
• SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (5 diffs)
• SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (7 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -59 +59 @@
       OnlineCalculatorError errorState = OnlineCalculatorError.None;
 
-      IntervalConstraintsParser parser = new IntervalConstraintsParser();
-      var constraints = parser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
+      var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
       var intervalInterpreter = new IntervalInterpreter();
       var variableRanges = ((RegressionProblemData)problemData).VariableRangesParameter.Value.VariableIntervals;
@@ -90 +89 @@
     }
 
-    private static bool HasConstraintVioluations(List<IntervalConstraint> constraints, IntervalInterpreter intervalInterpreter,
+    private static bool HasConstraintVioluations(IEnumerable<IntervalConstraint> constraints, IntervalInterpreter intervalInterpreter,
       Dictionary<string, Interval> variableRanges, ISymbolicExpressionTree solution) {
       foreach (var constraint in constraints) {
@@ -96 +95 @@
           throw new ArgumentException($"The given variable {constraint.Variable} in the constraint does not exists in the model.", nameof(IntervalConstraintsParser));
         if (!constraint.IsDerivation) {
-          var res = intervalInterpreter.GetSymbolicExressionTreeInterval(solution, variableRanges);
+          var res = intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges);
           if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
             constraint.InclusiveUpperBound)) {
@@ -106 +105 @@
             tree = DerivativeCalculator.Derive(tree, constraint.Variable);
           }
-          var res = intervalInterpreter.GetSymbolicExressionTreeInterval(tree, variableRanges);
+          var res = intervalInterpreter.GetSymbolicExpressionTreeInterval(tree, variableRanges);
           if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
             constraint.InclusiveUpperBound)) {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -59 +59 @@
       OnlineCalculatorError errorState = OnlineCalculatorError.None;
 
-      IntervalConstraintsParser parser = new IntervalConstraintsParser();
-      var constraints = parser.Parse(((RegressionProblemData) problemData).IntervalConstraintsParameter.Value.Value);
+      var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
       var intervalInterpreter = new IntervalInterpreter();
-      var variableRanges = ((RegressionProblemData) problemData).VariableRangesParameter.Value.VariableIntervals;
+      var variableRanges = ((RegressionProblemData)problemData).VariableRangesParameter.Value.VariableIntervals;
 
 
@@ -92 +91 @@
       // var e = m.GetEstimatedValues (TRAINING)
       // OnlinePearsonCalc.Calculate(e, TARGET_TRAIING)
-      
+
       // scaledTree = model.Tree;
 
@@ -120 +119 @@
       }
       if (errorState != OnlineCalculatorError.None) return double.NaN;
-      return r*r;
+      return r * r;
     }
 
@@ -141 +140 @@
     }
 
-    private static bool CheckConstraintsViolations(List<IntervalConstraint> constraints, IntervalInterpreter intervalInterpreter,
+    private static bool CheckConstraintsViolations(IEnumerable<IntervalConstraint> constraints, IntervalInterpreter intervalInterpreter,
       Dictionary<string, Interval> variableRanges, ISymbolicExpressionTree solution, out double r) {
       foreach (var constraint in constraints) {
@@ -147 +146 @@
           throw new ArgumentException($"The given variable {constraint.Variable} in the constraint does not exists in the model.", nameof(IntervalConstraintsParser));
         if (!constraint.IsDerivation) {
-          var res = intervalInterpreter.GetSymbolicExressionTreeInterval(solution, variableRanges);
+          var res = intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges);
           if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
             constraint.InclusiveUpperBound)) {
@@ -158 +157 @@
             tree = DerivativeCalculator.Derive(tree, constraint.Variable);
           }
-          var res = intervalInterpreter.GetSymbolicExressionTreeInterval(tree, variableRanges);
+          var res = intervalInterpreter.GetSymbolicExpressionTreeInterval(tree, variableRanges);
           if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
             constraint.InclusiveUpperBound)) {