Commit Graph

123 Commits

Author SHA1 Message Date
Cosmin Boaca
3985980b2f Added returnDFVal parameter to parallel CvSVM::predict function 2014-01-28 11:54:39 +02:00
Andrey Pavlenko
c8afe7efc6 Merge pull request #1320 from mbarnach:svm_hog 2014-01-21 19:23:04 +04:00
Ilya Lavrenov
37789f015a deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
Roman Donchenko
9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Mathieu Barnachon
63c23cce65 Merge remote-tracking branch 'upstream/master' into svm_hog 2013-11-24 13:24:39 +01:00
Roman Donchenko
cf00349b5b Gave CvSVM a private copy constructor & assignment operator.
The implicitly generated ones don't work properly, and I don't want to
write proper ones. :-)

"Fixes" <http://code.opencv.org/issues/3358>.
2013-11-20 14:59:42 +04:00
Mathieu Barnachon
0934344a3d Update sample and code with external computation of HOG detector. 2013-09-12 18:38:49 +02:00
Roman Donchenko
345bc633cc Boring changes - ml. 2013-09-05 18:26:44 +04:00
Roman Donchenko
e59c74e1c7 Merge pull request #1348 from SpecLad:merge-2.4 2013-08-28 13:41:41 +04:00
Roman Donchenko
9ed475cf52 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
Maria Dimashova
989be02562 fixed cpp wrappers of ML tree-based models 2013-08-23 18:13:10 +04:00
Mathieu Barnachon
7f3273c77f Adding an export for HOGDetector compatibility.
An SVM train with HOG could export a single vector for HOGDetector.
2013-08-22 15:00:32 +12:00
Roman Donchenko
4143071e22 In CvBoost, delegated update_weights's implementation to a helper method.
This allows subclasses of CvBoost to override initial weights that
update_weights uses without duplicating its entire implementation.
2013-04-11 13:50:10 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev
75513a46dc Remove all include directives for <string> 2013-03-22 22:14:47 +04:00
Andrey Kamaev
2ad7b97f1c All modules (except ocl and gpu) compiles and pass tests 2013-03-22 22:14:26 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Vadim Pisarevsky
a06af5ca25 dramatic speedup of SVM::predict in the case of linear SVM 2013-03-19 18:28:17 +04:00
Andrey Kamaev
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
cuda-geek
15e125c751 Merge pull request #543 from taka-no-me:explicit_stl 2013-02-26 20:54:13 +04:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04: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
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
8672ae58e2 fix globbing under win 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
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
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
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
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
Alexander Mordvintsev
a98d6b6217 exposed parallelized SVM prediction to python (predict_all) 2012-06-14 10:02:49 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
eb2f1f81ed Fixed hundreds of documentation problems 2012-05-28 07:36:14 +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
Alexander Mordvintsev
a0af870719 added CV_OUT to CvANN_MLP::predict
python cv2 MLP sample done
2011-08-14 04:32:27 +00:00
Ilya Lysenkov
10065d3321 Trunk: moved contructors implementations from .hpp to .cpp 2011-06-24 12:48:00 +00:00
Ilya Lysenkov
2c958b2598 Trunk: moved contructors implementations from .hpp to .cpp 2011-06-24 12:25:52 +00:00
Maria Dimashova
fc04b7ab4f minor refactoring of CvMLData interface 2011-06-17 10:11:52 +00:00
Maria Dimashova
0209d72534 minor change (moved methods implementation from hpp to cpp) 2011-06-16 12:35:40 +00:00
P. Druzhkov
e20d570ed1 brief gbt documentation added. some sample fixes made. code updated. 2011-06-15 21:54:25 +00:00
Maria Dimashova
2920796800 minor 2011-06-15 10:11:20 +00:00
Maria Dimashova
3dc03531e1 added CvEM read/write (#1032) 2011-06-07 10:05:23 +00:00
P. Druzhkov
15f7918e34 problem with the supported data matrices types is fixed
minor fixes in CvGBTrees, its test and sample
2011-05-11 07:58:47 +00:00
Vadim Pisarevsky
ae8f2eeac2 restored img_proc_test main() call; removed windows.h from ml.hpp 2011-05-06 11:51:39 +00:00
Vadim Pisarevsky
17a2480a21 integrated parallel SVM prediction; fixed warnings after meanshift integration 2011-04-19 16:20:44 +00:00
Vadim Pisarevsky
253d8c683e knearest training has been threaded (thanks to Konstantin Krivakin) 2011-04-01 11:24:15 +00:00
Vadim Pisarevsky
800266dd52 parallel training of a neural net using TBB (thanks to Konstantin Krivakin) 2011-03-22 17:40:58 +00:00
Vadim Pisarevsky
bad4ca2a51 added the optional balanced cross-validation in SVN::train_auto (by arman, ticket #314) 2010-11-29 22:37:02 +00:00
Maria Dimashova
c104cdce96 made random generators of MLL classes depended on default rng (theRNG) (#205). 2010-11-29 14:04:08 +00:00
Vadim Pisarevsky
59e2afe4d2 fixed the ordering of parameters in PyArg_ParseTupleAndKeywords, added correct Ptr<CvDTreeSplit>::delete_obj() (ticket #406) 2010-11-25 23:16:32 +00:00
Vadim Pisarevsky
5b6a755719 almost finished Python wrappers 2010-11-02 17:58:22 +00:00
Vadim Pisarevsky
893fb90b87 extended Python bindings; not merged into cv.cpp yet; and many of the helper functions, like pyopencv_to_*, pyopencv_from_* etc. are still missing 2010-10-29 13:09:49 +00:00
Vadim Pisarevsky
83f6085773 added more helper macros to the function declarations, to assist the Python wrapper generator. Fixed memleak in Mat::operator()(Range,Range) and the related functions (Mat::row, Mat::col etc.) 2010-10-27 18:26:39 +00:00
Vadim Pisarevsky
1b1eab8e67 added helper macros to the function declarations 2010-10-16 20:34:34 +00:00
P. Druzhkov
d611fb61fc Gradient Boosting Trees (CvGBTrees) added to opencv mll. Test for all CvGBTrees public methods added. 2010-10-13 20:18:12 +00:00
Vadim Pisarevsky
758e826d2e do not use WIN64/_WIN64 anymore - CMake did not set it anyway. Use WIN32 + __x86_64 or _M_X64 instead. Also, make VideoInput optional (WITH_VIDEOINPUT=ON/OFF) => now Mingw-dw2 can build OpenCV 2010-07-16 22:38:57 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00