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

Timestamp:

04/01/19 19:19:14 (5 years ago)

Author:

gkronber

Message:

#2994: another unit test, smaller fixes and checks for invalid parameters

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

@@ -207 +207 @@
     /// <returns></returns>
     public static ISymbolicRegressionSolution CreateRegressionSolution(RegressionProblemData problemData, string modelStructure, int maxIterations, bool applyLinearScaling, IRandom rand = null) {
+      if (applyLinearScaling) throw new NotSupportedException("Linear scaling is not yet supported in NLR with constraints.");
       var parser = new InfixExpressionParser();
       var tree = parser.Parse(modelStructure);
@@ -262 +263 @@
       foreach (var constraint in constraints) {
         if (constraint.IsDerivation) {
+          if (!problemData.AllowedInputVariables.Contains(constraint.Variable))
+            throw new ArgumentException($"Invalid constraint: the variable {constraint.Variable} does not exist in the dataset.");
           var df = DerivativeCalculator.Derive(treeForDerivation, constraint.Variable);