moved documentation for CUDA version of softcascade

diff --git a/modules/gpu/doc/object_detection.rst b/modules/gpu/doc/object_detection.rst
index 4afe8bb..fd0ac86 100644 (file)
--- a/modules/gpu/doc/object_detection.rst
+++ b/modules/gpu/doc/object_detection.rst
@@ -199,88 +199,6 @@ Returns block descriptors computed for the whole image.
 The function is mainly used to learn the classifier.
 
 
-Soft Cascade Classifier
-==========================
-
-Soft Cascade Classifier for Object Detection
-----------------------------------------------------------
-
-Cascade detectors have been shown to operate extremely rapidly, with high accuracy, and have important applications in different spheres. The initial goal for this cascade implementation was the fast and accurate pedestrian detector but it also useful in general. Soft cascade is trained with AdaBoost. But instead of training sequence of stages, the soft cascade is trained as a one long stage of T weak classifiers. Soft cascade is formulated as follows:
-
-.. math::
-    \texttt{H}(x) = \sum _{\texttt{t}=1..\texttt{T}} {\texttt{s}_t(x)}
-
-where :math:`\texttt{s}_t(x) = \alpha_t\texttt{h}_t(x)` are the set of thresholded weak classifiers selected during AdaBoost training scaled by the associated weights. Let
-
-.. math::
-    \texttt{H}_t(x) = \sum _{\texttt{i}=1..\texttt{t}} {\texttt{s}_i(x)}
-
-be the partial sum of sample responses before :math:`t`-the weak classifier will be applied. The funtcion :math:`\texttt{H}_t(x)` of :math:`t` for sample :math:`x` named *sample trace*.
-After each weak classifier evaluation, the sample trace at the point :math:`t` is compared with the rejection threshold :math:`r_t`. The sequence of :math:`r_t` named *rejection trace*.
-
-The sample has been rejected if it fall rejection threshold. So stageless cascade allows to reject not-object sample as soon as possible. Another meaning of the sample trace is a confidence with that sample recognized as desired object. At each :math:`t` that confidence depend on all previous weak classifier. This feature of soft cascade is resulted in more accurate detection. The original formulation of soft cascade can be found in [BJ05]_.
-
-gpu::SCascade
------------------------------------------------
-.. ocv:class:: gpu::SCascade : public Algorithm
-
-Implementation of soft (stageless) cascaded detector. ::
-
-    class CV_EXPORTS SCascade : public Algorithm
-    {
-        struct CV_EXPORTS Detection
-        {
-              ushort x;
-              ushort y;
-              ushort w;
-              ushort h;
-              float confidence;
-              int kind;
-
-              enum {PEDESTRIAN = 0};
-        };
-
-        SCascade(const double minScale = 0.4, const double maxScale = 5., const int scales = 55, const int rejfactor = 1);
-        virtual ~SCascade();
-        virtual bool load(const FileNode& fn);
-        virtual void detect(InputArray image, InputArray rois, OutputArray objects, Stream& stream = Stream::Null()) const;
-        virtual void genRoi(InputArray roi, OutputArray mask, Stream& stream = Stream::Null()) const;
-    };
-
-
-gpu::SCascade::~SCascade
----------------------------
-Destructor for SCascade.
-
-.. ocv:function:: gpu::SCascade::~SCascade()
-
-
-
-gpu::SCascade::load
---------------------------
-Load cascade from FileNode.
-
-.. ocv:function:: bool gpu::SCascade::load(const FileNode& fn)
-
-    :param fn: File node from which the soft cascade are read.
-
-
-
-gpu::SCascade::detect
---------------------------
-Apply cascade to an input frame and return the vector of Decection objcts.
-
-.. ocv:function:: void gpu::SCascade::detect(InputArray image, InputArray rois, OutputArray objects, Stream& stream = Stream::Null()) const
-
-    :param image: a frame on which detector will be applied.
-
-    :param rois: a regions of interests mask generated by genRoi. Only the objects that fall into one of the regions will be returned.
-
-    :param objects: an output array of Detections represented as GpuMat of detections (SCascade::Detection). The first element of the matrix is  actually a count of detections.
-
-    :param stream: a high-level CUDA stream abstraction used for asynchronous execution.
-
-
 gpu::CascadeClassifier_GPU
 --------------------------
 .. ocv:class:: gpu::CascadeClassifier_GPU

diff --git a/modules/softcascade/doc/softcascade.rst b/modules/softcascade/doc/softcascade.rst
index 66c93d1..a8e0417 100644 (file)
--- a/modules/softcascade/doc/softcascade.rst
+++ b/modules/softcascade/doc/softcascade.rst
@@ -8,4 +8,5 @@ softcascade. Soft Cascade object detection and training.
     :maxdepth: 2
 
     softcascade_detector
-    softcascade_training
\ No newline at end of file
+    softcascade_training
+    softcascade_cuda
\ No newline at end of file

diff --git a/modules/softcascade/doc/softcascade_cuda.rst b/modules/softcascade/doc/softcascade_cuda.rst
new file mode 100644 (file)
index 0000000..5047748
--- /dev/null
+++ b/modules/softcascade/doc/softcascade_cuda.rst
@@ -0,0 +1,62 @@
+CUDA version of Soft Cascade Classifier
+========================================
+
+softcascade::SCascade
+-----------------------------------------------
+.. ocv:class:: softcascade::SCascade : public Algorithm
+
+Implementation of soft (stageless) cascaded detector. ::
+
+    class CV_EXPORTS SCascade : public Algorithm
+    {
+        struct CV_EXPORTS Detection
+        {
+              ushort x;
+              ushort y;
+              ushort w;
+              ushort h;
+              float confidence;
+              int kind;
+
+              enum {PEDESTRIAN = 0};
+        };
+
+        SCascade(const double minScale = 0.4, const double maxScale = 5., const int scales = 55, const int rejfactor = 1);
+        virtual ~SCascade();
+        virtual bool load(const FileNode& fn);
+        virtual void detect(InputArray image, InputArray rois, OutputArray objects, Stream& stream = Stream::Null()) const;
+        virtual void genRoi(InputArray roi, OutputArray mask, Stream& stream = Stream::Null()) const;
+    };
+
+
+softcascade::SCascade::~SCascade
+---------------------------
+Destructor for SCascade.
+
+.. ocv:function:: gpu::SCascade::~SCascade()
+
+
+
+softcascade::SCascade::load
+--------------------------
+Load cascade from FileNode.
+
+.. ocv:function:: bool gpu::SCascade::load(const FileNode& fn)
+
+    :param fn: File node from which the soft cascade are read.
+
+
+
+softcascade::SCascade::detect
+--------------------------
+Apply cascade to an input frame and return the vector of Decection objcts.
+
+.. ocv:function:: void gpu::SCascade::detect(InputArray image, InputArray rois, OutputArray objects, Stream& stream = Stream::Null()) const
+
+    :param image: a frame on which detector will be applied.
+
+    :param rois: a regions of interests mask generated by genRoi. Only the objects that fall into one of the regions will be returned.
+
+    :param objects: an output array of Detections represented as GpuMat of detections (SCascade::Detection). The first element of the matrix is  actually a count of detections.
+
+    :param stream: a high-level CUDA stream abstraction used for asynchronous execution.