Changeset 16831

Timestamp:

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

Author:

gkronber

Message:

#2994: made required changes to work with current trunk

Location:

branches/2994-AutoDiffForIntervals

Files:

• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/ConstrainedNonlinearRegression.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/Interpreter.cs (modified) (2 diffs)
• Tests/ConstrainedNLRTest.cs (modified) (1 diff)

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))

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/Interpreter.cs

@@ -370 +370 @@
   public sealed class IntervalEvaluator : Interpreter<AlgebraicInterval> {
     [ThreadStatic]
-    private Dictionary<string, Interval> intervals;
-
-    public Interval Evaluate(ISymbolicExpressionTree tree, Dictionary<string, Interval> intervals) {
+    private IDictionary<string, Interval> intervals;
+
+    public Interval Evaluate(ISymbolicExpressionTree tree, IDictionary<string, Interval> intervals) {
       this.intervals = intervals;
       var code = Compile(tree);
@@ -379 +379 @@
     }
 
-    public Interval Evaluate(ISymbolicExpressionTree tree, Dictionary<string, Interval> intervals, ISymbolicExpressionTreeNode[] paramNodes, out double[] lowerGradient, out double[] upperGradient) {
+    public Interval Evaluate(ISymbolicExpressionTree tree, IDictionary<string, Interval> intervals, ISymbolicExpressionTreeNode[] paramNodes, out double[] lowerGradient, out double[] upperGradient) {
       this.intervals = intervals;
       var code = Compile(tree);

branches/2994-AutoDiffForIntervals/Tests/ConstrainedNLRTest.cs

@@ -13 +13 @@
       var modelStructure = "1.0*sqr(x)+1.0*x+1.0";
       var problemData = new RegressionProblemData();
-      problemData.IntervalConstraints.Value =
-@"y in [0 .. 100] 
-∂y/∂x in ]-inf. .. 0]
-";
+//       problemData.IntervalConstraints.Value = new ParsedConstraint(
+// @"y in [0 .. 100] 
+// ∂y/∂x in ]-inf. .. 0]
+// ", problemData);
       var solution = ConstrainedNonlinearRegression.CreateRegressionSolution(problemData, modelStructure, 0, true, new FastRandom(1234));
     }