Commit b30a275a authored by Davis King's avatar Davis King

Changed to suppress compiler warning and also make more general.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403475
parent e419bb1c
...@@ -107,7 +107,7 @@ namespace ...@@ -107,7 +107,7 @@ namespace
for (int i = 0; i < 40; ++i) for (int i = 0; i < 40; ++i)
{ {
for (long dims = 2; dims < 6; ++dims) for (long dims = 1; dims < 6; ++dims)
{ {
rs.add(do_the_test(dims, 1.0)); rs.add(do_the_test(dims, 1.0));
} }
...@@ -115,7 +115,7 @@ namespace ...@@ -115,7 +115,7 @@ namespace
for (int i = 0; i < 40; ++i) for (int i = 0; i < 40; ++i)
{ {
for (long dims = 2; dims < 6; ++dims) for (long dims = 1; dims < 6; ++dims)
{ {
rs.add(do_the_test(dims, 5.0)); rs.add(do_the_test(dims, 5.0));
} }
......
...@@ -122,7 +122,7 @@ namespace ...@@ -122,7 +122,7 @@ namespace
cov.add(vects.back()); cov.add(vects.back());
} }
DLIB_TEST(cov.in_vector_size() == dims); DLIB_TEST(cov.in_vector_size() == (long)dims);
DLIB_TEST(equal(mean(vector_to_matrix(vects)), cov.mean())); DLIB_TEST(equal(mean(vector_to_matrix(vects)), cov.mean()));
DLIB_TEST_MSG(equal(covariance(vector_to_matrix(vects)), cov.covariance()), DLIB_TEST_MSG(equal(covariance(vector_to_matrix(vects)), cov.covariance()),
...@@ -149,7 +149,7 @@ namespace ...@@ -149,7 +149,7 @@ namespace
cov2.add(vects.back()); cov2.add(vects.back());
} }
DLIB_TEST((cov+cov2).in_vector_size() == dims); DLIB_TEST((cov+cov2).in_vector_size() == (long)dims);
DLIB_TEST(equal(mean(vector_to_matrix(vects)), (cov+cov2).mean())); DLIB_TEST(equal(mean(vector_to_matrix(vects)), (cov+cov2).mean()));
DLIB_TEST_MSG(equal(covariance(vector_to_matrix(vects)), (cov+cov2).covariance()), DLIB_TEST_MSG(equal(covariance(vector_to_matrix(vects)), (cov+cov2).covariance()),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment