renamed datasetstools to datasets

modules/datasets/CMakeLists.txt

@@ -0,0 +1,3 @@
+set(the_description "datasets framework")
+ocv_define_module(datasets opencv_core opencv_face)
+

modules/datasets/doc/datasets.rst

@@ -1,10 +1,10 @@
 *********************************************************
-datasetstools. Tools for working with different datasets.
+datasets. Framework for working with different datasets.
 *********************************************************
 
 .. highlight:: cpp
 
-The datasetstools module includes classes for working with different datasets.
+The datasets module includes classes for working with different datasets.
 
 Action Recognition
 ------------------
@@ -23,7 +23,7 @@ _`"HMDB: A Large Human Motion Database"`: http://serre-lab.clps.brown.edu/resour
 
  2. Unpack them.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_ar_hmdb -p=/home/user/path_to_unpacked_folders/
+ 3. To load data run: ./opencv/build/bin/example_datasets_ar_hmdb -p=/home/user/path_to_unpacked_folders/
 
 AR_sports
 =========
@@ -37,7 +37,7 @@ _`"Sports-1M Dataset"`: http://cs.stanford.edu/people/karpathy/deepvideo/
 
  1. From link above download dataset files (git clone https://code.google.com/p/sports-1m-dataset/).
 
- 2. To load data run: ./opencv/build/bin/example_datasetstools_ar_sports -p=/home/user/path_to_downloaded_folders/
+ 2. To load data run: ./opencv/build/bin/example_datasets_ar_sports -p=/home/user/path_to_downloaded_folders/
 
 Face Recognition
 ----------------
@@ -52,16 +52,16 @@ _`"Labeled Faces in the Wild"`: http://vis-www.cs.umass.edu/lfw/
 
 .. note:: Usage
 
- 1. From link above download any dataset file: lfw.tgz\lfwa.tar.gz\lfw-deepfunneled.tgz\lfw-funneled.tgz and files with pairs: with 10 test splits: pairs.txt and with developer train split: pairsDevTrain.txt.
+ 1. From link above download any dataset file: lfw.tgz\lfwa.tar.gz\lfw-deepfunneled.tgz\lfw-funneled.tgz and files with pairs: 10 test splits: pairs.txt and developer train split: pairsDevTrain.txt.
 
  2. Unpack dataset file and place pairs.txt and pairsDevTrain.txt in created folder.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_fr_lfw -p=/home/user/path_to_unpacked_folder/lfw2/
+ 3. To load data run: ./opencv/build/bin/example_datasets_fr_lfw -p=/home/user/path_to_unpacked_folder/lfw2/
 
 .. note:: Benchmark
 
  - For this dataset was implemented benchmark, which gives accuracy: 0.623833 +- 0.005223 (train split: pairsDevTrain.txt, dataset: lfwa)
- - To run this benchmark execute: ./opencv/build/bin/example_datasetstools_fr_lfw_benchmark -p=/home/user/path_to_unpacked_folder/lfw2/
+ - To run this benchmark execute: ./opencv/build/bin/example_datasets_fr_lfw_benchmark -p=/home/user/path_to_unpacked_folder/lfw2/
 
 Gesture Recognition
 -------------------
@@ -82,7 +82,7 @@ _`"ChaLearn Looking at People"`: http://gesture.chalearn.org/
 
  3. Unpack all archives in Train/ & Validation/ in the folders with the same names, for example: Sample0001.zip to Sample0001/
 
- 4. To load data run: ./opencv/build/bin/example_datasetstools_gr_chalearn -p=/home/user/path_to_unpacked_folders/
+ 4. To load data run: ./opencv/build/bin/example_datasets_gr_chalearn -p=/home/user/path_to_unpacked_folders/
 
 GR_skig
 =======
@@ -98,7 +98,7 @@ _`"Sheffield Kinect Gesture Dataset"`: http://lshao.staff.shef.ac.uk/data/Sheffi
 
  2. Unpack them.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_gr_skig -p=/home/user/path_to_unpacked_folders/
+ 3. To load data run: ./opencv/build/bin/example_datasets_gr_skig -p=/home/user/path_to_unpacked_folders/
 
 Human Pose Estimation
 ---------------------
@@ -117,7 +117,7 @@ _`"PARSE Dataset"`: http://www.ics.uci.edu/~dramanan/papers/parse/
 
  2. Unpack it.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_hpe_parse -p=/home/user/path_to_unpacked_folder/people_all/
+ 3. To load data run: ./opencv/build/bin/example_datasets_hpe_parse -p=/home/user/path_to_unpacked_folder/people_all/
 
 Image Registration
 ------------------
@@ -136,7 +136,7 @@ _`"Affine Covariant Regions Datasets"`: http://www.robots.ox.ac.uk/~vgg/data/dat
 
  2. Unpack them.
 
- 3. To load data, for example, for "bark", run: ./opencv/build/bin/example_datasetstools_ir_affine -p=/home/user/path_to_unpacked_folder/bark/
+ 3. To load data, for example, for "bark", run: ./opencv/build/bin/example_datasets_ir_affine -p=/home/user/path_to_unpacked_folder/bark/
 
 IR_robot
 ========
@@ -151,7 +151,7 @@ _`"Robot Data Set"`: http://roboimagedata.compute.dtu.dk/?page_id=24
  1. From link above download files for dataset "Point Feature Data Set – 2010": SET001_6.tar.gz-SET055_60.tar.gz (there are two data sets: - Full resolution images (1200×1600), ~500 Gb and - Half size image (600×800), ~115 Gb.)
  2. Unpack them to one folder.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_ir_robot -p=/home/user/path_to_unpacked_folder/
+ 3. To load data run: ./opencv/build/bin/example_datasets_ir_robot -p=/home/user/path_to_unpacked_folder/
 
 Image Segmentation
 ------------------
@@ -170,7 +170,7 @@ _`"The Berkeley Segmentation Dataset and Benchmark"`: https://www.eecs.berkeley.
 
  2. Unpack them.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_is_bsds -p=/home/user/path_to_unpacked_folder/BSDS300/
+ 3. To load data run: ./opencv/build/bin/example_datasets_is_bsds -p=/home/user/path_to_unpacked_folder/BSDS300/
 
 IS_weizmann
 ===========
@@ -186,7 +186,7 @@ _`"Weizmann Segmentation Evaluation Database"`: http://www.wisdom.weizmann.ac.il
 
  2. Unpack them.
 
- 3. To load data, for example, for 1 object dataset, run: ./opencv/build/bin/example_datasetstools_is_weizmann -p=/home/user/path_to_unpacked_folder/1obj/
+ 3. To load data, for example, for 1 object dataset, run: ./opencv/build/bin/example_datasets_is_weizmann -p=/home/user/path_to_unpacked_folder/1obj/
 
 Multiview Stereo Matching
 -------------------------
@@ -205,7 +205,7 @@ _`"EPFL Multi-View Stereo"`: http://cvlabwww.epfl.ch/~strecha/multiview/denseMVS
 
  2. Unpack them in separate folder for each object. For example, for "fountain", in folder fountain/ : fountain_dense_bounding.tar.gz -> bounding/, fountain_dense_cameras.tar.gz -> camera/, fountain_dense_images.tar.gz -> png/, fountain_dense_p.tar.gz -> P/
 
- 3. To load data, for example, for "fountain", run: ./opencv/build/bin/example_datasetstools_msm_epfl -p=/home/user/path_to_unpacked_folder/fountain/
+ 3. To load data, for example, for "fountain", run: ./opencv/build/bin/example_datasets_msm_epfl -p=/home/user/path_to_unpacked_folder/fountain/
 
 MSM_middlebury
 ==============
@@ -221,7 +221,7 @@ _`"Stereo – Middlebury Computer Vision"`: http://vision.middlebury.edu/mview/
 
  2. Unpack them.
 
- 3. To load data, for example "temple" dataset, run: ./opencv/build/bin/example_datasetstools_msm_middlebury -p=/home/user/path_to_unpacked_folder/temple/
+ 3. To load data, for example "temple" dataset, run: ./opencv/build/bin/example_datasets_msm_middlebury -p=/home/user/path_to_unpacked_folder/temple/
 
 Object Recognition
 ------------------
@@ -242,7 +242,7 @@ Currently implemented loading full list with urls. Planned to implement dataset
 
  2. Unpack it.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_or_imagenet -p=/home/user/path_to_unpacked_file/
+ 3. To load data run: ./opencv/build/bin/example_datasets_or_imagenet -p=/home/user/path_to_unpacked_file/
 
 OR_mnist
 ===========
@@ -258,7 +258,7 @@ _`"MNIST"`: http://yann.lecun.com/exdb/mnist/
 
  2. Unpack them.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_or_mnist -p=/home/user/path_to_unpacked_files/
+ 3. To load data run: ./opencv/build/bin/example_datasets_or_mnist -p=/home/user/path_to_unpacked_files/
 
 OR_sun
 ======
@@ -276,7 +276,7 @@ Currently implemented loading "Scene Recognition Benchmark. SUN397". Planned to
 
  2. Unpack it.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_or_sun -p=/home/user/path_to_unpacked_folder/SUN397/
+ 3. To load data run: ./opencv/build/bin/example_datasets_or_sun -p=/home/user/path_to_unpacked_folder/SUN397/
 
 SLAM
 ----
@@ -295,7 +295,7 @@ _`"KITTI Vision Benchmark"`: http://www.cvlibs.net/datasets/kitti/eval_odometry.
 
  2. Unpack data_odometry_poses.zip, it creates folder dataset/poses/. After that unpack data_odometry_gray.zip, data_odometry_color.zip, data_odometry_velodyne.zip. Folder dataset/sequences/ will be created with folders 00/..21/. Each of these folders will contain: image_0/, image_1/, image_2/, image_3/, velodyne/ and files calib.txt & times.txt. These two last files will be replaced after unpacking data_odometry_calib.zip at the end.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_slam_kitti -p=/home/user/path_to_unpacked_folder/dataset/
+ 3. To load data run: ./opencv/build/bin/example_datasets_slam_kitti -p=/home/user/path_to_unpacked_folder/dataset/
 
 SLAM_tumindoor
 ==============
@@ -311,7 +311,7 @@ _`"TUMindoor Dataset"`: http://www.navvis.lmt.ei.tum.de/dataset/
 
  2. Unpack them in separate folder for each dataset. dslr.tar.bz2 -> dslr/, info.tar.bz2 -> info/, ladybug.tar.bz2 -> ladybug/, pointcloud.tar.bz2 -> pointcloud/.
 
- 3. To load each dataset run: ./opencv/build/bin/example_datasetstools_slam_tumindoor -p=/home/user/path_to_unpacked_folders/
+ 3. To load each dataset run: ./opencv/build/bin/example_datasets_slam_tumindoor -p=/home/user/path_to_unpacked_folders/
 
 Text Recognition
 ----------------
@@ -332,7 +332,7 @@ _`"The Chars74K Dataset"`: http://www.ee.surrey.ac.uk/CVSSP/demos/chars74k/
 
  3. Move .m files from folder ListsTXT/ to appropriate folder. For example, English/list_English_Img.m for EnglishImg.tgz.
 
- 4. To load data, for example "EnglishImg", run: ./opencv/build/bin/example_datasetstools_tr_chars -p=/home/user/path_to_unpacked_folder/English/
+ 4. To load data, for example "EnglishImg", run: ./opencv/build/bin/example_datasets_tr_chars -p=/home/user/path_to_unpacked_folder/English/
 
 TR_svt
 ======
@@ -348,5 +348,5 @@ _`"The Street View Text Dataset"`: http://vision.ucsd.edu/~kai/svt/
 
  2. Unpack it.
 
- 3. To load data run: ./opencv/build/bin/example_datasetstools_tr_svt -p=/home/user/path_to_unpacked_folder/svt/svt1/
+ 3. To load data run: ./opencv/build/bin/example_datasets_tr_svt -p=/home/user/path_to_unpacked_folder/svt/svt1/
 

modules/datasets/include/opencv2/datasets/ar_hmdb.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_AR_HMDB_HPP
-#define OPENCV_DATASETSTOOLS_AR_HMDB_HPP
+#ifndef OPENCV_DATASETS_AR_HMDB_HPP
+#define OPENCV_DATASETS_AR_HMDB_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct AR_hmdbObj : public Object

modules/datasets/include/opencv2/datasets/ar_sports.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_AR_SPORTS_HPP
-#define OPENCV_DATASETSTOOLS_AR_SPORTS_HPP
+#ifndef OPENCV_DATASETS_AR_SPORTS_HPP
+#define OPENCV_DATASETS_AR_SPORTS_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct AR_sportsObj : public Object

modules/datasets/include/opencv2/datasets/dataset.hpp

@@ -39,8 +39,8 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_DATASET_HPP
-#define OPENCV_DATASETSTOOLS_DATASET_HPP
+#ifndef OPENCV_DATASETS_DATASET_HPP
+#define OPENCV_DATASETS_DATASET_HPP
 
 #include <string>
 #include <vector>
@@ -49,7 +49,7 @@
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct Object

modules/datasets/include/opencv2/datasets/fr_lfw.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_FR_LFW_HPP
-#define OPENCV_DATASETSTOOLS_FR_LFW_HPP
+#ifndef OPENCV_DATASETS_FR_LFW_HPP
+#define OPENCV_DATASETS_FR_LFW_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct FR_lfwObj : public Object

modules/datasets/include/opencv2/datasets/gr_chalearn.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_GR_CHALEARN_HPP
-#define OPENCV_DATASETSTOOLS_GR_CHALEARN_HPP
+#ifndef OPENCV_DATASETS_GR_CHALEARN_HPP
+#define OPENCV_DATASETS_GR_CHALEARN_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct groundTruth

modules/datasets/include/opencv2/datasets/gr_skig.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_GR_SKIG_HPP
-#define OPENCV_DATASETSTOOLS_GR_SKIG_HPP
+#ifndef OPENCV_DATASETS_GR_SKIG_HPP
+#define OPENCV_DATASETS_GR_SKIG_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 enum actionType

modules/datasets/include/opencv2/datasets/hpe_parse.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_HPE_PARSE_HPP
-#define OPENCV_DATASETSTOOLS_HPE_PARSE_HPP
+#ifndef OPENCV_DATASETS_HPE_PARSE_HPP
+#define OPENCV_DATASETS_HPE_PARSE_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct HPE_parseObj : public Object

modules/datasets/include/opencv2/datasets/ir_affine.hpp

@@ -39,20 +39,20 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_IR_AFFINE_HPP
-#define OPENCV_DATASETSTOOLS_IR_AFFINE_HPP
+#ifndef OPENCV_DATASETS_IR_AFFINE_HPP
+#define OPENCV_DATASETS_IR_AFFINE_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 #include <opencv2/core/matx.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct IR_affineObj : public Object

modules/datasets/include/opencv2/datasets/ir_robot.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_IR_ROBOT_HPP
-#define OPENCV_DATASETSTOOLS_IR_ROBOT_HPP
+#ifndef OPENCV_DATASETS_IR_ROBOT_HPP
+#define OPENCV_DATASETS_IR_ROBOT_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 // calibration matrix from calibrationFile.mat

modules/datasets/include/opencv2/datasets/is_bsds.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_IS_BSDS_HPP
-#define OPENCV_DATASETSTOOLS_IS_BSDS_HPP
+#ifndef OPENCV_DATASETS_IS_BSDS_HPP
+#define OPENCV_DATASETS_IS_BSDS_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct IS_bsdsObj : public Object

modules/datasets/include/opencv2/datasets/is_weizmann.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_IS_WEIZMANN_HPP
-#define OPENCV_DATASETSTOOLS_IS_WEIZMANN_HPP
+#ifndef OPENCV_DATASETS_IS_WEIZMANN_HPP
+#define OPENCV_DATASETS_IS_WEIZMANN_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct IS_weizmannObj : public Object

modules/datasets/include/opencv2/datasets/msm_epfl.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_MSM_EPFL_HPP
-#define OPENCV_DATASETSTOOLS_MSM_EPFL_HPP
+#ifndef OPENCV_DATASETS_MSM_EPFL_HPP
+#define OPENCV_DATASETS_MSM_EPFL_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct cameraParam

modules/datasets/include/opencv2/datasets/msm_middlebury.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_MSM_MIDDLEBURY_HPP
-#define OPENCV_DATASETSTOOLS_MSM_MIDDLEBURY_HPP
+#ifndef OPENCV_DATASETS_MSM_MIDDLEBURY_HPP
+#define OPENCV_DATASETS_MSM_MIDDLEBURY_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct MSM_middleburyObj : public Object

modules/datasets/include/opencv2/datasets/or_imagenet.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_OR_IMAGENET_HPP
-#define OPENCV_DATASETSTOOLS_OR_IMAGENET_HPP
+#ifndef OPENCV_DATASETS_OR_IMAGENET_HPP
+#define OPENCV_DATASETS_OR_IMAGENET_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct OR_imagenetObj : public Object

modules/datasets/include/opencv2/datasets/or_mnist.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_OR_MNIST_HPP
-#define OPENCV_DATASETSTOOLS_OR_MNIST_HPP
+#ifndef OPENCV_DATASETS_OR_MNIST_HPP
+#define OPENCV_DATASETS_OR_MNIST_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct OR_mnistObj : public Object

modules/datasets/include/opencv2/datasets/or_sun.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_OR_SUN_HPP
-#define OPENCV_DATASETSTOOLS_OR_SUN_HPP
+#ifndef OPENCV_DATASETS_OR_SUN_HPP
+#define OPENCV_DATASETS_OR_SUN_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct OR_sunObj : public Object

modules/datasets/include/opencv2/datasets/slam_kitti.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_SLAM_KITTI_HPP
-#define OPENCV_DATASETSTOOLS_SLAM_KITTI_HPP
+#ifndef OPENCV_DATASETS_SLAM_KITTI_HPP
+#define OPENCV_DATASETS_SLAM_KITTI_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct pose

modules/datasets/include/opencv2/datasets/slam_tumindoor.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_SLAM_TUMINDOOR_HPP
-#define OPENCV_DATASETSTOOLS_SLAM_TUMINDOOR_HPP
+#ifndef OPENCV_DATASETS_SLAM_TUMINDOOR_HPP
+#define OPENCV_DATASETS_SLAM_TUMINDOOR_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 enum imageType

modules/datasets/include/opencv2/datasets/tr_chars.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_TR_CHARS_HPP
-#define OPENCV_DATASETSTOOLS_TR_CHARS_HPP
+#ifndef OPENCV_DATASETS_TR_CHARS_HPP
+#define OPENCV_DATASETS_TR_CHARS_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct TR_charsObj : public Object

modules/datasets/include/opencv2/datasets/tr_svt.hpp

@@ -39,19 +39,19 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_TR_SVT_HPP
-#define OPENCV_DATASETSTOOLS_TR_SVT_HPP
+#ifndef OPENCV_DATASETS_TR_SVT_HPP
+#define OPENCV_DATASETS_TR_SVT_HPP
 
 #include <string>
 #include <vector>
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 
 #include <opencv2/core.hpp>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 struct tag

modules/datasets/include/opencv2/datasets/util.hpp

@@ -39,8 +39,8 @@
 //
 //M*/
 
-#ifndef OPENCV_DATASETSTOOLS_UTIL_HPP
-#define OPENCV_DATASETSTOOLS_UTIL_HPP
+#ifndef OPENCV_DATASETS_UTIL_HPP
+#define OPENCV_DATASETS_UTIL_HPP
 
 #include <string>
 #include <vector>
@@ -49,7 +49,7 @@
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 void CV_EXPORTS split(const std::string &s, std::vector<std::string> &elems, char delim);

modules/datasets/samples/ar_hmdb.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/ar_hmdb.hpp"
+#include "opencv2/datasets/ar_hmdb.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/ar_sports.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/ar_sports.hpp"
+#include "opencv2/datasets/ar_sports.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -51,7 +51,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/fr_lfw.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/fr_lfw.hpp"
+#include "opencv2/datasets/fr_lfw.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/fr_lfw_benchmark.cpp

@@ -43,7 +43,7 @@
 #include "opencv2/imgcodecs.hpp"
 
 #include "opencv2/face.hpp"
-#include "opencv2/datasetstools/fr_lfw.hpp"
+#include "opencv2/datasets/fr_lfw.hpp"
 
 #include <iostream>
 
@@ -55,7 +55,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 using namespace cv::face;
 
 map<string, int> people;
@@ -68,7 +68,7 @@ int getLabel(const string &imagePath)
     map<string, int>::iterator it = people.find(curr);
     if (people.end() == it)
     {
-        people.insert(make_pair(curr, people.size()));
+        people.insert(make_pair(curr, (int)people.size()));
         it = people.find(curr);
     }
     return (*it).second;
@@ -115,11 +115,11 @@ int main(int argc, const char *argv[])
         labels.push_back(currNum);
     }
 
