mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-11 14:39:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,297 Commits 6 Branches 127 Tags 3 GiB
0155851929
Commit Graph

517 Commits

Author SHA1 Message Date
Maksim Shabunin
9f08310307 Disabled TrainData::getNormCatValues wrapping due to pointer in parameters 2015-03-19 15:45:34 +03:00
Maksim Shabunin
5709ec85d7 Disabled missing python method for static ml function 2015-03-19 15:11:49 +03:00
Maksim Shabunin
5247eacc3c Add python and java support for ml module 2015-03-19 13:22:30 +03:00
Maksim Shabunin
7335a40a61 Replaced CV_PURE_PROPERTY macros with corresponding code 2015-03-18 17:23:42 +03:00
ippei ito
518fd59a10 fixed whitespace error 2015-03-12 01:09:15 +09:00
ippei ito
49b38fe793 Fixed compile error build with VisualStudio2013 on windows. 
REG_NONE defined in ml.hpp conflicts with defined in Winnt.h
 2015-03-12 00:32:17 +09:00
Maksim Shabunin
79e8f0680c Updated ml module interfaces and documentation 2015-02-17 11:46:14 +03:00
Maksim Shabunin
c85197da55 Fixed allocated vector size in ML ANN algorithm 
- updated return value of points_classifier sample
 2015-02-03 18:16:20 +03:00
Maksim Shabunin
53c9460454 Reorganized ML module documentation 
- fixed one BiB record
- moved algorithms overview to separate page
- added docs for some enumerations
- fixed some small documentation errors
 2015-01-23 23:43:06 +03:00
Maksim Shabunin
38d37d2b00 Fixed uninitialized memory usage in ANN_MLP 2014-12-31 12:16:26 +03:00
Maksim Shabunin
d004ee58c5 Support loading old models in ML module 
- added test for loading legacy files
- added version to new written models
- fixed loading of several fields in some models
- added generation of new fields from old data
 2014-12-31 12:16:25 +03:00
