Commit Graph

248 Commits

Author SHA1 Message Date
Markus Schoeler
ddb0afbc44 Changed line 1266 in svm.cpp to allow the new kernels to be used 2013-02-14 15:28:10 +01:00
Markus Schoeler
7cab6798c0 Added two kernels to existing SVM framework
Histogram intersection kernel (accessible by using SVM::INTER in CV namespace as kernel_type)
Exponetial chi2 kernel (accessible by using SVM::CHI2 in CV namespace as kernel_type)

Formulars:
Exp-CHI2
k(x,y) = exp(-gamma * CHI2(x,y))
CHI2(x,y) = 1- 2* SUM_i[(xi-yi)²/(xi+yi)]

Intersec
k(x,y) = SUM_i[min(xi,yi)]
2013-02-14 11:30:30 +01:00
Andrey Kamaev
c527340cb6 Merge branch 2.4 2013-02-04 17:15:55 +04:00
Andrey Kamaev
9c939a8dcf Merge pull request #420 from asmaloney:check-mem-alloc 2013-02-04 12:56:36 +04:00
Andrey Kamaev
e2536f1c35 Merge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4 2013-02-04 11:54:43 +04:00
Andy Maloney
b497380a68 Check memory allocation
Initialize local variables
2013-02-02 08:33:40 -05:00
cuda-geek
f52ce6529b Merge pull request #322 from cuda-geek:training 2013-02-01 18:45:12 +04:00
LeonidBeynenson
87b0126e0d Fixed dummy warning. 2013-02-01 16:16:43 +04:00
Andrey Kamaev
61079547f0 Merge branch '2.4' 2013-02-01 14:59:40 +04:00
LeonidBeynenson
013d54c230 Changed types of some variables from int64 back to int.
Also corrected some indexes to be size_t.
2013-02-01 14:41:14 +04:00
marina.kolpakova
14ac8a528e final refactoring and test for training 2013-02-01 14:36:06 +04:00
marina.kolpakova
716a9ccb71 move training to softcascade module
rename Octave -> SoftCascadeOctave
2013-02-01 14:36:05 +04:00
marina.kolpakova
decb137185 use long seeds only for 64 bit systems 2013-02-01 14:35:29 +04:00
marina.kolpakova
b0905c67ba minor 2013-02-01 14:35:28 +04:00
marina.kolpakova
16aacf1780 use long seeds 2013-02-01 14:35:27 +04:00
marina.kolpakova
e903ce10ce fix wartings for 32bit build 2013-02-01 14:35:27 +04:00
marina.kolpakova
8672ae58e2 fix globbing under win 2013-02-01 14:34:40 +04:00
marina.kolpakova
e2de3b0b81 fix build inder mac 2013-02-01 14:34:40 +04:00
marina.kolpakova
dc12b4476a suppress debug out for soft cascade Octave 2013-02-01 14:34:40 +04:00
marina.kolpakova
e35eebd4d4 fix android build 2013-02-01 14:34:40 +04:00
marina.kolpakova
e47f58f4ce replace Mats to Input/OutputArrays for Octave's public interface 2013-02-01 14:34:40 +04:00
marina.kolpakova
e7bab669fa replace cv::Mat to Input/Output arrays 2013-02-01 14:34:40 +04:00
marina.kolpakova
a0f2203f22 raplase error output on CV_Error 2013-02-01 14:34:40 +04:00
marina.kolpakova
dd8de0c41f move soft cascade octave to ml module 2013-02-01 14:34:40 +04:00
marina.kolpakova
a0e93d0482 move image extraction logic from Octave to Dataset class 2013-02-01 14:34:40 +04:00
marina.kolpakova
a3600b94db created abstract FeaturePool class 2013-02-01 14:34:40 +04:00
marina.kolpakova
d4d47b1e58 restore backword compatibility 2013-02-01 14:34:39 +04:00
marina.kolpakova
a8d0e04912 amplement weidhting according to L. Bourdev and J. Brandt paper "Robust Object Detection Via Soft Cascade" 2013-02-01 14:34:39 +04:00
LeonidBeynenson
6de422701a Made changes to allow ml module to work with big data. 2013-01-31 19:37:20 +04:00
Daniil Osokin
fe5b9df45f Fixed multiple issues in docs (bug #2410) 2013-01-31 17:34:40 +04:00
Andrey Kamaev
dc0788c864 Merge branch 2.4 2013-01-17 18:39:20 +04:00
Alexander Smorkalov
8cb0343f4c Documentation build warning fixes.
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Kamaev
084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +04:00
Maria Dimashova
0e2958e888 fixed CvBoost::predict
(Sometimes sample_data became bad because the buffer with its values was deallocated early).
2012-12-29 00:30:52 +04:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Andrey Kamaev
9526907cba Use .yml.gz format to reduce space requirement from ~260Mb to ~17Mb for ml tests
The size of temporary files is an issue on mobile platforms.
2012-12-20 18:46:54 +04:00
Eugene Gritskevich
8ca86e2f52 Update modules/ml/doc/gradient_boosted_trees.rst 2012-12-06 21:44:55 +03:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
marina.kolpakova
7a5b9a6b7f replase __APPLE__ marco with __clang__ 2012-11-01 19:34:05 +04:00
Andrey Kamaev
74fe158f4b Merge pull request #117 from vpisarev/doc_updates 2012-10-31 16:56:04 +04:00
Vadim Pisarevsky
849a8c8d20 fixed many errors in warnings in rst docs; added ocl module description (by Niko Li) 2012-10-31 15:15:51 +04:00
Andrey Kamaev
2b0072d823 Suppress more warnings in gtest on OS X 2012-10-24 20:36:30 +04:00
Andrey Kamaev
0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
edee177ef1 Fix binary compatibility of opencv_ml 2012-10-17 02:09:23 +04:00
Andrey Kamaev
7d6a2f1bca Revert "skip of table header in MLData (#1962)"
This reverts commit 4d36be8794.

Conflicts:
	modules/ml/include/opencv2/ml/ml.hpp
	modules/ml/src/data.cpp
2012-10-17 02:09:20 +04:00
Andrey Kamaev
0dc3d61071 Revert "yet another portion of changes towards the binary compatibility"
This reverts commit 618fbf5508.
2012-10-17 02:09:17 +04:00
Andrey Kamaev
e7b81688a4 Revert "yet another portion of changes towards the binary compatibility"
This reverts commit 618fbf5508.
2012-10-16 19:35:57 +04:00
Andrey Kamaev
18ab16dbd3 Revert "some more fixes towards binary compatibility"
This reverts commit a8c5e35619.

Conflicts:
	modules/imgproc/src/imgwarp.cpp
2012-10-16 19:35:28 +04:00
Vadim Pisarevsky
a8c5e35619 some more fixes towards binary compatibility 2012-10-09 15:56:16 +04:00
Vadim Pisarevsky
618fbf5508 yet another portion of changes towards the binary compatibility 2012-10-08 21:36:27 +04:00
Andrey Kamaev
f268af8ef0 Removed remaining SWIG marks from headers 2012-09-07 22:19:43 +04:00
Vadim Pisarevsky
633a8bfacc fixed many warnings (modified pull request 13) 2012-08-28 18:15:14 +04:00
Andrey Kamaev
1a621c2916 Fix build warnings 2012-08-19 19:36:43 +04:00
Andrey Pavlenko
de90033e93 test 2012-07-25 18:26:07 +04:00
Maria Dimashova
d38f694275 fixed CvBoost in mll if no tree can be trained. 2012-07-12 12:29:50 +00:00
Maria Dimashova
0b4e96d89c updated thresholds in EM test after cv::EM fixing 2012-07-11 13:52:19 +00:00
Maria Dimashova
75e0eeab17 fixed #2160 2012-07-11 13:51:36 +00:00
Maria Dimashova
994f8710f3 fixed #2159 2012-07-11 13:26:58 +00:00
Andrey Kamaev
e900952b87 quiet most of the OSX build warnings 2012-07-05 12:56:31 +00:00
Maria Dimashova
d56b771963 fixed #2082 2012-07-01 20:59:29 +00:00
Andrey Kamaev
d9c74f63e1 All tests writing temporary files are updated to use cv::tempfile() function 2012-06-25 11:24:06 +00:00
Andrey Kamaev
e94e5866a1 Fixed mingw build warnings 2012-06-20 17:57:26 +00:00
Andrey Kamaev
d48d7b2b46 Updated warning options for GCC; fixed new warnings. 2012-06-20 12:27:02 +00:00
Alexander Mordvintsev
b4dafa6b58 fixed SVM train_auto docs: "train set" <-> "test set" 2012-06-18 11:38:47 +00:00
Alexander Mordvintsev
a98d6b6217 exposed parallelized SVM prediction to python (predict_all) 2012-06-14 10:02:49 +00:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Marina Kolpakova
6727e4cb6d fixed build under android 2012-06-10 09:44:47 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Vadim Pisarevsky
1e14d84008 possibly fixed crash boost caused by the recent modification; slightly improved mlp params in letter_recog sample 2012-06-09 07:05:24 +00:00
Andrey Kamaev
47a4e87784 Ignored warnings from gtest with precompiled headers enabled 2012-06-08 14:54:17 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
bc54195199 decreased size of the buffer used in CvBoost::update_weights (ticket #1803) 2012-06-06 10:10:48 +00:00
Andrey Kamaev
a20248977c Documentation: fixed class/struc members documentation; added warning on incorrectly documented member 2012-05-29 16:55:46 +00:00
Andrey Kamaev
6ca618277c More fixes for documentation. 2012-05-28 20:11:38 +00:00
Andrey Kamaev
78329b0dfe New bunch of documentation fixes 2012-05-28 14:36:15 +00:00
Andrey Kamaev
eb2f1f81ed Fixed hundreds of documentation problems 2012-05-28 07:36:14 +00:00
Maria Dimashova
276a3fe01b fixed #1981 2012-05-24 16:52:14 +00:00
Vadim Pisarevsky
fd68cc768a fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876) 2012-05-21 14:56:07 +00:00
Maria Dimashova
4d36be8794 skip of table header in MLData (#1962) 2012-05-19 14:34:36 +00:00
Vadim Pisarevsky
9bbcebd6b0 added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu. 2012-05-12 13:54:26 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
eecda6d308 added explicit () to avoid MSVC /analyze warning 2012-03-31 17:39:06 +00:00
Maria Dimashova
7f2cda6c8c fix the ticket #1234 2012-03-30 15:04:51 +00:00
Maria Dimashova
8d9d964550 added smoke test on EM, fixed EM reading #1570 (thanks to mr.pppoe), 2012-03-29 08:55:43 +00:00
Maria Dimashova
008a1c91fd fixed em test 2012-03-29 07:01:57 +00:00
Andrey Kamaev
94c258cf15 #1205 fixed ~100 of ~700 parameters 2012-03-29 06:50:05 +00:00
Vadim Pisarevsky
168d19364f improved description of RTreeParams (ticket #1656; thanks to Nghia Ho) 2012-03-27 12:58:58 +00:00
Vadim Pisarevsky
8bb422b1fc fixed potential buffer size overflow in Boost::update_weight, bug #1524 (thanks to benlemna for the patch) 2012-03-26 09:53:52 +00:00
Vadim Pisarevsky
846e37ded5 fixed many warnings from GCC 4.6.1 2012-03-17 09:22:31 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization:
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Maria Dimashova
48ea65e69c fixed traincascade for ordered features 2011-12-22 11:19:27 +00:00
Vadim Pisarevsky
2547f7554e fixed memory corruption in CvEM::read() (ticket #1399) 2011-12-03 18:55:40 +00:00
Maria Dimashova
a3ce652eb4 fixed CvRTrees::read in case nactive_vars==var_count (thanks to Malcolm Reynolds) 2011-11-10 13:40:11 +00:00
Alexander Mordvintsev
a0af870719 added CV_OUT to CvANN_MLP::predict
python cv2 MLP sample done
2011-08-14 04:32:27 +00:00
Andrey Kamaev
d7a9b99b1d Documentation: fixed references for C++ operators 2011-08-13 21:39:10 +00:00