Changeset 14400 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs

Timestamp:

11/17/16 15:41:33 (8 years ago)

Author:

gkronber

Message:

#2697: reverse merge of r14378, r14390, r14391, r14393, r14394, r14396

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs

@@ -165 +165 @@
       try {
         CalculateModel(ds, rows, scaleInputs);
-      } catch (alglib.alglibexception ae) {
+      }
+      catch (alglib.alglibexception ae) {
         // wrap exception so that calling code doesn't have to know about alglib implementation
         throw new ArgumentException("There was a problem in the calculation of the Gaussian process model", ae);
@@ -259 +260 @@
     private static double[,] GetData(IDataset ds, IEnumerable<string> allowedInputs, IEnumerable<int> rows, Scaling scaling) {
       if (scaling != null) {
-        // 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);
+        return AlglibUtil.PrepareAndScaleInputMatrix(ds, allowedInputs, rows, scaling);
       } else {
-        return ds.ToArray(allowedInputs, rows);
+        return AlglibUtil.PrepareInputMatrix(ds, allowedInputs, rows);
       }
     }
@@ -344 +334 @@
         return Enumerable.Range(0, newN)
           .Select(i => ms[i] + Util.ScalarProd(Ks[i], alpha));
-      } catch (alglib.alglibexception ae) {
+      }
+      catch (alglib.alglibexception ae) {
         // wrap exception so that calling code doesn't have to know about alglib implementation
         throw new ArgumentException("There was a problem in the calculation of the Gaussian process model", ae);
@@ -390 +381 @@
         }
         return kss;
-      } catch (alglib.alglibexception ae) {
+      }
+      catch (alglib.alglibexception ae) {
         // wrap exception so that calling code doesn't have to know about alglib implementation
         throw new ArgumentException("There was a problem in the calculation of the Gaussian process model", ae);