Vadim Pisarevsky
2520e335d1
removed many extra whitespaces; fixed 1 warning
2014-08-03 03:08:25 +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
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
Andrey Pavlenko
c8afe7efc6
Merge pull request #1320 from mbarnach:svm_hog
2014-01-21 19:23:04 +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
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
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
Piotr Miecielica
923698d700
Fixes of some memory leaks
2013-11-21 18:55:09 +01: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
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
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
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
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
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +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
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
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
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
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
Andy Maloney
b497380a68
Check memory allocation
...
Initialize local variables
2013-02-02 08:33:40 -05:00
LeonidBeynenson
87b0126e0d
Fixed dummy warning.
2013-02-01 16:16:43 +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
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
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
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
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
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
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
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00