document updated, added simple base class for datasets and other minor changes

modules/datasetstools/doc/html/_static/basic.css

+/*
+ * basic.css
+ * ~~~~~~~~~
+ *
+ * Sphinx stylesheet -- basic theme.
+ *
+ * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/* -- main layout ----------------------------------------------------------- */
+
+div.clearer {
+    clear: both;
+}
+
+/* -- relbar ---------------------------------------------------------------- */
+
+div.related {
+    width: 100%;
+    font-size: 90%;
+}
+
+div.related h3 {
+    display: none;
+}
+
+div.related ul {
+    margin: 0;
+    padding: 0 0 0 10px;
+    list-style: none;
+}
+
+div.related li {
+    display: inline;
+}
+
+div.related li.right {
+    float: right;
+    margin-right: 5px;
+}
+
+/* -- sidebar --------------------------------------------------------------- */
+
+div.sphinxsidebarwrapper {
+    padding: 10px 5px 0 10px;
+}
+
+div.sphinxsidebar {
+    float: left;
+    width: 230px;
+    margin-left: -100%;
+    font-size: 90%;
+}
+
+div.sphinxsidebar ul {
+    list-style: none;
+}
+
+div.sphinxsidebar ul ul,
+div.sphinxsidebar ul.want-points {
+    margin-left: 20px;
+    list-style: square;
+}
+
+div.sphinxsidebar ul ul {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+div.sphinxsidebar form {
+    margin-top: 10px;
+}
+
+div.sphinxsidebar input {
+    border: 1px solid #98dbcc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+div.sphinxsidebar #searchbox input[type="text"] {
+    width: 170px;
+}
+
+div.sphinxsidebar #searchbox input[type="submit"] {
+    width: 30px;
+}
+
+img {
+    border: 0;
+    max-width: 100%;
+}
+
+/* -- search page ----------------------------------------------------------- */
+
+ul.search {
+    margin: 10px 0 0 20px;
+    padding: 0;
+}
+
+ul.search li {
+    padding: 5px 0 5px 20px;
+    background-image: url(file.png);
+    background-repeat: no-repeat;
+    background-position: 0 7px;
+}
+
+ul.search li a {
+    font-weight: bold;
+}
+
+ul.search li div.context {
+    color: #888;
+    margin: 2px 0 0 30px;
+    text-align: left;
+}
+
+ul.keywordmatches li.goodmatch a {
+    font-weight: bold;
+}
+
+/* -- index page ------------------------------------------------------------ */
+
+table.contentstable {
+    width: 90%;
+}
+
+table.contentstable p.biglink {
+    line-height: 150%;
+}
+
+a.biglink {
+    font-size: 1.3em;
+}
+
+span.linkdescr {
+    font-style: italic;
+    padding-top: 5px;
+    font-size: 90%;
+}
+
+/* -- general index --------------------------------------------------------- */
+
+table.indextable {
+    width: 100%;
+}
+
+table.indextable td {
+    text-align: left;
+    vertical-align: top;
+}
+
+table.indextable dl, table.indextable dd {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+table.indextable tr.pcap {
+    height: 10px;
+}
+
+table.indextable tr.cap {
+    margin-top: 10px;
+    background-color: #f2f2f2;
+}
+
+img.toggler {
+    margin-right: 3px;
+    margin-top: 3px;
+    cursor: pointer;
+}
+
+div.modindex-jumpbox {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 1em 0 1em 0;
+    padding: 0.4em;
+}
+
+div.genindex-jumpbox {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 1em 0 1em 0;
+    padding: 0.4em;
+}
+
+/* -- general body styles --------------------------------------------------- */
+
+a.headerlink {
+    visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+    visibility: visible;
+}
+
+div.body p.caption {
+    text-align: inherit;
+}
+
+div.body td {
+    text-align: left;
+}
+
+.field-list ul {
+    padding-left: 1em;
+}
+
+.first {
+    margin-top: 0 !important;
+}
+
+p.rubric {
+    margin-top: 30px;
+    font-weight: bold;
+}
+
+img.align-left, .figure.align-left, object.align-left {
+    clear: left;
+    float: left;
+    margin-right: 1em;
+}
+
+img.align-right, .figure.align-right, object.align-right {
+    clear: right;
+    float: right;
+    margin-left: 1em;
+}
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+    text-align: left;
+}
+
+.align-center {
+    text-align: center;
+}
+
+.align-right {
+    text-align: right;
+}
+
+/* -- sidebars -------------------------------------------------------------- */
+
+div.sidebar {
+    margin: 0 0 0.5em 1em;
+    border: 1px solid #ddb;
+    padding: 7px 7px 0 7px;
+    background-color: #ffe;
+    width: 40%;
+    float: right;
+}
+
+p.sidebar-title {
+    font-weight: bold;
+}
+
+/* -- topics ---------------------------------------------------------------- */
+
+div.topic {
+    border: 1px solid #ccc;
+    padding: 7px 7px 0 7px;
+    margin: 10px 0 10px 0;
+}
+
+p.topic-title {
+    font-size: 1.1em;
+    font-weight: bold;
+    margin-top: 10px;
+}
+
+/* -- admonitions ----------------------------------------------------------- */
+
+div.admonition {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    padding: 7px;
+}
+
+div.admonition dt {
+    font-weight: bold;
+}
+
+div.admonition dl {
+    margin-bottom: 0;
+}
+
+p.admonition-title {
+    margin: 0px 10px 5px 0px;
+    font-weight: bold;
+}
+
+div.body p.centered {
+    text-align: center;
+    margin-top: 25px;
+}
+
+/* -- tables ---------------------------------------------------------------- */
+
+table.docutils {
+    border: 0;
+    border-collapse: collapse;
+}
+
+table.docutils td, table.docutils th {
+    padding: 1px 8px 1px 5px;
+    border-top: 0;
+    border-left: 0;
+    border-right: 0;
+    border-bottom: 1px solid #aaa;
+}
+
+table.field-list td, table.field-list th {
+    border: 0 !important;
+}
+
+table.footnote td, table.footnote th {
+    border: 0 !important;
+}
+
+th {
+    text-align: left;
+    padding-right: 5px;
+}
+
+table.citation {
+    border-left: solid 1px gray;
+    margin-left: 1px;
+}
+
+table.citation td {
+    border-bottom: none;
+}
+
+/* -- other body styles ----------------------------------------------------- */
+
+ol.arabic {
+    list-style: decimal;
+}
+
+ol.loweralpha {
+    list-style: lower-alpha;
+}
+
+ol.upperalpha {
+    list-style: upper-alpha;
+}
+
+ol.lowerroman {
+    list-style: lower-roman;
+}
+
+ol.upperroman {
+    list-style: upper-roman;
+}
+
+dl {
+    margin-bottom: 15px;
+}
+
+dd p {
+    margin-top: 0px;
+}
+
+dd ul, dd table {
+    margin-bottom: 10px;
+}
+
+dd {
+    margin-top: 3px;
+    margin-bottom: 10px;
+    margin-left: 30px;
+}
+
+dt:target, .highlighted {
+    background-color: #fbe54e;
+}
+
+dl.glossary dt {
+    font-weight: bold;
+    font-size: 1.1em;
+}
+
+.field-list ul {
+    margin: 0;
+    padding-left: 1em;
+}
+
+.field-list p {
+    margin: 0;
+}
+
+.optional {
+    font-size: 1.3em;
+}
+
+.versionmodified {
+    font-style: italic;
+}
+
+.system-message {
+    background-color: #fda;
+    padding: 5px;
+    border: 3px solid red;
+}
+
+.footnote:target  {
+    background-color: #ffa;
+}
+
+.line-block {
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.line-block .line-block {
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: 1.5em;
+}
+
+.guilabel, .menuselection {
+    font-family: sans-serif;
+}
+
+.accelerator {
+    text-decoration: underline;
+}
+
+.classifier {
+    font-style: oblique;
+}
+
+abbr, acronym {
+    border-bottom: dotted 1px;
+    cursor: help;
+}
+
+/* -- code displays --------------------------------------------------------- */
+
+pre {
+    overflow: auto;
+    overflow-y: hidden;  /* fixes display issues on Chrome browsers */
+}
+
+td.linenos pre {
+    padding: 5px 0px;
+    border: 0;
+    background-color: transparent;
+    color: #aaa;
+}
+
+table.highlighttable {
+    margin-left: 0.5em;
+}
+
+table.highlighttable td {
+    padding: 0 0.5em 0 0.5em;
+}
+
+tt.descname {
+    background-color: transparent;
+    font-weight: bold;
+    font-size: 1.2em;
+}
+
+tt.descclassname {
+    background-color: transparent;
+}
+
+tt.xref, a tt {
+    background-color: transparent;
+    font-weight: bold;
+}
+
+h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+    background-color: transparent;
+}
+
+.viewcode-link {
+    float: right;
+}
+
+.viewcode-back {
+    float: right;
+    font-family: sans-serif;
+}
+
+div.viewcode-block:target {
+    margin: -1px -10px;
+    padding: 0 10px;
+}
+
+/* -- math display ---------------------------------------------------------- */
+
+img.math {
+    vertical-align: middle;
+}
+
+div.body div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}
+
+/* -- printout stylesheet --------------------------------------------------- */
+
+@media print {
+    div.document,
+    div.documentwrapper,
+    div.bodywrapper {
+        margin: 0 !important;
+        width: 100%;
+    }
+
+    div.sphinxsidebar,
+    div.related,
+    div.footer,
+    #top-link {
+        display: none;
+    }
+}
\ No newline at end of file