Vadim Pisarevsky
1c8493fb0d Merge pull request #3549 from mshabunin:sphinx-doc-remove 2014-12-31 09:14:22 +00:00
Julien Nabet
2d5e3b57ea Fix cppcheck reports warnings: 
(performance) Possible inefficient checking for 'lmap' emptiness
(warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
(style) Array index '<xxx>' is used before limits check
 2014-12-27 10:54:34 +01:00
Maksim Shabunin
d01bedbc61 Removed Sphinx documentation files 2014-12-26 19:12:19 +03:00
TobyWanKenobi
b35f5d115f Removed "FORMAT_XML" to generalize format 
Removed the "FileStorage::FORMAT_XML" to generalize format of the String
model.
 2014-12-08 09:21:55 +01:00
TobyWanKenobi
f54b80d2c8 Re-edition of documentation 
Re-edited the documentation again.
 2014-12-03 17:13:11 +01:00
TobyWanKenobi
b3bba3476d Re-editing Documentation 
Attempting to re-editing the documentation, to satisfy buildbot error
status.
 2014-12-03 15:54:25 +01:00
TobyWanKenobi
270af2ca79 Changing tabs to spaces. 
Edited previous code to change tabs into spaces.
 2014-12-03 15:40:12 +01:00
TobyWanKenobi
a1e04c98aa Add method in StatModel class, to load from String 
Added a method "loadFromString" which is based on the "load" one. It
allow to directly pass the XML string which can be usefull and faster
when you have a huge file in a variable.
 2014-12-02 15:15:06 +01:00
Maksim Shabunin
03e213ccae Doxygen documentation: BiB references and fixes 2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c Doxygen documentation: more fixes and cleanups 2014-12-01 15:50:36 +03:00
Maksim Shabunin
8e9ea0e3d1 Doxygen doucmentation: ml module 2014-12-01 15:47:13 +03:00
bartaandras
21227ba092 Fixed calc_output_scale with NO_OUTPUT_SCALE flag set. 2014-11-04 11:35:45 +01:00
Vadim Pisarevsky
b37a641cc9 fixed bug in automatic SVM training 2014-10-18 20:53:39 +04:00
Benoit Seguin
450734cc32 Correction of the integer data treated as floating point data bug, already corrected in the 2.4 branch. 2014-09-23 14:03:20 +02:00
Vadim Pisarevsky
4057e27539 Merge pull request #3126 from avdmitry:move_KDTree_to_ml 2014-09-14 18:57:23 +00:00
Dmitriy Anisimov
a6b29be55b minor change: moved algorithm type to the end of params 2014-09-13 15:06:07 +04:00
Dmitriy Anisimov
dfaf75f502 moving algorithm type to param 2014-09-06 09:29:32 +04:00
Dmitriy Anisimov
5f3ee657ce removed kdtree declaration from interface 2014-08-31 21:39:47 +04:00
Dmitriy Anisimov
9ddb23e025 first implementation KNearest wrapper on KDTree 2014-08-23 18:41:32 +04:00
Dmitriy Anisimov
37b1a7560c first version of moving KDTree from core to ml 2014-08-18 22:40:31 +04:00
Maksim Shabunin
108caae216 Modified logistic regression module according to comments 
- Reworked documentation to reflect actual code
- Removed some unused variables
- Removed unnecessary 'cv::' modifiers
 2014-08-18 19:13:59 +04:00
Maksim Shabunin
4667e18831 Updated logistic regression example 
- Extracted common operations to separate functions.
- Activated first parameters set.
- Some output formatting.
- Fixed loop break condition in mini_batch_gradient function.
 2014-08-18 19:06:58 +04:00
Maksim Shabunin
3e26086f82 Reworked ML logistic regression implementation, initial version 2014-08-18 19:06:58 +04:00
Maksim Shabunin
71770eb790 Fixed ML module build after merge 2014-08-18 19:06:58 +04:00
Rahul Kavi
a23836231f fixed warnings in type conversions 
fixed warnings in type conversions from size_t to int (in getting size of number of unique classes in a training problem).
 2014-08-18 19:06:58 +04:00
Rahul Kavi
d20b2a5a97 removed extra comments in train method 2014-08-18 19:06:58 +04:00
Rahul Kavi
ae02ecec60 removed a couple of unnecessary comments in Logistic Regression training method 2014-08-18 19:06:58 +04:00
Rahul Kavi
f20db35b78 fixed logistic regression documentation warnings 2014-08-18 19:06:58 +04:00
Rahul Kavi
21de04b4a2 fixed default constructor for LogisticRegression class declaration 2014-08-18 19:06:58 +04:00
Rahul Kavi
65eb52a247 removed default value from LogisticRegression constructor function definition 2014-08-18 19:06:57 +04:00
Rahul Kavi
e7f14f3d0e fixed missing semicolon in logistic regression documentation 2014-08-18 19:06:57 +04:00
Rahul Kavi
3622de2621 updated mini_batch_size description for LogisticRegressionParams in documentation 2014-08-18 19:06:57 +04:00
Rahul Kavi
e4ef0e0ca8 fixed indentation in logistic regression documentation 2014-08-18 19:06:57 +04:00
Rahul Kavi
7c97dbc196 fixed indentation in logistic regression documentation 2014-08-18 19:06:57 +04:00
Rahul Kavi
aa35835cfc fixed white space in logistic regression prototype 2014-08-18 19:06:57 +04:00
Rahul Kavi
8995921cc5 fixed white space in logistic regression classifier 2014-08-18 19:06:57 +04:00
Rahul Kavi
a9df50eefc updated test for logistic regression 2014-08-18 19:06:57 +04:00
Rahul Kavi
b3b4e83aed updated logistic regression definition 2014-08-18 19:06:57 +04:00
Rahul Kavi
95ea09c3dc updated prototype for logistic regression classifier 2014-08-18 19:06:57 +04:00
Rahul Kavi
bf2ee3c58a updated prototype for logistic regression classifier 2014-08-18 19:06:52 +04:00
Rahul Kavi
3a6deb3ed3 updated documentation to reflect new api changes for logistic regression 2014-08-18 19:06:52 +04:00
Rahul Kavi
af88f0c067 updated documentation to do reflect changes to logistic regression class 2014-08-18 19:06:52 +04:00
Rahul Kavi
1652b2a443 fixed trailing whitespaces in LogisticRegression code. 2014-08-18 19:06:52 +04:00
Rahul Kavi
5bb43f69ab removed trailing whitespaces from predict function 2014-08-18 19:06:52 +04:00
Rahul Kavi
50031ffb15 removed trailing whitespaces from updated logistic regression definition 2014-08-18 19:06:52 +04:00
Rahul Kavi
78f3b0ad1f removed unnecessary semicolon in LogisticRegression class documentation 2014-08-18 19:06:52 +04:00
Rahul Kavi
56d715b091 fixed typedef for LogisticRegression. Updated LogisticRegression prototype with newer C++ API 2014-08-18 19:06:52 +04:00
Rahul Kavi
e4a90c19cc updated documentation to reflect newer changes to LogisticRegression class 2014-08-18 19:06:48 +04:00
Rahul Kavi
64aaa6e1ae updated test for logistic regression after changes to LogisticRegression class 2014-08-18 19:06:48 +04:00
Rahul Kavi
d5ad4f3255 added updated logistic regression prototype with newer C++ API 2014-08-18 19:06:48 +04:00
Rahul Kavi
0e13f33193 rewrote the code to update API, removed inheritance from CvStatModel. 2014-08-18 19:06:48 +04:00
Rahul Kavi
6c74439d56 fixed trailing white-space in logistic regression class 2014-08-18 19:06:48 +04:00
Rahul Kavi
6ae43a2243 added logistic regression classifier 2014-08-18 19:06:48 +04:00
Rahul Kavi
fcfeb2451b added logistic regression prototype 2014-08-18 19:06:48 +04:00
Rahul Kavi
3039ed7682 added test for logistic regression 2014-08-18 19:06:36 +04:00
Rahul Kavi
3bf6c3c2aa added documentation for logistic regression classifier 2014-08-18 19:06:36 +04:00
Rahul Kavi
b9902f39b7 added reference to logistic regression document 2014-08-18 19:06:36 +04:00
Adil Ibragimov
8a4a1bb018 Several type of formal refactoring: 
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
 2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
05e7c29de5 fixed various warnings and obvious errors reported by clang compiler and the coverity tool. 2014-08-10 00:10:05 +04:00
Vadim Pisarevsky
222f8a3d5e hopefully fixed test failure on Linux 2014-08-04 01:16:45 +04:00
Vadim Pisarevsky
24b01a8e4f continuing to debug boost and fix MSVC compile errors 2014-08-03 21:21:11 +04:00
Vadim Pisarevsky
98a1181240 fixed the condition 2014-08-03 13:15:43 +04:00
Vadim Pisarevsky
79b593d8d8 more fixes and more debugging code 2014-08-03 13:08:03 +04:00
Vadim Pisarevsky
eeb786fcfd fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code 2014-08-03 12:46:28 +04:00
Vadim Pisarevsky
8e9d1d9fe6 temporarily disabled java bindings for ml; hopefully fixed warnings etc. 2014-08-03 04:28:20 +04:00
Vadim Pisarevsky
2520e335d1 removed many extra whitespaces; fixed 1 warning 2014-08-03 03:08:25 +04:00
Vadim Pisarevsky
28ca6ac05e fixed building html docs 2014-08-03 02:34:47 +04:00
Vadim Pisarevsky
c6593d02a6 updated docs 2014-08-03 01:41:30 +04:00
Vadim Pisarevsky
c20ff6ce19 made everything compile and even run somehow 2014-08-03 01:41:09 +04:00
Vadim Pisarevsky
10b60f8d16 continuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably, should make it in less hacky way 2014-07-31 14:12:10 +04:00
Vadim Pisarevsky
223cdcd0ee fixed compilation of some samples; fixed ANN_MLP::predict 2014-07-30 22:53:46 +04:00
Vadim Pisarevsky
ba3783d205 initial commit; ml has been refactored; it compiles and the tests run well; some other modules, apps and samples do not compile; to be fixed 2014-07-29 23:54:23 +04:00
Roman Donchenko
33087f9eaa Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-06-02 13:43:28 +04:00
berak
2bacd8b702 2 fixed unassigned reshapes in em (#3674) 2014-05-28 10:37:16 +02:00
Roman Donchenko
3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp
 2014-05-19 18:39:20 +04:00
Vladislav Vinogradov
7e2f7f45d7 fix bug #3690 
removed invalid condition, it is always false
 2014-05-14 10:47:28 +04:00
Ilya Lavrenov
aa5326c231 cv::norm -> cvtest::norm in tests 
Conflicts:

	modules/core/src/stat.cpp
 2014-04-08 14:49:20 +04:00
Ilya Lavrenov
32eb38ec98 fixed defects from coverity.com 2014-02-23 20:21:08 +04:00
Cosmin Boaca
f756171f7b Fixed alignment 2014-01-30 16:43:56 +02:00
Cosmin Boaca
8782eb8657 Fixed alignment 2014-01-30 16:41:38 +02:00
Cosmin Boaca
2cd22a3ca3 Fixed broken alignment 2014-01-30 13:37:53 +02:00
Cosmin Boaca
e6f86ea39d Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier 2014-01-30 13:32:32 +02:00
Cosmin Boaca
97092e31bc Added result_probabilities parameter to CvNormalBayesClassifier::predict method. Issue #3401 2014-01-29 13:57:51 +02:00
Cosmin Boaca
3985980b2f Added returnDFVal parameter to parallel CvSVM::predict function 2014-01-28 11:54:39 +02:00
Roman Donchenko
bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
 2014-01-27 15:28:14 +04:00
Andrey Pavlenko
c8afe7efc6 Merge pull request #1320 from mbarnach:svm_hog 2014-01-21 19:23:04 +04:00
Andrey Pavlenko
32bc89f094 Merge pull request #2107 from nghiaho12:nn_doc 2014-01-21 19:11:12 +04:00
Roman Donchenko
9dc93ce328 Merge pull request #2176 from SpecLad:merge-2.4 2014-01-20 18:04:56 +04:00
Roman Donchenko
e45fd939c2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
 2014-01-20 15:10:19 +04:00
Ilya Lavrenov
37789f015a deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
Roman Donchenko
fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
 2014-01-14 11:53:59 +04:00
Daniil Osokin
5d2edced26 Added throwing exception when saving untrained SVM model 2014-01-13 13:50:30 +04:00
Ilya Lavrenov
6b9ebcbf3d deleted extra semicolons 2014-01-07 02:52:30 +04:00
Nghia Ho
d3e24f3cbf Improved documentation for neural network 2014-01-03 14:18:07 +11: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
Roman Donchenko
06f6f74e61 Merge pull request #1839 from pmiecielica:memory_leaks 2013-11-25 12:17:08 +04:00
Mathieu Barnachon
63c23cce65 Merge remote-tracking branch 'upstream/master' into svm_hog 2013-11-24 13:24:39 +01:00
Piotr Miecielica
923698d700 Fixes of some memory leaks 2013-11-21 18:55:09 +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
Alexander Alekhin
e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
 2013-10-15 20:08:52 +04:00
Alexander Alekhin
f63b0dfaf4 svm: disable failed tests 2013-10-07 18:17:10 +04:00
Roman Donchenko
81eb4bd8be Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
 2013-10-01 15:57:33 +04:00
Csaba Kertesz
6fb3b4f41c Fix a memory leak in CvNormalBayesClassifier::train() 2013-09-20 22:36:49 +02:00
Mathieu Barnachon
0934344a3d Update sample and code with external computation of HOG detector. 2013-09-12 18:38:49 +02:00
Roman Donchenko
24dee16b12 Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience. 
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
 2013-09-05 19:03:00 +04: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
Roman Donchenko
2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
 2013-08-27 13:26:44 +04:00
Maria Dimashova
989be02562 fixed cpp wrappers of ML tree-based models 2013-08-23 18:13:10 +04:00
Mathieu Barnachon
4fbd5707f7 Fix warning on precision lost due to double to float conversion. 2013-08-22 17:34:31 +12: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
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
 2013-08-19 19:02:36 +04:00
Roman Donchenko
6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml
 2013-08-13 12:56:39 +04:00
Roman Donchenko
d9f71b762f Deleted almost all of the precomp.cpp files. 
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
 2013-08-08 12:43:07 +04:00
StevenPuttemans
ed76b2f98f Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong 
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
 2013-08-07 14:49:33 +02:00
Roman Donchenko
2f780ed994 Fix whitespace errors. 2013-08-06 18:07:00 +04:00
Roman Donchenko
dcaf923517 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/ffmpeg/ffmpeg_version.cmake
	cmake/OpenCVFindLibsGrfmt.cmake
	cmake/templates/cvconfig.h.cmake
	modules/bioinspired/doc/retina/index.rst
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/calib3d/src/precomp.hpp
	modules/contrib/src/inputoutput.cpp
	modules/contrib/src/precomp.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/types_c.h
	modules/core/src/drawing.cpp
	modules/core/src/precomp.hpp
	modules/core/src/system.cpp
	modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
	modules/features2d/doc/common_interfaces_of_feature_detectors.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/src/precomp.hpp
	modules/flann/src/precomp.hpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/src/precomp.hpp
	modules/gpu/test/test_imgproc.cpp
	modules/highgui/CMakeLists.txt
	modules/highgui/test/test_precomp.hpp
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/precomp.hpp
	modules/java/generator/src/cpp/Mat.cpp
	modules/legacy/src/precomp.hpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/ml/src/precomp.hpp
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/src/precomp.hpp
	modules/objdetect/include/opencv2/objdetect/objdetect.hpp
	modules/objdetect/src/cascadedetect.cpp
	modules/objdetect/src/hog.cpp
	modules/objdetect/src/precomp.hpp
	modules/objdetect/test/test_latentsvmdetector.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/opencl/objdetect_hog.cl
	modules/ocl/src/precomp.hpp
	modules/photo/src/precomp.hpp
	modules/stitching/src/precomp.hpp
	modules/superres/perf/perf_precomp.hpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	modules/superres/test/test_precomp.hpp
	modules/ts/include/opencv2/ts.hpp
	modules/video/src/precomp.hpp
	modules/videostab/src/precomp.hpp
	modules/world/src/precomp.hpp
 2013-08-06 13:56:49 +04:00
StevenPuttemans
f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Nghia Ho
eb2720a908 missing fclose when returning early 2013-07-24 23:53:18 +10:00
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
Roman Donchenko
13cd0a0502 Merge remote-tracking branch 'origin/2.4' 
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
 2013-06-19 15:25:37 +04:00
Vladislav Vinogradov
e433145b7e fix for Bug #3085: 
weights array is only allocated for (l_count+1) elements,
but then weights[l_count+1] element is accessed.
 2013-06-13 10:22:56 +04:00
Roman Donchenko
bae85660da Merge remote-tracking branch 'origin/2.4' 
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
 2013-06-05 15:42:07 +04:00
Roman Donchenko
29b13ec1de Replaced most of the usages of parallel_for with that of parallel_for_. 
This should allow many algorithms to take advantage of more parallelization
technologies.
 2013-05-31 12:22:04 +04: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
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev
d62bc8cfbf Remove more old definitions from internal.hpp 2013-04-01 16:32:08 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00
Andrey Kamaev
13b31b0804 Move C++ basic structures to separate header and inverse dependency from C API 
cv::Complex, cv::Point_ and cv::Point3_ are moved.
 2013-04-01 15:24:32 +04:00
Andrey Kamaev
db45e04d58 Merge pull request #720 from taka-no-me:drop_sort 2013-04-01 15:14:45 +04:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Andrey Kamaev
cc6bdfb045 Remove inline sorting algorithms from core headers 2013-03-28 17:22:50 +04:00
Andrey Kamaev
be7bbe3aa9 Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +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
82d7292ee7 Merge pull request #680 from vpisarev:c2cpp_video_take2 2013-03-22 19:34:53 +04:00
Vadim Pisarevsky
e01335bf47 fixed buffer size and restored the use of compressed files in ml's load_save tests. 2013-03-22 01:53:41 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Vadim Pisarevsky
4331f76d18 add hack to disable optimization of linear svms; improved precision of optimize_linear_svm; add the relevant test, which however requires some big database (so it's disabled by default) 2013-03-21 19:17:59 +04:00
Vadim Pisarevsky
63a5587d0d exploring possible bug in optimize_linear_svm 2013-03-21 17:00:08 +04:00
Vadim Pisarevsky
07e0f7bf59 refactored video module; use the new-style algorithms now 2013-03-20 19:51:49 +04:00
Andrey Kamaev
89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +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
Andrey Kamaev
351ecbbcce Repair build 2013-02-26 23:12:20 +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
9f888fdb97 Merge pull request #490 from mschoeler:master 2013-02-26 18:33:05 +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
5484a41960 Corrected a mistake in CHI2 kernel in line 354 and line 362 svm.cpp 
Added new kernels to documentation
 2013-02-22 15:43:41 +01:00
Andrey Kamaev
637397f621 Merge branch '2.4' 2013-02-20 12:31:16 +04:00
Andrey Kamaev
5691fd3abe Merge pull request #503 from taka-no-me:fix_docs 2013-02-19 18:01:51 +04:00
Andrey Kamaev
ff7b604a25 Fix several inconsistent declarations identified by check_doc2 script 2013-02-19 16:22:20 +04:00
Niels Gerlif Myrtue
7697d79d93 Added the predict_all function wrapper for python that was missing from the documentation 
Copied the docstring description
 2013-02-19 13:11:30 +11:00
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