fixed U non-orthogonality in SVD (http://code.opencv.org/issues/3801)

savuor · savuor · commit 0a3a2df4333b · 2016-09-03T21:58:19.000+03:00
diff --git a/modules/core/src/lapack.cpp b/modules/core/src/lapack.cpp
@@ -688,7 +688,7 @@ JacobiSVDImpl_(_Tp* At, size_t astep, _Tp* _W, _Tp* Vt, size_t vstep,
                         At[i*astep + k] = t;
                         asum += std::abs(t);
                     }
-                    asum = asum ? 1/asum : 0;
+                    asum = asum > eps * 100 ? 1 / asum : 0;
                     for( k = 0; k < m; k++ )
                         At[i*astep + k] *= asum;
                 }
diff --git a/modules/core/test/test_mat.cpp b/modules/core/test/test_mat.cpp
@@ -919,6 +919,20 @@ TEST(Core_Mat, copyNx1ToVector)
     ASSERT_PRED_FORMAT2(cvtest::MatComparator(0, 0), ref_dst16, cv::Mat_<ushort>(dst16));
 }
 
+TEST(Core_SVD, orthogonality)
+{
+    for (int i = 0; i < 2; i++)
+    {
+        int type = i == 0 ? CV_32F : CV_64F;
+        Mat mat_D(2, 2, type);
+        mat_D.setTo(88.);
+        Mat mat_U, mat_W;
+        SVD::compute(mat_D, mat_W, mat_U, noArray(), SVD::FULL_UV);
+        mat_U *= mat_U.t();
+        ASSERT_LT(norm(mat_U, Mat::eye(2, 2, type), NORM_INF), 1e-5);
+    }
+}
+
 TEST(Core_Mat, multiDim)
 {
     int d[]={3,3,3};

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,7 @@ JacobiSVDImpl_(_Tp* At, size_t astep, _Tp* _W, _Tp* Vt, size_t vstep,`
`688`	`688`	`At[i*astep + k] = t;`
`689`	`689`	`asum += std::abs(t);`
`690`	`690`	`}`
`691`		`- asum = asum ? 1/asum : 0;`
	`691`	`+ asum = asum > eps * 100 ? 1 / asum : 0;`
`692`	`692`	`for( k = 0; k < m; k++ )`
`693`	`693`	`At[iastep + k] = asum;`
`694`	`694`	`}`