-    // 2200 pairsDevTrain, first split: correct: 373, from: 600 -> 0.621667%
+    // 2200 pairsDevTrain, first split: correct: 373, from: 600 -> 62.1667%
     Ptr<FaceRecognizer> model = createLBPHFaceRecognizer();
-    // 2200 pairsDevTrain, first split: correct: correct: 369, from: 600 -> 0.615%
+    // 2200 pairsDevTrain, first split: correct: correct: 369, from: 600 -> 61.5%
     //Ptr<FaceRecognizer> model = createEigenFaceRecognizer();
-    // 2200 pairsDevTrain, first split: correct: 372, from: 600 -> 0.62%
+    // 2200 pairsDevTrain, first split: correct: 372, from: 600 -> 62%
     //Ptr<FaceRecognizer> model = createFisherFaceRecognizer();
 
     model->train(images, labels);
@@ -154,7 +154,7 @@ int main(int argc, const char *argv[])
             }
         }
         p.push_back(1.0*correct/(correct+incorrect));
-        printf("correct: %u, from: %u -> %f%%\n", correct, correct+incorrect, p.back());
+        printf("correct: %u, from: %u -> %f\n", correct, correct+incorrect, p.back());
     }
     double mu = 0.0;
     for (vector<double>::iterator it=p.begin(); it!=p.end(); ++it)

