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

Timestamp:

04/17/19 14:37:55 (6 years ago)

Author:

chaider

Message:

#2971 Several chanages regarding review comments

Location:

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

Files:

• SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (2 diffs)
• SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (2 diffs)

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

@@ -61 +61 @@
 
       //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
-      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints.Where(x => x.IsChecked);
+      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints.Where(x => x.Enabled);
       var intervalInterpreter = new IntervalInterpreter();
-      var variableRanges = ((RegressionProblemData)problemData).VariableRangesParameter.Value.VariableIntervals;
+      var variableRanges = ((RegressionProblemData) problemData).VariableRangesParameter.Value.VariableIntervals;
 
 
@@ -92 +92 @@
 
     private static bool HasConstraintVioluations(IEnumerable<IntervalConstraint> constraints, IntervalInterpreter intervalInterpreter,
-      Dictionary<string, Interval> variableRanges, ISymbolicExpressionTree solution) {
+      IDictionary<string, Interval> variableRanges, ISymbolicExpressionTree solution) {
       foreach (var constraint in constraints) {
         if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))

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

@@ -64 +64 @@
       var variableRanges = ((RegressionProblemData)problemData).VariableRangesParameter.Value.VariableIntervals;
 
-
-      //foreach (var constraint in constraints) {
-      //  if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))
-      //    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);
-      //    if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
-      //      constraint.InclusiveUpperBound)) {
-      //      return 0;
-      //    }
-      //  } else {
-      //    var tree = solution;
-      //    for (var i = 0; i < constraint.NumberOfDerivation; ++i) {
-      //      tree = DerivativeCalculator.Derive(tree, constraint.Variable);
-      //    }
-      //    var res = intervalInterpreter.GetSymbolicExressionTreeInterval(tree, variableRanges);
-      //    if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
-      //      constraint.InclusiveUpperBound)) {
-      //      return 0;
-      //    }
-      //  }
-      //}
-      // TODO
-      // m = new SymbolicRegressionModel(...)
-      // m.Scale();
-
-      // var e = m.GetEstimatedValues (TRAINING)
-      // OnlinePearsonCalc.Calculate(e, TARGET_TRAIING)
-
-      // scaledTree = model.Tree;
-
-      // constraints mit scaledTree berechnen (auch die Ableitungen)
-
       double r;
       if (applyLinearScaling) {
@@ -142 +109 @@
 
     private static bool CheckConstraintsViolations(IEnumerable<IntervalConstraint> constraints, IntervalInterpreter intervalInterpreter,
-      Dictionary<string, Interval> variableRanges, ISymbolicExpressionTree solution, out double r) {
+      IDictionary<string, Interval> variableRanges, ISymbolicExpressionTree solution, out double r) {
       foreach (var constraint in constraints) {
         if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))