Changeset 14400 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca

Timestamp:

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

Author:

gkronber

Message:

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

Location:

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

Files:

• Initialization/LdaInitializer.cs (modified) (1 diff)
• Initialization/PcaInitializer.cs (modified) (1 diff)
• NcaGradientCalculator.cs (modified) (1 diff)
• NcaModel.cs (modified) (1 diff)

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

@@ -44 +44 @@
       var attributes = data.AllowedInputVariables.Count();
 
-      var ldaDs = data.Dataset.ToArray(
-                                       data.AllowedInputVariables.Concat(data.TargetVariable.ToEnumerable()),
-                                       data.TrainingIndices);
+      var ldaDs = AlglibUtil.PrepareInputMatrix(data.Dataset,
+                                                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 = data.Dataset.ToArray(data.AllowedInputVariables, data.TrainingIndices);
+      var pcaDs = AlglibUtil.PrepareInputMatrix(data.Dataset, data.AllowedInputVariables, data.TrainingIndices);
 
       int info;

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaGradientCalculator.cs

@@ -99 +99 @@
       }
 
-      var data = problemData.Dataset.ToArray(problemData.AllowedInputVariables,
-                                             problemData.TrainingIndices);
+      var data = AlglibUtil.PrepareInputMatrix(problemData.Dataset, problemData.AllowedInputVariables,
+                                               problemData.TrainingIndices);
       var classes = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, problemData.TrainingIndices).ToArray();
 

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaModel.cs

@@ -86 +86 @@
 
     public double[,] Reduce(IDataset dataset, IEnumerable<int> rows) {
-      var data = dataset.ToArray(allowedInputVariables, rows);
+      var data = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables, rows);
 
       var targets = dataset.GetDoubleValues(TargetVariable, rows).ToArray();