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
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
75e0eeab17
fixed #2160
2012-07-11 13:51:36 +00:00
Maria Dimashova
994f8710f3
fixed #2159
2012-07-11 13:26:58 +00:00
Maria Dimashova
d56b771963
fixed #2082
2012-07-01 20:59:29 +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
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
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
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
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
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
Maria Dimashova
221422467e
fixed priors usage in ertrees
2011-07-24 18:15:53 +00:00
Vadim Pisarevsky
b700521b95
fixed trim_weights in boosting (thanks to frankman for the patch; ticket #1231 )
2011-07-22 12:20:43 +00:00
Vadim Pisarevsky
4e099d2e5c
fixed memory leak in CvKNearest::train() and the constructor.
2011-07-08 06:48:18 +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
Vadim Pisarevsky
0e14fef96e
fixed warnings in gbt; added insertChannel() and extractChannel(); made the code "rand{u|n}(arr, <number>, <number>)" work properly.
2011-06-18 10:56:49 +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
Anatoly Baksheev
8f4c7db3f6
~40 warnings under VS2008
...
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
2011-06-11 17:24:09 +00:00
Vadim Pisarevsky
f9fc180e1a
fixed tickets #1117 and #954
2011-06-10 17:22:33 +00:00
Vadim Pisarevsky
20aca7440f
a lot of small corrections to bring down the number of undocumented functions, reported by the script; added em.cpp sample
2011-06-09 01:16:45 +00:00
Maria Dimashova
bdae962e13
removed constraint to max_iter in CvANN_MLP ( #1110 )
2011-06-07 12:28:18 +00:00
Maria Dimashova
9e21f06404
replaced M_PI by CV_PI
2011-06-07 12:08:36 +00:00
Maria Dimashova
3dc03531e1
added CvEM read/write ( #1032 )
2011-06-07 10:05:23 +00:00
Vadim Pisarevsky
23768b1826
replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket #719 )
2011-05-21 18:32:34 +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
Anatoly Baksheev
8ebff41c29
more warnings fixed. +some warnings in examples
2011-05-07 12:06:58 +00:00
Anatoly Baksheev
1c18e5fef9
fixed ~300 warnings under windows (had to hack gtest a bit)
2011-05-06 21:45:48 +00:00
Maria Dimashova
2f81eb22f6
fixed #887
2011-05-02 17:04:29 +00:00
Maria Dimashova
5c9e6b7059
fixed CvGBTrees
2011-04-30 18:02:56 +00:00
Maria Dimashova
481d0b2c56
fixed CvBoost
2011-04-30 17:39:24 +00:00
Vadim Pisarevsky
21f962c315
small correction to the previous patch (also by Konstantin Krivakin)
2011-04-20 17:56:25 +00:00
Vadim Pisarevsky
17a2480a21
integrated parallel SVM prediction; fixed warnings after meanshift integration
2011-04-19 16:20:44 +00:00
Vadim Pisarevsky
abeeb40d46
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
2011-04-17 13:14:45 +00:00
Vadim Pisarevsky
b9fa21d011
normal bayes classifier has been parallelized using TBB; letter_recog sample updated to demosntrate knearest & bayes classifiers (thanks to Konstantin Krivakin for the patches)
2011-04-14 17:04:39 +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
c5e3869c32
replaced alloca() (a.k.a. cvStackAlloc) with AutoBuffer or vector() everywhere. cvStackAlloc() is still defined, but we do not need alloca() anymore to compile and run OpenCV ( fixes #889 and may be some others)
2011-02-18 10:36:18 +00:00
Vadim Pisarevsky
0e81d9a11c
replaced alloca() (a.k.a. cvStackAlloc) with AutoBuffer or vector() everywhere. cvStackAlloc() is still defined, but we do not need alloca() anymore to compile and run OpenCV ( fixes #889 and may be some others)
2011-02-18 10:31:14 +00:00
Vadim Pisarevsky
65a7f13af3
replaced alloca() (a.k.a. cvStackAlloc) with AutoBuffer or vector() everywhere. cvStackAlloc() is still defined, but we do not need alloca() anymore to compile and run OpenCV ( fixes #889 and may be some others)
2011-02-18 10:29:57 +00:00