Changeset 2415 for trunk/sources/LibSVM/Training.cs

Timestamp:

10/07/09 11:58:21 (15 years ago)

Author:

gkronber

Message:

Updated LibSVM project to latest version. #774

File:

• trunk/sources/LibSVM/Training.cs (modified) (4 diffs)

trunk/sources/LibSVM/Training.cs

@@ -23 +23 @@
 namespace SVM
 {
-    /// <remarks>
+    /// <summary>
     /// Class containing the routines to train SVM models.
-    /// </remarks>
+    /// </summary>
     public static class Training
     {
+        /// <summary>
+        /// Whether the system will output information to the console during the training process.
+        /// </summary>
+        public static bool IsVerbose
+        {
+            get
+            {
+                return Procedures.IsVerbose;
+            }
+            set
+            {
+                Procedures.IsVerbose = value;
+            }
+        }
+
         private static double doCrossValidation(Problem problem, Parameter parameters, int nr_fold)
         {
             int i;
             double[] target = new double[problem.Count];
-            Dictionary<int, double>[] confidence = new Dictionary<int, double>[problem.Count];
-            Procedures.svm_cross_validation(problem, parameters, nr_fold, target, confidence);
-            if (parameters.Probability)
-            {
-                List<RankPair> ranks = new List<RankPair>();
-                for (i = 0; i < target.Length; i++)
-                    ranks.Add(new RankPair(confidence[i][1], problem.Y[i]));
-                PerformanceEvaluator eval = new PerformanceEvaluator(ranks);
-                return eval.AuC*eval.AP;
+            Procedures.svm_cross_validation(problem, parameters, nr_fold, target);
+            int total_correct = 0;
+            double total_error = 0;
+            double sumv = 0, sumy = 0, sumvv = 0, sumyy = 0, sumvy = 0;
+            if (parameters.SvmType == SvmType.EPSILON_SVR || parameters.SvmType == SvmType.NU_SVR)
+            {
+                for (i = 0; i < problem.Count; i++)
+                {
+                    double y = problem.Y[i];
+                    double v = target[i];
+                    total_error += (v - y) * (v - y);
+                    sumv += v;
+                    sumy += y;
+                    sumvv += v * v;
+                    sumyy += y * y;
+                    sumvy += v * y;
+                }
+                return(problem.Count * sumvy - sumv * sumy) / (Math.Sqrt(problem.Count * sumvv - sumv * sumv) * Math.Sqrt(problem.Count * sumyy - sumy * sumy));
             }
             else
-            {
-                int total_correct = 0;
-                double total_error = 0;
-                double sumv = 0, sumy = 0, sumvv = 0, sumyy = 0, sumvy = 0;
-                if (parameters.SvmType == SvmType.EPSILON_SVR || parameters.SvmType == SvmType.NU_SVR)
-                {
-                    for (i = 0; i < problem.Count; i++)
-                    {
-                        double y = problem.Y[i];
-                        double v = target[i];
-                        total_error += (v - y) * (v - y);
-                        sumv += v;
-                        sumy += y;
-                        sumvv += v * v;
-                        sumyy += y * y;
-                        sumvy += v * y;
-                    }
-                }
-                else
-                    for (i = 0; i < problem.Count; i++)
-                        if (target[i] == problem.Y[i])
-                            ++total_correct;
-                return (double)total_correct / problem.Count;
-            }
-
+                for (i = 0; i < problem.Count; i++)
+                    if (target[i] == problem.Y[i])
+                        ++total_correct;
+            return (double)total_correct / problem.Count;
         }
         /// <summary>
@@ -96 +99 @@
         public static double PerformCrossValidation(Problem problem, Parameter parameters, int nrfold)
         {
-            Procedures.svm_check_parameter(problem, parameters);
-            return doCrossValidation(problem, parameters, nrfold);
+            string error = Procedures.svm_check_parameter(problem, parameters);
+            if (error == null)
+                return doCrossValidation(problem, parameters, nrfold);
+            else throw new Exception(error);
         }
 
@@ -108 +113 @@
         public static Model Train(Problem problem, Parameter parameters)
         {
-            Procedures.svm_check_parameter(problem, parameters);
-
-            return Procedures.svm_train(problem, parameters);
+            string error = Procedures.svm_check_parameter(problem, parameters);
+
+            if (error == null)
+                return Procedures.svm_train(problem, parameters);
+            else throw new Exception(error);
         }
 
@@ -190 +197 @@
 
                     case 'w':
-                        ++parameters.WeightCount;
-                        {
-                            int[] old = parameters.WeightLabels;
-                            parameters.WeightLabels = new int[parameters.WeightCount];
-                            Array.Copy(old, 0, parameters.WeightLabels, 0, parameters.WeightCount - 1);
-                        }
-                        {
-                            double[] old = parameters.Weights;
-                            parameters.Weights = new double[parameters.WeightCount];
-                            Array.Copy(old, 0, parameters.Weights, 0, parameters.WeightCount - 1);
-                        }
-
-                        parameters.WeightLabels[parameters.WeightCount - 1] = int.Parse(args[i - 1].Substring(2));
-                        parameters.Weights[parameters.WeightCount - 1] = double.Parse(args[i]);
+                        parameters.Weights[int.Parse(args[i - 1].Substring(2))] = double.Parse(args[1]);
                         break;