Changeset 16786 for branches

Timestamp:

04/15/19 22:04:10 (6 years ago)

Author:

gkronber

Message:

#2925: fixed a problem with solutions for latent variables

File:

• branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Problem.cs (modified) (1 diff)

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Problem.cs

@@ -773 +773 @@
 
         #region produce classical solutions to allow visualization with PDP
-        for (int treeIdx = 0; treeIdx < trees.Length; treeIdx++) {
+        for (int treeIdx = 0; treeIdx < targetVars.Length; treeIdx++) {
           var t = (ISymbolicExpressionTree)trees[treeIdx].Clone();
           var name = targetVars.Concat(latentVariables).ElementAt(treeIdx); // whatever
           var model = new SymbolicRegressionModel(name + "_diff", t, new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
           var solutionDataset = ((Dataset)problemData.Dataset).ToModifiable();
-          if (treeIdx < targetVars.Length) {
-            var absValues = solutionDataset.GetDoubleValues(name).ToArray();
-            solutionDataset.AddVariable(name + "_diff", absValues.Skip(1).Zip(absValues, (v1, v0) => v1 - v0).Concat(new double[] { 0.0 }).ToList());
-          }
+          var absValues = solutionDataset.GetDoubleValues(name).ToArray();
+          solutionDataset.AddVariable(name + "_diff", absValues.Skip(1).Zip(absValues, (v1, v0) => v1 - v0).Concat(new double[] { 0.0 }).ToList());
           var solutionProblemData = new RegressionProblemData(solutionDataset, problemData.AllowedInputVariables, name + "_diff");
           var solution = model.CreateRegressionSolution(solutionProblemData);