modules/datasets/samples/gr_chalearn.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/gr_chalearn.hpp"
+#include "opencv2/datasets/gr_chalearn.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/gr_skig.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/gr_skig.hpp"
+#include "opencv2/datasets/gr_skig.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -51,7 +51,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/hpe_parse.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/hpe_parse.hpp"
+#include "opencv2/datasets/hpe_parse.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/ir_affine.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/ir_affine.hpp"
+#include "opencv2/datasets/ir_affine.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -51,7 +51,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/ir_robot.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/ir_robot.hpp"
+#include "opencv2/datasets/ir_robot.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/is_bsds.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/is_bsds.hpp"
+#include "opencv2/datasets/is_bsds.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/is_weizmann.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/is_weizmann.hpp"
+#include "opencv2/datasets/is_weizmann.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/msm_epfl.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/msm_epfl.hpp"
+#include "opencv2/datasets/msm_epfl.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/msm_middlebury.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/msm_middlebury.hpp"
+#include "opencv2/datasets/msm_middlebury.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/or_imagenet.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/or_imagenet.hpp"
+#include "opencv2/datasets/or_imagenet.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -52,7 +52,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/or_mnist.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/or_mnist.hpp"
+#include "opencv2/datasets/or_mnist.hpp"
 
 #include <opencv2/core.hpp>
 #include <opencv2/imgcodecs.hpp>
