Changeset 9272

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

Files:

• Initialization/INcaInitializer.cs (modified) (1 diff)
• Initialization/LdaInitializer.cs (modified) (1 diff)
• Initialization/NcaInitializer.cs (modified) (3 diffs)
• Initialization/PcaInitializer.cs (modified) (1 diff)
• Initialization/RandomInitializer.cs (modified) (1 diff)
• ModelCreation/NcaModelCreator.cs (modified) (3 diffs)
• NcaGradientCalculator.cs (modified) (4 diffs)
• NcaModel.cs (modified) (4 diffs)

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();
 

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/ModelCreation/NcaModelCreator.cs

@@ -55 +55 @@
     }
 
-    public ILookupParameter<Scaling> ScalingParameter {
-      get { return (ILookupParameter<Scaling>)Parameters["Scaling"]; }
-    }
-
     public ILookupParameter<INcaModel> NcaModelParameter {
       get { return (ILookupParameter<INcaModel>)Parameters["NcaModel"]; }
@@ -72 +68 @@
       Parameters.Add(new LookupParameter<RealVector>("NcaMatrixGradients", "The gradients from the matrix that is being optimized."));
       Parameters.Add(new LookupParameter<IClassificationProblemData>("ProblemData", "The classification problem data."));
-      Parameters.Add(new LookupParameter<Scaling>("Scaling", "The scaling of the dataset."));
       Parameters.Add(new LookupParameter<INcaModel>("NcaModel", "The NCA model that should be created."));
     }
@@ -91 +86 @@
         }
 
-      var scaling = ScalingParameter.ActualValue;
       var problemData = ProblemDataParameter.ActualValue;
-      NcaModelParameter.ActualValue = new NcaModel(k, matrix, problemData.Dataset, problemData.TrainingIndices, problemData.TargetVariable, problemData.AllowedInputVariables, scaling, problemData.ClassValues.ToArray());
+      NcaModelParameter.ActualValue = new NcaModel(k, matrix, problemData.Dataset, problemData.TrainingIndices, problemData.TargetVariable, problemData.AllowedInputVariables, problemData.ClassValues.ToArray());
       return base.Apply();
     }

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

@@ -65 +65 @@
       get { return (ILookupParameter<IClassificationProblemData>)Parameters["ProblemData"]; }
     }
-
-    public ILookupParameter<Scaling> ScalingParameter {
-      get { return (ILookupParameter<Scaling>)Parameters["Scaling"]; }
-    }
     #endregion
 
@@ -83 +79 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the current matrix."));
       Parameters.Add(new LookupParameter<IClassificationProblemData>("ProblemData", "The classification problem data."));
-      Parameters.Add(new LookupParameter<Scaling>("Scaling", "The scaling of the dataset."));
     }
 
@@ -92 +87 @@
     public override IOperation Apply() {
       var problemData = ProblemDataParameter.ActualValue;
-      var scaling = ScalingParameter.ActualValue;
       var dimensions = DimensionsParameter.ActualValue.Value;
       var neighborSamples = NeighborSamplesParameter.ActualValue.Value;
@@ -104 +98 @@
       }
 
-      var data = AlglibUtil.PrepareAndScaleInputMatrix(problemData.Dataset, problemData.AllowedInputVariables,
-                                                       problemData.TrainingIndices, scaling);
+      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

@@ -33 +33 @@
 
     [Storable]
-    private Scaling scaling;
-    [Storable]
     private double[,] transformationMatrix;
     public double[,] TransformationMatrix {
@@ -52 +50 @@
     protected NcaModel(NcaModel original, Cloner cloner)
       : base(original, cloner) {
-      this.scaling = cloner.Clone(original.scaling);
       this.transformationMatrix = (double[,])original.transformationMatrix.Clone();
       this.allowedInputVariables = (string[])original.allowedInputVariables.Clone();
@@ -59 +56 @@
       this.classValues = (double[])original.classValues.Clone();
     }
-    public NcaModel(int k, double[,] transformationMatrix, Dataset dataset, IEnumerable<int> rows, string targetVariable, IEnumerable<string> allowedInputVariables, Scaling scaling, double[] classValues) {
+    public NcaModel(int k, double[,] transformationMatrix, Dataset dataset, IEnumerable<int> rows, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues) {
       Name = ItemName;
       Description = ItemDescription;
-      this.scaling = scaling;
       this.transformationMatrix = (double[,])transformationMatrix.Clone();
       this.allowedInputVariables = allowedInputVariables.ToArray();
@@ -90 +86 @@
 
     public double[,] Reduce(Dataset dataset, IEnumerable<int> rows) {
-      var scaledData = AlglibUtil.PrepareAndScaleInputMatrix(dataset, allowedInputVariables, rows, scaling);
+      var data = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables, rows);
+
       var targets = dataset.GetDoubleValues(targetVariable, rows).ToArray();
-      var result = new double[scaledData.GetLength(0), transformationMatrix.GetLength(1) + 1];
-      for (int i = 0; i < scaledData.GetLength(0); i++)
-        for (int j = 0; j < scaledData.GetLength(1); j++) {
+      var result = new double[data.GetLength(0), transformationMatrix.GetLength(1) + 1];
+      for (int i = 0; i < data.GetLength(0); i++)
+        for (int j = 0; j < data.GetLength(1); j++) {
           for (int x = 0; x < transformationMatrix.GetLength(1); x++) {
-            result[i, x] += scaledData[i, j] * transformationMatrix[j, x];
+            result[i, x] += data[i, j] * transformationMatrix[j, x];
           }
           result[i, transformationMatrix.GetLength(1)] = targets[i];