Changeset 16972 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling

Timestamp:

05/21/19 09:57:53 (5 years ago)

Author:

gkronber

Message:

#2925: Fixes in problem instances and calculation of numerical differences in Analyze()

Location:

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

Files:

• Problem.cs (modified) (1 diff)
• ProblemInstanceProvider.cs (modified) (2 diffs)

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

@@ -862 +862 @@
           var absValues = solutionDataset.GetDoubleValues(name).ToArray();
 
-          solutionDataset.AddVariable(name + "_diff", CalculateDifferences(absValues, NumericDifferencesSmoothing).ToList());
+          var diffValues = new double[absValues.Length];
+          foreach(var ep in TrainingEpisodes) {
+            var y = solutionDataset.GetDoubleValues(name, Enumerable.Range(ep.Start, ep.End - ep.Start)).ToArray();
+            var yd = CalculateDifferences(y, NumericDifferencesSmoothing).ToArray();
+            for(int r = ep.Start;  r < ep.End;r++) {
+              diffValues[r] = yd[r - ep.Start];
+            }
+          }
+
+          solutionDataset.AddVariable(name + "_diff", diffValues);
           var solutionProblemData = new RegressionProblemData(solutionDataset, problemData.AllowedInputVariables, name + "_diff");
-          solutionProblemData.TrainingPartition.Start = problemData.TrainingPartition.Start;
-          solutionProblemData.TrainingPartition.End = problemData.TrainingPartition.End;
+          solutionProblemData.TrainingPartition.Start = TrainingEpisodes.Select(ep => ep.Start).Min();
+          solutionProblemData.TrainingPartition.End = TrainingEpisodes.Select(ep => ep.End).Max(); // assumes training episodes are sequential without gaps
           solutionProblemData.TestPartition.Start = problemData.TestPartition.Start;
           solutionProblemData.TestPartition.End = problemData.TestPartition.End;

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

@@ -117 +117 @@
     private DataDescriptor Glider() {
       return new DataDescriptor {
-        Name = "Bar Magnets",
+        Name = "Glider",
         Description = "Publication: M. Schmidt, H. Lipson; Data-Mining Dynamical Systems: Automated Symbolic System Identification for Exploratory Analysis, ESDA 2008.",
         TargetVariables = new[] { "y1", "y2" },
@@ -169 +169 @@
         TargetVariables = new[] { "y1", "y2", "y3", "y4", "y5" },
         InputVariables = new string[] { },
-        TrainingEpisodes = new IntRange[] { new IntRange(0, 30), new IntRange(31, 61), new IntRange(62, 92) },
+        TrainingEpisodes = new IntRange[] { new IntRange(0, 31), new IntRange(31, 62), new IntRange(62, 93) },
         TestEpisodes = new IntRange[] { },
         FileName = "S-System.csv"