Changeset 8441 for branches/NCA/HeuristicLab.Algorithms.NCA/3.3/NCAModel.cs

Timestamp:

08/08/12 18:20:33 (12 years ago)

Author:

abeham

Message:

#1913: added quality output

File:

• branches/NCA/HeuristicLab.Algorithms.NCA/3.3/NCAModel.cs (modified) (5 diffs)

branches/NCA/HeuristicLab.Algorithms.NCA/3.3/NCAModel.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Algorithms.DataAnalysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -63 +64 @@
       get { return (double[,])transformedTrainingset.Clone(); }
     }
+    [Storable]
+    private Scaling scaling;
 
     [StorableConstructor]
@@ -77 +80 @@
       if (original.transformedTrainingset != null)
         this.transformedTrainingset = (double[,])original.transformedTrainingset.Clone();
+      this.scaling = cloner.Clone(original.scaling);
     }
-    public NCAModel(double[,] transformedTrainingset, double[,] transformationMatrix, int k, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues = null)
+    public NCAModel(double[,] transformedTrainingset, Scaling scaling, double[,] transformationMatrix, int k, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues = null)
       : base() {
       this.name = ItemName;
       this.description = ItemDescription;
       this.transformedTrainingset = transformedTrainingset;
+      this.scaling = scaling;
       this.transformationMatrix = transformationMatrix;
       this.k = k;
@@ -96 +101 @@
 
     public IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows) {
-      int k = Math.Min(this.k, transformedTrainingset.GetLength(0));
-      double[] transformedRow = new double[transformationMatrix.GetLength(1)];
+      var k = Math.Min(this.k, transformedTrainingset.GetLength(0));
+      var transformedRow = new double[transformationMatrix.GetLength(1)];
       var kVotes = new SortedList<double, double>(k + 1);
       foreach (var r in rows) {
@@ -103 +108 @@
         int j = 0;
         foreach (var v in allowedInputVariables) {
+          var values = scaling.GetScaledValues(dataset, v, rows);
           double val = dataset.GetDoubleValue(v, r);
           for (int i = 0; i < transformedRow.Length; i++)