Merge pull request opencv#8098 from chrizandr:Tree_load_Wrapper

alalek · web-flow · commit 75533fcd066a · 2017-01-30T17:25:23.000+03:00
Add wrappers for load functions for DTrees and Boost classifiers
diff --git a/modules/ml/include/opencv2/ml.hpp b/modules/ml/include/opencv2/ml.hpp
@@ -1137,6 +1137,17 @@ class CV_EXPORTS_W DTrees : public StatModel
     file using Algorithm::load\<DTrees\>(filename).
      */
     CV_WRAP static Ptr<DTrees> create();
+
+    /** @brief Loads and creates a serialized DTrees from a file
+     *
+     * Use DTree::save to serialize and store an DTree to disk.
+     * Load the DTree from this file again, by calling this function with the path to the file.
+     * Optionally specify the node for the file containing the classifier
+     *
+     * @param filepath path to serialized DTree
+     * @param nodeName name of node containing the classifier
+     */
+    CV_WRAP static Ptr<DTrees> load(const String& filepath , const String& nodeName = String());
 };
 
 /****************************************************************************************\
@@ -1251,6 +1262,17 @@ class CV_EXPORTS_W Boost : public DTrees
     /** Creates the empty model.
     Use StatModel::train to train the model, Algorithm::load\<Boost\>(filename) to load the pre-trained model. */
     CV_WRAP static Ptr<Boost> create();
+
+    /** @brief Loads and creates a serialized Boost from a file
+     *
+     * Use Boost::save to serialize and store an RTree to disk.
+     * Load the Boost from this file again, by calling this function with the path to the file.
+     * Optionally specify the node for the file containing the classifier
+     *
+     * @param filepath path to serialized Boost
+     * @param nodeName name of node containing the classifier
+     */
+    CV_WRAP static Ptr<Boost> load(const String& filepath , const String& nodeName = String());
 };
 
 /****************************************************************************************\
diff --git a/modules/ml/src/boost.cpp b/modules/ml/src/boost.cpp
@@ -507,6 +507,11 @@ Ptr<Boost> Boost::create()
     return makePtr<BoostImpl>();
 }
 
+Ptr<Boost> Boost::load(const String& filepath, const String& nodeName)
+{
+    return Algorithm::load<Boost>(filepath, nodeName);
+}
+
 }}
 
 /* End of file. */
diff --git a/modules/ml/src/tree.cpp b/modules/ml/src/tree.cpp
@@ -1941,6 +1941,12 @@ Ptr<DTrees> DTrees::create()
     return makePtr<DTreesImpl>();
 }
 
+Ptr<DTrees> DTrees::load(const String& filepath, const String& nodeName)
+{
+    return Algorithm::load<DTrees>(filepath, nodeName);
+}
+
+
 }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1941,6 +1941,12 @@ Ptr<DTrees> DTrees::create()`
`1941`	`1941`	`return makePtr<DTreesImpl>();`
`1942`	`1942`	`}`
`1943`	`1943`
	`1944`	`+Ptr<DTrees> DTrees::load(const String& filepath, const String& nodeName)`
	`1945`	`+{`
	`1946`	`+ return Algorithm::load<DTrees>(filepath, nodeName);`
	`1947`	`+}`
	`1948`	`+`
	`1949`	`+`
`1944`	`1950`	`}`
`1945`	`1951`	`}`
`1946`	`1952`