- Timestamp:
- 06/25/15 18:21:19 (9 years ago)
- Location:
- branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis (added) merged: 12504,12509
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaAlgorithm.cs
r12012 r12515 43 43 with additional regularizations described in Z. Yang, J. Laaksonen. 2007. 44 44 Regularized Neighborhood Component Analysis. Lecture Notes in Computer Science, 4522. pp. 253-262.")] 45 [Creatable( "Data Analysis")]45 [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 170)] 46 46 [StorableClass] 47 47 public sealed class NcaAlgorithm : EngineAlgorithm { -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaModel.cs
r12012 r12515 56 56 this.classValues = (double[])original.classValues.Clone(); 57 57 } 58 public NcaModel(int k, double[,] transformationMatrix, Dataset dataset, IEnumerable<int> rows, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues) {58 public NcaModel(int k, double[,] transformationMatrix, IDataset dataset, IEnumerable<int> rows, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues) { 59 59 Name = ItemName; 60 60 Description = ItemDescription; … … 72 72 } 73 73 74 public IEnumerable<double> GetEstimatedClassValues( Dataset dataset, IEnumerable<int> rows) {74 public IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) { 75 75 var ds = ReduceDataset(dataset, rows); 76 76 return nnModel.GetEstimatedClassValues(ds, Enumerable.Range(0, ds.Rows)); … … 85 85 } 86 86 87 public double[,] Reduce( Dataset dataset, IEnumerable<int> rows) {87 public double[,] Reduce(IDataset dataset, IEnumerable<int> rows) { 88 88 var data = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables, rows); 89 89 … … 100 100 } 101 101 102 public Dataset ReduceDataset( Dataset dataset, IEnumerable<int> rows) {102 public Dataset ReduceDataset(IDataset dataset, IEnumerable<int> rows) { 103 103 return new Dataset(Enumerable 104 104 .Range(0, transformationMatrix.GetLength(1))
Note: See TracChangeset
for help on using the changeset viewer.