potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Minor fixes

Browse Source 
Fix failed builds that opencv's buildbot has got.
This commit is contained in:
Alex Leontiev
2013-09-28 15:58:06 +08:00
parent 891bcd8491
commit 3ac3ba0415
2 changed files with 138 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/optim/src/conjugate_gradient.cpp
+2 -4
View File
@@ -37,11 +37,11 @@ namespace cv{namespace optim{
print_matrix(d);
for(int i=0;i<SEC_METHOD_ITERATIONS;i++){
_f->getGradient((double*)x.data,(double*)buf1.data);
_f->getGradient((double*)x.data,(double*)buf1.data);
dprintf(("buf1:\n"));
print_matrix(buf1);
x=x+sigma*d;
_f->getGradient((double*)x.data,(double*)buf2.data);
_f->getGradient((double*)x.data,(double*)buf2.data);
dprintf(("buf2:\n"));
print_matrix(buf2);
double d1=buf1.dot(d), d2=buf2.dot(d);
@@ -85,10 +85,8 @@ namespace cv{namespace optim{
proxy_x=x_mat;
}
_Function->getGradient((double*)proxy_x.data,(double*)d.data);
if(true){
d*=-1.0;
d.copyTo(r);
}else{((double*)d.data)[1]=42.0;}
//here everything goes. check that everything is setted properly
dprintf(("proxy_x\n"));print_matrix(proxy_x);