Changeset 16831 for branches/2994-AutoDiffForIntervals/HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression

Timestamp:

04/19/19 09:30:56 (6 years ago)

Author:

gkronber

Message:

#2994: made required changes to work with current trunk

File:

• branches/2994-AutoDiffForIntervals/HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/ConstrainedNonlinearRegression.cs (modified) (2 diffs)

branches/2994-AutoDiffForIntervals/HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/ConstrainedNonlinearRegression.cs

@@ -249 +249 @@
         }
       }
-      var intervals = problemData.IntervalConstraints;
-      var constraints = IntervalConstraintsParser.Parse(intervals.Value);
+      var intervalConstraints = problemData.IntervalConstraints;
       var dataIntervals = problemData.VariableRanges.VariableIntervals;
 
@@ -260 +259 @@
       var allThetaNodes = thetaNames.Select(_ => new List<ConstantTreeNode>()).ToArray();
       var constraintTrees = new List<ISymbolicExpressionTree>();
-      foreach (var constraint in constraints) {
+      foreach (var constraint in intervalConstraints.Constraints) {
         if (constraint.IsDerivation) {
           if (!problemData.AllowedInputVariables.Contains(constraint.Variable))