Changeset 16742 for branches

Timestamp:

04/02/19 13:50:24 (5 years ago)

Author:

gkronber

Message:

#2994: fix for compatibility with #2971

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

@@ -250 +250 @@
       }
       var intervals = problemData.IntervalConstraints;
-      var constraintsParser = new IntervalConstraintsParser();
-      var constraints = constraintsParser.Parse(intervals.Value);
+      var constraints = IntervalConstraintsParser.Parse(intervals.Value);
       var dataIntervals = problemData.VariableRanges.VariableIntervals;
 
@@ -417 +416 @@
           if (thetaIdx >= 0) {
             var parent = n.Parent;
-            if(thetaNodes[thetaIdx].Any()) {
+            if (thetaNodes[thetaIdx].Any()) {
               // HACK: REUSE CONSTANT TREE NODE IN SEVERAL TREES
               // we use this trick to allow autodiff over thetas when thetas occurr multiple times in the tree (e.g. in derived trees)