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

Timestamp:

04/10/20 14:04:59 (5 years ago)

Author:

mkommend

Message:

#2971: Further minor refactorings and renaming of members.

Location:

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

Files:

• Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (2 diffs)
• SymbolicRegressionConstraintAnalyzer.cs (modified) (1 diff)

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

@@ -91 +91 @@
         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) {
+        if (!constraint.IsDerivative) {
           var res = intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges);
           if (!constraint.Interval.Contains(res)) {
@@ -98 +98 @@
         } else {
           var tree = solution;
-          for (var i = 0; i < constraint.NumberOfDerivation; ++i) {
+          for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
             tree = DerivativeCalculator.Derive(tree, constraint.Variable);
           }

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

@@ -105 +105 @@
       Interval resultInterval;
 
-      if (!constraint.IsDerivation) {
+      if (!constraint.IsDerivative) {
         resultInterval = intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges);
       } else {
         var tree = solution;
-        for (var i = 0; i < constraint.NumberOfDerivation; ++i) {
+        for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
           tree = DerivativeCalculator.Derive(tree, constraint.Variable);
         }