Added Fernandos first tutorial regarding SVMs. Extended the global links…

Added Fernandos first tutorial regarding SVMs. Extended the global links (conf.py). Corrected the author names. Minor modification to the dft tutorial. 

doc/conf.py

@@ -348,10 +348,12 @@ extlinks = {'cvt_color': ('http://opencv.willowgarage.com/documentation/cpp/imgp
             'contour_area' : ('http://opencv.willowgarage.com/documentation/cpp/imgproc_structural_analysis_and_shape_descriptors.html#cv-contourarea%s', None),
             'arc_length' : ('http://opencv.willowgarage.com/documentation/cpp/imgproc_structural_analysis_and_shape_descriptors.html#cv-arclength%s', None),
             'basicstructures' : ('http://opencv.itseez.com/modules/core/doc/basic_structures.html#%s', None),
+            'oldbasicstructures' : ('http://opencv.itseez.com/modules/core/doc/old_basic_structures.html#%s', None),
             'readwriteimagevideo' : ('http://opencv.itseez.com/modules/highgui/doc/reading_and_writing_images_and_video.html#%s', None),
             'operationsonarrays' : ('http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html#%s', None),
             'utilitysystemfunctions':('http://opencv.itseez.com/modules/core/doc/utility_and_system_functions_and_macros.html#%s', None),
             'imgprocfilter':('http://opencv.itseez.com/modules/imgproc/doc/filtering.html#%s', None),
+            'svms':('http://opencv.itseez.com/modules/ml/doc/support_vector_machines.html#%s', None),
             'point_polygon_test' : ('http://opencv.willowgarage.com/documentation/cpp/imgproc_structural_analysis_and_shape_descriptors.html#cv-pointpolygontest%s', None)
            }
 

doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.rst

@@ -13,3 +13,26 @@ We'll seek answers for the following questions:
    + What is a Fourier transform and why use it? 
    + How to do it in OpenCV? 
    + Usage of functions such as: :imgprocfilter:`copyMakeBorder() <copymakeborder>`, :operationsonarrays:`merge() <merge>`, :operationsonarrays:`dft() <dft>`, :operationsonarrays:`getOptimalDFTSize() <getoptimaldftsize>`, :operationsonarrays:`log() <log>` and :operationsonarrays:`normalize() <normalize>` .
+
+Source code
+===========
+
+Here's a sample usage of :operationsonarrays:`dft() <dft>` : 
+
+.. literalinclude:: ../../../../samples/cpp/tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp
+   :language: cpp
+   :linenos:
+   :tab-width: 4
+   :lines: 1-3, 5, 19-20, 23-78
+
+Explanation
+===========
+
+The Fourier Transform will decompose an image into its sinus and cosines components. In other words, it will transform an image from its spatial domain to its frequency domain. The idea is that any function may be approximated exactly with the sum of infinite sinus and cosines functions. The Fourier Transform is a way how to do this. Mathematically a two dimensional images Fourier transform is: 
+
+.. math::
+   
+   F(k,l) = \displaystyle\sum\limits_{i=0}^{N-1}\sum\limits_{j=0}^{N-1} f(i,j)e^{-i2\pi(\frac{ki}{N}+\frac{lj}{N})} 
+   
+   e^{ix} = \cos{x} + i\sin {x}
+

doc/tutorials/definitions/tocDefinitions.rst

 .. |Author_AnaH| unicode:: Ana U+0020 Huam U+00E1 n
 .. |Author_BernatG| unicode:: Bern U+00E1 t U+0020 G U+00E1 bor
 .. |Author_AndreyK| unicode:: Andrey U+0020 Kamaev
-.. |Author_VictorE| unicode:: Victor Eruhimov 
-
+.. |Author_VictorE| unicode:: Victor U+0020 Eruhimov 
+.. |Author_FernandoI| unicode:: Fernando U+0020 Iglesias U+0020 Garc U+00ED a 
 
 

doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst

+.. _introductiontosvms:
+
+Introduction to Support Vector Machines
+***************************************
+
+Goal
+====
+
+In this tutorial you will learn how to:
+
+.. container:: enumeratevisibleitemswithsquare
+
+   + Use the OpenCV functions :svms:`CvSVM::train <cvsvm-train>` to build a classifier based on SVMs and :svms:`CvSVM::predict <cvsvm-predict>` to test its performance.  
+
+What is a SVM?
+==============
+
+A Support Vector Machine (SVM) is a discriminative classifier formally defined by a separating hyperplane. In other words, given labeled training data (*supervised learning*), the algorithm outputs an optimal hyperplane which categorizes new examples.
+
+In which sense is the hyperplane obtained optimal? Let's consider the following
+simple problem:
+
+  For a linearly separable set of 2D-points which belong to one of two classes, find a separating straight line.
+
+.. image:: images/separating-lines.png
+   :alt: A seperation example
+   :align: center
+
+.. note:: In this example we deal with lines and points in the Cartesian plane instead of hyperplanes and vectors in a high dimensional space. This is a simplification of the problem.It is important to understand that this is done only because our intuition is better built from examples that are easy to imagine. However, the same concepts apply to tasks where the examples to classify lie in a space whose dimension is higher than two.
+
+In the above picture you can see that there exists multiple lines that offer a solution to the problem. Is any of them better than the others? We can intuitively define a criterion to estimate the worth of the lines:
+
+  A line is bad if it passes too close to the points because it will be noise sensitive and it will not generalize correctly. Therefore, our goal should be to find the line passing as far as possible from all points.
+
+Then, the operation of the SVM algorithm is based on finding the hyperplane that gives the largest minimum distance to the training examples. Twice, this distance receives the important name of **margin** within SVM's theory. Therefore, the optimal separating hyperplane *maximizes* the margin of the training data.
+
+.. image:: images/optimal-hyperplane.png
+   :alt: The Optimal hyperplane
+   :align: center 
+
+How is the optimal hyperplane computed?
+=======================================
+
+Let's introduce the notation used to define formally a hyperplane:
+
+.. math:: 
+  f(x) = \beta_{0} + \beta^{T} x,
+
+where :math:`\beta` is known as the *weight vector* and :math:`\beta_{0}` as the *bias*.
+
+.. seealso:: A more in depth description of this and hyperplanes you can find in the section 4.5 (*Seperating Hyperplanes*) of the book: *Elements of Statistical Learning* by T. Hastie, R. Tibshirani and J. H. Friedman.
+
+The optimal hyperplane can be represented in an infinite number of different ways by scaling of :math:`\beta` and :math:`\beta_{0}`. As a matter of convention, among all the possible representations of the hyperplane, the one chosen is
+
+.. math::
+  |\beta_{0} + \beta^{T} x| = 1
+
+where :math:`x` symbolizes the training examples closest to the hyperplane. In general, the training examples that are closest to the hyperplane are called **support vectors**. This representation is known as the **canonical hyperplane**.
+
+Now, we use the result of geometry that gives the distance between a point :math:`x` and a hyperplane :math:`(\beta, \beta_{0})`:
+
+.. math::
+   \mathrm{distance} = \frac{|\beta_{0} + \beta^{T} x|}{||\beta||}.
+
+In particular, for the canonical hyperplane, the numerator is equal to one and the distance to the support vectors is
+
+.. math::
+  \mathrm{distance}_{\text{ support vectors}} = \frac{|\beta_{0} + \beta^{T} x|}{||\beta||} = \frac{1}{||\beta||}.
+
+Recall that the margin introduced in the previous section, here denoted as :math:`M`, is twice the distance to the closest examples:
+
+.. math::
+  M = \frac{2}{||\beta||}
+
+Finally, the problem of maximizing :math:`M` is equivalent to the problem of minimizing a function :math:`L(\beta)` subject to some constraints. The constraints model the requirement for the hyperplane to classify correctly all the training examples :math:`x_{i}`. Formally,
+
+.. math::
+  \min_{\beta, \beta_{0}} L(\beta) = \frac{1}{2}||\beta||^{2} \text{ subject to } y_{i}(\beta^{T} x_{i} + \beta_{0}) \geq 1 \text{ } \forall i,
+
+where :math:`y_{i}` represents each of the labels of the training examples.
+
+This is a problem of Lagrangian optimization that can be solved using Lagrange multipliers to obtain the weight vector :math:`\beta` and the bias :math:`\beta_{0}` of the optimal hyperplane.
+
+Source Code
+===========
+
+.. literalinclude:: ../../../../samples/cpp/tutorial_code/ml/introduction_to_svm/introduction_to_svm.cpp
+   :language: cpp
+   :linenos:
+   :tab-width: 4
+
+Explanation
+===========
+
+1. **Set up the training data**
+
+  The training data of this exercise is formed by a set of labeled 2D-points that belong to one of two different classes; one of the classes consists of one point and the other of three points.
+
+  .. code-block:: cpp
+
+     float labels[4] = {1.0, -1.0, -1.0, -1.0};
+     float trainingData[4][2] = {{501, 10}, {255, 10}, {501, 255}, {10, 501}};
+
+  The function :svms:`CvSVM::train <cvsvm-train>` that will be used afterwards requires the training data to be stored as :basicstructures:`Mat <mat>` objects of floats. Therefore, we create these objects from the arrays defined above:
+
+  .. code-block:: cpp
+
+     Mat trainingDataMat(3, 2, CV_32FC1, trainingData);
+     Mat labelsMat      (3, 1, CV_32FC1, labels);    
+
+2. **Set up SVM's parameters**
+
+   In this tutorial we have introduced the theory of SVMs in the most simple case, when the training examples are spread into two classes that are linearly separable. However, SVMs can be used in a wide variety of problems (e.g. problems with non-linearly separable data, a SVM using a kernel function to raise the dimensionality of the examples, etc). As a consequence of this, we have to define some parameters before training the SVM. These parameters are stored in an object of the class :svms:`CvSVMParams <cvsvmparams>` .
+
+   .. code-block:: cpp
+
+      CvSVMParams params;
+      params.svm_type    = CvSVM::C_SVC;
+      params.kernel_type = CvSVM::LINEAR;
+      params.term_crit   = cvTermCriteria(CV_TERMCRIT_ITER, 100, 1e-6);
+
+   * *Type of SVM*. We choose here the type **CvSVM::C_SVC** that can be used for n-class classification (n :math:`\geq` 2). This parameter is defined in the attribute *CvSVMParams.svm_type*.
+
+     .. note:: The important feature of the type of SVM **CvSVM::C_SVC** deals with imperfect separation of classes (i.e. when the training data is non-linearly separable). This feature is not important here since the data is linearly separable and we chose this SVM type only for being the most commonly used.
+
+   * *Type of SVM kernel*. We have not talked about kernel functions since they are not interesting for the training data we are dealing with. Nevertheless, let's explain briefly now the main idea behind a kernel function. It is a mapping done to the training data to improve its resemblance to a linearly separable set of data. This mapping consists of increasing the dimensionality of the data and is done efficiently using a kernel function. We choose here the type **CvSVM::LINEAR** which means that no mapping is done. This parameter is defined in the attribute *CvSVMParams.kernel_type*.
+
+   * *Termination criteria of the algorithm*. The SVM training procedure is implemented solving a constrained quadratic optimization problem in an **iterative** fashion. Here we specify a maximum number of iterations and a tolerance error so we allow the algorithm to finish in less number of steps even if the optimal hyperplane has not been computed yet. This parameter is defined in a structure :oldbasicstructures:`cvTermCriteria <cvtermcriteria>`.
+
+3. **Train the SVM**
+
+   We call the method `CvSVM::train <http://opencv.itseez.com/modules/ml/doc/support_vector_machines.html#cvsvm-train>`_ to build the SVM model.
+
+   .. code-block:: cpp
+
+      CvSVM SVM;
+      SVM.train(trainingDataMat, labelsMat, Mat(), Mat(), params);
+
+4. **Regions classified by the SVM**
+
+  The method :svms:`CvSVM::predict <cvsvm-predict>` is used to classify an input sample using a trained SVM. In this example we have used this method in order to color the space depending on the prediction done by the SVM. In other words, an image is traversed interpreting its pixels as points of the Cartesian plane. Each of the points is colored depending on the class predicted by the SVM; in green if it is the class with label 1 and in blue if it is the class with label -1.
+
+  .. code-block:: cpp
+
+     Vec3b green(0,255,0), blue (255,0,0);
+     
+     for (int i = 0; i < image.rows; ++i)
+         for (int j = 0; j < image.cols; ++j)
+         {
+         Mat sampleMat = (Mat_<float>(1,2) << i,j);
+         float response = SVM.predict(sampleMat);
+
+         if (response == 1)
+            image.at<Vec3b>(j, i)  = green;
+         else 
+         if (response == -1) 
+            image.at<Vec3b>(j, i)  = blue;
+         }
+
+5. **Support vectors**
+
+   We use here a couple of methods to obtain information about the support vectors. The method :svms:`CvSVM::get_support_vector_count <cvsvm-get-support-vector>` outputs the total number of support vectors used in the problem and with the method :svms:`CvSVM::get_support_vector <cvsvm-get-support-vector>` we obtain each of the support vectors using an index. We have used this methods here to find the training examples that are support vectors and highlight them.
+
+   .. code-block:: cpp
+
+      int c     = SVM.get_support_vector_count();
+
+      for (int i = 0; i < c; ++i)
+      {
+      const float* v = SVM.get_support_vector(i); // get and then highlight with grayscale
+      circle(	image,  Point( (int) v[0], (int) v[1]),   6,  Scalar(128, 128, 128), thickness, lineType);
+      }
+
+Results
+=======
+
+.. container:: enumeratevisibleitemswithsquare
+
+   * The code opens an image and shows the training examples of both classes. The points of one class are represented with white circles and black ones are used for the other class.
+
+   * The SVM is trained and used to classify all the pixels of the image. This results in a division of the image in a blue region and a green region. The boundary between both regions is the optimal separating hyperplane.
+
+   * Finally the support vectors are shown using gray rings around the training examples.
+
+.. image:: images/result.png
+  :alt: The seperated planes
+  :align: center 
+

doc/tutorials/ml/table_of_content_ml/table_of_content_ml.rst

@@ -5,8 +5,32 @@
 
 Use the powerfull machine learning classes for statistical classification, regression and clustering of data.
 
-.. include:: ../../definitions/noContent.rst
+.. include:: ../../definitions/tocDefinitions.rst 
+
++ 
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+
+  ============ ==============================================
+  |IntroSVM|   **Title:** :ref:`introductiontosvms`
+
+               *Compatibility:* > OpenCV 2.0
+
+               *Author:* |Author_FernandoI|
+
+               Learn what a Suport Vector Machine is. 
+
+  ============ ==============================================
+
+  .. |IntroSVM| image:: images/introduction_to_svm.png
+     :height: 90pt
+     :width:  90pt
 
 .. raw:: latex
 
    \pagebreak
+
+.. toctree::
+   :hidden:
+   
+   ../introduction_to_svm/introduction_to_svm

samples/cpp/tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp

@@ -76,4 +76,3 @@ int main(int argc, char ** argv)
 
     return 0;
 }
