Changeset 12515 for branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine
- Timestamp:
- 06/25/15 18:21:19 (9 years ago)
- Location:
- branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis
- Files:
-
- 5 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/SupportVectorMachine/SupportVectorClassification.cs
r12012 r12515 37 37 /// </summary> 38 38 [Item("Support Vector Classification", "Support vector machine classification data analysis algorithm (wrapper for libSVM).")] 39 [Creatable( "Data Analysis")]39 [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 110)] 40 40 [StorableClass] 41 41 public sealed class SupportVectorClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> { … … 149 149 public static SupportVectorClassificationSolution CreateSupportVectorClassificationSolution(IClassificationProblemData problemData, IEnumerable<string> allowedInputVariables, 150 150 int svmType, int kernelType, double cost, double nu, double gamma, int degree, out double trainingAccuracy, out double testAccuracy, out int nSv) { 151 Datasetdataset = problemData.Dataset;151 var dataset = problemData.Dataset; 152 152 string targetVariable = problemData.TargetVariable; 153 153 IEnumerable<int> rows = problemData.TrainingIndices; -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineModel.cs
r12012 r12515 120 120 121 121 #region IRegressionModel Members 122 public IEnumerable<double> GetEstimatedValues( Dataset dataset, IEnumerable<int> rows) {122 public IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) { 123 123 return GetEstimatedValuesHelper(dataset, rows); 124 124 } … … 132 132 133 133 #region IClassificationModel Members 134 public IEnumerable<double> GetEstimatedClassValues( Dataset dataset, IEnumerable<int> rows) {134 public IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) { 135 135 if (classValues == null) throw new NotSupportedException(); 136 136 // return the original class value instead of the predicted value of the model … … 159 159 } 160 160 #endregion 161 private IEnumerable<double> GetEstimatedValuesHelper( Dataset dataset, IEnumerable<int> rows) {161 private IEnumerable<double> GetEstimatedValuesHelper(IDataset dataset, IEnumerable<int> rows) { 162 162 // calculate predictions for the currently requested rows 163 163 svm_problem problem = SupportVectorMachineUtil.CreateSvmProblem(dataset, targetVariable, allowedInputVariables, rows); -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs
r12012 r12515 40 40 /// <param name="rowIndices">The rows of the dataset that should be contained in the resulting SVM-problem</param> 41 41 /// <returns>A problem data type that can be used to train a support vector machine.</returns> 42 public static svm_problem CreateSvmProblem( Dataset dataset, string targetVariable, IEnumerable<string> inputVariables, IEnumerable<int> rowIndices) {42 public static svm_problem CreateSvmProblem(IDataset dataset, string targetVariable, IEnumerable<string> inputVariables, IEnumerable<int> rowIndices) { 43 43 double[] targetVector = dataset.GetDoubleValues(targetVariable, rowIndices).ToArray(); 44 44 svm_node[][] nodes = new svm_node[targetVector.Length][]; -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs
r12012 r12515 37 37 /// </summary> 38 38 [Item("Support Vector Regression", "Support vector machine regression data analysis algorithm (wrapper for libSVM).")] 39 [Creatable( "Data Analysis")]39 [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 110)] 40 40 [StorableClass] 41 41 public sealed class SupportVectorRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> { … … 152 152 string svmType, string kernelType, double cost, double nu, double gamma, double epsilon, int degree, 153 153 out double trainingR2, out double testR2, out int nSv) { 154 Datasetdataset = problemData.Dataset;154 var dataset = problemData.Dataset; 155 155 string targetVariable = problemData.TargetVariable; 156 156 IEnumerable<int> rows = problemData.TrainingIndices;
Note: See TracChangeset
for help on using the changeset viewer.