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

Timestamp:

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

Author:

abeham

Message:

#1913: removed scaling of data

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaGradientCalculator.cs (modified) (4 diffs)

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