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

Timestamp:

03/04/13 15:16:49 (12 years ago)

Author:

abeham

Message:

#1913: removed scaling of data

Location:

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

Files:

• INcaInitializer.cs (modified) (1 diff)
• LdaInitializer.cs (modified) (1 diff)
• NcaInitializer.cs (modified) (3 diffs)
• PcaInitializer.cs (modified) (1 diff)
• RandomInitializer.cs (modified) (1 diff)

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

@@ -31 +31 @@
     /// <param name="dimensions">The amount of columns in the matrix</param>
     /// <returns>The matrix that projects the input variables into a lower dimensional space.</returns>
-    double[,] Initialize(IClassificationProblemData data, Scaling scaling, int dimensions);
+    double[,] Initialize(IClassificationProblemData data, int dimensions);
   }
 }

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

@@ -40 +40 @@
     }
 
-    public override double[,] Initialize(IClassificationProblemData data, Scaling scaling, int dimensions) {
+    public override double[,] Initialize(IClassificationProblemData data, int dimensions) {
       var instances = data.TrainingIndices.Count();
       var attributes = data.AllowedInputVariables.Count();
 
-      var ldaDs = new double[instances, attributes + 1];
-      int j = 0;
-      foreach (var a in data.AllowedInputVariables) {
-        int i = 0;
-        var sv = scaling.GetScaledValues(data.Dataset, a, data.TrainingIndices);
-        foreach (var v in sv) {
-          ldaDs[i++, j] = v;
-        }
-        j++;
-      }
-      j = 0;
-      foreach (var tv in data.Dataset.GetDoubleValues(data.TargetVariable, data.TrainingIndices))
-        ldaDs[j++, attributes] = tv;
+      var ldaDs = AlglibUtil.PrepareInputMatrix(data.Dataset,
+                                                data.AllowedInputVariables.Concat(data.TargetVariable.ToEnumerable()),
+                                                data.TrainingIndices);
 
       var uniqueClasses = data.Dataset.GetDoubleValues(data.TargetVariable, data.TrainingIndices).Distinct().Count();

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

@@ -43 +43 @@
       get { return (ILookupParameter<RealVector>)Parameters["NcaMatrix"]; }
     }
-    public ILookupParameter<Scaling> ScalingParameter {
-      get { return (ILookupParameter<Scaling>)Parameters["Scaling"]; }
-    }
 
     [StorableConstructor]
@@ -54 +51 @@
       Parameters.Add(new LookupParameter<IntValue>("Dimensions", "The number of dimensions to which the features should be pruned."));
       Parameters.Add(new LookupParameter<RealVector>("NcaMatrix", "The coefficients of the matrix that need to be optimized. Note that the matrix is flattened."));
-      Parameters.Add(new LookupParameter<Scaling>("Scaling", "Each dataset is scaled and the information is stored in a scaling object."));
     }
 
     public override IOperation Apply() {
       var problemData = ProblemDataParameter.ActualValue;
-      var scaling = new Scaling(problemData.Dataset, problemData.AllowedInputVariables, problemData.TrainingIndices);
 
       var dimensions = DimensionsParameter.ActualValue.Value;
-      var matrix = Initialize(problemData, scaling, dimensions);
+      var matrix = Initialize(problemData, dimensions);
       var attributes = matrix.GetLength(0);
 
@@ -70 +65 @@
           result[i * dimensions + j] = matrix[i, j];
 
-      ScalingParameter.ActualValue = scaling;
       NcaMatrixParameter.ActualValue = new RealVector(result);
       return base.Apply();
     }
 
-    public abstract double[,] Initialize(IClassificationProblemData data, Scaling scaling, int dimensions);
+    public abstract double[,] Initialize(IClassificationProblemData data, int dimensions);
   }
 }

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

@@ -40 +40 @@
     }
 
-    public override double[,] Initialize(IClassificationProblemData data, Scaling scaling, int dimensions) {
+    public override double[,] Initialize(IClassificationProblemData data, int dimensions) {
       var instances = data.TrainingIndices.Count();
       var attributes = data.AllowedInputVariables.Count();
 
-      var pcaDs = AlglibUtil.PrepareAndScaleInputMatrix(data.Dataset, data.AllowedInputVariables, data.TrainingIndices, scaling);
+      var pcaDs = AlglibUtil.PrepareInputMatrix(data.Dataset, data.AllowedInputVariables, data.TrainingIndices);
 
       int info;

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

@@ -48 +48 @@
     }
 
-    public override double[,] Initialize(IClassificationProblemData data, Scaling scaling, int dimensions) {
+    public override double[,] Initialize(IClassificationProblemData data, int dimensions) {
       var attributes = data.AllowedInputVariables.Count();