Commit 617dd5db authored by Marina Noskova's avatar Marina Noskova

Fixed doc/opencv.bib

parent c5221723
...@@ -415,6 +415,16 @@ ...@@ -415,6 +415,16 @@
pages = {2548--2555}, pages = {2548--2555},
organization = {IEEE} organization = {IEEE}
} }
@ARTICLE{Louhichi07,
author = {Louhichi, H. and Fournel, T. and Lavest, J. M. and Ben Aissia, H.},
title = {Self-calibration of Scheimpflug cameras: an easy protocol},
year = {2007},
pages = {2616–2622},
journal = {Meas. Sci. Technol.},
volume = {18},
number = {8},
publisher = {IOP Publishing Ltd}
}
@ARTICLE{LibSVM, @ARTICLE{LibSVM,
author = {Chang, Chih-Chung and Lin, Chih-Jen}, author = {Chang, Chih-Chung and Lin, Chih-Jen},
title = {LIBSVM: a library for support vector machines}, title = {LIBSVM: a library for support vector machines},
...@@ -871,4 +881,4 @@ ...@@ -871,4 +881,4 @@
pages={177--186}, pages={177--186},
year={2010}, year={2010},
publisher={Springer} publisher={Springer}
} }
\ No newline at end of file
...@@ -1697,7 +1697,6 @@ CV_EXPORTS void randMVNormal( InputArray mean, InputArray cov, int nsamples, Out ...@@ -1697,7 +1697,6 @@ CV_EXPORTS void randMVNormal( InputArray mean, InputArray cov, int nsamples, Out
CV_EXPORTS void createConcentricSpheresTestSet( int nsamples, int nfeatures, int nclasses, CV_EXPORTS void createConcentricSpheresTestSet( int nsamples, int nfeatures, int nclasses,
OutputArray samples, OutputArray responses); OutputArray samples, OutputArray responses);
//! @} ml //! @} ml
} }
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "opencv2/ml.hpp" #include "opencv2/ml.hpp"
#include "opencv2/core/core_c.h" #include "opencv2/core/core_c.h"
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include <assert.h> #include <assert.h>
......
...@@ -267,9 +267,7 @@ void CV_MLBaseTest::run( int ) ...@@ -267,9 +267,7 @@ void CV_MLBaseTest::run( int )
{ {
string filename = ts->get_data_path(); string filename = ts->get_data_path();
filename += get_validation_filename(); filename += get_validation_filename();
validationFS.open( filename, FileStorage::READ ); validationFS.open( filename, FileStorage::READ );
read_params( *validationFS ); read_params( *validationFS );
int code = cvtest::TS::OK; int code = cvtest::TS::OK;
......
...@@ -150,11 +150,7 @@ int CV_SLMLTest::validate_test_results( int testCaseIdx ) ...@@ -150,11 +150,7 @@ int CV_SLMLTest::validate_test_results( int testCaseIdx )
TEST(ML_NaiveBayes, save_load) { CV_SLMLTest test( CV_NBAYES ); test.safe_run(); } TEST(ML_NaiveBayes, save_load) { CV_SLMLTest test( CV_NBAYES ); test.safe_run(); }
TEST(ML_KNearest, save_load) { CV_SLMLTest test( CV_KNEAREST ); test.safe_run(); } TEST(ML_KNearest, save_load) { CV_SLMLTest test( CV_KNEAREST ); test.safe_run(); }
TEST(ML_SVM, save_load) TEST(ML_SVM, save_load) { CV_SLMLTest test( CV_SVM ); test.safe_run(); }
{
CV_SLMLTest test( CV_SVM );
test.safe_run();
}
TEST(ML_ANN, save_load) { CV_SLMLTest test( CV_ANN ); test.safe_run(); } TEST(ML_ANN, save_load) { CV_SLMLTest test( CV_ANN ); test.safe_run(); }
TEST(ML_DTree, save_load) { CV_SLMLTest test( CV_DTREE ); test.safe_run(); } TEST(ML_DTree, save_load) { CV_SLMLTest test( CV_DTREE ); test.safe_run(); }
TEST(ML_Boost, save_load) { CV_SLMLTest test( CV_BOOST ); test.safe_run(); } TEST(ML_Boost, save_load) { CV_SLMLTest test( CV_BOOST ); test.safe_run(); }
......
...@@ -5659,7 +5659,7 @@ class TestCaseNameIs { ...@@ -5659,7 +5659,7 @@ class TestCaseNameIs {
// Returns true iff the name of test_case matches name_. // Returns true iff the name of test_case matches name_.
bool operator()(const TestCase* test_case) const { bool operator()(const TestCase* test_case) const {
return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0; return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0;
} }
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment