Changeset 14393 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization

Timestamp:

11/15/16 21:23:43 (8 years ago)

Author:

gkronber

Message:

#2697:

• removed AlglibUtil.cs and added an extension method .ToArray(names, rows) to IDataset instead.
• refactored transformation so that it is possible to apply an transformation without resetting the parameters
• Used transformations instead of Scaling as far as possible.
• Moved TakeEvery extension method to HL.Common

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization

Files:

• LdaInitializer.cs (modified) (1 diff)
• PcaInitializer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/LdaInitializer.cs

@@ -44 +44 @@
       var attributes = data.AllowedInputVariables.Count();
 
-      var ldaDs = AlglibUtil.PrepareInputMatrix(data.Dataset,
-                                                data.AllowedInputVariables.Concat(data.TargetVariable.ToEnumerable()),
-                                                data.TrainingIndices);
+      var ldaDs = data.Dataset.ToArray(
+                                       data.AllowedInputVariables.Concat(data.TargetVariable.ToEnumerable()),
+                                       data.TrainingIndices);
 
       // map class values to sequential natural numbers (required by alglib)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/PcaInitializer.cs

@@ -44 +44 @@
       var attributes = data.AllowedInputVariables.Count();
 
-      var pcaDs = AlglibUtil.PrepareInputMatrix(data.Dataset, data.AllowedInputVariables, data.TrainingIndices);
+      var pcaDs = data.Dataset.ToArray(data.AllowedInputVariables, data.TrainingIndices);
 
       int info;