Changeset 17311 for branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/ConstrainedNLS.cs

Timestamp:

10/04/19 09:34:18 (5 years ago)

Author:

gkronber

Message:

#2994: add names for constraints and derivatives, fix a problem: variableRanges are reset when creating a new solution. fix smaller bugs

File:

• branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/ConstrainedNLS.cs (modified) (3 diffs)

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/ConstrainedNLS.cs

@@ -174 +174 @@
       int idx = 0;
       var formatter = new InfixExpressionFormatter();
+      var constraintDescriptions = state.ConstraintDescriptions.ToArray();
       foreach(var constraintTree in state.constraintTrees) {
         // HACK to remove parameter nodes which occurr multiple times
         var reparsedTree = parser.Parse(formatter.Format(constraintTree));
-        Results.AddOrUpdateResult($"Constraint {idx++}", reparsedTree);
+        Results.AddOrUpdateResult($"{constraintDescriptions[idx++]}", reparsedTree);
       }
 
@@ -191 +192 @@
 
       Results.AddOrUpdateResult("Best solution", CreateSolution((ISymbolicExpressionTree)state.BestTree.Clone(), problem.ProblemData));
-      Results.AddOrUpdateResult("Best solution constraint values", new DoubleArray(state.BestConstraintValues));
+      var bestConstraintValues = new DoubleArray(state.BestConstraintValues);
+      bestConstraintValues.ElementNames = constraintDescriptions;
+      Results.AddOrUpdateResult("Best solution constraint values", bestConstraintValues);
 
 
@@ -215 +218 @@
       var model = new SymbolicRegressionModel(problemData.TargetVariable, tree, new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
       // model.Scale(problemData);
-      return model.CreateRegressionSolution((IRegressionProblemData)problemData.Clone());
+      // var sol = model.CreateRegressionSolution((IRegressionProblemData)problemData.Clone());
+      // model.CreateRegressionSolution produces a new ProblemData and recalculates intervals
+
+      var sol = new SymbolicRegressionSolution(model, (IRegressionProblemData)problemData.Clone());
+
+      // ==> set variable ranges to same range as in original problemData
+      // foreach(var interval in problemData.VariableRanges.GetIntervals()) {
+      //   sol.ProblemData.VariableRanges.SetInterval
+      // }
+      return sol;
     }
   }