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
