Changeset 14854 for trunk

Timestamp:

04/12/17 10:31:51 (8 years ago)

Author:

gkronber

Message:

#2697: introduced original code for scaling from AlglibUtil into GaussianProcessModel to guarantee backwards compatibility regarding unit test results

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs (modified) (1 diff)

trunk/sources/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);