Changeset 16602 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Solution.cs

Timestamp:

02/13/19 13:43:03 (5 years ago)

Author:

gkronber

Message:

#2925: write back optimized constants to trees

File:

• branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Solution.cs (modified) (2 diffs)

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

@@ -8 +8 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using HeuristicLab.Random;
 
@@ -88 +89 @@
       var forecastEpisode = new IntRange(episode.Start, episode.End + forecastHorizon);
 
-      double[] optL0;
       var random = new FastRandom(12345);
-      Problem.OptimizeForEpisodes(trees, problemData, targetVars, latentVariables, random, new[] { forecastEpisode }, 100, numericIntegrationSteps, odeSolver, out optL0, out snmse);
+      snmse = Problem.OptimizeForEpisodes(trees, problemData, targetVars, latentVariables, random, new[] { forecastEpisode }, 100, numericIntegrationSteps, odeSolver);
       var optimizationData = new Problem.OptimizationData(trees, targetVars, problemData, null, new[] { forecastEpisode }, numericIntegrationSteps, latentVariables, odeSolver);
-      var predictions = Problem.Integrate(optimizationData, optL0).ToArray();
+
+
+      var theta = Problem.ExtractParametersFromTrees(trees);
+
+      var predictions = Problem.Integrate(optimizationData, theta).ToArray();
       return predictions.Select(p => p.Select(pi => pi.Item1).ToArray()).ToArray();
     }