modules/datasetstools/doc/html/_static/default.css

+/*
+ * default.css_t
+ * ~~~~~~~~~~~~~
+ *
+ * Sphinx stylesheet -- default theme.
+ *
+ * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+@import url("basic.css");
+
+/* -- page layout ----------------------------------------------------------- */
+
+body {
+    font-family: sans-serif;
+    font-size: 100%;
+    background-color: #11303d;
+    color: #000;
+    margin: 0;
+    padding: 0;
+}
+
+div.document {
+    background-color: #1c4e63;
+}
+
+div.documentwrapper {
+    float: left;
+    width: 100%;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 230px;
+}
+
+div.body {
+    background-color: #ffffff;
+    color: #000000;
+    padding: 0 20px 30px 20px;
+}
+
+div.footer {
+    color: #ffffff;
+    width: 100%;
+    padding: 9px 0 9px 0;
+    text-align: center;
+    font-size: 75%;
+}
+
+div.footer a {
+    color: #ffffff;
+    text-decoration: underline;
+}
+
+div.related {
+    background-color: #133f52;
+    line-height: 30px;
+    color: #ffffff;
+}
+
+div.related a {
+    color: #ffffff;
+}
+
+div.sphinxsidebar {
+}
+
+div.sphinxsidebar h3 {
+    font-family: 'Trebuchet MS', sans-serif;
+    color: #ffffff;
+    font-size: 1.4em;
+    font-weight: normal;
+    margin: 0;
+    padding: 0;
+}
+
+div.sphinxsidebar h3 a {
+    color: #ffffff;
+}
+
+div.sphinxsidebar h4 {
+    font-family: 'Trebuchet MS', sans-serif;
+    color: #ffffff;
+    font-size: 1.3em;
+    font-weight: normal;
+    margin: 5px 0 0 0;
+    padding: 0;
+}
+
+div.sphinxsidebar p {
+    color: #ffffff;
+}
+
+div.sphinxsidebar p.topless {
+    margin: 5px 10px 10px 10px;
+}
+
+div.sphinxsidebar ul {
+    margin: 10px;
+    padding: 0;
+    color: #ffffff;
+}
+
+div.sphinxsidebar a {
+    color: #98dbcc;
+}
+
+div.sphinxsidebar input {
+    border: 1px solid #98dbcc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+
+
+/* -- hyperlink styles ------------------------------------------------------ */
+
+a {
+    color: #355f7c;
+    text-decoration: none;
+}
+
+a:visited {
+    color: #355f7c;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+
+
+/* -- body styles ----------------------------------------------------------- */
+
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+    font-family: 'Trebuchet MS', sans-serif;
+    background-color: #f2f2f2;
+    font-weight: normal;
+    color: #20435c;
+    border-bottom: 1px solid #ccc;
+    margin: 20px -20px 10px -20px;
+    padding: 3px 0 3px 10px;
+}
+
+div.body h1 { margin-top: 0; font-size: 200%; }
+div.body h2 { font-size: 160%; }
+div.body h3 { font-size: 140%; }
+div.body h4 { font-size: 120%; }
+div.body h5 { font-size: 110%; }
+div.body h6 { font-size: 100%; }
+
+a.headerlink {
+    color: #c60f0f;
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+}
+
+a.headerlink:hover {
+    background-color: #c60f0f;
+    color: white;
+}
+
+div.body p, div.body dd, div.body li {
+    text-align: justify;
+    line-height: 130%;
+}
+
+div.admonition p.admonition-title + p {
+    display: inline;
+}
+
+div.admonition p {
+    margin-bottom: 5px;
+}
+
+div.admonition pre {
+    margin-bottom: 5px;
+}
+
+div.admonition ul, div.admonition ol {
+    margin-bottom: 5px;
+}
+
+div.note {
+    background-color: #eee;
+    border: 1px solid #ccc;
+}
+
+div.seealso {
+    background-color: #ffc;
+    border: 1px solid #ff6;
+}
+
+div.topic {
+    background-color: #eee;
+}
+
+div.warning {
+    background-color: #ffe4e4;
+    border: 1px solid #f66;
+}
+
+p.admonition-title {
+    display: inline;
+}
+
+p.admonition-title:after {
+    content: ":";
+}
+
+pre {
+    padding: 5px;
+    background-color: #eeffcc;
+    color: #333333;
+    line-height: 120%;
+    border: 1px solid #ac9;
+    border-left: none;
+    border-right: none;
+}
+
+tt {
+    background-color: #ecf0f3;
+    padding: 0 1px 0 1px;
+    font-size: 0.95em;
+}
+
+th {
+    background-color: #ede;
+}
+
+.warning tt {
+    background: #efc2c2;
+}
+
+.note tt {
+    background: #d6d6d6;
+}
+
+.viewcode-back {
+    font-family: sans-serif;
+}
+
+div.viewcode-block:target {
+    background-color: #f4debf;
+    border-top: 1px solid #ac9;
+    border-bottom: 1px solid #ac9;
+}
\ No newline at end of file

modules/datasetstools/include/opencv2/ar_hmdb.h

@@ -45,22 +45,28 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct action
 {
     std::string name;
     std::vector<std::string> videoNames;
 };
 
-class ar_hmdb
+class ar_hmdb : public dataset
 {
 public:
     ar_hmdb() {}
-    ar_hmdb(std::string &path, unsigned int number);
+    ar_hmdb(std::string &path, unsigned int number = 0);
+    virtual ~ar_hmdb() {}
 
-    void loadDataset(std::string &path, unsigned int number);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<action> train;
     std::vector<action> test;
+
+private:
+    void loadDataset(std::string &path, unsigned int number = 0);
 };
 
 #endif

modules/datasetstools/include/opencv2/ar_sports.h

@@ -45,22 +45,28 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct element
 {
     std::string videoUrl;
     std::vector<unsigned int> labels;
 };
 
-class ar_sports
+class ar_sports : public dataset
 {
 public:
     ar_sports() {}
     ar_sports(std::string &path);
+    virtual ~ar_sports() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<element> train;
     std::vector<element> test;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/dataset.h

+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2014, Itseez Inc, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Itseez Inc or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef DATASET_H
+#define DATASET_H
+
+#include <string>
+
+class dataset
+{
+public:
+    dataset() {}
+    virtual ~dataset() {}
+
+    virtual void load(std::string &path, unsigned int number = 0) = 0;
+};
+
+#endif

modules/datasetstools/include/opencv2/fr_lfw.h

@@ -45,21 +45,27 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct face
 {
     std::string name;
     std::vector<std::string> images;
 };
 
-class fr_lfw
+class fr_lfw : public dataset
 {
 public:
     fr_lfw() {}
     fr_lfw(std::string &path);
+    virtual ~fr_lfw() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<face> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/gr_chalearn.h

@@ -45,6 +45,8 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct groundTruth
 {
     unsigned int gestureID, initialFrame, lastFrame;
@@ -68,15 +70,19 @@ struct gesture
     std::vector<skeleton> skeletons;
 };
 
-class gr_chalearn
+class gr_chalearn : public dataset
 {
 public:
     gr_chalearn() {}
     gr_chalearn(std::string &path);
+    virtual ~gr_chalearn() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<gesture> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/gr_skig.h

@@ -45,6 +45,8 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct gesture
 {
     std::string rgb;
@@ -52,15 +54,19 @@ struct gesture
     unsigned char person, background, illumination, pose, actionType;
 };
 
-class gr_skig
+class gr_skig : public dataset
 {
 public:
     gr_skig() {}
     gr_skig(std::string &path);
+    virtual ~gr_skig() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<gesture> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/hpe_parse.h

@@ -45,16 +45,22 @@
 #include <string>
 #include <vector>
 
-class hpe_parse
+#include "dataset.h"
+
+class hpe_parse : public dataset
 {
 public:
     hpe_parse() {}
     hpe_parse(std::string &path);
+    virtual ~hpe_parse() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<std::string> train;
     std::vector<std::string> test;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/ir_affine.h

@@ -45,21 +45,27 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct imageParams
 {
     std::string imageName;
     double mat[3][3];
 };
 
-class ir_affine
+class ir_affine : public dataset
 {
 public:
     ir_affine() {}
     ir_affine(std::string &path);
+    virtual ~ir_affine() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<imageParams> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/ir_robot.h

@@ -45,6 +45,8 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 // calibration matrix from calibrationFile.mat
 // 2.8290e+03   0.0000e+00   8.0279e+02
 // 0.0000e+00   2.8285e+03   6.1618e+02
@@ -56,15 +58,19 @@ struct scene
     std::vector<std::string> images; // TODO: implement more complex structure
 };
 
-class ir_robot
+class ir_robot : public dataset
 {
 public:
     ir_robot() {}
     ir_robot(std::string &path);
+    virtual ~ir_robot() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<scene> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/is_bsds.h

@@ -45,16 +45,22 @@
 #include <string>
 #include <vector>
 
-class is_bsds
+#include "dataset.h"
+
+class is_bsds : public dataset
 {
 public:
     is_bsds() {}
     is_bsds(std::string &path);
+    virtual ~is_bsds() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<std::string> train;
     std::vector<std::string> test;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/is_weizmann.h

@@ -45,6 +45,8 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct object
 {
     std::string imageName;
@@ -53,15 +55,19 @@ struct object
     std::string humanSeg; // TODO: read human segmented
 };
 
-class is_weizmann
+class is_weizmann : public dataset
 {
 public:
     is_weizmann() {}
     is_weizmann(std::string &path);
+    virtual ~is_weizmann() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<object> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/msm_epfl.h

@@ -45,21 +45,27 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct object
 {
     std::string imageName;
     std::vector<double> bounding, camera, p; // TODO: implement better structures
 };
 
-class msm_epfl
+class msm_epfl : public dataset
 {
 public:
     msm_epfl() {}
     msm_epfl(std::string &path);
+    virtual ~msm_epfl() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<object> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/msm_middlebury.h

@@ -45,6 +45,8 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct cameraParam
 {
     std::string imageName;
@@ -53,15 +55,19 @@ struct cameraParam
     double t[3];
 };
 
-class msm_middlebury
+class msm_middlebury : public dataset
 {
 public:
     msm_middlebury() {}
     msm_middlebury(std::string &path);
+    virtual ~msm_middlebury() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<cameraParam> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/or_imagenet.h

@@ -46,6 +46,8 @@
 #include <vector>
 #include <set>
 
+#include "dataset.h"
+
 struct object
 {
     std::string wnid; // TODO: string -> unsigned int
@@ -53,16 +55,20 @@ struct object
     std::string imageUrl;
 };
 
-class or_imagenet
+class or_imagenet : public dataset
 {
 public:
     or_imagenet() {}
-    or_imagenet(std::string &fileName);
+    or_imagenet(std::string &path);
+    virtual ~or_imagenet() {}
 
-    void loadDataset(std::string &fileName);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<object> train;
     std::set<std::string> wnids;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/or_sun.h

@@ -45,21 +45,27 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct object
 {
     std::string name;
     std::vector<std::string> imageNames;
 };
 
-class or_sun
+class or_sun : public dataset
 {
 public:
     or_sun() {}
     or_sun(std::string &path);
+    virtual ~or_sun() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<object> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/slam_kitti.h

@@ -45,6 +45,8 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct pose
 {
     double elem[12];
@@ -59,15 +61,19 @@ struct sequence
     std::vector<pose> posesArray;
 };
 
-class slam_kitti
+class slam_kitti : public dataset
 {
 public:
     slam_kitti() {}
     slam_kitti(std::string &path);
+    virtual ~slam_kitti() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<sequence> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/slam_tumindoor.h

@@ -45,6 +45,8 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 enum imageType
 {
     LEFT = 0,
@@ -59,15 +61,19 @@ struct imageInfo
     imageType type;
 };
 
-class slam_tumindoor
+class slam_tumindoor : public dataset
 {
 public:
     slam_tumindoor() {}
     slam_tumindoor(std::string &path);
+    virtual ~slam_tumindoor() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<imageInfo> train;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/include/opencv2/tr_chars.h

@@ -45,22 +45,28 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct character
 {
     std::string imgName;
     unsigned int label;
 };
 
-class tr_chars
+class tr_chars : public dataset
 {
 public:
     tr_chars() {}
-    tr_chars(std::string &path, unsigned int number);
+    tr_chars(std::string &path, unsigned int number = 0);
+    virtual ~tr_chars() {}
 
-    void loadDataset(std::string &path, unsigned int number);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<character> train;
     std::vector<character> test;
+
+private:
+    void loadDataset(std::string &path, unsigned int number = 0);
 };
 
 #endif

modules/datasetstools/include/opencv2/tr_svt.h

@@ -45,6 +45,8 @@
 #include <string>
 #include <vector>
 
+#include "dataset.h"
+
 struct tag
 {
     std::string value;
@@ -58,16 +60,20 @@ struct image
     std::vector<tag> tags;
 };
 
-class tr_svt
+class tr_svt : public dataset
 {
 public:
     tr_svt() {}
     tr_svt(std::string &path);
+    virtual ~tr_svt() {}
 
-    void loadDataset(std::string &path);
+    virtual void load(std::string &path, unsigned int number = 0);
 
     std::vector<image> train;
     std::vector<image> test;
+
+private:
+    void loadDataset(std::string &path);
 };
 
 #endif

modules/datasetstools/samples/ar_hmdb.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/ar_hmdb.h>
+#include "opencv2/ar_hmdb.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])
@@ -66,7 +65,7 @@ int main(int argc, char *argv[])
     ar_hmdb dataset[3];
     for (unsigned int i=0; i<3; ++i)
     {
-        dataset[i].loadDataset(path, i+1);
+        dataset[i].load(path, i);
     }
 
     // ***************

modules/datasetstools/samples/ar_sports.cpp

@@ -39,7 +39,8 @@
 //
 //M*/
 
-#include <opencv2/ar_sports.h>
+#include "opencv2/ar_sports.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 #include <cstdlib> // atoi
@@ -47,8 +48,6 @@
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/fr_lfw.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/fr_lfw.h>
+#include "opencv2/fr_lfw.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/gr_chalearn.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/gr_chalearn.h>
+#include "opencv2/gr_chalearn.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/gr_skig.cpp

@@ -39,7 +39,8 @@
 //
 //M*/
 
-#include <opencv2/gr_skig.h>
+#include "opencv2/gr_skig.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 #include <cstdlib> // atoi
@@ -47,8 +48,6 @@
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/hpe_parse.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/hpe_parse.h>
+#include "opencv2/hpe_parse.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/ir_affine.cpp

@@ -39,7 +39,8 @@
 //
 //M*/
 
-#include <opencv2/ir_affine.h>
+#include "opencv2/ir_affine.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 #include <cstdlib> // atoi
@@ -47,8 +48,6 @@
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/ir_robot.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/ir_robot.h>
+#include "opencv2/ir_robot.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/is_bsds.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/is_bsds.h>
+#include "opencv2/is_bsds.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/is_weizmann.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/is_weizmann.h>
+#include "opencv2/is_weizmann.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/msm_epfl.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/msm_epfl.h>
+#include "opencv2/msm_epfl.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/msm_middlebury.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/msm_middlebury.h>
+#include "opencv2/msm_middlebury.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/or_imagenet.cpp

@@ -39,7 +39,8 @@
 //
 //M*/
 
-#include <opencv2/or_imagenet.h>
+#include "opencv2/or_imagenet.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 #include <cstdlib> // atoi
@@ -48,8 +49,6 @@
 #include <vector>
 #include <set>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/or_sun.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/or_sun.h>
+#include "opencv2/or_sun.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/slam_kitti.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/slam_kitti.h>
+#include "opencv2/slam_kitti.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/slam_tumindoor.cpp

@@ -39,15 +39,14 @@
 //
 //M*/
 
-#include <opencv2/slam_tumindoor.h>
+#include "opencv2/slam_tumindoor.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/samples/tr_chars.cpp

@@ -39,7 +39,8 @@
 //
 //M*/
 
-#include <opencv2/tr_chars.h>
+#include "opencv2/tr_chars.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 #include <cstdlib> // atoi
@@ -47,8 +48,6 @@
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])
@@ -70,7 +69,7 @@ int main(int argc, char *argv[])
         tr_chars curr;
         dataset.push_back(curr);
 
-        dataset.back().loadDataset(path, dataset.size()-1);
+        dataset.back().load(path, dataset.size()-1);
     } while (dataset.back().train.size()>0);
     dataset.pop_back(); // remove last empty split
 

modules/datasetstools/samples/tr_svt.cpp

@@ -39,7 +39,8 @@
 //
 //M*/
 
-#include <opencv2/tr_svt.h>
+#include "opencv2/tr_svt.h"
+#include <opencv2/core.hpp>
 
 #include <cstdio>
 #include <cstdlib> // atoi
@@ -47,8 +48,6 @@
 #include <string>
 #include <vector>
 
-#include <opencv2/core/core.hpp>
-
 using namespace std;
 
 int main(int argc, char *argv[])

modules/datasetstools/src/ar_hmdb.cpp

@@ -70,10 +70,15 @@ ar_hmdb::ar_hmdb(string &path, unsigned int number)
     loadDataset(path, number);
 }
 
+void ar_hmdb::load(string &path, unsigned int number)
+{
+    loadDataset(path, number);
+}
+
 void ar_hmdb::loadDataset(string &path, unsigned int number)
 {
-    // valid number [1,2,3]
-    if (number<1 || number>3)
+    // valid number [0,1,2]
+    if (number>2)
     {
         return;
     }
@@ -92,7 +97,7 @@ void ar_hmdb::loadDataset(string &path, unsigned int number)
         test.push_back(curr);
 
         char tmp[2];
-        sprintf(tmp, "%u", number);
+        sprintf(tmp, "%u", number+1);
         string fileName(pathSplit + curr.name + "_test_split" + tmp + ".txt");
         loadAction(fileName, train.back().videoNames, test.back().videoNames);
     }

modules/datasetstools/src/ar_sports.cpp

@@ -74,6 +74,11 @@ ar_sports::ar_sports(string &path)
     loadDataset(path);
 }
 
+void ar_sports::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void ar_sports::loadDataset(string &path)
 {
     string trainPath(path + "original/train_partition.txt");

modules/datasetstools/src/fr_lfw.cpp

@@ -53,6 +53,11 @@ fr_lfw::fr_lfw(std::string &path)
     loadDataset(path);
 }
 
+void fr_lfw::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void fr_lfw::loadDataset(string &path)
 {
     vector<string> fileNames;

modules/datasetstools/src/gr_chalearn.cpp

@@ -54,6 +54,11 @@ gr_chalearn::gr_chalearn(std::string &path)
     loadDataset(path);
 }
 
+void gr_chalearn::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void gr_chalearn::loadDataset(string &path)
 {
     vector<string> fileNames;

modules/datasetstools/src/gr_skig.cpp

@@ -55,6 +55,11 @@ gr_skig::gr_skig(std::string &path)
     loadDataset(path);
 }
 
+void gr_skig::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void gr_skig::loadDataset(string &path)
 {
     for (unsigned int i=1; i<=6; ++i)

modules/datasetstools/src/hpe_parse.cpp

@@ -53,6 +53,11 @@ hpe_parse::hpe_parse(std::string &path)
     loadDataset(path);
 }
 
+void hpe_parse::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void hpe_parse::loadDataset(string &path)
 {
     unsigned int i=0;

modules/datasetstools/src/ir_affine.cpp

@@ -53,6 +53,11 @@ ir_affine::ir_affine(std::string &path)
     loadDataset(path);
 }
 
+void ir_affine::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void ir_affine::loadDataset(string &path)
 {
     for (unsigned int i=1; i<=6; ++i)

modules/datasetstools/src/ir_robot.cpp

@@ -53,6 +53,11 @@ ir_robot::ir_robot(std::string &path)
     loadDataset(path);
 }
 
+void ir_robot::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void ir_robot::loadDataset(string &path)
 {
     vector<string> fileNames;

modules/datasetstools/src/is_bsds.cpp

@@ -62,6 +62,11 @@ is_bsds::is_bsds(std::string &path)
     loadDataset(path);
 }
 
+void is_bsds::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void is_bsds::loadDataset(string &path)
 {
     string trainName(path + "iids_train.txt");

modules/datasetstools/src/is_weizmann.cpp

@@ -53,6 +53,11 @@ is_weizmann::is_weizmann(std::string &path)
     loadDataset(path);
 }
 
+void is_weizmann::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void is_weizmann::loadDataset(string &path)
 {
     vector<string> fileNames;

modules/datasetstools/src/msm_epfl.cpp

@@ -63,6 +63,11 @@ msm_epfl::msm_epfl(std::string &path)
     loadDataset(path);
 }
 
+void msm_epfl::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void msm_epfl::loadDataset(string &path)
 {
     string pathBounding(path + "bounding/");

modules/datasetstools/src/msm_middlebury.cpp

@@ -52,6 +52,11 @@ msm_middlebury::msm_middlebury(std::string &path)
     loadDataset(path);
 }
 
+void msm_middlebury::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void msm_middlebury::loadDataset(string &path)
 {
     string name(path.substr(0, path.length()-1));

modules/datasetstools/src/or_imagenet.cpp

@@ -49,14 +49,19 @@
 
 using namespace std;
 
-or_imagenet::or_imagenet(std::string &fileName)
+or_imagenet::or_imagenet(std::string &path)
 {
-    loadDataset(fileName);
+    loadDataset(path);
 }
 
-void or_imagenet::loadDataset(string &fileName)
+void or_imagenet::load(string &path, unsigned int number)
 {
-    ifstream infile((fileName + "fall11_urls.txt").c_str());
+    loadDataset(path);
+}
+
+void or_imagenet::loadDataset(string &path)
+{
+    ifstream infile((path + "fall11_urls.txt").c_str());
     string line;
     while (getline(infile, line))
     {

modules/datasetstools/src/or_sun.cpp

@@ -53,6 +53,11 @@ or_sun::or_sun(std::string &path)
     loadDataset(path);
 }
 
+void or_sun::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void or_sun::loadDataset(string &path)
 {
     string classNameFile(path + "ClassName.txt");

modules/datasetstools/src/slam_kitti.cpp

@@ -54,6 +54,11 @@ slam_kitti::slam_kitti(std::string &path)
     loadDataset(path);
 }
 
+void slam_kitti::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void slam_kitti::loadDataset(string &path)
 {
     string pathSequence(path + "sequences/");

modules/datasetstools/src/slam_tumindoor.cpp

@@ -55,6 +55,11 @@ slam_tumindoor::slam_tumindoor(std::string &path)
     loadDataset(path);
 }
 
+void slam_tumindoor::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void slam_tumindoor::loadDataset(string &path)
 {
     string infoPath(path + "info/2011-12-17_15.02.56-info.csv"); // TODO

modules/datasetstools/src/tinyxml2/tinyxml2.cpp

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

modules/datasetstools/src/tr_chars.cpp

@@ -70,6 +70,11 @@ tr_chars::tr_chars(std::string &path, unsigned int number)
     loadDataset(path, number);
 }
 
+void tr_chars::load(string &path, unsigned int number)
+{
+    loadDataset(path, number);
+}
+
 void tr_chars::loadDataset(string &path, unsigned int number)
 {
     vector<int> allLabels, trainSet, testSet;

modules/datasetstools/src/tr_svt.cpp

@@ -102,6 +102,11 @@ tr_svt::tr_svt(std::string &path)
     loadDataset(path);
 }
 
+void tr_svt::load(string &path, unsigned int number)
+{
+    loadDataset(path);
+}
+
 void tr_svt::loadDataset(string &path)
 {
     string trainXml(path + "train.xml");