\ No newline at end of file
-

samples/cpp/tutorial_code/ml/introduction_to_svm/introduction_to_svm.cpp

+#include <opencv2/core/core.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/ml/ml.hpp>
+
+using namespace cv;
+
+int main()
+{
+    // Data for visual representation
+    int width = 512, height = 512;
+    Mat image = Mat::zeros(height, width, CV_8UC3);
+
+    // Set up training data
+    float labels[4] = {1.0, -1.0, -1.0, -1.0};
+    Mat labelsMat(3, 1, CV_32FC1, labels);
+
+    float trainingData[4][2] = { {501, 10}, {255, 10}, {501, 255}, {10, 501} };
+    Mat trainingDataMat(3, 2, CV_32FC1, trainingData);
+
+    // Set up SVM's parameters
+    CvSVMParams params;
+    params.svm_type    = CvSVM::C_SVC;
+    params.kernel_type = CvSVM::LINEAR;
+    params.term_crit   = cvTermCriteria(CV_TERMCRIT_ITER, 100, 1e-6);
+
+    // Train the SVM
+    CvSVM SVM;
+    SVM.train(trainingDataMat, labelsMat, Mat(), Mat(), params);
+    
+    Vec3b green(0,255,0), blue (255,0,0);
+    // Show the decision regions given by the SVM
+    for (int i = 0; i < image.rows; ++i)
+        for (int j = 0; j < image.cols; ++j)
+        {
+            Mat sampleMat = (Mat_<float>(1,2) << i,j);
+            float response = SVM.predict(sampleMat);
+
+            if (response == 1)
+                image.at<Vec3b>(j, i)  = green;
+            else if (response == -1) 
+                 image.at<Vec3b>(j, i)  = blue;
+        }
+
+    // Show the training data
+    int thickness = -1;
+    int lineType = 8;
+    circle(	image, Point(501,  10), 5, Scalar(  0,   0,   0), thickness, lineType);
+    circle(	image, Point(255,  10), 5, Scalar(255, 255, 255), thickness, lineType);
+    circle(	image, Point(501, 255), 5, Scalar(255, 255, 255), thickness, lineType);
+    circle(	image, Point( 10, 501), 5, Scalar(255, 255, 255), thickness, lineType);
+
+    // Show support vectors
+    thickness = 2;
+    lineType  = 8;
+    int c     = SVM.get_support_vector_count();
+
+    for (int i = 0; i < c; ++i)
+    {
+        const float* v = SVM.get_support_vector(i);
+        circle(	image,  Point( (int) v[0], (int) v[1]),   6,  Scalar(128, 128, 128), thickness, lineType);
+    }
+
+    imwrite("result.png", image);        // save the image 
+
+    imshow("SVM Simple Example", image); // show it to the user
+    waitKey(0);
+
+}