@@ -51,7 +51,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/or_sun.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/or_sun.hpp"
+#include "opencv2/datasets/or_sun.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/slam_kitti.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/slam_kitti.hpp"
+#include "opencv2/datasets/slam_kitti.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/slam_tumindoor.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/slam_tumindoor.hpp"
+#include "opencv2/datasets/slam_tumindoor.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -50,7 +50,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/tr_chars.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/tr_chars.hpp"
+#include "opencv2/datasets/tr_chars.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -51,7 +51,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/samples/tr_svt.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/tr_svt.hpp"
+#include "opencv2/datasets/tr_svt.hpp"
 
 #include <opencv2/core.hpp>
 
@@ -51,7 +51,7 @@
 
 using namespace std;
 using namespace cv;
-using namespace cv::datasetstools;
+using namespace cv::datasets;
 
 int main(int argc, char *argv[])
 {

modules/datasets/src/ar_hmdb.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/ar_hmdb.hpp"
+#include "opencv2/datasets/ar_hmdb.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/ar_sports.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/ar_sports.hpp"
+#include "opencv2/datasets/ar_sports.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/dataset.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/dataset.hpp"
+#include "opencv2/datasets/dataset.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/fr_lfw.cpp

@@ -39,14 +39,14 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/fr_lfw.hpp"
+#include "opencv2/datasets/fr_lfw.hpp"
 #include "precomp.hpp"
 
 #include <map>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/gr_chalearn.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/gr_chalearn.hpp"
+#include "opencv2/datasets/gr_chalearn.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/gr_skig.cpp

@@ -39,14 +39,14 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/gr_skig.hpp"
+#include "opencv2/datasets/gr_skig.hpp"
 #include "precomp.hpp"
 
 #include <cstring>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/hpe_parse.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/hpe_parse.hpp"
+#include "opencv2/datasets/hpe_parse.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/ir_affine.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/ir_affine.hpp"
+#include "opencv2/datasets/ir_affine.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/ir_robot.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/ir_robot.hpp"
+#include "opencv2/datasets/ir_robot.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/is_bsds.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/is_bsds.hpp"
+#include "opencv2/datasets/is_bsds.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/is_weizmann.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/is_weizmann.hpp"
+#include "opencv2/datasets/is_weizmann.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/msm_epfl.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/msm_epfl.hpp"
+#include "opencv2/datasets/msm_epfl.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/msm_middlebury.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/msm_middlebury.hpp"
+#include "opencv2/datasets/msm_middlebury.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/or_imagenet.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/or_imagenet.hpp"
+#include "opencv2/datasets/or_imagenet.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/or_mnist.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/or_mnist.hpp"
+#include "opencv2/datasets/or_mnist.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/or_sun.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/or_sun.hpp"
+#include "opencv2/datasets/or_sun.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/precomp.hpp

@@ -47,6 +47,6 @@
 
 #include <fstream>
 
-#include "opencv2/datasetstools/util.hpp"
+#include "opencv2/datasets/util.hpp"
 
 #endif

modules/datasets/src/slam_kitti.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/slam_kitti.hpp"
+#include "opencv2/datasets/slam_kitti.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/slam_tumindoor.cpp

@@ -39,14 +39,14 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/slam_tumindoor.hpp"
+#include "opencv2/datasets/slam_tumindoor.hpp"
 #include "precomp.hpp"
 
 #include <cstring>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/tinyxml2/tinyxml2.cpp

@@ -21,7 +21,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "opencv2/datasetstools/tinyxml2/tinyxml2.h"
+#include "opencv2/datasets/tinyxml2/tinyxml2.h"
 
 #include <new>		// yes, this one new style header, is in the Android SDK.
 #   ifdef ANDROID_NDK

modules/datasets/src/tr_chars.cpp

@@ -39,12 +39,12 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/tr_chars.hpp"
+#include "opencv2/datasets/tr_chars.hpp"
 #include "precomp.hpp"
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/tr_svt.cpp

@@ -39,14 +39,14 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/tr_svt.hpp"
+#include "opencv2/datasets/tr_svt.hpp"
 #include "precomp.hpp"
 
-#include <opencv2/datasetstools/tinyxml2/tinyxml2.h>
+#include <opencv2/datasets/tinyxml2/tinyxml2.h>
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasets/src/util.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "opencv2/datasetstools/util.hpp"
+#include "opencv2/datasets/util.hpp"
 
 #include <cstdlib>
 
@@ -55,7 +55,7 @@
 
 namespace cv
 {
-namespace datasetstools
+namespace datasets
 {
 
 using namespace std;

modules/datasetstools/CMakeLists.txt

@@ -1,3 +0,0 @@
-set(the_description "datasets tools")
-ocv_define_module(datasetstools opencv_core opencv_face)
-