Changeset 15143 for stable

Timestamp:

07/06/17 11:13:51 (7 years ago)

Author:

gkronber

Message:

#2697: merged r14845, r14851, r14854

Location:

stable

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs (modified) (1 diff)

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs

@@ -259 +259 @@
     private static double[,] GetData(IDataset ds, IEnumerable<string> allowedInputs, IEnumerable<int> rows, Scaling scaling) {
       if (scaling != null) {
+        // BackwardsCompatibility3.3
+        #region Backwards compatible code, remove with 3.4
         // TODO: completely remove Scaling class
-        List<ITransformation<double>> transformations = new List<ITransformation<double>>();
-
-        foreach (var varName in allowedInputs) {
-          double min;
-          double max;
-          scaling.GetScalingParameters(varName, out min, out max);
-          var add = -min / (max - min);
-          var mult = 1.0 / (max - min);
-          transformations.Add(new LinearTransformation(allowedInputs) { Addend = add, Multiplier = mult });
-        }
-        return ds.ToArray(allowedInputs, transformations, rows);
+        List<string> variablesList = allowedInputs.ToList();
+        List<int> rowsList = rows.ToList();
+
+        double[,] matrix = new double[rowsList.Count, variablesList.Count];
+
+        int col = 0;
+        foreach (string column in variablesList) {
+          var values = scaling.GetScaledValues(ds, column, rowsList);
+          int row = 0;
+          foreach (var value in values) {
+            matrix[row, col] = value;
+            row++;
+          }
+          col++;
+        }
+        return matrix;
+        #endregion
       } else {
         return ds.ToArray(allowedInputs, rows);

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs

@@ -106 +106 @@
 
     // state for recursive transformation of trees 
-    private readonly List<string> variableNames;
-    private readonly List<int> lags;
     private readonly List<double> initialConstants;
     private readonly Dictionary<DataForVariable, AutoDiff.Variable> parameters;
@@ -115 +113 @@
     private TreeToAutoDiffTermConverter(bool makeVariableWeightsVariable) {
       this.makeVariableWeightsVariable = makeVariableWeightsVariable;
-      this.variableNames = new List<string>();
-      this.lags = new List<int>();
       this.initialConstants = new List<double>();
       this.parameters = new Dictionary<DataForVariable, AutoDiff.Variable>();

stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs

@@ -233 +233 @@
 
     private void AssertEqualAfterSimplification(string original, string expected) {
-      var simplifier = new SymbolicDataAnalysisExpressionTreeSimplifier();
+      var simplifier = new TreeSimplifier();
       var formatter = new SymbolicExpressionTreeStringFormatter();
       var importer = new SymbolicExpressionImporter();