Skip to content

GitLab

Commit 9a8ed037 authored by Davis King's avatar Davis King
Browse files

Switched all the test statements in the regression test suite from 

DLIB_CASSERT to DLIB_TEST and DLIB_TEST_MSG.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402975
parent 574215ed
Show whitespace changes
Inline Side-by-side
Showing with 1781 additions and 1781 deletions
dlib/test/image.cpp
View file @ 9a8ed037
......@@ -38,7 +38,7 @@ namespace
assign_image(img2, img1);
DLIB_CASSERT(img1.nr() == 100 && img1.nc() == 100 &&
DLIB_TEST_MSG(img1.nr() == 100 && img1.nc() == 100 &&
img2.nr() == 100 && img2.nc() == 100,"");
......@@ -46,8 +46,8 @@ namespace
{
for (long c = 0; c < img1.nc(); ++c)
{
DLIB_CASSERT(img1[r][c] == 7,"");
DLIB_CASSERT(img2[r][c] == 7,"");
DLIB_TEST(img1[r][c] == 7);
DLIB_TEST(img2[r][c] == 7);
}
}
......@@ -58,8 +58,8 @@ namespace
{
for (long c = 0; c < img1.nc(); ++c)
{
DLIB_CASSERT(img1[r][c] == 7,"");
DLIB_CASSERT(img2[r][c] == on_pixel,"");
DLIB_TEST(img1[r][c] == 7);
DLIB_TEST(img2[r][c] == on_pixel);
}
}
......@@ -81,21 +81,21 @@ namespace
istringstream sin(sout.str());
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_dng(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c].h == r*14 + c + 1, "");
DLIB_CASSERT(img[r][c].s == r*14 + c + 2, "");
DLIB_CASSERT(img[r][c].i == r*14 + c + 3, "");
DLIB_TEST(img[r][c].h == r*14 + c + 1);
DLIB_TEST(img[r][c].s == r*14 + c + 2);
DLIB_TEST(img[r][c].i == r*14 + c + 3);
}
}
}
......@@ -122,22 +122,22 @@ namespace
istringstream sin(sout.str());
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_dng(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c].red == r*14 + c + 1, "");
DLIB_CASSERT(img[r][c].green == r*14 + c + 2, "");
DLIB_CASSERT(img[r][c].blue == r*14 + c + 3, "");
DLIB_CASSERT(img[r][c].alpha == r*14 + c + 4, "");
DLIB_TEST(img[r][c].red == r*14 + c + 1);
DLIB_TEST(img[r][c].green == r*14 + c + 2);
DLIB_TEST(img[r][c].blue == r*14 + c + 3);
DLIB_TEST(img[r][c].alpha == r*14 + c + 4);
}
}
}
......@@ -167,40 +167,40 @@ namespace
for (int i = 0; i < 2; ++i)
{
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_dng(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c].red == r*14 + c + 1, "");
DLIB_CASSERT(img[r][c].green == r*14 + c + 2, "");
DLIB_CASSERT(img[r][c].blue == r*14 + c + 3, "");
DLIB_TEST(img[r][c].red == r*14 + c + 1);
DLIB_TEST(img[r][c].green == r*14 + c + 2);
DLIB_TEST(img[r][c].blue == r*14 + c + 3);
}
}
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_bmp(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c].red == r*14 + c + 1, "got " << (int)img[r][c].red << " but expected " << r*14 + c + 1);
DLIB_CASSERT(img[r][c].green == r*14 + c + 2, "");
DLIB_CASSERT(img[r][c].blue == r*14 + c + 3, "");
DLIB_TEST_MSG(img[r][c].red == r*14 + c + 1, "got " << (int)img[r][c].red << " but expected " << r*14 + c + 1);
DLIB_TEST(img[r][c].green == r*14 + c + 2);
DLIB_TEST(img[r][c].blue == r*14 + c + 3);
}
}
}
......@@ -225,19 +225,19 @@ namespace
istringstream sin(sout.str());
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_dng(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c] == r*14 + c + 0xFF, "");
DLIB_TEST(img[r][c] == r*14 + c + 0xFF);
}
}
}
......@@ -265,37 +265,37 @@ namespace
for (int i = 0; i < 2; ++i)
{
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_dng(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c] == r*14 + c, "");
DLIB_TEST(img[r][c] == r*14 + c);
}
}
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_bmp(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c] == r*14 + c, "");
DLIB_TEST(img[r][c] == r*14 + c);
}
}
}
......@@ -326,37 +326,37 @@ namespace
for (int i = 0; i < 2; ++i)
{
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_dng(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c] == r*14 + c, "");
DLIB_TEST(img[r][c] == r*14 + c);
}
}
img.clear();
DLIB_CASSERT(img.nr() == 0,"");
DLIB_CASSERT(img.nc() == 0,"");
DLIB_TEST(img.nr() == 0);
DLIB_TEST(img.nc() == 0);
load_bmp(img, sin);
DLIB_CASSERT(img.nr() == 14,"");
DLIB_CASSERT(img.nc() == 15,"");
DLIB_TEST(img.nr() == 14);
DLIB_TEST(img.nc() == 15);
for (long r = 0; r < 14; ++r)
{
for (long c = 0; c < 15; ++c)
{
DLIB_CASSERT(img[r][c] == r*14 + c, "");
DLIB_TEST(img[r][c] == r*14 + c);
}
}
}
......@@ -380,11 +380,11 @@ namespace
if ((r == 5 && c == 5) ||
(r == 7 && c == 7))
{
DLIB_CASSERT(img2[r][c] == 255, "");
DLIB_TEST(img2[r][c] == 255);
}
else
{
DLIB_CASSERT(img2[r][c] == 0, "");
DLIB_TEST(img2[r][c] == 0);
}
}
}
......
dlib/test/kcentroid.cpp
View file @ 9a8ed037
......@@ -152,39 +152,39 @@ namespace
dlog << LDEBUG << test(temp) ;
dlog << LDEBUG << "squared_norm(): " << test.squared_norm() ;
DLIB_CASSERT(approx_equal(test(temp), 2), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 0), "");
DLIB_TEST(approx_equal(test(temp), 2));
DLIB_TEST(approx_equal(test.squared_norm(), 0));
// make test store the point(2,0,0,0,0)
test.train(temp, 0, 1);
dlog << LDEBUG << test(temp) ;
dlog << LDEBUG << "squared_norm(): " << test.squared_norm() ;
DLIB_CASSERT(approx_equal(test(temp), 0), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(temp), 0), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 4), "");
DLIB_TEST(approx_equal(test(temp), 0));
DLIB_TEST(approx_equal(test.get_distance_function()(temp), 0));
DLIB_TEST(approx_equal(test.squared_norm(), 4));
temp = 0,2,0,0,0;
dlog << LDEBUG << test(temp) ;
DLIB_CASSERT(approx_equal(test(temp), std::sqrt(2*2 + 2*2.0)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 4), "");
DLIB_TEST(approx_equal(test(temp), std::sqrt(2*2 + 2*2.0)));
DLIB_TEST(approx_equal(test.squared_norm(), 4));
// make test store the point(0,2,0,0,0)
test.train(temp, 0, 1);
dlog << LDEBUG << test(temp) ;
DLIB_CASSERT(approx_equal(test(temp), 0), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 4), "");
DLIB_TEST(approx_equal(test(temp), 0));
DLIB_TEST(approx_equal(test.squared_norm(), 4));
temp = 2,0,0,0,0;
DLIB_CASSERT(approx_equal(test(temp), std::sqrt(2*2 + 2*2.0)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 4), "");
DLIB_TEST(approx_equal(test(temp), std::sqrt(2*2 + 2*2.0)));
DLIB_TEST(approx_equal(test.squared_norm(), 4));
// make test store the point(1,1,0,0,0)
test.train(temp, 0.5, 0.5);
temp = 0;
DLIB_CASSERT(approx_equal(test(temp), std::sqrt(2.0)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 2), "");
DLIB_TEST(approx_equal(test(temp), std::sqrt(2.0)));
DLIB_TEST(approx_equal(test.squared_norm(), 2));
// make test store the point(1,1,0,3,0)
temp = 0,0,0,3,0;
......@@ -192,11 +192,11 @@ namespace
test.train(temp, 1, 1);
temp = 0;
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
temp = 1,2,3,4,5;
DLIB_CASSERT(approx_equal(test(temp), length(temp2-temp)), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(temp), length(temp2-temp)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2-temp)));
DLIB_TEST(approx_equal(test.get_distance_function()(temp), length(temp2-temp)));
// make test store the point(0,1,0,3,-1)
temp = 1,0,0,0,1;
......@@ -204,10 +204,10 @@ namespace
temp2 = 0,1,0,3,-1;
temp = 0;
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
temp = 1,2,3,4,5;
DLIB_CASSERT(approx_equal(test(temp), length(temp2-temp)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2-temp)));
// make test store the -1*point(0,1,0,3,-1)
......@@ -216,10 +216,10 @@ namespace
temp2 = -temp2;
temp = 0;
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
temp = 1,2,-3,4,5;
DLIB_CASSERT(approx_equal(test(temp), length(temp2-temp)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2-temp)));
......@@ -229,10 +229,10 @@ namespace
temp2 = 0;
temp = 0;
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
temp = 1,2,-3,4,5;
DLIB_CASSERT(approx_equal(test(temp), length(temp2-temp)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2-temp)));
......@@ -242,13 +242,13 @@ namespace
temp2 = 1,0,0,0,0;
temp = 0;
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_CASSERT(approx_equal(test.inner_product(test), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
DLIB_TEST(approx_equal(test.inner_product(test), length_squared(temp2)));
temp = 1,2,-3,4,5;
DLIB_CASSERT(approx_equal(test(temp), length(temp2-temp)), "");
DLIB_CASSERT(approx_equal(test(test), 0), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(test.get_distance_function()), 0), "");
DLIB_TEST(approx_equal(test(temp), length(temp2-temp)));
DLIB_TEST(approx_equal(test(test), 0));
DLIB_TEST(approx_equal(test.get_distance_function()(test.get_distance_function()), 0));
}
......@@ -282,9 +282,9 @@ namespace
temp = 2,0,0,0;
temp2 = 0;
val = 0;
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST(approx_equal(test(temp2), dist(k,temp2,val)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
temp2 = 0;
......@@ -297,25 +297,25 @@ namespace
dlog << LDEBUG << test(temp) ;
dlog << LDEBUG << "squared_norm(): " << test.squared_norm() ;
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val)), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(temp2), dist(k,temp2,val), 1e-6),
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST(approx_equal(test(temp2), dist(k,temp2,val)));
DLIB_TEST_MSG(approx_equal(test.get_distance_function()(temp2), dist(k,temp2,val), 1e-6),
test.get_distance_function()(temp2) - dist(k,temp2,val) << " compare to: " <<
test(temp2) - dist(k,temp2,val)
);
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
// make test store the point(0,0,0,0,0)
val = 0,0,0,0,0;
test.train(temp2, 1,-1);
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val)), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(temp2), dist(k,temp2,val)),
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST(approx_equal(test(temp2), dist(k,temp2,val)));
DLIB_TEST_MSG(approx_equal(test.get_distance_function()(temp2), dist(k,temp2,val)),
test.get_distance_function()(temp2) - dist(k,temp2,val) << " compare to: " <<
test(temp2) - dist(k,temp2,val)
);
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
......@@ -326,11 +326,11 @@ namespace
test.train(temp2, 1,1);
temp = 1,0,3,0;
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val), 1e-7),
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST_MSG(approx_equal(test(temp2), dist(k,temp2,val), 1e-7),
test(temp2) - dist(k,temp2,val));
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_CASSERT(approx_equal(test(test), 0, 1e-7), test(test));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
DLIB_TEST_MSG(approx_equal(test(test), 0, 1e-7), test(test));
val2 = 0,1,2.6,8,b;
......@@ -340,12 +340,12 @@ namespace
test.train(temp2, 1,1);
temp = 1,1,3,0;
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val)), test(temp2) - dist(k,temp2,val));
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_CASSERT(approx_equal(test.inner_product(test), length_squared(val)), "");
DLIB_CASSERT(approx_equal(test(test), 0), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(test.get_distance_function()), 0, 1e-6),
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST_MSG(approx_equal(test(temp2), dist(k,temp2,val)), test(temp2) - dist(k,temp2,val));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
DLIB_TEST(approx_equal(test.inner_product(test), length_squared(val)));
DLIB_TEST(approx_equal(test(test), 0));
DLIB_TEST_MSG(approx_equal(test.get_distance_function()(test.get_distance_function()), 0, 1e-6),
test.get_distance_function()(test.get_distance_function()));
}
......@@ -377,44 +377,44 @@ namespace
dlog << LDEBUG << test(temp) ;
dlog << LDEBUG << "squared_norm(): " << test.squared_norm() ;
DLIB_CASSERT(approx_equal(test(temp), 2), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 0), "");
DLIB_TEST(approx_equal(test(temp), 2));
DLIB_TEST(approx_equal(test.squared_norm(), 0));
// make test store the point(2,0,0,0,0)
test.train(temp, 0, 1);
dlog << LDEBUG << test(temp) ;
dlog << LDEBUG << "squared_norm(): " << test.squared_norm() ;
DLIB_CASSERT(approx_equal(test(temp), 0), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 4), "");
DLIB_TEST(approx_equal(test(temp), 0));
DLIB_TEST(approx_equal(test.squared_norm(), 4));
dlog << LDEBUG << "AAAA 2" ;
temp.clear();
temp[1] = 2;
dlog << LDEBUG << test(temp) ;
DLIB_CASSERT(approx_equal(test(temp), std::sqrt(2*2 + 2*2.0)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 4), "");
DLIB_TEST(approx_equal(test(temp), std::sqrt(2*2 + 2*2.0)));
DLIB_TEST(approx_equal(test.squared_norm(), 4));
// make test store the point(0,2,0,0,0)
test.train(temp, 0, 1);
dlog << LDEBUG << test(temp) ;
DLIB_CASSERT(approx_equal(test(temp), 0), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 4), "");
DLIB_TEST(approx_equal(test(temp), 0));
DLIB_TEST(approx_equal(test.squared_norm(), 4));
temp.clear();
temp[0] = 2;
DLIB_CASSERT(approx_equal(test(temp), std::sqrt(2*2 + 2*2.0)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 4), "");
DLIB_TEST(approx_equal(test(temp), std::sqrt(2*2 + 2*2.0)));
DLIB_TEST(approx_equal(test.squared_norm(), 4));
// make test store the point(1,1,0,0,0)
test.train(temp, 0.5, 0.5);
dlog << LDEBUG << "AAAA 3" ;
temp.clear();
DLIB_CASSERT(approx_equal(test(temp), std::sqrt(2.0)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), 2), "");
DLIB_CASSERT(approx_equal(test(test), 0), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(test.get_distance_function()), 0), "");
DLIB_TEST(approx_equal(test(temp), std::sqrt(2.0)));
DLIB_TEST(approx_equal(test.squared_norm(), 2));
DLIB_TEST(approx_equal(test(test), 0));
DLIB_TEST(approx_equal(test.get_distance_function()(test.get_distance_function()), 0));
dlog << LDEBUG << "AAAA 3.1" ;
// make test store the point(1,1,0,3,0)
......@@ -427,8 +427,8 @@ namespace
dlog << LDEBUG << "AAAA 3.2" ;
temp.clear();
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
dlog << LDEBUG << "AAAA 3.3" ;
temp[0] = 1;
temp[1] = 2;
......@@ -438,7 +438,7 @@ namespace
dlog << LDEBUG << "AAAA 3.4" ;
double junk = sparse_vector::distance(temp2,temp);
dlog << LDEBUG << "AAAA 3.5" ;
DLIB_CASSERT(approx_equal(test(temp), junk) , "");
DLIB_TEST(approx_equal(test(temp), junk) );
dlog << LDEBUG << "AAAA 4" ;
// make test store the point(0,1,0,3,-1)
......@@ -452,14 +452,14 @@ namespace
temp2[4] = -1;
temp.clear();
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
temp[0] = 1;
temp[1] = 2;
temp[2] = 3;
temp[3] = 4;
temp[4] = 5;
DLIB_CASSERT(approx_equal(test(temp), sparse_vector::distance(temp2,temp)), "");
DLIB_TEST(approx_equal(test(temp), sparse_vector::distance(temp2,temp)));
// make test store the -1*point(0,1,0,3,-1)
......@@ -473,14 +473,14 @@ namespace
dlog << LDEBUG << "AAAA 5" ;
temp.clear();
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
temp[0] = 1;
temp[1] = 2;
temp[2] = -3;
temp[3] = 4;
temp[4] = 5;
DLIB_CASSERT(approx_equal(test(temp), sparse_vector::distance(temp2,temp)), "");
DLIB_TEST(approx_equal(test(temp), sparse_vector::distance(temp2,temp)));
......@@ -490,15 +490,15 @@ namespace
temp2.clear();
temp.clear();
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
temp[0] = 1;
temp[1] = 2;
temp[2] = -3;
temp[3] = 4;
temp[4] = 5;
DLIB_CASSERT(approx_equal(test(temp), sparse_vector::distance(temp2,temp)), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(temp), sparse_vector::distance(temp2,temp)), "");
DLIB_TEST(approx_equal(test(temp), sparse_vector::distance(temp2,temp)));
DLIB_TEST(approx_equal(test.get_distance_function()(temp), sparse_vector::distance(temp2,temp)));
dlog << LDEBUG << "AAAA 6" ;
......@@ -511,18 +511,18 @@ namespace
temp2[0] = 1;
temp.clear();
DLIB_CASSERT(approx_equal(test(temp), length(temp2)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(temp2)), "");
DLIB_CASSERT(approx_equal(test.inner_product(test), length_squared(temp2)), "");
DLIB_TEST(approx_equal(test(temp), length(temp2)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(temp2)));
DLIB_TEST(approx_equal(test.inner_product(test), length_squared(temp2)));
temp[0] = 1;
temp[1] = 2;
temp[2] = -3;
temp[3] = 4;
temp[4] = 5;
DLIB_CASSERT(approx_equal(test(temp), sparse_vector::distance(temp2,temp)), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(temp), sparse_vector::distance(temp2,temp)), "");
DLIB_CASSERT(approx_equal(test(test), 0), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(test.get_distance_function()), 0), "");
DLIB_TEST(approx_equal(test(temp), sparse_vector::distance(temp2,temp)));
DLIB_TEST(approx_equal(test.get_distance_function()(temp), sparse_vector::distance(temp2,temp)));
DLIB_TEST(approx_equal(test(test), 0));
DLIB_TEST(approx_equal(test.get_distance_function()(test.get_distance_function()), 0));
dlog << LDEBUG << "AAAA 7" ;
}
......@@ -559,9 +559,9 @@ namespace
temp[0] = 2;
temp2.clear();
val.clear();
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST(approx_equal(test(temp2), dist(k,temp2,val)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
temp2.clear();
......@@ -576,14 +576,14 @@ namespace
dlog << LDEBUG << test(temp) ;
dlog << LDEBUG << "squared_norm(): " << test.squared_norm() ;
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val)), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(temp2), dist(k,temp2,val), 1e-7),
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST(approx_equal(test(temp2), dist(k,temp2,val)));
DLIB_TEST_MSG(approx_equal(test.get_distance_function()(temp2), dist(k,temp2,val), 1e-7),
test.get_distance_function()(temp2) - dist(k,temp2,val)
);
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_CASSERT(approx_equal(test(test), 0), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(test.get_distance_function()), 0, 1e-6), "");
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
DLIB_TEST(approx_equal(test(test), 0));
DLIB_TEST(approx_equal(test.get_distance_function()(test.get_distance_function()), 0, 1e-6));
// make test store the point(0,0,0,0,0)
val.clear();
......@@ -594,12 +594,12 @@ namespace
dlog << LDEBUG << test(temp) ;
dlog << LDEBUG << "squared_norm(): " << test.squared_norm() ;
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), test(temp) - dist(k,temp,val));
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val)), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(temp2), dist(k,temp2,val)), "");
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_CASSERT(approx_equal(test(test), 0), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(test.get_distance_function()), 0), "");
DLIB_TEST_MSG(approx_equal(test(temp), dist(k,temp,val)), test(temp) - dist(k,temp,val));
DLIB_TEST(approx_equal(test(temp2), dist(k,temp2,val)));
DLIB_TEST(approx_equal(test.get_distance_function()(temp2), dist(k,temp2,val)));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
DLIB_TEST(approx_equal(test(test), 0));
DLIB_TEST(approx_equal(test.get_distance_function()(test.get_distance_function()), 0));
val2.clear();
val2[0] = 0;
......@@ -616,10 +616,10 @@ namespace
temp.clear();
temp[0] = 1;
temp[2] = 3;
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val), 1e-7),
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST_MSG(approx_equal(test(temp2), dist(k,temp2,val), 1e-7),
test(temp2) - dist(k,temp2,val));
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
val2.clear();
......@@ -643,12 +643,12 @@ namespace
temp[1] = 1;
temp[2] = 3;
temp[3] = 0;
DLIB_CASSERT(approx_equal(test(temp), dist(k,temp,val)), "");
DLIB_CASSERT(approx_equal(test(temp2), dist(k,temp2,val)), test(temp2) - dist(k,temp2,val));
DLIB_CASSERT(approx_equal(test.squared_norm(), length_squared(val)), "");
DLIB_CASSERT(approx_equal(test.inner_product(test), length_squared(val)), "");
DLIB_CASSERT(approx_equal(test(test), 0), "");
DLIB_CASSERT(approx_equal(test.get_distance_function()(test.get_distance_function()), 0), "");
DLIB_TEST(approx_equal(test(temp), dist(k,temp,val)));
DLIB_TEST_MSG(approx_equal(test(temp2), dist(k,temp2,val)), test(temp2) - dist(k,temp2,val));
DLIB_TEST(approx_equal(test.squared_norm(), length_squared(val)));
DLIB_TEST(approx_equal(test.inner_product(test), length_squared(val)));
DLIB_TEST(approx_equal(test(test), 0));
DLIB_TEST(approx_equal(test.get_distance_function()(test.get_distance_function()), 0));
}
// ----------------------------------------------------------------------------------------
......
dlib/test/lz77_buffer.cpp
View file @ 9a8ed037
......@@ -37,10 +37,10 @@ namespace
buf test(8,20);
srand(static_cast<unsigned int>(time(0)));
DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,test.get_history_buffer_limit());
DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST_MSG(test.get_history_buffer_limit() == 256-20,test.get_history_buffer_limit());
DLIB_TEST(test.get_lookahead_buffer_limit() == 20);
for (int g = 0; g < 2; ++g)
......@@ -51,12 +51,12 @@ namespace
{
test.add('a');
}
DLIB_CASSERT(test.get_lookahead_buffer_size() == 20,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 20);
test.shift_buffers(5);
DLIB_CASSERT(test.get_lookahead_buffer_size() == 15,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 15);
......@@ -65,10 +65,10 @@ namespace
test.find_match(index,length,5);
DLIB_CASSERT(length <= temp,
DLIB_TEST_MSG(length <= temp,
"length: " << length <<
"\ntemp: " << temp);
DLIB_CASSERT(test.get_lookahead_buffer_size() <= 15,"");
DLIB_TEST(test.get_lookahead_buffer_size() <= 15);
}
......@@ -83,35 +83,35 @@ namespace
DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,"");
DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_limit() == 256-20);
DLIB_TEST(test.get_lookahead_buffer_limit() == 20);
unsigned long a,b, temp = test.get_lookahead_buffer_size();
test.find_match(a,b,0);
DLIB_CASSERT(b <= temp,"");
DLIB_CASSERT(b == 0,"");
DLIB_TEST(b <= temp);
DLIB_TEST(b == 0);
test.find_match(a,b,5);
DLIB_CASSERT(b == 0,"");
DLIB_TEST(b == 0);
DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,"");
DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_limit() == 256-20);
DLIB_TEST(test.get_lookahead_buffer_limit() == 20);
ostringstream sout;
sout << "DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_size() == 0,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,);\n";
sout << "DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_size() == 0,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_size() == 0,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_limit() == 20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_size() == 0,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_limit() == 20,);\n";
istringstream sin(sout.str());
sout.str("");
......@@ -125,29 +125,29 @@ namespace
ch = sin.get();
sbuffer[0] = ch; sbuffer.rotate_left(1);
test.add(ch);
DLIB_CASSERT(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch,"");
DLIB_CASSERT(test.get_lookahead_buffer_size() == 1,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,"");
DLIB_TEST(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch);
DLIB_TEST(test.get_lookahead_buffer_size() == 1);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST(test.get_lookahead_buffer_limit() == 20);
ch = sin.get();
sbuffer[0] = ch; sbuffer.rotate_left(1);
test.add(ch);
DLIB_CASSERT(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch,"");
DLIB_CASSERT(test.get_lookahead_buffer_size() == 2,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,"");
DLIB_TEST(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch);
DLIB_TEST(test.get_lookahead_buffer_size() == 2);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST(test.get_lookahead_buffer_limit() == 20);
ch = sin.get();
sbuffer[0] = ch; sbuffer.rotate_left(1);
test.add(ch);
DLIB_CASSERT(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch,"");
DLIB_CASSERT(test.get_lookahead_buffer_size() == 3,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_TEST(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch);
DLIB_TEST(test.get_lookahead_buffer_size() == 3);
DLIB_TEST(test.get_history_buffer_size() == 0);
// add 17 chars to test so that the lookahead buffer will be full
for (int i = 0; i < 17; ++i)
......@@ -155,20 +155,20 @@ namespace
ch = sin.get();
sbuffer[0] = ch; sbuffer.rotate_left(1);
test.add(ch);
DLIB_CASSERT(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch,"");
DLIB_TEST(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch);
}
DLIB_CASSERT(test.get_lookahead_buffer_size() == 20,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.lookahead_buffer(0) == sbuffer[20],"");
DLIB_TEST(test.get_lookahead_buffer_size() == 20);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST(test.lookahead_buffer(0) == sbuffer[20]);
ch = sin.get();
sbuffer[0] = ch; sbuffer.rotate_left(1);
test.add(ch);
DLIB_CASSERT(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch,"");
DLIB_CASSERT(test.get_lookahead_buffer_size() == 20,"");
DLIB_CASSERT(test.get_history_buffer_size() == 1,"");
DLIB_TEST(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch);
DLIB_TEST(test.get_lookahead_buffer_size() == 20);
DLIB_TEST(test.get_history_buffer_size() == 1);
......@@ -181,9 +181,9 @@ namespace
{
sbuffer[0] = ch; sbuffer.rotate_left(1);
test.add(ch);
DLIB_CASSERT(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch,"");
DLIB_CASSERT(test.history_buffer(0) == sbuffer[21],"");
DLIB_CASSERT(test.history_buffer(1) == sbuffer[22],"");
DLIB_TEST(test.lookahead_buffer(test.get_lookahead_buffer_size()-1) == ch);
DLIB_TEST(test.history_buffer(0) == sbuffer[21]);
DLIB_TEST(test.history_buffer(1) == sbuffer[22]);
ch = sin.get();
}
......@@ -195,11 +195,11 @@ namespace
sbuffer.rotate_right(1);
for (unsigned int i = 0; i < test.get_history_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i));
}
for (unsigned int i = 0; i < test.get_lookahead_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i));
}
sbuffer.rotate_left(1);
......@@ -217,13 +217,13 @@ namespace
unsigned long match_index, match_length;
unsigned long ltemp = test.get_lookahead_buffer_size();
test.find_match(match_index,match_length,0);
DLIB_CASSERT(match_length <= ltemp,"");
DLIB_TEST(match_length <= ltemp);
// verify the match with sbuffer
for (unsigned int i = 0; i < match_length; ++i)
{
DLIB_CASSERT(sbuffer[19-i] == sbuffer[match_index+20-i],i);
DLIB_TEST_MSG(sbuffer[19-i] == sbuffer[match_index+20-i],i);
}
......@@ -238,27 +238,27 @@ namespace
test.clear();
DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,"");
DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_limit() == 256-20);
DLIB_TEST(test.get_lookahead_buffer_limit() == 20);
sbuf sbuffer;
sbuffer.set_size(8);
ostringstream sout;
sout << "DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_size() == 0,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,);\n";
sout << "DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_size() == 0,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_limit() == 20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_limit() == 20,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_TEST_MSG(test.get_lookahead_buffer_size() == 0,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_limit() == 256-20,);\n";
sout << "DLIB_TEST_MSG(test.get_history_buffer_limit() == 256-20,);\n";
istringstream sin(sout.str());
unsigned char ch;
......@@ -274,11 +274,11 @@ namespace
sbuffer.rotate_right(1);
for (unsigned int i = 0; i < test.get_history_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i));
}
for (unsigned int i = 0; i < test.get_lookahead_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i));
}
sbuffer.rotate_left(1);
......@@ -288,15 +288,15 @@ namespace
unsigned long match_index, match_length;
unsigned long ltemp = test.get_lookahead_buffer_size();
test.find_match(match_index,match_length,0);
DLIB_CASSERT(match_length <= ltemp,"");
DLIB_TEST(match_length <= ltemp);
DLIB_CASSERT(test.get_lookahead_buffer_size() == 20-match_length,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 20-match_length);
sbuffer.rotate_right(1); // do this because we never put anything in sbuffer[0]
// verify the match with sbuffer
for (unsigned int i = 0; i < match_length; ++i)
{
DLIB_CASSERT(sbuffer[i+20-match_length] == sbuffer[i+1+match_index+20-match_length],"");
DLIB_TEST(sbuffer[i+20-match_length] == sbuffer[i+1+match_index+20-match_length]);
}
sbuffer.rotate_left(1); // free up sbuffer[0] for new data
......@@ -342,11 +342,11 @@ namespace
sbuffer.rotate_right(1);
for (unsigned int i = 0; i < test.get_history_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i));
}
for (unsigned int i = 0; i < test.get_lookahead_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i));
}
sbuffer.rotate_left(1);
......@@ -356,14 +356,14 @@ namespace
test.find_match(match_index,match_length,10+g);
if (match_length > 0)
DLIB_CASSERT(match_length >= static_cast<unsigned int>(10+g) , "");
DLIB_TEST(match_length >= static_cast<unsigned int>(10+g) );
sbuffer.rotate_right(1); // do this because we never put anything in sbuffer[0]
// verify the match with sbuffer
for (unsigned int i = 0; i < match_length; ++i)
{
DLIB_CASSERT(sbuffer[i+20-match_length] == sbuffer[i+1+match_index+20-match_length],"");
DLIB_TEST(sbuffer[i+20-match_length] == sbuffer[i+1+match_index+20-match_length]);
}
sbuffer.rotate_left(1); // free up sbuffer[0] for new data
......@@ -381,10 +381,10 @@ namespace
{
test.clear();
DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,"");
DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_limit() == 256-20);
DLIB_TEST(test.get_lookahead_buffer_limit() == 20);
sbuf sbuffer;
......@@ -417,11 +417,11 @@ namespace
for (unsigned int i = 0; i < test.get_history_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i));
}
for (unsigned int i = 0; i < test.get_lookahead_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i));
}
sbuffer.rotate_left(1);
......@@ -430,16 +430,16 @@ namespace
unsigned long match_index, match_length;
unsigned long lookahead_size_before = test.get_lookahead_buffer_size();
test.find_match(match_index,match_length,0);
DLIB_CASSERT(match_length <= lookahead_size_before,"");
DLIB_TEST(match_length <= lookahead_size_before);
DLIB_CASSERT(test.get_lookahead_buffer_size() == lookahead_size_before-match_length,"");
DLIB_TEST(test.get_lookahead_buffer_size() == lookahead_size_before-match_length);
sbuffer.rotate_right(1); // do this because we never put anything in sbuffer[0]
// verify the match with sbuffer
for (unsigned int i = 0; i < match_length; ++i)
{
DLIB_CASSERT(sbuffer[19-i] == sbuffer[match_index+20-i],i);
DLIB_TEST_MSG(sbuffer[19-i] == sbuffer[match_index+20-i],i);
}
sbuffer.rotate_left(1); // free up sbuffer[0] for new data
......@@ -458,10 +458,10 @@ namespace
{
test.clear();
DLIB_CASSERT(test.get_lookahead_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_size() == 0,"");
DLIB_CASSERT(test.get_history_buffer_limit() == 256-20,"");
DLIB_CASSERT(test.get_lookahead_buffer_limit() == 20,"");
DLIB_TEST(test.get_lookahead_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_size() == 0);
DLIB_TEST(test.get_history_buffer_limit() == 256-20);
DLIB_TEST(test.get_lookahead_buffer_limit() == 20);
sbuf sbuffer;
......@@ -499,11 +499,11 @@ namespace
for (unsigned int i = 0; i < test.get_history_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()+i] == test.history_buffer(i));
}
for (unsigned int i = 0; i < test.get_lookahead_buffer_size(); ++i)
{
DLIB_CASSERT(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i),"");
DLIB_TEST(sbuffer[test.get_lookahead_buffer_limit()-1-i] == test.lookahead_buffer(i));
}
sbuffer.rotate_left(1);
......@@ -516,20 +516,20 @@ namespace
if (match_length != 0)
{
DLIB_CASSERT(match_index < history_size_before,
DLIB_TEST_MSG(match_index < history_size_before,
"match_index: " << match_index <<
"\nhistory_size_before: " << history_size_before);
}
DLIB_CASSERT(test.get_lookahead_buffer_size() == lookahead_size_before-match_length,"");
DLIB_TEST(test.get_lookahead_buffer_size() == lookahead_size_before-match_length);
sbuffer.rotate_right(1); // do this because we never put anything in sbuffer[0]
// verify the match with sbuffer
for (unsigned int i = 0; i < match_length; ++i)
{
DLIB_CASSERT(sbuffer[19-i] == sbuffer[match_index+20-i],i);
DLIB_TEST_MSG(sbuffer[19-i] == sbuffer[match_index+20-i],i);
}
sbuffer.rotate_left(1); // free up sbuffer[0] for new data
......
dlib/test/map.cpp
View file @ 9a8ed037
......@@ -42,98 +42,98 @@ namespace
map test, test2;
enumerable<map_pair<int,int> >& e = test;
DLIB_CASSERT(e.at_start() == true,"");
DLIB_TEST(e.at_start() == true);
for (int j = 0; j < 4; ++j)
{
DLIB_CASSERT(test.at_start() == true,"");
DLIB_CASSERT(test.current_element_valid() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.at_start() == false,"");
DLIB_CASSERT(test.current_element_valid() == false,"");
DLIB_TEST(test.at_start() == true);
DLIB_TEST(test.current_element_valid() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.at_start() == false);
DLIB_TEST(test.current_element_valid() == false);
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(test.is_in_domain(5) == false,"");
DLIB_CASSERT(test.is_in_domain(0) == false,"");
DLIB_CASSERT(test.is_in_domain(-999) == false,"");
DLIB_CASSERT(test.is_in_domain(4999) == false,"");
DLIB_TEST(test.size() == 0);
DLIB_TEST(test.is_in_domain(5) == false);
DLIB_TEST(test.is_in_domain(0) == false);
DLIB_TEST(test.is_in_domain(-999) == false);
DLIB_TEST(test.is_in_domain(4999) == false);
int a,b;
a = 8;
b = 94;
test.add(a,b);
DLIB_CASSERT(test.size() == 1,"");
DLIB_CASSERT(test.is_in_domain(8) == true,"");
DLIB_CASSERT(test.is_in_domain(5) == false,"");
DLIB_CASSERT(test.is_in_domain(0) == false,"");
DLIB_CASSERT(test.is_in_domain(-999) == false,"");
DLIB_CASSERT(test.is_in_domain(4999) == false,"");
DLIB_CASSERT(test[8] == 94,"");
DLIB_TEST(test.size() == 1);
DLIB_TEST(test.is_in_domain(8) == true);
DLIB_TEST(test.is_in_domain(5) == false);
DLIB_TEST(test.is_in_domain(0) == false);
DLIB_TEST(test.is_in_domain(-999) == false);
DLIB_TEST(test.is_in_domain(4999) == false);
DLIB_TEST(test[8] == 94);
a = 53;
b = 4;
test.add(a,b);
DLIB_CASSERT(test.size() == 2,"");
DLIB_CASSERT(test.is_in_domain(53) == true,"");
DLIB_CASSERT(test.is_in_domain(5) == false,"");
DLIB_CASSERT(test.is_in_domain(0) == false,"");
DLIB_CASSERT(test.is_in_domain(-999) == false,"");
DLIB_CASSERT(test.is_in_domain(4999) == false,"");
DLIB_CASSERT(test[53] == 4,"");
DLIB_TEST(test.size() == 2);
DLIB_TEST(test.is_in_domain(53) == true);
DLIB_TEST(test.is_in_domain(5) == false);
DLIB_TEST(test.is_in_domain(0) == false);
DLIB_TEST(test.is_in_domain(-999) == false);
DLIB_TEST(test.is_in_domain(4999) == false);
DLIB_TEST(test[53] == 4);
swap(test,test2);
DLIB_CASSERT(test2.size() == 2,"");
DLIB_CASSERT(test2.is_in_domain(8) == true,"");
DLIB_CASSERT(test2.is_in_domain(5) == false,"");
DLIB_CASSERT(test2.is_in_domain(0) == false,"");
DLIB_CASSERT(test2.is_in_domain(-999) == false,"");
DLIB_CASSERT(test2.is_in_domain(4999) == false,"");
DLIB_CASSERT(test2[8] == 94,"");
DLIB_CASSERT(test2.size() == 2,"");
DLIB_CASSERT(test2.is_in_domain(53) == true,"");
DLIB_CASSERT(test2.is_in_domain(5) == false,"");
DLIB_CASSERT(test2.is_in_domain(0) == false,"");
DLIB_CASSERT(test2.is_in_domain(-999) == false,"");
DLIB_CASSERT(test2.is_in_domain(4999) == false,"");
DLIB_CASSERT(test2[53] == 4,"");
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(test.is_in_domain(8) == false,"");
DLIB_CASSERT(test.is_in_domain(5) == false,"");
DLIB_CASSERT(test.is_in_domain(0) == false,"");
DLIB_CASSERT(test.is_in_domain(-999) == false,"");
DLIB_CASSERT(test.is_in_domain(4999) == false,"");
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(test.is_in_domain(53) == false,"");
DLIB_CASSERT(test.is_in_domain(5) == false,"");
DLIB_CASSERT(test.is_in_domain(0) == false,"");
DLIB_CASSERT(test.is_in_domain(-999) == false,"");
DLIB_CASSERT(test.is_in_domain(4999) == false,"");
DLIB_TEST(test2.size() == 2);
DLIB_TEST(test2.is_in_domain(8) == true);
DLIB_TEST(test2.is_in_domain(5) == false);
DLIB_TEST(test2.is_in_domain(0) == false);
DLIB_TEST(test2.is_in_domain(-999) == false);
DLIB_TEST(test2.is_in_domain(4999) == false);
DLIB_TEST(test2[8] == 94);
DLIB_TEST(test2.size() == 2);
DLIB_TEST(test2.is_in_domain(53) == true);
DLIB_TEST(test2.is_in_domain(5) == false);
DLIB_TEST(test2.is_in_domain(0) == false);
DLIB_TEST(test2.is_in_domain(-999) == false);
DLIB_TEST(test2.is_in_domain(4999) == false);
DLIB_TEST(test2[53] == 4);
DLIB_TEST(test.size() == 0);
DLIB_TEST(test.is_in_domain(8) == false);
DLIB_TEST(test.is_in_domain(5) == false);
DLIB_TEST(test.is_in_domain(0) == false);
DLIB_TEST(test.is_in_domain(-999) == false);
DLIB_TEST(test.is_in_domain(4999) == false);
DLIB_TEST(test.size() == 0);
DLIB_TEST(test.is_in_domain(53) == false);
DLIB_TEST(test.is_in_domain(5) == false);
DLIB_TEST(test.is_in_domain(0) == false);
DLIB_TEST(test.is_in_domain(-999) == false);
DLIB_TEST(test.is_in_domain(4999) == false);
test.clear();
DLIB_CASSERT(test.at_start() == true,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.at_start() == false,"");
DLIB_TEST(test.at_start() == true);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.at_start() == false);
DLIB_CASSERT(test.size() == 0,"");
DLIB_TEST(test.size() == 0);
while (test.size() < 10000)
{
......@@ -143,9 +143,9 @@ namespace
test.add(a,b);
}
DLIB_CASSERT(test.size() == 10000,"");
DLIB_TEST(test.size() == 10000);
test.clear();
DLIB_CASSERT(test.size() == 0,"");
DLIB_TEST(test.size() == 0);
while (test.size() < 10000)
{
......@@ -155,71 +155,71 @@ namespace
test.add(a,b);
}
DLIB_CASSERT(test.size() == 10000,"");
DLIB_TEST(test.size() == 10000);
int count = 0;
a = -1;
while (test.move_next())
{
DLIB_CASSERT(test.element().key() == test.element().key(),"");
DLIB_CASSERT(test.element().value() == test.element().value(),"");
DLIB_CASSERT(test.element().key() == test.element().key(),"");
DLIB_CASSERT(test.element().value() == test.element().value(),"");
DLIB_TEST(test.element().key() == test.element().key());
DLIB_TEST(test.element().value() == test.element().value());
DLIB_TEST(test.element().key() == test.element().key());
DLIB_TEST(test.element().value() == test.element().value());
DLIB_CASSERT(a < test.element().key(),"");
DLIB_TEST(a < test.element().key());
a = test.element().key();
++count;
}
DLIB_CASSERT(test.current_element_valid() == false,"");
DLIB_CASSERT(test.at_start() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_CASSERT(test.current_element_valid() == false,"");
DLIB_CASSERT(test.at_start() == false,"");
DLIB_CASSERT(test.move_next() == false,"");
DLIB_TEST(test.current_element_valid() == false);
DLIB_TEST(test.at_start() == false);
DLIB_TEST(test.move_next() == false);
DLIB_TEST(test.current_element_valid() == false);
DLIB_TEST(test.at_start() == false);
DLIB_TEST(test.move_next() == false);
DLIB_CASSERT(count == 10000,"");
DLIB_TEST(count == 10000);
test.swap(test2);
DLIB_CASSERT(test.size() == 2,"");
DLIB_CASSERT(test2.size() == 10000,"");
DLIB_TEST(test.size() == 2);
DLIB_TEST(test2.size() == 10000);
count = 0;
a = -1;
test2.reset();
test2.move_next();
test2.element().value() = 99;
DLIB_CASSERT(test2[test2.element().key()] == 99,"");
DLIB_CASSERT(test2.element().value() == 99,"");
DLIB_TEST(test2[test2.element().key()] == 99);
DLIB_TEST(test2.element().value() == 99);
test2.reset();
while (test2.move_next())
{
DLIB_CASSERT(test2[test2.element().key()] == test2.element().value(),"");
DLIB_CASSERT(test2.element().key() == test2.element().key(),"");
DLIB_CASSERT(test2.element().value() == test2.element().value(),"");
DLIB_CASSERT(test2.element().key() == test2.element().key(),"");
DLIB_CASSERT(test2.element().value() == test2.element().value(),"");
DLIB_CASSERT(a < test2.element().key(),"");
DLIB_TEST(test2[test2.element().key()] == test2.element().value());
DLIB_TEST(test2.element().key() == test2.element().key());
DLIB_TEST(test2.element().value() == test2.element().value());
DLIB_TEST(test2.element().key() == test2.element().key());
DLIB_TEST(test2.element().value() == test2.element().value());
DLIB_TEST(a < test2.element().key());
a = test2.element().key();
++count;
}
DLIB_CASSERT(test2.size() == 10000,"");
DLIB_CASSERT(count == 10000,"");
DLIB_CASSERT(test2.current_element_valid() == false,"");
DLIB_CASSERT(test2.at_start() == false,"");
DLIB_CASSERT(test2.move_next() == false,"");
DLIB_CASSERT(test2.current_element_valid() == false,"");
DLIB_CASSERT(test2.at_start() == false,"");
DLIB_CASSERT(test2.move_next() == false,"");
DLIB_TEST(test2.size() == 10000);
DLIB_TEST(count == 10000);
DLIB_TEST(test2.current_element_valid() == false);
DLIB_TEST(test2.at_start() == false);
DLIB_TEST(test2.move_next() == false);
DLIB_TEST(test2.current_element_valid() == false);
DLIB_TEST(test2.at_start() == false);
DLIB_TEST(test2.move_next() == false);
test2.clear();
DLIB_CASSERT(test2.size() == 0,"");
DLIB_CASSERT(test2.at_start() == true,"");
DLIB_TEST(test2.size() == 0);
DLIB_TEST(test2.at_start() == true);
while (test.size() < 20000)
{
......@@ -237,7 +237,7 @@ namespace
test.clear();
deserialize(test,sin);
DLIB_CASSERT(test.at_start() == true,"");
DLIB_TEST(test.at_start() == true);
{
int* array1 = new int[test.size()];
......@@ -249,29 +249,29 @@ namespace
count = 0;
while (test.move_next())
{
DLIB_CASSERT(test.element().key() == test.element().key(),"");
DLIB_CASSERT(test.element().value() == test.element().value(),"");
DLIB_CASSERT(test.element().key() == test.element().key(),"");
DLIB_CASSERT(test.current_element_valid() == true,"");
DLIB_TEST(test.element().key() == test.element().key());
DLIB_TEST(test.element().value() == test.element().value());
DLIB_TEST(test.element().key() == test.element().key());
DLIB_TEST(test.current_element_valid() == true);
*tmp1 = test.element().key();
*tmp2 = test.element().value();
++tmp1;
++tmp2;
++count;
}
DLIB_CASSERT(count == 20000,"");
DLIB_TEST(count == 20000);
tmp1 = array1;
tmp2 = array2;
for (int i = 0; i < 20000; ++i)
{
DLIB_CASSERT(test.is_in_domain(*tmp1) == true,"");
DLIB_CASSERT(test[*tmp1] == *tmp2,"");
DLIB_TEST(test.is_in_domain(*tmp1) == true);
DLIB_TEST(test[*tmp1] == *tmp2);
++tmp1;
++tmp2;
}
DLIB_CASSERT(test.size() == 20000,"");
DLIB_TEST(test.size() == 20000);
tmp1 = array1;
tmp2 = array2;
......@@ -279,29 +279,29 @@ namespace
while (test.size() > 10000)
{
test.remove(*tmp1,a,b);
DLIB_CASSERT(*tmp1 == a,"");
DLIB_CASSERT(*tmp2 == b,"");
DLIB_TEST(*tmp1 == a);
DLIB_TEST(*tmp2 == b);
++tmp1;
++tmp2;
++count;
}
DLIB_CASSERT(count == 10000,"");
DLIB_CASSERT(test.size() == 10000,"");
DLIB_TEST(count == 10000);
DLIB_TEST(test.size() == 10000);
while (test.move_next())
{
DLIB_CASSERT(test.element().key() == *tmp1,"");
DLIB_CASSERT(test.element().key() == *tmp1,"");
DLIB_CASSERT(test.element().key() == *tmp1,"");
DLIB_CASSERT(test.element().value() == *tmp2,"");
DLIB_CASSERT(test.element().value() == *tmp2,"");
DLIB_CASSERT(test.element().value() == *tmp2,"");
DLIB_TEST(test.element().key() == *tmp1);
DLIB_TEST(test.element().key() == *tmp1);
DLIB_TEST(test.element().key() == *tmp1);
DLIB_TEST(test.element().value() == *tmp2);
DLIB_TEST(test.element().value() == *tmp2);
DLIB_TEST(test.element().value() == *tmp2);
++tmp1;
++tmp2;
++count;
}
DLIB_CASSERT(count == 20000,"");
DLIB_CASSERT(test.size() == 10000,"");
DLIB_TEST(count == 20000);
DLIB_TEST(test.size() == 10000);
while (test.size() < 20000)
{
......@@ -317,27 +317,27 @@ namespace
a = -1;
while (test2.move_next())
{
DLIB_CASSERT(test2.element().key() == test2.element().key(),"");
DLIB_CASSERT(test2.element().value() == test2.element().value(),"");
DLIB_CASSERT(test2.element().key() == test2.element().key(),"");
DLIB_CASSERT(a < test2.element().key(),"");
DLIB_TEST(test2.element().key() == test2.element().key());
DLIB_TEST(test2.element().value() == test2.element().value());
DLIB_TEST(test2.element().key() == test2.element().key());
DLIB_TEST(a < test2.element().key());
a = test2.element().key();
++count;
}
DLIB_CASSERT(count == 20000,"");
DLIB_CASSERT(test2.size() == 20000,"");
DLIB_TEST(count == 20000);
DLIB_TEST(test2.size() == 20000);
a = -1;
int c = 0;
while (test2.size()>0)
{
test2.remove_any(b,c);
DLIB_CASSERT( a < b,"");
DLIB_TEST( a < b);
a = b;
}
DLIB_CASSERT(test2.size() == 0,"");
DLIB_TEST(test2.size() == 0);
delete [] array1;
delete [] array2;
}
......@@ -356,13 +356,13 @@ namespace
a = -1;
while (test.move_next())
{
DLIB_CASSERT(a < test.element().key(),"");
DLIB_CASSERT(test[test.element().key()] == test.element().value(),"");
DLIB_TEST(a < test.element().key());
DLIB_TEST(test[test.element().key()] == test.element().value());
a = test.element().key();
++count;
if (count == 5000)
break;
DLIB_CASSERT(test.current_element_valid() == true,"");
DLIB_TEST(test.current_element_valid() == true);
}
test.reset();
......@@ -371,13 +371,13 @@ namespace
a = -1;
while (test.move_next())
{
DLIB_CASSERT(a < test.element().key(),"");
DLIB_TEST(a < test.element().key());
a = test.element().key();
++count;
DLIB_CASSERT(test.current_element_valid() == true,"");
DLIB_TEST(test.current_element_valid() == true);
}
DLIB_CASSERT(count == 10000,"");
DLIB_TEST(count == 10000);
test.clear();
......@@ -387,26 +387,26 @@ namespace
{
test.clear();
DLIB_CASSERT(test.size() == 0,"");
DLIB_TEST(test.size() == 0);
int a = 5;
int b = 6;
test.add(a,b);
a = 7;
b = 8;
test.add(a,b);
DLIB_CASSERT(test.size() == 2,"");
DLIB_CASSERT(test[7] == 8,"");
DLIB_CASSERT(test[5] == 6,"");
DLIB_CASSERT(test.is_in_domain(7),"");
DLIB_CASSERT(test.is_in_domain(5),"");
DLIB_TEST(test.size() == 2);
DLIB_TEST(test[7] == 8);
DLIB_TEST(test[5] == 6);
DLIB_TEST(test.is_in_domain(7));
DLIB_TEST(test.is_in_domain(5));
test.destroy(7);
DLIB_CASSERT(test.size() == 1,"");
DLIB_CASSERT(!test.is_in_domain(7),"");
DLIB_CASSERT(test.is_in_domain(5),"");
DLIB_TEST(test.size() == 1);
DLIB_TEST(!test.is_in_domain(7));
DLIB_TEST(test.is_in_domain(5));
test.destroy(5);
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(!test.is_in_domain(7),"");
DLIB_CASSERT(!test.is_in_domain(5),"");
DLIB_TEST(test.size() == 0);
DLIB_TEST(!test.is_in_domain(7));
DLIB_TEST(!test.is_in_domain(5));
}
}
......
dlib/test/matrix.cpp
View file @ 9a8ed037
......@@ -39,10 +39,10 @@ namespace
{
matrix<complex<double>,2,2,MM> m;
set_all_elements(m,complex<double>(1,2));
DLIB_CASSERT((conj(m) == uniform_matrix<complex<double>,2,2>(conj(m(0,0)))),"");
DLIB_CASSERT((real(m) == uniform_matrix<double,2,2>(1)),"");
DLIB_CASSERT((imag(m) == uniform_matrix<double,2,2>(2)),"");
DLIB_CASSERT((sum(abs(norm(m) - uniform_matrix<double,2,2>(5))) < 1e-10 ),norm(m));
DLIB_TEST((conj(m) == uniform_matrix<complex<double>,2,2>(conj(m(0,0)))));
DLIB_TEST((real(m) == uniform_matrix<double,2,2>(1)));
DLIB_TEST((imag(m) == uniform_matrix<double,2,2>(2)));
DLIB_TEST_MSG((sum(abs(norm(m) - uniform_matrix<double,2,2>(5))) < 1e-10 ),norm(m));
}
......@@ -61,10 +61,10 @@ namespace
matrix<double> mi = pinv(m );
DLIB_CASSERT(mi.nr() == m.nc(),"");
DLIB_CASSERT(mi.nc() == m.nr(),"");
DLIB_CASSERT((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,5>())),"");
DLIB_CASSERT((equal(round_zeros(m*mi,0.000001) , identity_matrix<double,5>())),"");
DLIB_TEST(mi.nr() == m.nc());
DLIB_TEST(mi.nc() == m.nr());
DLIB_TEST((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,5>())));
DLIB_TEST((equal(round_zeros(m*mi,0.000001) , identity_matrix<double,5>())));
}
{
matrix<double,5,0,MM> m(5,5);
......@@ -81,7 +81,7 @@ namespace
matrix<double> mi = pinv(m );
DLIB_CASSERT((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,5>())),"");
DLIB_TEST((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,5>())));
}
{
......@@ -99,7 +99,7 @@ namespace
matrix<double> mi = pinv(m );
DLIB_CASSERT((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,5>())),"");
DLIB_TEST((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,5>())));
}
......@@ -118,7 +118,7 @@ namespace
matrix<double> mi = pinv(m );
DLIB_CASSERT((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,5>())),"");
DLIB_TEST((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,5>())));
}
......@@ -137,9 +137,9 @@ namespace
matrix<double> mi = pinv(m );
DLIB_CASSERT(mi.nr() == m.nc(),"");
DLIB_CASSERT(mi.nc() == m.nr(),"");
DLIB_CASSERT((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,2>())),"");
DLIB_TEST(mi.nr() == m.nc());
DLIB_TEST(mi.nc() == m.nr());
DLIB_TEST((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,2>())));
}
{
......@@ -157,9 +157,9 @@ namespace
matrix<double> mi = pinv(m );
DLIB_CASSERT(mi.nr() == m.nc(),"");
DLIB_CASSERT(mi.nc() == m.nr(),"");
DLIB_CASSERT((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,2>())),"");
DLIB_TEST(mi.nr() == m.nc());
DLIB_TEST(mi.nc() == m.nr());
DLIB_TEST((equal(round_zeros(mi*m,0.000001) , identity_matrix<double,2>())));
}
{
......@@ -184,28 +184,28 @@ namespace
d2(i) = i;
}
DLIB_CASSERT(a1 == trans(a2),"");
DLIB_CASSERT(a1 == trans(b2),"");
DLIB_CASSERT(a1 == trans(c2),"");
DLIB_CASSERT(a1 == trans(d2),"");
DLIB_TEST(a1 == trans(a2));
DLIB_TEST(a1 == trans(b2));
DLIB_TEST(a1 == trans(c2));
DLIB_TEST(a1 == trans(d2));
DLIB_CASSERT(a1 == b1,"");
DLIB_CASSERT(a1 == c1,"");
DLIB_CASSERT(a1 == d1,"");
DLIB_TEST(a1 == b1);
DLIB_TEST(a1 == c1);
DLIB_TEST(a1 == d1);
DLIB_CASSERT(trans(a1) == c2,"");
DLIB_CASSERT(trans(b1) == c2,"");
DLIB_CASSERT(trans(c1) == c2,"");
DLIB_CASSERT(trans(d1) == c2,"");
DLIB_TEST(trans(a1) == c2);
DLIB_TEST(trans(b1) == c2);
DLIB_TEST(trans(c1) == c2);
DLIB_TEST(trans(d1) == c2);
DLIB_CASSERT(sum(a1) == 10,"");
DLIB_CASSERT(sum(a2) == 10,"");
DLIB_CASSERT(sum(b1) == 10,"");
DLIB_CASSERT(sum(b2) == 10,"");
DLIB_CASSERT(sum(c1) == 10,"");
DLIB_CASSERT(sum(c2) == 10,"");
DLIB_CASSERT(sum(d1) == 10,"");
DLIB_CASSERT(sum(d2) == 10,"");
DLIB_TEST(sum(a1) == 10);
DLIB_TEST(sum(a2) == 10);
DLIB_TEST(sum(b1) == 10);
DLIB_TEST(sum(b2) == 10);
DLIB_TEST(sum(c1) == 10);
DLIB_TEST(sum(c2) == 10);
DLIB_TEST(sum(d1) == 10);
DLIB_TEST(sum(d2) == 10);
const matrix<long> orig1 = a1;
const matrix<long> orig2 = a2;
......@@ -220,14 +220,14 @@ namespace
serialize(d1,sout);
serialize(d2,sout);
DLIB_CASSERT(a1 == orig1,"");
DLIB_CASSERT(a2 == orig2,"");
DLIB_CASSERT(b1 == orig1,"");
DLIB_CASSERT(b2 == orig2,"");
DLIB_CASSERT(c1 == orig1,"");
DLIB_CASSERT(c2 == orig2,"");
DLIB_CASSERT(d1 == orig1,"");
DLIB_CASSERT(d2 == orig2,"");
DLIB_TEST(a1 == orig1);
DLIB_TEST(a2 == orig2);
DLIB_TEST(b1 == orig1);
DLIB_TEST(b2 == orig2);
DLIB_TEST(c1 == orig1);
DLIB_TEST(c2 == orig2);
DLIB_TEST(d1 == orig1);
DLIB_TEST(d2 == orig2);
set_all_elements(a1,99);
set_all_elements(a2,99);
......@@ -238,14 +238,14 @@ namespace
set_all_elements(d1,99);
set_all_elements(d2,99);
DLIB_CASSERT(a1 != orig1,"");
DLIB_CASSERT(a2 != orig2,"");
DLIB_CASSERT(b1 != orig1,"");
DLIB_CASSERT(b2 != orig2,"");
DLIB_CASSERT(c1 != orig1,"");
DLIB_CASSERT(c2 != orig2,"");
DLIB_CASSERT(d1 != orig1,"");
DLIB_CASSERT(d2 != orig2,"");
DLIB_TEST(a1 != orig1);
DLIB_TEST(a2 != orig2);
DLIB_TEST(b1 != orig1);
DLIB_TEST(b2 != orig2);
DLIB_TEST(c1 != orig1);
DLIB_TEST(c2 != orig2);
DLIB_TEST(d1 != orig1);
DLIB_TEST(d2 != orig2);
istringstream sin(sout.str());
......@@ -258,14 +258,14 @@ namespace
deserialize(d1,sin);
deserialize(d2,sin);
DLIB_CASSERT(a1 == orig1,"");
DLIB_CASSERT(a2 == orig2,"");
DLIB_CASSERT(b1 == orig1,"");
DLIB_CASSERT(b2 == orig2,"");
DLIB_CASSERT(c1 == orig1,"");
DLIB_CASSERT(c2 == orig2,"");
DLIB_CASSERT(d1 == orig1,"");
DLIB_CASSERT(d2 == orig2,"");
DLIB_TEST(a1 == orig1);
DLIB_TEST(a2 == orig2);
DLIB_TEST(b1 == orig1);
DLIB_TEST(b2 == orig2);
DLIB_TEST(c1 == orig1);
DLIB_TEST(c2 == orig2);
DLIB_TEST(d1 == orig1);
DLIB_TEST(d2 == orig2);
}
......@@ -275,15 +275,15 @@ namespace
matrix<double,0,1> b(5);
matrix<double,1,5> c(5);
matrix<double,5,1> d(5);
DLIB_CASSERT(a.nr() == 1,"");
DLIB_CASSERT(a.nc() == 5,"");
DLIB_CASSERT(c.nr() == 1,"");
DLIB_CASSERT(c.nc() == 5,"");
DLIB_TEST(a.nr() == 1);
DLIB_TEST(a.nc() == 5);
DLIB_TEST(c.nr() == 1);
DLIB_TEST(c.nc() == 5);
DLIB_CASSERT(b.nc() == 1,"");
DLIB_CASSERT(b.nr() == 5,"");
DLIB_CASSERT(d.nc() == 1,"");
DLIB_CASSERT(d.nr() == 5,"");
DLIB_TEST(b.nc() == 1);
DLIB_TEST(b.nr() == 5);
DLIB_TEST(d.nc() == 1);
DLIB_TEST(d.nr() == 5);
}
{
......@@ -297,15 +297,15 @@ namespace
c.set_size(5);
d.set_size(5);
DLIB_CASSERT(a.nr() == 1,"");
DLIB_CASSERT(a.nc() == 5,"");
DLIB_CASSERT(c.nr() == 1,"");
DLIB_CASSERT(c.nc() == 5,"");
DLIB_TEST(a.nr() == 1);
DLIB_TEST(a.nc() == 5);
DLIB_TEST(c.nr() == 1);
DLIB_TEST(c.nc() == 5);
DLIB_CASSERT(b.nc() == 1,"");
DLIB_CASSERT(b.nr() == 5,"");
DLIB_CASSERT(d.nc() == 1,"");
DLIB_CASSERT(d.nr() == 5,"");
DLIB_TEST(b.nc() == 1);
DLIB_TEST(b.nr() == 5);
DLIB_TEST(d.nc() == 1);
DLIB_TEST(d.nr() == 5);
}
{
......@@ -318,7 +318,7 @@ namespace
a = a*b;
DLIB_CASSERT(a(0) == 5,"");
DLIB_TEST(a(0) == 5);
}
{
......@@ -334,35 +334,35 @@ namespace
DLIB_CASSERT(rowm(a,1).nr() == 1,"");
DLIB_CASSERT(rowm(a,1).nc() == a.nc(),"");
DLIB_CASSERT(colm(a,1).nr() == a.nr(),"");
DLIB_CASSERT(colm(a,1).nc() == 1,"");
DLIB_TEST(rowm(a,1).nr() == 1);
DLIB_TEST(rowm(a,1).nc() == a.nc());
DLIB_TEST(colm(a,1).nr() == a.nr());
DLIB_TEST(colm(a,1).nc() == 1);
for (long c = 0; c < a.nc(); ++c)
{
DLIB_CASSERT( rowm(a,1)(c) == 1*a.nc() + c,"");
DLIB_TEST( rowm(a,1)(c) == 1*a.nc() + c);
}
for (long r = 0; r < a.nr(); ++r)
{
DLIB_CASSERT( colm(a,1)(r) == r*a.nc() + 1,"");
DLIB_TEST( colm(a,1)(r) == r*a.nc() + 1);
}
rectangle rect(2, 1, 3+2-1, 2+1-1);
DLIB_CASSERT(get_rect(a).contains(get_rect(a)), "");
DLIB_CASSERT(get_rect(a).contains(rect), "");
DLIB_TEST(get_rect(a).contains(get_rect(a)));
DLIB_TEST(get_rect(a).contains(rect));
for (long r = 0; r < 2; ++r)
{
for (long c = 0; c < 3; ++c)
{
DLIB_CASSERT(subm(a,1,2,2,3)(r,c) == (r+1)*a.nc() + c+2,"");
DLIB_CASSERT(subm(a,1,2,2,3) == subm(a,rect),"");
DLIB_TEST(subm(a,1,2,2,3)(r,c) == (r+1)*a.nc() + c+2);
DLIB_TEST(subm(a,1,2,2,3) == subm(a,rect));
}
}
DLIB_CASSERT(subm(a,rectangle()).nr() == 0,"");
DLIB_CASSERT(subm(a,rectangle()).nc() == 0,"");
DLIB_TEST(subm(a,rectangle()).nr() == 0);
DLIB_TEST(subm(a,rectangle()).nc() == 0);
}
......@@ -381,26 +381,26 @@ namespace
DLIB_CASSERT(rowm(array_to_matrix(a),1).nr() == 1,"");
DLIB_CASSERT(rowm(array_to_matrix(a),1).nc() == a.nc(),"");
DLIB_CASSERT(colm(array_to_matrix(a),1).nr() == a.nr(),"");
DLIB_CASSERT(colm(array_to_matrix(a),1).nc() == 1,"");
DLIB_TEST(rowm(array_to_matrix(a),1).nr() == 1);
DLIB_TEST(rowm(array_to_matrix(a),1).nc() == a.nc());
DLIB_TEST(colm(array_to_matrix(a),1).nr() == a.nr());
DLIB_TEST(colm(array_to_matrix(a),1).nc() == 1);
for (long c = 0; c < a.nc(); ++c)
{
DLIB_CASSERT( rowm(array_to_matrix(a),1)(c) == 1*a.nc() + c,"");
DLIB_TEST( rowm(array_to_matrix(a),1)(c) == 1*a.nc() + c);
}
for (long r = 0; r < a.nr(); ++r)
{
DLIB_CASSERT( colm(array_to_matrix(a),1)(r) == r*a.nc() + 1,"");
DLIB_TEST( colm(array_to_matrix(a),1)(r) == r*a.nc() + 1);
}
for (long r = 0; r < 2; ++r)
{
for (long c = 0; c < 3; ++c)
{
DLIB_CASSERT(subm(array_to_matrix(a),1,2,2,3)(r,c) == (r+1)*a.nc() + c+2,"");
DLIB_TEST(subm(array_to_matrix(a),1,2,2,3)(r,c) == (r+1)*a.nc() + c+2);
}
}
......@@ -421,10 +421,10 @@ namespace
matrix<double> mi = pinv(cos(exp(array_to_matrix(m))) );
DLIB_CASSERT(mi.nr() == m.nc(),"");
DLIB_CASSERT(mi.nc() == m.nr(),"");
DLIB_CASSERT((equal(round_zeros(mi*cos(exp(array_to_matrix(m))),0.000001) , identity_matrix<double,5>())),"");
DLIB_CASSERT((equal(round_zeros(cos(exp(array_to_matrix(m)))*mi,0.000001) , identity_matrix<double,5>())),"");
DLIB_TEST(mi.nr() == m.nc());
DLIB_TEST(mi.nc() == m.nr());
DLIB_TEST((equal(round_zeros(mi*cos(exp(array_to_matrix(m))),0.000001) , identity_matrix<double,5>())));
DLIB_TEST((equal(round_zeros(cos(exp(array_to_matrix(m)))*mi,0.000001) , identity_matrix<double,5>())));
}
{
......@@ -452,10 +452,10 @@ namespace
set_colm(m1,4) = trans(rowm(m1,4));
set_rowm(m1,0) = 9;
DLIB_CASSERT(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
DLIB_TEST_MSG(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
set_subm(m1,0,0,5,5) = m1*m1;
DLIB_CASSERT(m1 == res*res, "m1: \n" << m1 << "\nres*res: \n" << res*res);
DLIB_TEST_MSG(m1 == res*res, "m1: \n" << m1 << "\nres*res: \n" << res*res);
m1 = res;
set_subm(m1,1,1,2,2) = subm(m1,0,0,2,2);
......@@ -469,7 +469,7 @@ namespace
};
res = res_vals2;
DLIB_CASSERT(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
DLIB_TEST_MSG(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
}
......@@ -499,10 +499,10 @@ namespace
set_colm(m1,4) = trans(rowm(m1,4));
set_rowm(m1,0) = 9;
DLIB_CASSERT(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
DLIB_TEST_MSG(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
set_subm(m1,0,0,5,5) = m1*m1;
DLIB_CASSERT(m1 == res*res, "m1: \n" << m1 << "\nres*res: \n" << res*res);
DLIB_TEST_MSG(m1 == res*res, "m1: \n" << m1 << "\nres*res: \n" << res*res);
m1 = res;
set_subm(m1,1,1,2,2) = subm(m1,0,0,2,2);
......@@ -516,7 +516,7 @@ namespace
};
res = res_vals2;
DLIB_CASSERT(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
DLIB_TEST_MSG(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
}
......@@ -554,33 +554,33 @@ namespace
res = res_vals;
temp = matrix<long,4,5>(res_vals_r2);
DLIB_CASSERT(remove_row<2>(res) == temp,"");
DLIB_CASSERT(remove_row<2>(res)(3,3) == 3,"");
DLIB_CASSERT(remove_row<2>(res).nr() == 4,"");
DLIB_CASSERT(remove_row<2>(res).nc() == 5,"");
DLIB_CASSERT(remove_row(res,2) == temp,"");
DLIB_CASSERT(remove_row(res,2)(3,3) == 3,"");
DLIB_CASSERT(remove_row(res,2).nr() == 4,"");
DLIB_CASSERT(remove_row(res,2).nc() == 5,"");
DLIB_TEST(remove_row<2>(res) == temp);
DLIB_TEST(remove_row<2>(res)(3,3) == 3);
DLIB_TEST(remove_row<2>(res).nr() == 4);
DLIB_TEST(remove_row<2>(res).nc() == 5);
DLIB_TEST(remove_row(res,2) == temp);
DLIB_TEST(remove_row(res,2)(3,3) == 3);
DLIB_TEST(remove_row(res,2).nr() == 4);
DLIB_TEST(remove_row(res,2).nc() == 5);
temp = matrix<long,5,5>(res_vals);
temp = remove_row(res,2);
DLIB_CASSERT((temp == matrix<long,4,5>(res_vals_r2)),"");
DLIB_TEST((temp == matrix<long,4,5>(res_vals_r2)));
temp = matrix<long,5,5>(res_vals);
temp = remove_col(res,3);
DLIB_CASSERT((temp == matrix<long,5,4>(res_vals_c3)),"");
DLIB_TEST((temp == matrix<long,5,4>(res_vals_c3)));
matrix<long,3,1> vect;
set_all_elements(vect,1);
temp = identity_matrix<long>(3);
temp = temp*vect;
DLIB_CASSERT(temp == vect,"");
DLIB_TEST(temp == vect);
temp = matrix<long,5,4>(res_vals_c3);
DLIB_CASSERT(remove_col(res,3) == temp,"");
DLIB_CASSERT(remove_col(res,3)(2,3) == 0,"");
DLIB_CASSERT(remove_col(res,3).nr() == 5,"");
DLIB_CASSERT(remove_col(res,3).nc() == 4,"");
DLIB_TEST(remove_col(res,3) == temp);
DLIB_TEST(remove_col(res,3)(2,3) == 0);
DLIB_TEST(remove_col(res,3).nr() == 5);
DLIB_TEST(remove_col(res,3).nc() == 4);
set_all_elements(m2, 1);
set_subm(m1, rectangle(1,1,3,2)) = 2;
......@@ -591,7 +591,7 @@ namespace
set_rowm(m1,0) = rowm(m1,4);
set_rowm(m1,3) = 4;
DLIB_CASSERT(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
DLIB_TEST_MSG(m1 == res, "m1: \n" << m1 << "\nres: \n" << res);
}
......@@ -609,11 +609,11 @@ namespace
m = m*trans(m);
matrix<double> L = chol(m);
DLIB_CASSERT(equal(L*trans(L), m), "");
DLIB_TEST(equal(L*trans(L), m));
DLIB_CASSERT(equal(inv(m), inv_upper_triangular(trans(L))*inv_lower_triangular((L))), "")
DLIB_CASSERT(equal(round_zeros(inv_upper_triangular(trans(L))*trans(L),1e-10), identity_matrix<double>(3), 1e-10),"");
DLIB_CASSERT(equal(round_zeros(inv_lower_triangular((L))*(L),1e-10) ,identity_matrix<double>(3),1e-10),"");
DLIB_TEST_MSG(equal(inv(m), inv_upper_triangular(trans(L))*inv_lower_triangular((L))), "")
DLIB_TEST(equal(round_zeros(inv_upper_triangular(trans(L))*trans(L),1e-10), identity_matrix<double>(3), 1e-10));
DLIB_TEST(equal(round_zeros(inv_lower_triangular((L))*(L),1e-10) ,identity_matrix<double>(3),1e-10));
}
......@@ -634,14 +634,14 @@ namespace
m = m*trans(m);
matrix<double> L = chol(m);
DLIB_CASSERT(equal(L*trans(L), m, 1e-10), L*trans(L)-m);
DLIB_TEST_MSG(equal(L*trans(L), m, 1e-10), L*trans(L)-m);
DLIB_CASSERT(equal(inv(m), inv_upper_triangular(trans(L))*inv_lower_triangular((L))), "")
DLIB_CASSERT(equal(inv(m), trans(inv_lower_triangular(L))*inv_lower_triangular((L))), "")
DLIB_CASSERT(equal(inv(m), trans(inv_lower_triangular(L))*trans(inv_upper_triangular(trans(L)))), "")
DLIB_CASSERT(equal(round_zeros(inv_upper_triangular(trans(L))*trans(L),1e-10) , identity_matrix<double>(6), 1e-10),
DLIB_TEST_MSG(equal(inv(m), inv_upper_triangular(trans(L))*inv_lower_triangular((L))), "")
DLIB_TEST_MSG(equal(inv(m), trans(inv_lower_triangular(L))*inv_lower_triangular((L))), "")
DLIB_TEST_MSG(equal(inv(m), trans(inv_lower_triangular(L))*trans(inv_upper_triangular(trans(L)))), "")
DLIB_TEST_MSG(equal(round_zeros(inv_upper_triangular(trans(L))*trans(L),1e-10) , identity_matrix<double>(6), 1e-10),
round_zeros(inv_upper_triangular(trans(L))*trans(L),1e-10));
DLIB_CASSERT(equal(round_zeros(inv_lower_triangular((L))*(L),1e-10) ,identity_matrix<double>(6), 1e-10),
DLIB_TEST_MSG(equal(round_zeros(inv_lower_triangular((L))*(L),1e-10) ,identity_matrix<double>(6), 1e-10),
round_zeros(inv_lower_triangular((L))*(L),1e-10));
}
......@@ -652,14 +652,14 @@ namespace
4,5,6,6,
6,1,8,0;
m2 = m;
DLIB_CASSERT(round(m) == m2,"");
DLIB_CASSERT(round_zeros(m) == m2,"");
DLIB_TEST(round(m) == m2);
DLIB_TEST(round_zeros(m) == m2);
m2 = 0,2,3,4,
4,5,6,6,
6,0,8,0;
DLIB_CASSERT(round_zeros(m,2) == m2,"");
DLIB_TEST(round_zeros(m,2) == m2);
}
......@@ -668,12 +668,12 @@ namespace
matrix<double,6,6> m(identity_matrix<double>(6)*4.5);
matrix<double> L = chol(m);
DLIB_CASSERT(equal(L*trans(L), m, 1e-10), L*trans(L)-m);
DLIB_TEST_MSG(equal(L*trans(L), m, 1e-10), L*trans(L)-m);
DLIB_CASSERT(equal(inv(m), inv_upper_triangular(trans(L))*inv_lower_triangular((L))), "")
DLIB_CASSERT(equal(round_zeros(inv_upper_triangular(trans(L))*trans(L),1e-10) , identity_matrix<double>(6), 1e-10),
DLIB_TEST_MSG(equal(inv(m), inv_upper_triangular(trans(L))*inv_lower_triangular((L))), "")
DLIB_TEST_MSG(equal(round_zeros(inv_upper_triangular(trans(L))*trans(L),1e-10) , identity_matrix<double>(6), 1e-10),
round_zeros(inv_upper_triangular(trans(L))*trans(L),1e-10));
DLIB_CASSERT(equal(round_zeros(inv_lower_triangular((L))*(L),1e-10) ,identity_matrix<double>(6), 1e-10),
DLIB_TEST_MSG(equal(round_zeros(inv_lower_triangular((L))*(L),1e-10) ,identity_matrix<double>(6), 1e-10),
round_zeros(inv_lower_triangular((L))*(L),1e-10));
}
......@@ -683,8 +683,8 @@ namespace
matrix<double,6,6> m(identity_matrix<double>(6)*4.5);
m(1,4) = 2;
DLIB_CASSERT(dlib::equal(inv_upper_triangular(m), inv(m),1e-10), inv_upper_triangular(m)-inv(m));
DLIB_CASSERT(dlib::equal(inv_lower_triangular(trans(m)), inv(trans(m)),1e-10), inv_lower_triangular(trans(m))-inv(trans(m)));
DLIB_TEST_MSG(dlib::equal(inv_upper_triangular(m), inv(m),1e-10), inv_upper_triangular(m)-inv(m));
DLIB_TEST_MSG(dlib::equal(inv_lower_triangular(trans(m)), inv(trans(m)),1e-10), inv_lower_triangular(trans(m))-inv(trans(m)));
}
......@@ -707,9 +707,9 @@ namespace
}
// make sure the multiply optimizations aren't messing things up
DLIB_CASSERT(trans(i)*i == tmp(trans(i)*i),"");
DLIB_CASSERT(equal(trans(a)*a , tmp(trans(a)*a), 1e-11),max(abs(trans(a)*a - tmp(trans(a)*a))));
DLIB_CASSERT(equal(trans(b)*b , tmp(trans(b)*b), 1e-3f),max(abs(trans(b)*b - tmp(trans(b)*b))));
DLIB_TEST(trans(i)*i == tmp(trans(i)*i));
DLIB_TEST_MSG(equal(trans(a)*a , tmp(trans(a)*a), 1e-11),max(abs(trans(a)*a - tmp(trans(a)*a))));
DLIB_TEST_MSG(equal(trans(b)*b , tmp(trans(b)*b), 1e-3f),max(abs(trans(b)*b - tmp(trans(b)*b))));
}
{
......@@ -725,7 +725,7 @@ namespace
m(2,2) = 3;
m(3,3) = 4;
DLIB_CASSERT(diagm(i) == m,"");
DLIB_TEST(diagm(i) == m);
}
{
......@@ -741,7 +741,7 @@ namespace
m(2,2) = 3;
m(3,3) = 4;
DLIB_CASSERT(diagm(i) == m,"");
DLIB_TEST(diagm(i) == m);
}
{
......@@ -757,7 +757,7 @@ namespace
m(2,2) = 3;
m(3,3) = 4;
DLIB_CASSERT(diagm(i) == m,"");
DLIB_TEST(diagm(i) == m);
}
{
......@@ -773,147 +773,147 @@ namespace
m(2,2) = 3;
m(3,3) = 4;
DLIB_CASSERT(diagm(i) == m,"");
}
{
DLIB_CASSERT(range(0,5).nc() == 6,"");
DLIB_CASSERT(range(1,5).nc() == 5,"");
DLIB_CASSERT(range(0,5).nr() == 1,"");
DLIB_CASSERT(range(1,5).nr() == 1,"");
DLIB_CASSERT(trans(range(0,5)).nr() == 6,"");
DLIB_CASSERT(trans(range(1,5)).nr() == 5,"");
DLIB_CASSERT(trans(range(0,5)).nc() == 1,"");
DLIB_CASSERT(trans(range(1,5)).nc() == 1,"");
DLIB_CASSERT(range(0,2,5).nc() == 3,"");
DLIB_CASSERT(range(1,2,5).nc() == 3,"");
DLIB_CASSERT(range(0,2,5).nr() == 1,"");
DLIB_CASSERT(range(1,2,5).nr() == 1,"");
DLIB_CASSERT(trans(range(0,2,5)).nr() == 3,"");
DLIB_CASSERT(trans(range(1,2,5)).nr() == 3,"");
DLIB_CASSERT(trans(range(0,2,5)).nc() == 1,"");
DLIB_CASSERT(trans(range(1,2,5)).nc() == 1,"");
DLIB_CASSERT(range(0,3,6).nc() == 3,"");
DLIB_CASSERT(range(1,3,5).nc() == 2,"");
DLIB_CASSERT(range(0,3,5).nr() == 1,"");
DLIB_CASSERT(range(1,3,5).nr() == 1,"");
DLIB_CASSERT(trans(range(0,3,6)).nr() == 3,"");
DLIB_CASSERT(trans(range(1,3,5)).nr() == 2,"");
DLIB_CASSERT(trans(range(0,3,5)).nc() == 1,"");
DLIB_CASSERT(trans(range(1,3,5)).nc() == 1,"");
DLIB_CASSERT(range(1,9,5).nc() == 1,"");
DLIB_CASSERT(range(1,9,5).nr() == 1,"");
DLIB_CASSERT(range(0,0).nc() == 1,"");
DLIB_CASSERT(range(0,0).nr() == 1,"");
DLIB_CASSERT(range(1,1)(0) == 1,"");
DLIB_CASSERT(range(0,5)(0) == 0 && range(0,5)(1) == 1 && range(0,5)(5) == 5,"");
DLIB_CASSERT(range(1,2,5)(0) == 1 && range(1,2,5)(1) == 3 && range(1,2,5)(2) == 5,"");
DLIB_CASSERT((range<0,5>()(0) == 0 && range<0,5>()(1) == 1 && range<0,5>()(5) == 5),"");
DLIB_CASSERT((range<1,2,5>()(0) == 1 && range<1,2,5>()(1) == 3 && range<1,2,5>()(2) == 5),"");
DLIB_CASSERT((range<0,5>().nc() == 6),"");
DLIB_CASSERT((range<1,5>().nc() == 5),"");
DLIB_CASSERT((range<0,5>().nr() == 1),"");
DLIB_CASSERT((range<1,5>().nr() == 1),"");
DLIB_CASSERT((trans(range<0,5>()).nr() == 6),"");
DLIB_CASSERT((trans(range<1,5>()).nr() == 5),"");
DLIB_CASSERT((trans(range<0,5>()).nc() == 1),"");
DLIB_CASSERT((trans(range<1,5>()).nc() == 1),"");
DLIB_CASSERT((range<0,2,5>().nc() == 3),"");
DLIB_CASSERT((range<1,2,5>().nc() == 3),"");
DLIB_CASSERT((range<0,2,5>().nr() == 1),"");
DLIB_CASSERT((range<1,2,5>().nr() == 1),"");
DLIB_CASSERT((trans(range<0,2,5>()).nr() == 3),"");
DLIB_CASSERT((trans(range<1,2,5>()).nr() == 3),"");
DLIB_CASSERT((trans(range<0,2,5>()).nc() == 1),"");
DLIB_CASSERT((trans(range<1,2,5>()).nc() == 1),"");
DLIB_CASSERT((range<0,3,6>().nc() == 3),"");
DLIB_CASSERT((range<1,3,5>().nc() == 2),"");
DLIB_CASSERT((range<0,3,5>().nr() == 1),"");
DLIB_CASSERT((range<1,3,5>().nr() == 1),"");
DLIB_CASSERT((trans(range<0,3,6>()).nr() == 3),"");
DLIB_CASSERT((trans(range<1,3,5>()).nr() == 2),"");
DLIB_CASSERT((trans(range<0,3,5>()).nc() == 1),"");
DLIB_CASSERT((trans(range<1,3,5>()).nc() == 1),"");
}
{
DLIB_CASSERT(range(5,0).nc() == 6,"");
DLIB_CASSERT(range(5,1).nc() == 5,"");
DLIB_CASSERT(range(5,0).nr() == 1,"");
DLIB_CASSERT(range(5,1).nr() == 1,"");
DLIB_CASSERT(trans(range(5,0)).nr() == 6,"");
DLIB_CASSERT(trans(range(5,1)).nr() == 5,"");
DLIB_CASSERT(trans(range(5,0)).nc() == 1,"");
DLIB_CASSERT(trans(range(5,1)).nc() == 1,"");
DLIB_CASSERT(range(5,2,0).nc() == 3,"");
DLIB_CASSERT(range(5,2,1).nc() == 3,"");
DLIB_CASSERT(range(5,2,0).nr() == 1,"");
DLIB_CASSERT(range(5,2,1).nr() == 1,"");
DLIB_CASSERT(trans(range(5,2,0)).nr() == 3,"");
DLIB_CASSERT(trans(range(5,2,1)).nr() == 3,"");
DLIB_CASSERT(trans(range(5,2,0)).nc() == 1,"");
DLIB_CASSERT(trans(range(5,2,1)).nc() == 1,"");
DLIB_CASSERT(range(6,3,0).nc() == 3,"");
DLIB_CASSERT(range(5,3,1).nc() == 2,"");
DLIB_CASSERT(range(5,3,0).nr() == 1,"");
DLIB_CASSERT(range(5,3,1).nr() == 1,"");
DLIB_CASSERT(trans(range(6,3,0)).nr() == 3,"");
DLIB_CASSERT(trans(range(5,3,1)).nr() == 2,"");
DLIB_CASSERT(trans(range(5,3,0)).nc() == 1,"");
DLIB_CASSERT(trans(range(5,3,1)).nc() == 1,"");
DLIB_CASSERT(range(5,9,1).nc() == 1,"");
DLIB_CASSERT(range(5,9,1).nr() == 1,"");
DLIB_CASSERT(range(0,0).nc() == 1,"");
DLIB_CASSERT(range(0,0).nr() == 1,"");
DLIB_CASSERT(range(1,1)(0) == 1,"");
DLIB_CASSERT(range(5,0)(0) == 5 && range(5,0)(1) == 4 && range(5,0)(5) == 0,"");
DLIB_CASSERT(range(5,2,1)(0) == 5 && range(5,2,1)(1) == 3 && range(5,2,1)(2) == 1,"");
DLIB_CASSERT((range<5,0>()(0) == 5 && range<5,0>()(1) == 4 && range<5,0>()(5) == 0),"");
DLIB_CASSERT((range<5,2,1>()(0) == 5 && range<5,2,1>()(1) == 3 && range<5,2,1>()(2) == 1),"");
DLIB_CASSERT((range<5,0>().nc() == 6),"");
DLIB_CASSERT((range<5,1>().nc() == 5),"");
DLIB_CASSERT((range<5,0>().nr() == 1),"");
DLIB_CASSERT((range<5,1>().nr() == 1),"");
DLIB_CASSERT((trans(range<5,0>()).nr() == 6),"");
DLIB_CASSERT((trans(range<5,1>()).nr() == 5),"");
DLIB_CASSERT((trans(range<5,0>()).nc() == 1),"");
DLIB_CASSERT((trans(range<5,1>()).nc() == 1),"");
DLIB_CASSERT((range<5,2,0>().nc() == 3),"");
DLIB_CASSERT((range<5,2,1>().nc() == 3),"");
DLIB_CASSERT((range<5,2,0>().nr() == 1),"");
DLIB_CASSERT((range<5,2,1>().nr() == 1),"");
DLIB_CASSERT((trans(range<5,2,0>()).nr() == 3),"");
DLIB_CASSERT((trans(range<5,2,1>()).nr() == 3),"");
DLIB_CASSERT((trans(range<5,2,0>()).nc() == 1),"");
DLIB_CASSERT((trans(range<5,2,1>()).nc() == 1),"");
DLIB_CASSERT((range<6,3,0>().nc() == 3),"");
DLIB_CASSERT((range<5,3,1>().nc() == 2),"");
DLIB_CASSERT((range<5,3,0>().nr() == 1),"");
DLIB_CASSERT((range<5,3,1>().nr() == 1),"");
DLIB_CASSERT((trans(range<6,3,0>()).nr() == 3),"");
DLIB_CASSERT((trans(range<5,3,1>()).nr() == 2),"");
DLIB_CASSERT((trans(range<5,3,0>()).nc() == 1),"");
DLIB_CASSERT((trans(range<5,3,1>()).nc() == 1),"");
DLIB_TEST(diagm(i) == m);
}
{
DLIB_TEST(range(0,5).nc() == 6);
DLIB_TEST(range(1,5).nc() == 5);
DLIB_TEST(range(0,5).nr() == 1);
DLIB_TEST(range(1,5).nr() == 1);
DLIB_TEST(trans(range(0,5)).nr() == 6);
DLIB_TEST(trans(range(1,5)).nr() == 5);
DLIB_TEST(trans(range(0,5)).nc() == 1);
DLIB_TEST(trans(range(1,5)).nc() == 1);
DLIB_TEST(range(0,2,5).nc() == 3);
DLIB_TEST(range(1,2,5).nc() == 3);
DLIB_TEST(range(0,2,5).nr() == 1);
DLIB_TEST(range(1,2,5).nr() == 1);
DLIB_TEST(trans(range(0,2,5)).nr() == 3);
DLIB_TEST(trans(range(1,2,5)).nr() == 3);
DLIB_TEST(trans(range(0,2,5)).nc() == 1);
DLIB_TEST(trans(range(1,2,5)).nc() == 1);
DLIB_TEST(range(0,3,6).nc() == 3);
DLIB_TEST(range(1,3,5).nc() == 2);
DLIB_TEST(range(0,3,5).nr() == 1);
DLIB_TEST(range(1,3,5).nr() == 1);
DLIB_TEST(trans(range(0,3,6)).nr() == 3);
DLIB_TEST(trans(range(1,3,5)).nr() == 2);
DLIB_TEST(trans(range(0,3,5)).nc() == 1);
DLIB_TEST(trans(range(1,3,5)).nc() == 1);
DLIB_TEST(range(1,9,5).nc() == 1);
DLIB_TEST(range(1,9,5).nr() == 1);
DLIB_TEST(range(0,0).nc() == 1);
DLIB_TEST(range(0,0).nr() == 1);
DLIB_TEST(range(1,1)(0) == 1);
DLIB_TEST(range(0,5)(0) == 0 && range(0,5)(1) == 1 && range(0,5)(5) == 5);
DLIB_TEST(range(1,2,5)(0) == 1 && range(1,2,5)(1) == 3 && range(1,2,5)(2) == 5);
DLIB_TEST((range<0,5>()(0) == 0 && range<0,5>()(1) == 1 && range<0,5>()(5) == 5));
DLIB_TEST((range<1,2,5>()(0) == 1 && range<1,2,5>()(1) == 3 && range<1,2,5>()(2) == 5));
DLIB_TEST((range<0,5>().nc() == 6));
DLIB_TEST((range<1,5>().nc() == 5));
DLIB_TEST((range<0,5>().nr() == 1));
DLIB_TEST((range<1,5>().nr() == 1));
DLIB_TEST((trans(range<0,5>()).nr() == 6));
DLIB_TEST((trans(range<1,5>()).nr() == 5));
DLIB_TEST((trans(range<0,5>()).nc() == 1));
DLIB_TEST((trans(range<1,5>()).nc() == 1));
DLIB_TEST((range<0,2,5>().nc() == 3));
DLIB_TEST((range<1,2,5>().nc() == 3));
DLIB_TEST((range<0,2,5>().nr() == 1));
DLIB_TEST((range<1,2,5>().nr() == 1));
DLIB_TEST((trans(range<0,2,5>()).nr() == 3));
DLIB_TEST((trans(range<1,2,5>()).nr() == 3));
DLIB_TEST((trans(range<0,2,5>()).nc() == 1));
DLIB_TEST((trans(range<1,2,5>()).nc() == 1));
DLIB_TEST((range<0,3,6>().nc() == 3));
DLIB_TEST((range<1,3,5>().nc() == 2));
DLIB_TEST((range<0,3,5>().nr() == 1));
DLIB_TEST((range<1,3,5>().nr() == 1));
DLIB_TEST((trans(range<0,3,6>()).nr() == 3));
DLIB_TEST((trans(range<1,3,5>()).nr() == 2));
DLIB_TEST((trans(range<0,3,5>()).nc() == 1));
DLIB_TEST((trans(range<1,3,5>()).nc() == 1));
}
{
DLIB_TEST(range(5,0).nc() == 6);
DLIB_TEST(range(5,1).nc() == 5);
DLIB_TEST(range(5,0).nr() == 1);
DLIB_TEST(range(5,1).nr() == 1);
DLIB_TEST(trans(range(5,0)).nr() == 6);
DLIB_TEST(trans(range(5,1)).nr() == 5);
DLIB_TEST(trans(range(5,0)).nc() == 1);
DLIB_TEST(trans(range(5,1)).nc() == 1);
DLIB_TEST(range(5,2,0).nc() == 3);
DLIB_TEST(range(5,2,1).nc() == 3);
DLIB_TEST(range(5,2,0).nr() == 1);
DLIB_TEST(range(5,2,1).nr() == 1);
DLIB_TEST(trans(range(5,2,0)).nr() == 3);
DLIB_TEST(trans(range(5,2,1)).nr() == 3);
DLIB_TEST(trans(range(5,2,0)).nc() == 1);
DLIB_TEST(trans(range(5,2,1)).nc() == 1);
DLIB_TEST(range(6,3,0).nc() == 3);
DLIB_TEST(range(5,3,1).nc() == 2);
DLIB_TEST(range(5,3,0).nr() == 1);
DLIB_TEST(range(5,3,1).nr() == 1);
DLIB_TEST(trans(range(6,3,0)).nr() == 3);
DLIB_TEST(trans(range(5,3,1)).nr() == 2);
DLIB_TEST(trans(range(5,3,0)).nc() == 1);
DLIB_TEST(trans(range(5,3,1)).nc() == 1);
DLIB_TEST(range(5,9,1).nc() == 1);
DLIB_TEST(range(5,9,1).nr() == 1);
DLIB_TEST(range(0,0).nc() == 1);
DLIB_TEST(range(0,0).nr() == 1);
DLIB_TEST(range(1,1)(0) == 1);
DLIB_TEST(range(5,0)(0) == 5 && range(5,0)(1) == 4 && range(5,0)(5) == 0);
DLIB_TEST(range(5,2,1)(0) == 5 && range(5,2,1)(1) == 3 && range(5,2,1)(2) == 1);
DLIB_TEST((range<5,0>()(0) == 5 && range<5,0>()(1) == 4 && range<5,0>()(5) == 0));
DLIB_TEST((range<5,2,1>()(0) == 5 && range<5,2,1>()(1) == 3 && range<5,2,1>()(2) == 1));
DLIB_TEST((range<5,0>().nc() == 6));
DLIB_TEST((range<5,1>().nc() == 5));
DLIB_TEST((range<5,0>().nr() == 1));
DLIB_TEST((range<5,1>().nr() == 1));
DLIB_TEST((trans(range<5,0>()).nr() == 6));
DLIB_TEST((trans(range<5,1>()).nr() == 5));
DLIB_TEST((trans(range<5,0>()).nc() == 1));
DLIB_TEST((trans(range<5,1>()).nc() == 1));
DLIB_TEST((range<5,2,0>().nc() == 3));
DLIB_TEST((range<5,2,1>().nc() == 3));
DLIB_TEST((range<5,2,0>().nr() == 1));
DLIB_TEST((range<5,2,1>().nr() == 1));
DLIB_TEST((trans(range<5,2,0>()).nr() == 3));
DLIB_TEST((trans(range<5,2,1>()).nr() == 3));
DLIB_TEST((trans(range<5,2,0>()).nc() == 1));
DLIB_TEST((trans(range<5,2,1>()).nc() == 1));
DLIB_TEST((range<6,3,0>().nc() == 3));
DLIB_TEST((range<5,3,1>().nc() == 2));
DLIB_TEST((range<5,3,0>().nr() == 1));
DLIB_TEST((range<5,3,1>().nr() == 1));
DLIB_TEST((trans(range<6,3,0>()).nr() == 3));
DLIB_TEST((trans(range<5,3,1>()).nr() == 2));
DLIB_TEST((trans(range<5,3,0>()).nc() == 1));
DLIB_TEST((trans(range<5,3,1>()).nc() == 1));
}
{
......@@ -926,24 +926,24 @@ namespace
}
}
DLIB_CASSERT(subm(m,range(0,3),range(0,0)) == colm(m,0),"");
DLIB_CASSERT(subm(m,range(0,3),range(1,1)) == colm(m,1),"");
DLIB_CASSERT(subm(m,range(0,3),range(2,2)) == colm(m,2),"");
DLIB_TEST(subm(m,range(0,3),range(0,0)) == colm(m,0));
DLIB_TEST(subm(m,range(0,3),range(1,1)) == colm(m,1));
DLIB_TEST(subm(m,range(0,3),range(2,2)) == colm(m,2));
DLIB_CASSERT(subm(m,range(0,0),range(0,2)) == rowm(m,0),"");
DLIB_CASSERT(subm(m,range(1,1),range(0,2)) == rowm(m,1),"");
DLIB_CASSERT(subm(m,range(2,2),range(0,2)) == rowm(m,2),"");
DLIB_CASSERT(subm(m,range(3,3),range(0,2)) == rowm(m,3),"");
DLIB_TEST(subm(m,range(0,0),range(0,2)) == rowm(m,0));
DLIB_TEST(subm(m,range(1,1),range(0,2)) == rowm(m,1));
DLIB_TEST(subm(m,range(2,2),range(0,2)) == rowm(m,2));
DLIB_TEST(subm(m,range(3,3),range(0,2)) == rowm(m,3));
DLIB_CASSERT(subm(m,0,0,2,2) == subm(m,range(0,1),range(0,1)),"");
DLIB_CASSERT(subm(m,1,1,2,2) == subm(m,range(1,2),range(1,2)),"");
DLIB_TEST(subm(m,0,0,2,2) == subm(m,range(0,1),range(0,1)));
DLIB_TEST(subm(m,1,1,2,2) == subm(m,range(1,2),range(1,2)));
matrix<double,2,2> m2 = subm(m,range(0,2,2),range(0,2,2));
DLIB_CASSERT(m2(0,0) == m(0,0),"");
DLIB_CASSERT(m2(0,1) == m(0,2),"");
DLIB_CASSERT(m2(1,0) == m(2,0),"");
DLIB_CASSERT(m2(1,1) == m(2,2),"");
DLIB_TEST(m2(0,0) == m(0,0));
DLIB_TEST(m2(0,1) == m(0,2));
DLIB_TEST(m2(1,0) == m(2,0));
DLIB_TEST(m2(1,1) == m(2,2));
}
......@@ -957,24 +957,24 @@ namespace
}
}
DLIB_CASSERT(subm(m,range<0,3>(),range<0,0>()) == colm(m,0),"");
DLIB_CASSERT(subm(m,range<0,3>(),range<1,1>()) == colm(m,1),"");
DLIB_CASSERT(subm(m,range<0,3>(),range<2,2>()) == colm(m,2),"");
DLIB_TEST(subm(m,range<0,3>(),range<0,0>()) == colm(m,0));
DLIB_TEST(subm(m,range<0,3>(),range<1,1>()) == colm(m,1));
DLIB_TEST(subm(m,range<0,3>(),range<2,2>()) == colm(m,2));
DLIB_CASSERT(subm(m,range<0,0>(),range<0,2>()) == rowm(m,0),"");
DLIB_CASSERT(subm(m,range<1,1>(),range<0,2>()) == rowm(m,1),"");
DLIB_CASSERT(subm(m,range<2,2>(),range<0,2>()) == rowm(m,2),"");
DLIB_CASSERT(subm(m,range<3,3>(),range<0,2>()) == rowm(m,3),"");
DLIB_TEST(subm(m,range<0,0>(),range<0,2>()) == rowm(m,0));
DLIB_TEST(subm(m,range<1,1>(),range<0,2>()) == rowm(m,1));
DLIB_TEST(subm(m,range<2,2>(),range<0,2>()) == rowm(m,2));
DLIB_TEST(subm(m,range<3,3>(),range<0,2>()) == rowm(m,3));
DLIB_CASSERT(subm(m,0,0,2,2) == subm(m,range<0,1>(),range<0,1>()),"");
DLIB_CASSERT(subm(m,1,1,2,2) == subm(m,range<1,2>(),range<1,2>()),"");
DLIB_TEST(subm(m,0,0,2,2) == subm(m,range<0,1>(),range<0,1>()));
DLIB_TEST(subm(m,1,1,2,2) == subm(m,range<1,2>(),range<1,2>()));
matrix<double,2,2> m2 = subm(m,range<0,2,2>(),range<0,2,2>());
DLIB_CASSERT(m2(0,0) == m(0,0),"");
DLIB_CASSERT(m2(0,1) == m(0,2),"");
DLIB_CASSERT(m2(1,0) == m(2,0),"");
DLIB_CASSERT(m2(1,1) == m(2,2),"");
DLIB_TEST(m2(0,0) == m(0,0));
DLIB_TEST(m2(0,1) == m(0,2));
DLIB_TEST(m2(1,0) == m(2,0));
DLIB_TEST(m2(1,1) == m(2,2));
}
......@@ -982,28 +982,28 @@ namespace
{
matrix<double,4,5> m;
set_subm(m, range(0,3), range(0,4)) = 4;
DLIB_CASSERT(min(m) == max(m) && min(m) == 4,"");
DLIB_TEST(min(m) == max(m) && min(m) == 4);
set_subm(m,range(1,1),range(0,4)) = 7;
DLIB_CASSERT((rowm(m,0) == uniform_matrix<double>(1,5, 4)),"");
DLIB_CASSERT((rowm(m,1) == uniform_matrix<double>(1,5, 7)),"");
DLIB_CASSERT((rowm(m,2) == uniform_matrix<double>(1,5, 4)),"");
DLIB_CASSERT((rowm(m,3) == uniform_matrix<double>(1,5, 4)),"");
DLIB_TEST((rowm(m,0) == uniform_matrix<double>(1,5, 4)));
DLIB_TEST((rowm(m,1) == uniform_matrix<double>(1,5, 7)));
DLIB_TEST((rowm(m,2) == uniform_matrix<double>(1,5, 4)));
DLIB_TEST((rowm(m,3) == uniform_matrix<double>(1,5, 4)));
set_subm(m, range(0,2,3), range(0,2,4)) = trans(subm(m,0,0,3,2));
DLIB_CASSERT(m(0,2) == 7,"");
DLIB_CASSERT(m(2,2) == 7,"");
DLIB_TEST(m(0,2) == 7);
DLIB_TEST(m(2,2) == 7);
DLIB_CASSERT(sum(m) == 7*5+ 7+7 + 4*(4*5 - 7),"");
DLIB_TEST(sum(m) == 7*5+ 7+7 + 4*(4*5 - 7));
}
{
DLIB_CASSERT(( uniform_matrix<double>(303,303, 3)*identity_matrix<double>(303) == uniform_matrix<double,303,303>(3) ) , "");
DLIB_CASSERT(( uniform_matrix<double,303,303>(3)*identity_matrix<double,303>() == uniform_matrix<double,303,303>(3) ), "");
DLIB_TEST(( uniform_matrix<double>(303,303, 3)*identity_matrix<double>(303) == uniform_matrix<double,303,303>(3) ) );
DLIB_TEST(( uniform_matrix<double,303,303>(3)*identity_matrix<double,303>() == uniform_matrix<double,303,303>(3) ));
}
{
......@@ -1011,35 +1011,35 @@ namespace
m = 1,2,3,
5,6,7;
DLIB_CASSERT(m(0,0) == 1 && m(0,1) == 2 && m(0,2) == 3 &&
DLIB_TEST_MSG(m(0,0) == 1 && m(0,1) == 2 && m(0,2) == 3 &&
m(1,0) == 5 && m(1,1) == 6 && m(1,2) == 7,"");
m = 4;
DLIB_CASSERT((m == uniform_matrix<double,2,3>(4)),"");
DLIB_TEST((m == uniform_matrix<double,2,3>(4)));
matrix<double,2,3> m2;
m2 = 1,2,3,
5,6,7;
DLIB_CASSERT(m2(0,0) == 1 && m2(0,1) == 2 && m2(0,2) == 3 &&
DLIB_TEST_MSG(m2(0,0) == 1 && m2(0,1) == 2 && m2(0,2) == 3 &&
m2(1,0) == 5 && m2(1,1) == 6 && m2(1,2) == 7,"");
matrix<double,2,1> m3;
m3 = 1,
5;
DLIB_CASSERT(m3(0) == 1 && m3(1) == 5 ,"");
DLIB_TEST(m3(0) == 1 && m3(1) == 5 );
matrix<double,1,2> m4;
m4 = 1, 5;
DLIB_CASSERT(m3(0) == 1 && m3(1) == 5 ,"");
DLIB_TEST(m3(0) == 1 && m3(1) == 5 );
}
{
matrix<double> m(4,1);
m = 3, 1, 5, 2;
DLIB_CASSERT(index_of_min(m) == 1, "");
DLIB_CASSERT(index_of_max(m) == 2, "");
DLIB_CASSERT(index_of_min(trans(m)) == 1, "");
DLIB_CASSERT(index_of_max(trans(m)) == 2, "");
DLIB_TEST(index_of_min(m) == 1);
DLIB_TEST(index_of_max(m) == 2);
DLIB_TEST(index_of_min(trans(m)) == 1);
DLIB_TEST(index_of_max(trans(m)) == 2);
}
{
......@@ -1048,12 +1048,12 @@ namespace
m1 = 3.0000, 3.7500, 4.5000, 5.2500, 6.0000;
m2 = linspace(3, 6, 5);
DLIB_CASSERT(equal(m1, m2), "");
DLIB_TEST(equal(m1, m2));
m1 = pow(10, m1);
m2 = logspace(3, 6, 5);
DLIB_CASSERT(equal(m1, m2), "");
DLIB_TEST(equal(m1, m2));
}
{
......@@ -1067,12 +1067,12 @@ namespace
c4 = 3, 0;
c5 = 3, 1;
DLIB_CASSERT(colm(m,0) == c0, colm(m,0) << "\n\n" << c0);
DLIB_CASSERT(colm(m,1) == c1, "");
DLIB_CASSERT(colm(m,2) == c2, "");
DLIB_CASSERT(colm(m,3) == c3, "");
DLIB_CASSERT(colm(m,4) == c4, "");
DLIB_CASSERT(colm(m,5) == c5, "");
DLIB_TEST_MSG(colm(m,0) == c0, colm(m,0) << "\n\n" << c0);
DLIB_TEST(colm(m,1) == c1);
DLIB_TEST(colm(m,2) == c2);
DLIB_TEST(colm(m,3) == c3);
DLIB_TEST(colm(m,4) == c4);
DLIB_TEST(colm(m,5) == c5);
}
}
......
dlib/test/matrix2.cpp
View file @ 9a8ed037
......@@ -86,81 +86,81 @@ namespace
matrix<double,2,1,MM> fm(array_f);
DLIB_CASSERT(fm.size() == 2,"");
DLIB_TEST(fm.size() == 2);
matrix<double> dfm(fm);
DLIB_CASSERT(round(fm)(0) == -1,"");
DLIB_CASSERT(round(fm)(1) == 1,"");
DLIB_CASSERT(round(dfm)(0) == -1,"");
DLIB_CASSERT(round(dfm)(1) == 1,"");
DLIB_CASSERT(round(dfm).size() == dfm.size(),"");
DLIB_TEST(round(fm)(0) == -1);
DLIB_TEST(round(fm)(1) == 1);
DLIB_TEST(round(dfm)(0) == -1);
DLIB_TEST(round(dfm)(1) == 1);
DLIB_TEST(round(dfm).size() == dfm.size());
const int array3[] = { 1, 2, 3, 4 };
matrix<double,3,3,MM> m3(array2);
matrix<double> dm3;
DLIB_CASSERT(dm3.size() == 0,"");
DLIB_CASSERT(dm3.nr() == 0,"");
DLIB_CASSERT(dm3.nc() == 0,"");
DLIB_TEST(dm3.size() == 0);
DLIB_TEST(dm3.nr() == 0);
DLIB_TEST(dm3.nc() == 0);
dm3.set_size(3,4);
DLIB_CASSERT(dm3.nr() == 3,"");
DLIB_CASSERT(dm3.nc() == 4,"");
DLIB_CASSERT(dm3.size() == 3*4,"");
DLIB_TEST(dm3.nr() == 3);
DLIB_TEST(dm3.nc() == 4);
DLIB_TEST(dm3.size() == 3*4);
dm3.set_size(3,3);
DLIB_CASSERT(dm3.nr() == 3,"");
DLIB_CASSERT(dm3.nc() == 3,"");
DLIB_TEST(dm3.nr() == 3);
DLIB_TEST(dm3.nc() == 3);
dm3 = m3;
dm3(0,0)++;
DLIB_CASSERT( dm3 != m3,"");
DLIB_TEST( dm3 != m3);
dm3 = m3;
DLIB_CASSERT( dm3 == m3,"");
DLIB_CASSERT( abs(sum(squared(normalize(dm3))) - 1.0) < 1e-10,"");
DLIB_TEST( dm3 == m3);
DLIB_TEST( abs(sum(squared(normalize(dm3))) - 1.0) < 1e-10);
matrix<double,3,4> mrc;
mrc.set_size(3,4);
set_all_elements(mrc,1);
DLIB_CASSERT(diag(mrc) == uniform_matrix<double>(3,1,1),"");
DLIB_CASSERT(diag(matrix<double>(mrc)) == uniform_matrix<double>(3,1,1),"");
DLIB_TEST(diag(mrc) == uniform_matrix<double>(3,1,1));
DLIB_TEST(diag(matrix<double>(mrc)) == uniform_matrix<double>(3,1,1));
matrix<double,2,3> mrc2;
set_all_elements(mrc2,1);
DLIB_CASSERT((removerc<1,1>(mrc) == mrc2),"");
DLIB_CASSERT((removerc(mrc,1,1) == mrc2),"");
DLIB_TEST((removerc<1,1>(mrc) == mrc2));
DLIB_TEST((removerc(mrc,1,1) == mrc2));
matrix<int,3,3> m4, m5, m6;
set_all_elements(m4, 4);
set_all_elements(m5, 4);
set_all_elements(m6, 1);
DLIB_CASSERT(squared(m4) == pointwise_multiply(m4,m4),"");
DLIB_CASSERT(cubed(m4) == pointwise_multiply(m4,m4,m4),"");
DLIB_CASSERT(pow(matrix_cast<double>(m4),2) == squared(matrix_cast<double>(m4)),"");
DLIB_CASSERT(pow(matrix_cast<double>(m4),3) == cubed(matrix_cast<double>(m4)),"");
DLIB_TEST(squared(m4) == pointwise_multiply(m4,m4));
DLIB_TEST(cubed(m4) == pointwise_multiply(m4,m4,m4));
DLIB_TEST(pow(matrix_cast<double>(m4),2) == squared(matrix_cast<double>(m4)));
DLIB_TEST(pow(matrix_cast<double>(m4),3) == cubed(matrix_cast<double>(m4)));
matrix<int> dm4;
matrix<int,0,0,memory_manager_stateless<char>::kernel_2_2a> dm5;
dm4 = dm4;
dm4 = dm5;
DLIB_CASSERT(dm4.nr() == 0,"");
DLIB_TEST(dm4.nr() == 0);
dm4 = m4;
dm5 = m5;
DLIB_CASSERT(dm4 == dm5,"");
DLIB_TEST(dm4 == dm5);
DLIB_CASSERT(m4 == m5,"");
DLIB_CASSERT(m6 != m5,"");
DLIB_TEST(m4 == m5);
DLIB_TEST(m6 != m5);
m4.swap(m6);
DLIB_CASSERT(m6 == m5,"");
DLIB_CASSERT(m4 != m5,"");
DLIB_TEST(m6 == m5);
DLIB_TEST(m4 != m5);
DLIB_CASSERT(m3.nr() == 3,"");
DLIB_CASSERT(m3.nc() == 3,"");
DLIB_TEST(m3.nr() == 3);
DLIB_TEST(m3.nc() == 3);
matrix<double,4,1> v(array3), v2;
DLIB_CASSERT(v.nr() == 4,"");
DLIB_CASSERT(v.nc() == 1,"");
DLIB_TEST(v.nr() == 4);
DLIB_TEST(v.nc() == 1);
std::vector<double> stdv(4);
std_vector_c<double> stdv_c(4);
......@@ -169,125 +169,125 @@ namespace
for (long i = 0; i < 4; ++i)
stdv[i] = stdv_c[i] = arr[i] = i+1;
DLIB_CASSERT(vector_to_matrix(stdv)(0) == 1,"");
DLIB_CASSERT(vector_to_matrix(stdv)(1) == 2,"");
DLIB_CASSERT(vector_to_matrix(stdv)(2) == 3,"");
DLIB_CASSERT(vector_to_matrix(stdv)(3) == 4,"");
DLIB_CASSERT(vector_to_matrix(stdv).nr() == 4,"");
DLIB_CASSERT(vector_to_matrix(stdv).nc() == 1,"");
DLIB_CASSERT(vector_to_matrix(stdv).size() == 4,"");
DLIB_CASSERT(equal(trans(vector_to_matrix(stdv))*vector_to_matrix(stdv), trans(v)*v), "");
DLIB_CASSERT(equal(trans(vector_to_matrix(stdv))*vector_to_matrix(stdv), tmp(trans(v)*v)), "");
DLIB_CASSERT(vector_to_matrix(stdv_c)(0) == 1,"");
DLIB_CASSERT(vector_to_matrix(stdv_c)(1) == 2,"");
DLIB_CASSERT(vector_to_matrix(stdv_c)(2) == 3,"");
DLIB_CASSERT(vector_to_matrix(stdv_c)(3) == 4,"");
DLIB_CASSERT(vector_to_matrix(stdv_c).nr() == 4,"");
DLIB_CASSERT(vector_to_matrix(stdv_c).nc() == 1,"");
DLIB_CASSERT(vector_to_matrix(stdv_c).size() == 4,"");
DLIB_CASSERT(equal(trans(vector_to_matrix(stdv_c))*vector_to_matrix(stdv_c), trans(v)*v), "");
DLIB_CASSERT(vector_to_matrix(arr)(0) == 1,"");
DLIB_CASSERT(vector_to_matrix(arr)(1) == 2,"");
DLIB_CASSERT(vector_to_matrix(arr)(2) == 3,"");
DLIB_CASSERT(vector_to_matrix(arr)(3) == 4,"");
DLIB_CASSERT(vector_to_matrix(arr).nr() == 4,"");
DLIB_CASSERT(vector_to_matrix(arr).nc() == 1,"");
DLIB_CASSERT(vector_to_matrix(arr).size() == 4,"");
DLIB_CASSERT(equal(trans(vector_to_matrix(arr))*vector_to_matrix(arr), trans(v)*v), "");
DLIB_CASSERT(v(0) == 1,"");
DLIB_CASSERT(v(1) == 2,"");
DLIB_CASSERT(v(2) == 3,"");
DLIB_CASSERT(v(3) == 4,"");
DLIB_TEST(vector_to_matrix(stdv)(0) == 1);
DLIB_TEST(vector_to_matrix(stdv)(1) == 2);
DLIB_TEST(vector_to_matrix(stdv)(2) == 3);
DLIB_TEST(vector_to_matrix(stdv)(3) == 4);
DLIB_TEST(vector_to_matrix(stdv).nr() == 4);
DLIB_TEST(vector_to_matrix(stdv).nc() == 1);
DLIB_TEST(vector_to_matrix(stdv).size() == 4);
DLIB_TEST(equal(trans(vector_to_matrix(stdv))*vector_to_matrix(stdv), trans(v)*v));
DLIB_TEST(equal(trans(vector_to_matrix(stdv))*vector_to_matrix(stdv), tmp(trans(v)*v)));
DLIB_TEST(vector_to_matrix(stdv_c)(0) == 1);
DLIB_TEST(vector_to_matrix(stdv_c)(1) == 2);
DLIB_TEST(vector_to_matrix(stdv_c)(2) == 3);
DLIB_TEST(vector_to_matrix(stdv_c)(3) == 4);
DLIB_TEST(vector_to_matrix(stdv_c).nr() == 4);
DLIB_TEST(vector_to_matrix(stdv_c).nc() == 1);
DLIB_TEST(vector_to_matrix(stdv_c).size() == 4);
DLIB_TEST(equal(trans(vector_to_matrix(stdv_c))*vector_to_matrix(stdv_c), trans(v)*v));
DLIB_TEST(vector_to_matrix(arr)(0) == 1);
DLIB_TEST(vector_to_matrix(arr)(1) == 2);
DLIB_TEST(vector_to_matrix(arr)(2) == 3);
DLIB_TEST(vector_to_matrix(arr)(3) == 4);
DLIB_TEST(vector_to_matrix(arr).nr() == 4);
DLIB_TEST(vector_to_matrix(arr).nc() == 1);
DLIB_TEST(vector_to_matrix(arr).size() == 4);
DLIB_TEST(equal(trans(vector_to_matrix(arr))*vector_to_matrix(arr), trans(v)*v));
DLIB_TEST(v(0) == 1);
DLIB_TEST(v(1) == 2);
DLIB_TEST(v(2) == 3);
DLIB_TEST(v(3) == 4);
matrix<double> dv = v;
DLIB_CASSERT((trans(v)*v).size() == 1,"");
DLIB_CASSERT((trans(v)*v).nr() == 1,"");
DLIB_CASSERT((trans(v)*dv).nr() == 1,"");
DLIB_CASSERT((trans(dv)*dv).nr() == 1,"");
DLIB_CASSERT((trans(dv)*v).nr() == 1,"");
DLIB_CASSERT((trans(v)*v).nc() == 1,"");
DLIB_CASSERT((trans(v)*dv).nc() == 1,"");
DLIB_CASSERT((trans(dv)*dv).nc() == 1,"");
DLIB_CASSERT((trans(dv)*v).nc() == 1,"");
DLIB_CASSERT((trans(v)*v)(0) == 1*1 + 2*2 + 3*3 + 4*4,"");
DLIB_CASSERT((trans(dv)*v)(0) == 1*1 + 2*2 + 3*3 + 4*4,"");
DLIB_CASSERT((trans(dv)*dv)(0) == 1*1 + 2*2 + 3*3 + 4*4,"");
DLIB_CASSERT((trans(v)*dv)(0) == 1*1 + 2*2 + 3*3 + 4*4,"");
DLIB_TEST((trans(v)*v).size() == 1);
DLIB_TEST((trans(v)*v).nr() == 1);
DLIB_TEST((trans(v)*dv).nr() == 1);
DLIB_TEST((trans(dv)*dv).nr() == 1);
DLIB_TEST((trans(dv)*v).nr() == 1);
DLIB_TEST((trans(v)*v).nc() == 1);
DLIB_TEST((trans(v)*dv).nc() == 1);
DLIB_TEST((trans(dv)*dv).nc() == 1);
DLIB_TEST((trans(dv)*v).nc() == 1);
DLIB_TEST((trans(v)*v)(0) == 1*1 + 2*2 + 3*3 + 4*4);
DLIB_TEST((trans(dv)*v)(0) == 1*1 + 2*2 + 3*3 + 4*4);
DLIB_TEST((trans(dv)*dv)(0) == 1*1 + 2*2 + 3*3 + 4*4);
DLIB_TEST((trans(v)*dv)(0) == 1*1 + 2*2 + 3*3 + 4*4);
dv = trans(dv)*v;
DLIB_CASSERT(dv.nr() == 1,"");
DLIB_CASSERT(dv.nc() == 1,"");
DLIB_TEST(dv.nr() == 1);
DLIB_TEST(dv.nc() == 1);
dm3 = m3;
DLIB_CASSERT(floor(det(m3)+0.01) == -444,"");
DLIB_CASSERT(floor(det(dm3)+0.01) == -444,"");
DLIB_CASSERT(min(m3) == 1,"");
DLIB_CASSERT(min(dm3) == 1,"");
DLIB_CASSERT(max(m3) == 52,"");
DLIB_CASSERT(max(dm3) == 52,"");
DLIB_CASSERT(sum(m3) == 112,"");
DLIB_CASSERT(sum(dm3) == 112,"");
DLIB_CASSERT(prod(m3) == 41513472,"");
DLIB_CASSERT(prod(dm3) == 41513472,"");
DLIB_CASSERT(prod(diag(m3)) == 1*52*9,"");
DLIB_CASSERT(prod(diag(dm3)) == 1*52*9,"");
DLIB_CASSERT(sum(diag(m3)) == 1+52+9,"");
DLIB_CASSERT(sum(diag(dm3)) == 1+52+9,"");
DLIB_CASSERT(equal(round(10000*m3*inv(m3))/10000 , identity_matrix<double,3>()),"");
DLIB_CASSERT(equal(round(10000*dm3*inv(m3))/10000 , identity_matrix<double,3>()),"");
DLIB_CASSERT(equal(round(10000*dm3*inv(dm3))/10000 , identity_matrix<double,3>()),"");
DLIB_CASSERT(equal(round(10000*m3*inv(dm3))/10000 , identity_matrix<double,3>()),"");
DLIB_CASSERT(equal(round(10000*tmp(m3*inv(m3)))/10000 , identity_matrix<double,3>()),"");
DLIB_CASSERT(equal(round(10000*tmp(dm3*inv(m3)))/10000 , identity_matrix<double,3>()),"");
DLIB_CASSERT(equal(round(10000*tmp(dm3*inv(dm3)))/10000 , identity_matrix<double,3>()),"");
DLIB_CASSERT(equal(round(10000*tmp(m3*inv(dm3)))/10000 , identity_matrix<double,3>()),"");
DLIB_CASSERT(-1*m3 == -m3,"");
DLIB_CASSERT(-1*dm3 == -m3,"");
DLIB_CASSERT(-1*m3 == -dm3,"");
DLIB_CASSERT(-1*dm3 == -dm3,"");
DLIB_CASSERT(m3 == dm3,"");
DLIB_TEST(floor(det(m3)+0.01) == -444);
DLIB_TEST(floor(det(dm3)+0.01) == -444);
DLIB_TEST(min(m3) == 1);
DLIB_TEST(min(dm3) == 1);
DLIB_TEST(max(m3) == 52);
DLIB_TEST(max(dm3) == 52);
DLIB_TEST(sum(m3) == 112);
DLIB_TEST(sum(dm3) == 112);
DLIB_TEST(prod(m3) == 41513472);
DLIB_TEST(prod(dm3) == 41513472);
DLIB_TEST(prod(diag(m3)) == 1*52*9);
DLIB_TEST(prod(diag(dm3)) == 1*52*9);
DLIB_TEST(sum(diag(m3)) == 1+52+9);
DLIB_TEST(sum(diag(dm3)) == 1+52+9);
DLIB_TEST(equal(round(10000*m3*inv(m3))/10000 , identity_matrix<double,3>()));
DLIB_TEST(equal(round(10000*dm3*inv(m3))/10000 , identity_matrix<double,3>()));
DLIB_TEST(equal(round(10000*dm3*inv(dm3))/10000 , identity_matrix<double,3>()));
DLIB_TEST(equal(round(10000*m3*inv(dm3))/10000 , identity_matrix<double,3>()));
DLIB_TEST(equal(round(10000*tmp(m3*inv(m3)))/10000 , identity_matrix<double,3>()));
DLIB_TEST(equal(round(10000*tmp(dm3*inv(m3)))/10000 , identity_matrix<double,3>()));
DLIB_TEST(equal(round(10000*tmp(dm3*inv(dm3)))/10000 , identity_matrix<double,3>()));
DLIB_TEST(equal(round(10000*tmp(m3*inv(dm3)))/10000 , identity_matrix<double,3>()));
DLIB_TEST(-1*m3 == -m3);
DLIB_TEST(-1*dm3 == -m3);
DLIB_TEST(-1*m3 == -dm3);
DLIB_TEST(-1*dm3 == -dm3);
DLIB_TEST(m3 == dm3);
m3(1,1) = 99;
DLIB_CASSERT(m3 != dm3,"");
DLIB_TEST(m3 != dm3);
m3 = dm3;
DLIB_CASSERT(m3 == dm3,"");
DLIB_TEST(m3 == dm3);
matrix<double,4,4,MM> mident(ident);
matrix<double,4,4> muniform0(uniform0);
matrix<double,4,4> muniform1(uniform1);
matrix<double,4,4> muniform3(uniform3);
matrix<double,4,4> m1(array), m2;
DLIB_CASSERT(m1.nr() == 4,"");
DLIB_CASSERT(m1.nc() == 4,"");
DLIB_CASSERT(muniform1 + muniform1 + muniform1 == muniform3,"");
DLIB_CASSERT(muniform1*2 + muniform1 + muniform1 - muniform1 == muniform3,"");
DLIB_CASSERT(2*muniform1 + muniform1 + muniform1 - muniform1 == muniform3,"");
DLIB_CASSERT(muniform1 + muniform1 + muniform1 - muniform3 == muniform0,"");
DLIB_CASSERT(equal(muniform3/3 , muniform1),"");
DLIB_CASSERT(v != m1,"");
DLIB_CASSERT(v == v,"");
DLIB_CASSERT(m1 == m1,"");
DLIB_TEST(m1.nr() == 4);
DLIB_TEST(m1.nc() == 4);
DLIB_TEST(muniform1 + muniform1 + muniform1 == muniform3);
DLIB_TEST(muniform1*2 + muniform1 + muniform1 - muniform1 == muniform3);
DLIB_TEST(2*muniform1 + muniform1 + muniform1 - muniform1 == muniform3);
DLIB_TEST(muniform1 + muniform1 + muniform1 - muniform3 == muniform0);
DLIB_TEST(equal(muniform3/3 , muniform1));
DLIB_TEST(v != m1);
DLIB_TEST(v == v);
DLIB_TEST(m1 == m1);
muniform0.swap(muniform1);
DLIB_CASSERT((muniform1 == matrix_cast<double>(uniform_matrix<long,4,4,0>())),"");
DLIB_CASSERT((muniform0 == matrix_cast<double>(uniform_matrix<long,4,4,1>())),"");
DLIB_CASSERT((muniform1 == matrix_cast<double>(uniform_matrix<long>(4,4,0))),"");
DLIB_CASSERT((muniform0 == matrix_cast<double>(uniform_matrix<long>(4,4,1))),"");
DLIB_TEST((muniform1 == matrix_cast<double>(uniform_matrix<long,4,4,0>())));
DLIB_TEST((muniform0 == matrix_cast<double>(uniform_matrix<long,4,4,1>())));
DLIB_TEST((muniform1 == matrix_cast<double>(uniform_matrix<long>(4,4,0))));
DLIB_TEST((muniform0 == matrix_cast<double>(uniform_matrix<long>(4,4,1))));
swap(muniform0,muniform1);
DLIB_CASSERT((mident == identity_matrix<double,4>()),"");
DLIB_CASSERT((muniform0 == matrix_cast<double>(uniform_matrix<long,4,4,0>())),"");
DLIB_CASSERT((muniform1 == matrix_cast<double>(uniform_matrix<long,4,4,1>())),"");
DLIB_CASSERT((muniform3 == matrix_cast<double>(uniform_matrix<long,4,4,3>())),"");
DLIB_CASSERT((muniform1*8 == matrix_cast<double>(uniform_matrix<long,4,4,8>())),"");
DLIB_TEST((mident == identity_matrix<double,4>()));
DLIB_TEST((muniform0 == matrix_cast<double>(uniform_matrix<long,4,4,0>())));
DLIB_TEST((muniform1 == matrix_cast<double>(uniform_matrix<long,4,4,1>())));
DLIB_TEST((muniform3 == matrix_cast<double>(uniform_matrix<long,4,4,3>())));
DLIB_TEST((muniform1*8 == matrix_cast<double>(uniform_matrix<long,4,4,8>())));
set_all_elements(m2,7);
DLIB_CASSERT(m2 == muniform1*7,"");
DLIB_TEST(m2 == muniform1*7);
m2 = array;
DLIB_CASSERT(m2 == m1,"");
DLIB_TEST(m2 == m1);
const double m1inv[] = {
-0.00946427624, 0.0593272941, 0.00970564379, -0.00973323731,
......@@ -297,20 +297,20 @@ namespace
};
m2 = m1inv;
DLIB_CASSERT((round(m2*m1) == identity_matrix<double,4>()),"");
DLIB_CASSERT((round(tmp(m2*m1)) == identity_matrix<double,4>()),"");
DLIB_TEST((round(m2*m1) == identity_matrix<double,4>()));
DLIB_TEST((round(tmp(m2*m1)) == identity_matrix<double,4>()));
DLIB_CASSERT(round(m2*10000) == round(inv(m1)*10000),
DLIB_TEST_MSG(round(m2*10000) == round(inv(m1)*10000),
round(m2*10000) - round(inv(m1)*10000)
<< "\n\n" << round(m2*10000)
<< "\n\n" << round(inv(m1)*10000)
<< "\n\n" << m2
<< "\n\n" << inv(m1)
);
DLIB_CASSERT(m1 == abs(-1*m1),"");
DLIB_CASSERT(abs(m2) == abs(-1*m2),"");
DLIB_TEST(m1 == abs(-1*m1));
DLIB_TEST(abs(m2) == abs(-1*m2));
DLIB_CASSERT(floor(det(m1)+0.01) == 3297875,"\nm1: \n" << m1 << "\ndet(m1): " << det(m1));
DLIB_TEST_MSG(floor(det(m1)+0.01) == 3297875,"\nm1: \n" << m1 << "\ndet(m1): " << det(m1));
ostringstream sout;
......@@ -319,23 +319,23 @@ namespace
set_all_elements(m1,0);
istringstream sin(sout.str());
deserialize(m1,sin);
DLIB_CASSERT(round(100000*m1) == round(100000*m2),"m1: \n" << m1 << endl << "m2: \n" << m2);
DLIB_TEST_MSG(round(100000*m1) == round(100000*m2),"m1: \n" << m1 << endl << "m2: \n" << m2);
set_all_elements(v,2);
v2 = pointwise_multiply(v, v*2);
set_all_elements(v,8);
DLIB_CASSERT(v == v2,"");
DLIB_CASSERT(v == tmp(v2),"");
DLIB_CASSERT((v == rotate<2,0>(v)),"");
DLIB_TEST(v == v2);
DLIB_TEST(v == tmp(v2));
DLIB_TEST((v == rotate<2,0>(v)));
m4 = array2;
m5 = array2_r;
DLIB_CASSERT((m5 == rotate<1,1>(m4)),"");
DLIB_TEST((m5 == rotate<1,1>(m4)));
m5 = array2;
DLIB_CASSERT((m5*2 == pointwise_multiply(m5,uniform_matrix<int,3,3,2>())),"");
DLIB_CASSERT((tmp(m5*2) == tmp(pointwise_multiply(m5,uniform_matrix<int,3,3,2>()))),"");
DLIB_TEST((m5*2 == pointwise_multiply(m5,uniform_matrix<int,3,3,2>())));
DLIB_TEST((tmp(m5*2) == tmp(pointwise_multiply(m5,uniform_matrix<int,3,3,2>()))));
v = tmp(v);
......@@ -343,29 +343,29 @@ namespace
matrix<double> dm10(10,5);
DLIB_CASSERT(dm10.nr() == 10,"");
DLIB_CASSERT(dm10.nc() == 5,"");
DLIB_TEST(dm10.nr() == 10);
DLIB_TEST(dm10.nc() == 5);
set_all_elements(dm10,4);
DLIB_CASSERT(dm10.nr() == 10,"");
DLIB_CASSERT(dm10.nc() == 5,"");
DLIB_TEST(dm10.nr() == 10);
DLIB_TEST(dm10.nc() == 5);
matrix<double,10,5> m10;
DLIB_CASSERT(m10.nr() == 10,"");
DLIB_CASSERT(m10.nc() == 5,"");
DLIB_TEST(m10.nr() == 10);
DLIB_TEST(m10.nc() == 5);
set_all_elements(m10,4);
DLIB_CASSERT(dm10 == m10,"");
DLIB_CASSERT((clamp<0,3>(dm10) == clamp<0,3>(m10)),"");
DLIB_CASSERT((clamp<0,3>(dm10)(0,2) == 3),"");
DLIB_TEST(dm10 == m10);
DLIB_TEST((clamp<0,3>(dm10) == clamp<0,3>(m10)));
DLIB_TEST((clamp<0,3>(dm10)(0,2) == 3));
set_all_elements(dm10,1);
set_all_elements(m10,4);
DLIB_CASSERT(4*dm10 == m10,"");
DLIB_CASSERT(5*dm10 - dm10 == m10,"");
DLIB_CASSERT((16*dm10)/4 == m10,"");
DLIB_CASSERT(dm10+dm10+2*dm10 == m10,"");
DLIB_CASSERT(dm10+tmp(dm10+2*dm10) == m10,"");
DLIB_TEST(4*dm10 == m10);
DLIB_TEST(5*dm10 - dm10 == m10);
DLIB_TEST((16*dm10)/4 == m10);
DLIB_TEST(dm10+dm10+2*dm10 == m10);
DLIB_TEST(dm10+tmp(dm10+2*dm10) == m10);
set_all_elements(dm10,4);
DLIB_CASSERT(dm10 == m10,"");
DLIB_CASSERT(sum(abs(sigmoid(dm10) -sigmoid(m10))) < 1e-10,sum(abs(sigmoid(dm10) -sigmoid(m10))) );
DLIB_TEST(dm10 == m10);
DLIB_TEST_MSG(sum(abs(sigmoid(dm10) -sigmoid(m10))) < 1e-10,sum(abs(sigmoid(dm10) -sigmoid(m10))) );
matrix<double, 7, 7,MM,column_major_layout> m7;
......@@ -379,21 +379,21 @@ namespace
}
m7 = dm7;
DLIB_CASSERT(inv(dm7) == inv(m7),"");
DLIB_CASSERT(det(dm7) == det(m7),"");
DLIB_CASSERT(min(dm7) == min(m7),"");
DLIB_CASSERT(max(dm7) == max(m7),"");
DLIB_CASSERT(abs(sum(dm7) - sum(m7)) < 1e-14,sum(dm7) - sum(m7));
DLIB_CASSERT(prod(dm7) == prod(m7),"");
DLIB_CASSERT(diag(dm7) == diag(m7),"");
DLIB_CASSERT(trans(dm7) == trans(m7),"");
DLIB_CASSERT(abs(dm7) == abs(m7),"");
DLIB_CASSERT(round(dm7) == round(m7),"");
DLIB_CASSERT(matrix_cast<int>(dm7) == matrix_cast<int>(m7),"");
DLIB_CASSERT((rotate<2,3>(dm7) == rotate<2,3>(m7)),"");
DLIB_CASSERT((sum(pointwise_multiply(dm7,dm7) - pointwise_multiply(m7,m7))) < 1e-10,"");
DLIB_CASSERT((sum(pointwise_multiply(dm7,dm7,dm7) - pointwise_multiply(m7,m7,m7))) < 1e-10,"");
DLIB_CASSERT((sum(pointwise_multiply(dm7,dm7,dm7,dm7) - pointwise_multiply(m7,m7,m7,m7))) < 1e-10,
DLIB_TEST(inv(dm7) == inv(m7));
DLIB_TEST(det(dm7) == det(m7));
DLIB_TEST(min(dm7) == min(m7));
DLIB_TEST(max(dm7) == max(m7));
DLIB_TEST_MSG(abs(sum(dm7) - sum(m7)) < 1e-14,sum(dm7) - sum(m7));
DLIB_TEST(prod(dm7) == prod(m7));
DLIB_TEST(diag(dm7) == diag(m7));
DLIB_TEST(trans(dm7) == trans(m7));
DLIB_TEST(abs(dm7) == abs(m7));
DLIB_TEST(round(dm7) == round(m7));
DLIB_TEST(matrix_cast<int>(dm7) == matrix_cast<int>(m7));
DLIB_TEST((rotate<2,3>(dm7) == rotate<2,3>(m7)));
DLIB_TEST((sum(pointwise_multiply(dm7,dm7) - pointwise_multiply(m7,m7))) < 1e-10);
DLIB_TEST((sum(pointwise_multiply(dm7,dm7,dm7) - pointwise_multiply(m7,m7,m7))) < 1e-10);
DLIB_TEST_MSG((sum(pointwise_multiply(dm7,dm7,dm7,dm7) - pointwise_multiply(m7,m7,m7,m7))) < 1e-10,
(sum(pointwise_multiply(dm7,dm7,dm7,dm7) - pointwise_multiply(m7,m7,m7,m7)))
);
......@@ -408,11 +408,11 @@ namespace
dsm += dsm;
sm += sm;
DLIB_CASSERT(dsm == 2*temp,"");
DLIB_CASSERT(sm == 2*temp,"");
DLIB_TEST(dsm == 2*temp);
DLIB_TEST(sm == 2*temp);
temp = dsm*sm + dsm;
dsm += dsm*sm;
DLIB_CASSERT(temp == dsm,temp - dsm);
DLIB_TEST_MSG(temp == dsm,temp - dsm);
set_all_elements(dsm,1);
set_all_elements(sm,1);
......@@ -420,11 +420,11 @@ namespace
dsm += dsm;
sm += sm;
DLIB_CASSERT(dsm == 2*temp,"");
DLIB_CASSERT(sm == 2*temp,"");
DLIB_TEST(dsm == 2*temp);
DLIB_TEST(sm == 2*temp);
temp = dsm*sm + dsm;
sm += dsm*sm;
DLIB_CASSERT(temp == sm,temp - sm);
DLIB_TEST_MSG(temp == sm,temp - sm);
set_all_elements(dsm,1);
set_all_elements(sm,1);
......@@ -432,11 +432,11 @@ namespace
dsm += dsm;
sm += sm;
DLIB_CASSERT(dsm == 2*temp,"");
DLIB_CASSERT(sm == 2*temp,"");
DLIB_TEST(dsm == 2*temp);
DLIB_TEST(sm == 2*temp);
temp = sm - dsm*sm ;
sm -= dsm*sm;
DLIB_CASSERT(temp == sm,temp - sm);
DLIB_TEST_MSG(temp == sm,temp - sm);
set_all_elements(dsm,1);
set_all_elements(sm,1);
......@@ -444,11 +444,11 @@ namespace
dsm += dsm;
sm += sm;
DLIB_CASSERT(dsm == 2*temp,"");
DLIB_CASSERT(sm == 2*temp,"");
DLIB_TEST(dsm == 2*temp);
DLIB_TEST(sm == 2*temp);
temp = dsm - dsm*sm ;
dsm -= dsm*sm;
DLIB_CASSERT(temp == dsm,temp - dsm);
DLIB_TEST_MSG(temp == dsm,temp - dsm);
set_all_elements(dsm,1);
set_all_elements(sm,1);
......@@ -456,53 +456,53 @@ namespace
dsm *= 2;
sm *= 2;
DLIB_CASSERT(dsm == temp,"");
DLIB_CASSERT(sm == temp,"");
DLIB_TEST(dsm == temp);
DLIB_TEST(sm == temp);
dsm /= 2;
sm /= 2;
DLIB_CASSERT(dsm == temp/2,"");
DLIB_CASSERT(sm == temp/2,"");
DLIB_TEST(dsm == temp/2);
DLIB_TEST(sm == temp/2);
dsm += dsm;
sm += sm;
DLIB_CASSERT(dsm == temp,"");
DLIB_CASSERT(sm == temp,"");
DLIB_TEST(dsm == temp);
DLIB_TEST(sm == temp);
dsm += sm;
sm += dsm;
DLIB_CASSERT(dsm == 2*temp,"");
DLIB_CASSERT(sm == temp*3,"");
DLIB_TEST(dsm == 2*temp);
DLIB_TEST(sm == temp*3);
dsm -= sm;
sm -= dsm;
DLIB_CASSERT(dsm == -temp,"");
DLIB_CASSERT(sm == 4*temp,"");
DLIB_TEST(dsm == -temp);
DLIB_TEST(sm == 4*temp);
sm -= sm;
dsm -= dsm;
DLIB_CASSERT(dsm == 0*temp,"");
DLIB_CASSERT(sm == 0*temp,"");
DLIB_TEST(dsm == 0*temp);
DLIB_TEST(sm == 0*temp);
set_all_elements(dsm,1);
set_all_elements(sm,1);
set_all_elements(temp,3);
dsm += sm+sm;
DLIB_CASSERT(dsm == temp,"");
DLIB_TEST(dsm == temp);
set_all_elements(dsm,1);
set_all_elements(sm,1);
set_all_elements(temp,-1);
dsm -= sm+sm;
DLIB_CASSERT(dsm == temp,"");
DLIB_TEST(dsm == temp);
set_all_elements(dsm,1);
set_all_elements(sm,1);
set_all_elements(temp,-1);
sm -= dsm+dsm;
DLIB_CASSERT(sm == temp,"");
DLIB_TEST(sm == temp);
set_all_elements(dsm,1);
set_all_elements(sm,1);
set_all_elements(temp,3);
sm += dsm+dsm;
DLIB_CASSERT(sm == temp,"");
DLIB_TEST(sm == temp);
......@@ -513,7 +513,7 @@ namespace
set_all_elements(bt1,2);
set_all_elements(bt2,3);
DLIB_CASSERT(trans(bt1)*bt2 == 18,"");
DLIB_TEST(trans(bt1)*bt2 == 18);
}
{
matrix<float,3,1> bt1;
......@@ -521,7 +521,7 @@ namespace
set_all_elements(bt1,2);
set_all_elements(bt2,3);
DLIB_CASSERT(trans(bt1)*bt2 == 18,"");
DLIB_TEST(trans(bt1)*bt2 == 18);
}
{
matrix<float> bt1(3,1);
......@@ -529,7 +529,7 @@ namespace
set_all_elements(bt1,2);
set_all_elements(bt2,3);
DLIB_CASSERT(trans(bt1)*bt2 == 18,"");
DLIB_TEST(trans(bt1)*bt2 == 18);
}
{
matrix<float,3,1> bt1;
......@@ -537,7 +537,7 @@ namespace
set_all_elements(bt1,2);
set_all_elements(bt2,3);
DLIB_CASSERT(trans(bt1)*bt2 == 18,"");
DLIB_TEST(trans(bt1)*bt2 == 18);
}
......@@ -568,18 +568,18 @@ namespace
svd2(true,true,a2+a2,u,q,v);
double err = sum(round(1e10*(a - subm(u,get_rect(a2+a2))*diagm(q)*trans(v))));
DLIB_CASSERT( err == 0,"err: " << err);
DLIB_CASSERT((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,M>()),"");
DLIB_CASSERT((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()),"");
DLIB_TEST_MSG( err == 0,"err: " << err);
DLIB_TEST((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,M>()));
DLIB_TEST((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()));
svd2(false,true,a2+a2,u2,q2,v2);
DLIB_CASSERT(equal(q2,q),"");
DLIB_CASSERT(equal(v2,v),"");
DLIB_TEST(equal(q2,q));
DLIB_TEST(equal(v2,v));
svd2(true,false,a2+a2,u2,q2,v2);
DLIB_CASSERT(equal(q2,q),"");
DLIB_CASSERT(equal(u2,u),"");
DLIB_TEST(equal(q2,q));
DLIB_TEST(equal(u2,u));
svd2(false,false,a2+a2,u2,q2,v2);
DLIB_CASSERT(equal(q2,q),"");
DLIB_TEST(equal(q2,q));
}
......@@ -609,18 +609,18 @@ namespace
svd2(true,true,a2+a2,u,q,v);
double err = sum(round(1e10*(a - subm(u,get_rect(a2+a2))*diagm(q)*trans(v))));
DLIB_CASSERT( err == 0,"err: " << err);
DLIB_CASSERT((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,M>()),"");
DLIB_CASSERT((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()),"");
DLIB_TEST_MSG( err == 0,"err: " << err);
DLIB_TEST((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,M>()));
DLIB_TEST((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()));
svd2(false,true,a2+a2,u2,q2,v2);
DLIB_CASSERT(equal(q2,q),"");
DLIB_CASSERT(equal(v2,v),"");
DLIB_TEST(equal(q2,q));
DLIB_TEST(equal(v2,v));
svd2(true,false,a2+a2,u2,q2,v2);
DLIB_CASSERT(equal(q2,q),"");
DLIB_CASSERT(equal(u2,u),"");
DLIB_TEST(equal(q2,q));
DLIB_TEST(equal(u2,u));
svd2(false,false,a2+a2,u2,q2,v2);
DLIB_CASSERT(equal(q2,q),"");
DLIB_TEST(equal(q2,q));
}
......@@ -650,9 +650,9 @@ namespace
svd2(true,true,a2+a2,u,q,v);
double err = sum(round(1e10*(a - subm(u,get_rect(a2+a2))*diagm(q)*trans(v))));
DLIB_CASSERT( err == 0,"err: " << err);
DLIB_CASSERT((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,M>()),"");
DLIB_CASSERT((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()),"");
DLIB_TEST_MSG( err == 0,"err: " << err);
DLIB_TEST((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,M>()));
DLIB_TEST((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()));
}
......@@ -680,9 +680,9 @@ namespace
svd(a2+a2,u,w,v);
DLIB_CASSERT( sum(round(1e10*(a - u*w*trans(v)))) == 0,"");
DLIB_CASSERT((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,N>()),"");
DLIB_CASSERT((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()),"");
DLIB_TEST( sum(round(1e10*(a - u*w*trans(v)))) == 0);
DLIB_TEST((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,N>()));
DLIB_TEST((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()));
}
{
......@@ -709,9 +709,9 @@ namespace
svd(a2+a2,u,w,v);
DLIB_CASSERT( sum(round(1e10*(a - u*w*trans(v)))) == 0,"");
DLIB_CASSERT((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,N>()),"");
DLIB_CASSERT((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()),"");
DLIB_TEST( sum(round(1e10*(a - u*w*trans(v)))) == 0);
DLIB_TEST((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,N>()));
DLIB_TEST((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()));
}
......@@ -735,9 +735,9 @@ namespace
svd(a,u,w,v);
DLIB_CASSERT( sum(round(1e10*(a - u*w*trans(v)))) == 0,"");
DLIB_CASSERT((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,N>()),"");
DLIB_CASSERT((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()),"");
DLIB_TEST( sum(round(1e10*(a - u*w*trans(v)))) == 0);
DLIB_TEST((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,N>()));
DLIB_TEST((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()));
}
......@@ -761,9 +761,9 @@ namespace
svd(a,u,w,v);
DLIB_CASSERT( sum(round(1e10*(a - u*w*trans(v)))) == 0,"");
DLIB_CASSERT((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,N>()),"");
DLIB_CASSERT((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()),"");
DLIB_TEST( sum(round(1e10*(a - u*w*trans(v)))) == 0);
DLIB_TEST((round(1e10*trans(u)*u) == 1e10*identity_matrix<double,N>()));
DLIB_TEST((round(1e10*trans(v)*v) == 1e10*identity_matrix<double,N>()));
}
......@@ -788,7 +788,7 @@ namespace
svd(a,u,w,v);
DLIB_CASSERT( sum(round(1e10*(a - u*w*trans(v)))) == 0,"");
DLIB_TEST( sum(round(1e10*(a - u*w*trans(v)))) == 0);
}
......@@ -812,7 +812,7 @@ namespace
svd(a,u,w,v);
DLIB_CASSERT( sum(round(1e10*(a - u*w*trans(v)))) == 0,"");
DLIB_TEST( sum(round(1e10*(a - u*w*trans(v)))) == 0);
}
......@@ -826,53 +826,53 @@ namespace
a(2,2) = 3;
b = a;
DLIB_CASSERT(diag(a)(0) == 1,"");
DLIB_CASSERT(diag(a)(1) == 2,"");
DLIB_CASSERT(diag(a)(2) == 3,"");
DLIB_CASSERT(diag(a).nr() == 3,"");
DLIB_CASSERT(diag(a).nc() == 1,"");
DLIB_TEST(diag(a)(0) == 1);
DLIB_TEST(diag(a)(1) == 2);
DLIB_TEST(diag(a)(2) == 3);
DLIB_TEST(diag(a).nr() == 3);
DLIB_TEST(diag(a).nc() == 1);
DLIB_CASSERT(diag(b)(0) == 1,"");
DLIB_CASSERT(diag(b)(1) == 2,"");
DLIB_CASSERT(diag(b)(2) == 3,"");
DLIB_CASSERT(diag(b).nr() == 3,"");
DLIB_CASSERT(diag(b).nc() == 1,"");
DLIB_TEST(diag(b)(0) == 1);
DLIB_TEST(diag(b)(1) == 2);
DLIB_TEST(diag(b)(2) == 3);
DLIB_TEST(diag(b).nr() == 3);
DLIB_TEST(diag(b).nc() == 1);
DLIB_CASSERT(pointwise_multiply(a,b)(0,0) == 1,"");
DLIB_CASSERT(pointwise_multiply(a,b)(1,1) == 4,"");
DLIB_CASSERT(pointwise_multiply(a,b)(2,2) == 9,"");
DLIB_CASSERT(pointwise_multiply(a,b)(1,0) == 0,"");
DLIB_CASSERT(pointwise_multiply(a,b,a)(1,0) == 0,"");
DLIB_CASSERT(pointwise_multiply(a,b,a,b)(1,0) == 0,"");
DLIB_TEST(pointwise_multiply(a,b)(0,0) == 1);
DLIB_TEST(pointwise_multiply(a,b)(1,1) == 4);
DLIB_TEST(pointwise_multiply(a,b)(2,2) == 9);
DLIB_TEST(pointwise_multiply(a,b)(1,0) == 0);
DLIB_TEST(pointwise_multiply(a,b,a)(1,0) == 0);
DLIB_TEST(pointwise_multiply(a,b,a,b)(1,0) == 0);
DLIB_CASSERT(complex_matrix(a,b)(0,0) == std::complex<double>(1,1),"");
DLIB_CASSERT(complex_matrix(a,b)(2,2) == std::complex<double>(3,3),"");
DLIB_CASSERT(complex_matrix(a,b)(2,1) == std::complex<double>(0,0),"");
DLIB_TEST(complex_matrix(a,b)(0,0) == std::complex<double>(1,1));
DLIB_TEST(complex_matrix(a,b)(2,2) == std::complex<double>(3,3));
DLIB_TEST(complex_matrix(a,b)(2,1) == std::complex<double>(0,0));
}
{
matrix<float,3,1> m1, m2;
set_all_elements(m1,2.0);
set_all_elements(m2,1.0/2.0);
DLIB_CASSERT(reciprocal(m1) == m2,"");
DLIB_CASSERT((reciprocal(uniform_matrix<float,3,1>(2.0)) == m2),"");
DLIB_CASSERT((round_zeros(uniform_matrix<float,3,1>(1e-8f)) == uniform_matrix<float,3,1>(0)) ,"");
DLIB_TEST(reciprocal(m1) == m2);
DLIB_TEST((reciprocal(uniform_matrix<float,3,1>(2.0)) == m2));
DLIB_TEST((round_zeros(uniform_matrix<float,3,1>(1e-8f)) == uniform_matrix<float,3,1>(0)) );
set_all_elements(m1,2.0);
m2 = m1;
m1(1,0) = static_cast<float>(1e-8);
m2(1,0) = 0;
DLIB_CASSERT(round_zeros(m1) == m2,"");
DLIB_TEST(round_zeros(m1) == m2);
m1 = round_zeros(m1);
DLIB_CASSERT(m1 == m2,"");
DLIB_TEST(m1 == m2);
}
{
matrix<matrix<double,2,2> > m;
m.set_size(3,3);
set_all_elements(m,uniform_matrix<double,2,2>(1));
DLIB_CASSERT((sum(m) == uniform_matrix<double,2,2>(9)),"");
DLIB_CASSERT((round_zeros(sqrt(sum(m)) - uniform_matrix<double,2,2>(3)) == uniform_matrix<double,2,2>(0)),"");
DLIB_TEST((sum(m) == uniform_matrix<double,2,2>(9)));
DLIB_TEST((round_zeros(sqrt(sum(m)) - uniform_matrix<double,2,2>(3)) == uniform_matrix<double,2,2>(0)));
}
{
......@@ -884,18 +884,18 @@ namespace
m2 = uniform_matrix<int,2,2>(2);
m1 = m1 + m2;
DLIB_CASSERT((m1 == uniform_matrix<int,2,2>(4)),"");
DLIB_TEST((m1 == uniform_matrix<int,2,2>(4)));
set_all_elements(m1,2);
set_all_elements(m2,2);
m1 = m1*m1;
DLIB_CASSERT((m1 == uniform_matrix<int,2,2>(8)),"");
DLIB_TEST((m1 == uniform_matrix<int,2,2>(8)));
m1(1,0) = 1;
set_all_elements(m2,8);
m2(0,1) = 1;
m1 = trans(m1);
DLIB_CASSERT(m1 == m2,"");
DLIB_TEST(m1 == m2);
}
{
......@@ -903,49 +903,49 @@ namespace
matrix<double> m2(2,3);
set_all_elements(m,1);
DLIB_CASSERT(mean(m) == 1,"");
DLIB_TEST(mean(m) == 1);
set_all_elements(m,2);
DLIB_CASSERT(mean(m) == 2,"");
DLIB_TEST(mean(m) == 2);
m(0,0) = 1;
m(0,1) = 1;
m(0,2) = 1;
DLIB_CASSERT(abs(mean(m) - 1.5) < 1e-10,"");
DLIB_CASSERT(abs(variance(m) - 0.3) < 1e-10,"");
DLIB_TEST(abs(mean(m) - 1.5) < 1e-10);
DLIB_TEST(abs(variance(m) - 0.3) < 1e-10);
set_all_elements(m2,1);
DLIB_CASSERT(mean(m2) == 1,"");
DLIB_TEST(mean(m2) == 1);
set_all_elements(m2,2);
DLIB_CASSERT(mean(m2) == 2,"");
DLIB_TEST(mean(m2) == 2);
m2(0,0) = 1;
m2(0,1) = 1;
m2(0,2) = 1;
DLIB_CASSERT(abs(mean(m2) - 1.5) < 1e-10,"");
DLIB_CASSERT(abs(variance(m2) - 0.3) < 1e-10,"");
DLIB_TEST(abs(mean(m2) - 1.5) < 1e-10);
DLIB_TEST(abs(variance(m2) - 0.3) < 1e-10);
set_all_elements(m,0);
DLIB_CASSERT(abs(variance(m)) < 1e-10,"");
DLIB_TEST(abs(variance(m)) < 1e-10);
set_all_elements(m,1);
DLIB_CASSERT(abs(variance(m)) < 1e-10,"");
DLIB_TEST(abs(variance(m)) < 1e-10);
set_all_elements(m,23.4);
DLIB_CASSERT(abs(variance(m)) < 1e-10,"");
DLIB_TEST(abs(variance(m)) < 1e-10);
}
{
matrix<matrix<double,3,1,MM>,2,2,MM> m;
set_all_elements(m,uniform_matrix<double,3,1>(1));
DLIB_CASSERT((round_zeros(variance(m)) == uniform_matrix<double,3,1>(0)),"");
DLIB_CASSERT((round_zeros(mean(m)) == uniform_matrix<double,3,1>(1)),"");
DLIB_TEST((round_zeros(variance(m)) == uniform_matrix<double,3,1>(0)));
DLIB_TEST((round_zeros(mean(m)) == uniform_matrix<double,3,1>(1)));
m(0,0) = uniform_matrix<double,3,1>(9);
DLIB_CASSERT((round_zeros(variance(m)) == uniform_matrix<double,3,1>(16)),"");
DLIB_CASSERT((round_zeros(mean(m)) == uniform_matrix<double,3,1>(3)),"");
DLIB_TEST((round_zeros(variance(m)) == uniform_matrix<double,3,1>(16)));
DLIB_TEST((round_zeros(mean(m)) == uniform_matrix<double,3,1>(3)));
matrix<matrix<double> > m2(2,2);
set_all_elements(m2,uniform_matrix<double,3,1>(1));
DLIB_CASSERT((round_zeros(variance(m2)) == uniform_matrix<double,3,1>(0)),"");
DLIB_CASSERT((round_zeros(mean(m2)) == uniform_matrix<double,3,1>(1)),"");
DLIB_TEST((round_zeros(variance(m2)) == uniform_matrix<double,3,1>(0)));
DLIB_TEST((round_zeros(mean(m2)) == uniform_matrix<double,3,1>(1)));
m2(0,0) = uniform_matrix<double,3,1>(9);
DLIB_CASSERT((round_zeros(variance(m2)) == uniform_matrix<double,3,1>(16)),"");
DLIB_CASSERT((round_zeros(mean(m2)) == uniform_matrix<double,3,1>(3)),"");
DLIB_TEST((round_zeros(variance(m2)) == uniform_matrix<double,3,1>(16)));
DLIB_TEST((round_zeros(mean(m2)) == uniform_matrix<double,3,1>(3)));
}
......@@ -957,26 +957,26 @@ namespace
4,6,8,10;
m2 = m;
DLIB_CASSERT(colm(m,range(0,3)) == m,"");
DLIB_CASSERT(rowm(m,range(0,3)) == m,"");
DLIB_CASSERT(colm(m,range(0,0)) == colm(m,0),"");
DLIB_CASSERT(rowm(m,range(0,0)) == rowm(m,0),"");
DLIB_CASSERT(colm(m,range(1,1)) == colm(m,1),"");
DLIB_CASSERT(rowm(m,range(1,1)) == rowm(m,1),"");
DLIB_TEST(colm(m,range(0,3)) == m);
DLIB_TEST(rowm(m,range(0,3)) == m);
DLIB_TEST(colm(m,range(0,0)) == colm(m,0));
DLIB_TEST(rowm(m,range(0,0)) == rowm(m,0));
DLIB_TEST(colm(m,range(1,1)) == colm(m,1));
DLIB_TEST(rowm(m,range(1,1)) == rowm(m,1));
DLIB_CASSERT(colm(m,range(2,2)) == colm(m,2),"");
DLIB_CASSERT(rowm(m,range(2,2)) == rowm(m,2),"");
DLIB_TEST(colm(m,range(2,2)) == colm(m,2));
DLIB_TEST(rowm(m,range(2,2)) == rowm(m,2));
DLIB_CASSERT(colm(m,range(1,2)) == subm(m,0,1,4,2),"");
DLIB_CASSERT(rowm(m,range(1,2)) == subm(m,1,0,2,4),"");
DLIB_TEST(colm(m,range(1,2)) == subm(m,0,1,4,2));
DLIB_TEST(rowm(m,range(1,2)) == subm(m,1,0,2,4));
set_colm(m,range(1,2)) = 9;
set_subm(m2,0,1,4,2) = 9;
DLIB_CASSERT(m == m2,"");
DLIB_TEST(m == m2);
set_colm(m,range(1,2)) = 11;
set_subm(m2,0,1,4,2) = 11;
DLIB_CASSERT(m == m2,"");
DLIB_TEST(m == m2);
}
......
dlib/test/matrix3.cpp
View file @ 9a8ed037
......@@ -34,15 +34,15 @@ namespace
const U& b
)
{
DLIB_CASSERT(a.nr() == b.nr(),"");
DLIB_CASSERT(a.nc() == b.nc(),"");
DLIB_TEST(a.nr() == b.nr());
DLIB_TEST(a.nc() == b.nc());
typedef typename T::type type;
for (long r = 0; r < a.nr(); ++r)
{
for (long c = 0; c < a.nc(); ++c)
{
type error = std::abs(a(r,c) - b(r,c));
DLIB_CASSERT(error < std::sqrt(std::numeric_limits<type>::epsilon())*eps_mul, "error: " << error <<
DLIB_TEST_MSG(error < std::sqrt(std::numeric_limits<type>::epsilon())*eps_mul, "error: " << error <<
" eps: " << std::sqrt(std::numeric_limits<type>::epsilon())*eps_mul);
}
}
......@@ -54,15 +54,15 @@ namespace
const U& b
)
{
DLIB_CASSERT(a.nr() == b.nr(),"");
DLIB_CASSERT(a.nc() == b.nc(),"");
DLIB_TEST(a.nr() == b.nr());
DLIB_TEST(a.nc() == b.nc());
typedef typename T::type type;
for (long r = 0; r < a.nr(); ++r)
{
for (long c = 0; c < a.nc(); ++c)
{
typename type::value_type error = std::abs(a(r,c) - b(r,c));
DLIB_CASSERT(error < std::sqrt(std::numeric_limits<typename type::value_type>::epsilon())*eps_mul, "error: " << error <<
DLIB_TEST_MSG(error < std::sqrt(std::numeric_limits<typename type::value_type>::epsilon())*eps_mul, "error: " << error <<
" eps: " << std::sqrt(std::numeric_limits<typename type::value_type>::epsilon())*eps_mul);
}
}
......@@ -75,8 +75,8 @@ namespace
)
{
T& a = const_cast<T&>(a_);
DLIB_CASSERT(a.nr() == b.nr(),"");
DLIB_CASSERT(a.nc() == b.nc(),"");
DLIB_TEST(a.nr() == b.nr());
DLIB_TEST(a.nc() == b.nc());
for (long r = 0; r < a.nr(); ++r)
{
for (long c = 0; c < a.nc(); ++c)
......@@ -470,8 +470,8 @@ namespace
c_check_equal( tmp(c_temp + conj(c_rv4)*c_cv4), c_temp + conj(c_rv4)*c_cv4);
c_check_equal( tmp(c_temp + trans(conj(c_cv4))*trans(c_rv4)), c_temp + trans(conj(c_cv4))*trans(c_rv4));
DLIB_CASSERT(abs((static_cast<complex<type> >(c_rv4*c_cv4) + i) - ((c_rv4*c_cv4)(0) + i)) < std::sqrt(std::numeric_limits<type>::epsilon())*eps_mul ,"");
DLIB_CASSERT(abs((rv4*cv4 + 1.0) - ((rv4*cv4)(0) + 1.0)) < std::sqrt(std::numeric_limits<type>::epsilon())*eps_mul,"");
DLIB_TEST(abs((static_cast<complex<type> >(c_rv4*c_cv4) + i) - ((c_rv4*c_cv4)(0) + i)) < std::sqrt(std::numeric_limits<type>::epsilon())*eps_mul );
DLIB_TEST(abs((rv4*cv4 + 1.0) - ((rv4*cv4)(0) + 1.0)) < std::sqrt(std::numeric_limits<type>::epsilon())*eps_mul);
}
}
......@@ -498,10 +498,10 @@ namespace
6, 7;
DLIB_CASSERT(subm(tensor_product(m1,m2),range(0,1), range(0,1)) == 1*m2,"");
DLIB_CASSERT(subm(tensor_product(m1,m2),range(0,1), range(2,3)) == 2*m2,"");
DLIB_CASSERT(subm(tensor_product(m1,m2),range(2,3), range(0,1)) == 3*m2,"");
DLIB_CASSERT(subm(tensor_product(m1,m2),range(2,3), range(2,3)) == 4*m2,"");
DLIB_TEST(subm(tensor_product(m1,m2),range(0,1), range(0,1)) == 1*m2);
DLIB_TEST(subm(tensor_product(m1,m2),range(0,1), range(2,3)) == 2*m2);
DLIB_TEST(subm(tensor_product(m1,m2),range(2,3), range(0,1)) == 3*m2);
DLIB_TEST(subm(tensor_product(m1,m2),range(2,3), range(2,3)) == 4*m2);
}
{
......@@ -538,8 +538,8 @@ namespace
0,0,9,0;
DLIB_CASSERT(lowerm(m) == ml,"");
DLIB_CASSERT(upperm(m) == mu,"");
DLIB_TEST(lowerm(m) == ml);
DLIB_TEST(upperm(m) == mu);
ml = 3,0,0,0,
4,3,0,0,
......@@ -549,8 +549,8 @@ namespace
0,4,6,7,
0,0,4,0;
DLIB_CASSERT(lowerm(m,3) == ml,"");
DLIB_CASSERT(upperm(m,4) == mu,"");
DLIB_TEST(lowerm(m,3) == ml);
DLIB_TEST(upperm(m,4) == mu);
}
......@@ -563,8 +563,8 @@ namespace
row = 4,5,6;
col = 3,6;
DLIB_CASSERT(rowm(m, 1, 3) == row,"");
DLIB_CASSERT(colm(m, 2, 2) == col,"");
DLIB_TEST(rowm(m, 1, 3) == row);
DLIB_TEST(colm(m, 2, 2) == col);
}
......
dlib/test/matrix_chol.cpp
View file @ 9a8ed037
......@@ -77,23 +77,23 @@ namespace
cholesky_decomposition<matrix_type> test(m);
// none of the matrices we should be passing in to test_cholesky() should be non-spd.
DLIB_CASSERT(test.is_spd() == true, "");
DLIB_TEST(test.is_spd() == true);
type temp;
DLIB_CASSERT( (temp= max(abs(test.get_l()*trans(test.get_l()) - m))) < eps,temp);
DLIB_TEST_MSG( (temp= max(abs(test.get_l()*trans(test.get_l()) - m))) < eps,temp);
matrix<type> m2;
matrix<type,0,1> col;
m2 = identity_matrix<type>(m.nr());
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
m2 = randmat<type>(m.nr(),5);
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
m2 = randmat<type>(m.nr(),1);
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
col = randmat<type>(m.nr(),1);
DLIB_CASSERT(equal(m*test.solve(col), col,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(col), col,eps),max(abs(m*test.solve(m2)- m2)));
// now make us a non-spd matrix
if (m.nr() > 1)
......@@ -102,17 +102,17 @@ namespace
sm(1,1) = 0;
cholesky_decomposition<matrix_type> test2(sm);
DLIB_CASSERT(test2.is_spd() == false, test2.get_l());
DLIB_TEST_MSG(test2.is_spd() == false, test2.get_l());
cholesky_decomposition<matrix_type> test3(sm*trans(sm));
DLIB_CASSERT(test3.is_spd() == false, test3.get_l());
DLIB_TEST_MSG(test3.is_spd() == false, test3.get_l());
sm = sm*trans(sm);
sm(1,1) = 5;
sm(1,0) -= 1;
cholesky_decomposition<matrix_type> test4(sm);
DLIB_CASSERT(test4.is_spd() == false, test4.get_l());
DLIB_TEST_MSG(test4.is_spd() == false, test4.get_l());
}
}
......
dlib/test/matrix_eig.cpp
View file @ 9a8ed037
......@@ -76,20 +76,20 @@ namespace
eigenvalue_decomposition<matrix_type> test(m);
DLIB_CASSERT(test.dim() == m.nr(), "");
DLIB_TEST(test.dim() == m.nr());
// make sure all the various ways of asking for the eigenvalues are actually returning a
// consistent set of eigenvalues.
DLIB_CASSERT(equal(real(test.get_eigenvalues()), test.get_real_eigenvalues(), eps), "");
DLIB_CASSERT(equal(imag(test.get_eigenvalues()), test.get_imag_eigenvalues(), eps), "");
DLIB_CASSERT(equal(real(diag(test.get_d())), test.get_real_eigenvalues(), eps), "");
DLIB_CASSERT(equal(imag(diag(test.get_d())), test.get_imag_eigenvalues(), eps), "");
DLIB_TEST(equal(real(test.get_eigenvalues()), test.get_real_eigenvalues(), eps));
DLIB_TEST(equal(imag(test.get_eigenvalues()), test.get_imag_eigenvalues(), eps));
DLIB_TEST(equal(real(diag(test.get_d())), test.get_real_eigenvalues(), eps));
DLIB_TEST(equal(imag(diag(test.get_d())), test.get_imag_eigenvalues(), eps));
matrix<type> eig1 ( real_eigenvalues(m));
matrix<type> eig2 ( test.get_real_eigenvalues());
sort(&eig1(0), &eig1(0) + eig1.size());
sort(&eig2(0), &eig2(0) + eig2.size());
DLIB_CASSERT(max(abs(eig1 - eig2)) < eps, "");
DLIB_TEST(max(abs(eig1 - eig2)) < eps);
const matrix<type> V = test.get_pseudo_v();
const matrix<type> D = test.get_pseudo_d();
......@@ -97,34 +97,34 @@ namespace
const matrix<complex<type> > CD = test.get_d();
const matrix<complex<type> > CM = complex_matrix(m, uniform_matrix<type>(m.nr(),m.nc(),0));
DLIB_CASSERT(V.nr() == test.dim(),"");
DLIB_CASSERT(V.nc() == test.dim(),"");
DLIB_CASSERT(D.nr() == test.dim(),"");
DLIB_CASSERT(D.nc() == test.dim(),"");
DLIB_TEST(V.nr() == test.dim());
DLIB_TEST(V.nc() == test.dim());
DLIB_TEST(D.nr() == test.dim());
DLIB_TEST(D.nc() == test.dim());
// CD is a diagonal matrix
DLIB_CASSERT(diagm(diag(CD)) == CD,"");
DLIB_TEST(diagm(diag(CD)) == CD);
// verify that these things are actually eigenvalues and eigenvectors of m
DLIB_CASSERT(max(abs(m*V - V*D)) < eps, "");
DLIB_CASSERT(max(norm(CM*CV - CV*CD)) < eps, "");
DLIB_TEST(max(abs(m*V - V*D)) < eps);
DLIB_TEST(max(norm(CM*CV - CV*CD)) < eps);
// if m is a symmetric matrix
if (max(abs(m-trans(m))) < 1e-5)
{
dlog << LTRACE << "m is symmetric";
// there aren't any imaginary eigenvalues
DLIB_CASSERT(max(abs(test.get_imag_eigenvalues())) < eps, "");
DLIB_CASSERT(diagm(diag(D)) == D,"");
DLIB_TEST(max(abs(test.get_imag_eigenvalues())) < eps);
DLIB_TEST(diagm(diag(D)) == D);
// V is orthogonal
DLIB_CASSERT(equal(V*trans(V), identity_matrix<type>(test.dim()), eps), "");
DLIB_CASSERT(equal(m , V*D*trans(V), eps), "");
DLIB_TEST(equal(V*trans(V), identity_matrix<type>(test.dim()), eps));
DLIB_TEST(equal(m , V*D*trans(V), eps));
}
else
{
dlog << LTRACE << "m is NOT symmetric";
DLIB_CASSERT(equal(m , V*D*inv(V), eps), max(abs(m - V*D*inv(V))));
DLIB_TEST_MSG(equal(m , V*D*inv(V), eps), max(abs(m - V*D*inv(V))));
}
}
......
dlib/test/matrix_lu.cpp
View file @ 9a8ed037
......@@ -76,33 +76,33 @@ namespace
lu_decomposition<matrix_type> test(m);
DLIB_CASSERT(test.is_square() == (m.nr() == m.nc()), "");
DLIB_TEST(test.is_square() == (m.nr() == m.nc()));
DLIB_CASSERT(test.nr() == m.nr(),"");
DLIB_CASSERT(test.nc() == m.nc(),"");
DLIB_TEST(test.nr() == m.nr());
DLIB_TEST(test.nc() == m.nc());
type temp;
DLIB_CASSERT( (temp= max(abs(test.get_l()*test.get_u() - rowm(m,test.get_pivot())))) < eps,temp);
DLIB_TEST_MSG( (temp= max(abs(test.get_l()*test.get_u() - rowm(m,test.get_pivot())))) < eps,temp);
if (test.is_square())
{
// none of the matrices we should be passing in to test_lu() should be singular.
DLIB_CASSERT (abs(test.det()) > eps/100, "det: " << test.det() );
DLIB_TEST_MSG (abs(test.det()) > eps/100, "det: " << test.det() );
dlog << LDEBUG << "big det: " << test.det();
DLIB_CASSERT(test.is_singular() == false,"");
DLIB_TEST(test.is_singular() == false);
matrix<type> m2;
matrix<type,0,1> col;
m2 = identity_matrix<type>(m.nr());
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
m2 = randmat<type>(m.nr(),5);
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
m2 = randmat<type>(m.nr(),1);
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
col = randmat<type>(m.nr(),1);
DLIB_CASSERT(equal(m*test.solve(col), col,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(col), col,eps),max(abs(m*test.solve(m2)- m2)));
// now make us a singular matrix
if (m.nr() > 1)
......@@ -111,13 +111,13 @@ namespace
set_colm(sm,0) = colm(sm,1);
lu_decomposition<matrix_type> test2(sm);
DLIB_CASSERT( (temp= max(abs(test2.get_l()*test2.get_u() - rowm(sm,test2.get_pivot())))) < eps,temp);
DLIB_TEST_MSG( (temp= max(abs(test2.get_l()*test2.get_u() - rowm(sm,test2.get_pivot())))) < eps,temp);
// these checks are only accurate for small matrices
if (test2.nr() < 100)
{
DLIB_CASSERT(test2.is_singular() == true,"det: " << test2.det());
DLIB_CASSERT(abs(test2.det()) < eps,"det: " << test2.det());
DLIB_TEST_MSG(test2.is_singular() == true,"det: " << test2.det());
DLIB_TEST_MSG(abs(test2.det()) < eps,"det: " << test2.det());
}
}
......
dlib/test/matrix_qr.cpp
View file @ 9a8ed037
......@@ -77,15 +77,15 @@ namespace
qr_decomposition<matrix_type> test(m);
DLIB_CASSERT(test.nr() == m.nr(),"");
DLIB_CASSERT(test.nc() == m.nc(),"");
DLIB_TEST(test.nr() == m.nr());
DLIB_TEST(test.nc() == m.nc());
type temp;
DLIB_CASSERT( (temp= max(abs(test.get_q()*test.get_r() - m))) < eps,temp);
DLIB_TEST_MSG( (temp= max(abs(test.get_q()*test.get_r() - m))) < eps,temp);
// none of the matrices we should be passing in to test_qr() should be non-full rank.
DLIB_CASSERT(test.is_full_rank() == true,"");
DLIB_TEST(test.is_full_rank() == true);
if (m.nr() == m.nc())
{
......@@ -93,17 +93,17 @@ namespace
matrix<type,0,1> col;
m2 = identity_matrix<type>(m.nr());
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
m2 = randmat<type>(m.nr(),5);
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
m2 = randmat<type>(m.nr(),1);
DLIB_CASSERT(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(m2), m2,eps),max(abs(m*test.solve(m2)- m2)));
col = randmat<type>(m.nr(),1);
DLIB_CASSERT(equal(m*test.solve(col), col,eps),max(abs(m*test.solve(m2)- m2)));
DLIB_TEST_MSG(equal(m*test.solve(col), col,eps),max(abs(m*test.solve(m2)- m2)));
}
else
{
DLIB_CASSERT(dlib::equal(pinv(m), test.solve(identity_matrix<type>(m.nr())), eps),
DLIB_TEST_MSG(dlib::equal(pinv(m), test.solve(identity_matrix<type>(m.nr())), eps),
max(abs(pinv(m) - test.solve(identity_matrix<type>(m.nr())))) );
}
......@@ -114,11 +114,11 @@ namespace
set_colm(sm,0) = colm(sm,1);
qr_decomposition<matrix_type> test2(sm);
DLIB_CASSERT( (temp= max(abs(test.get_q()*test.get_r() - m))) < eps,temp);
DLIB_TEST_MSG( (temp= max(abs(test.get_q()*test.get_r() - m))) < eps,temp);
if (test2.nc() < 100)
{
DLIB_CASSERT(test2.is_full_rank() == false,"eps: " << eps);
DLIB_TEST_MSG(test2.is_full_rank() == false,"eps: " << eps);
}
}
......
dlib/test/md5.cpp
View file @ 9a8ed037
......@@ -27,13 +27,13 @@ namespace
!*/
{
DLIB_CASSERT(md5 ("") == "d41d8cd98f00b204e9800998ecf8427e","");
DLIB_CASSERT(md5 ("a") == "0cc175b9c0f1b6a831c399e269772661","");
DLIB_CASSERT(md5 ("abc") == "900150983cd24fb0d6963f7d28e17f72","");
DLIB_CASSERT(md5 ("message digest") == "f96b697d7cb7938d525a2f31aaf161d0","");
DLIB_CASSERT(md5 ("abcdefghijklmnopqrstuvwxyz") == "c3fcd3d76192e4007dfb496cca67e13b","");
DLIB_CASSERT(md5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") == "d174ab98d277d9f5a5611c2c9f419d9f","");
DLIB_CASSERT(md5 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") == "57edf4a22be3c955ac49da2e2107b67a","");
DLIB_TEST(md5 ("") == "d41d8cd98f00b204e9800998ecf8427e");
DLIB_TEST(md5 ("a") == "0cc175b9c0f1b6a831c399e269772661");
DLIB_TEST(md5 ("abc") == "900150983cd24fb0d6963f7d28e17f72");
DLIB_TEST(md5 ("message digest") == "f96b697d7cb7938d525a2f31aaf161d0");
DLIB_TEST(md5 ("abcdefghijklmnopqrstuvwxyz") == "c3fcd3d76192e4007dfb496cca67e13b");
DLIB_TEST(md5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") == "d174ab98d277d9f5a5611c2c9f419d9f");
DLIB_TEST(md5 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") == "57edf4a22be3c955ac49da2e2107b67a");
}
......
dlib/test/member_function_pointer.cpp
View file @ 9a8ed037
......@@ -128,289 +128,289 @@ namespace
mfpkc<mfp<int,int,int> > a3c, b3c;
mfpkc<mfp<int,int,int,int> > a4c, b4c;
DLIB_CASSERT(a0c == b0c, "");
DLIB_CASSERT(a1c == b1c, "");
DLIB_CASSERT(a2c == b2c, "");
DLIB_CASSERT(a3c == b3c, "");
DLIB_CASSERT(a4c == b4c, "");
DLIB_CASSERT((a0c != b0c) == false, "");
DLIB_CASSERT((a1c != b1c) == false, "");
DLIB_CASSERT((a2c != b2c) == false, "");
DLIB_CASSERT((a3c != b3c) == false, "");
DLIB_CASSERT((a4c != b4c) == false, "");
DLIB_CASSERT(a0.is_set() == false,"");
DLIB_CASSERT(b0.is_set() == false,"");
DLIB_CASSERT(a0c.is_set() == false,"");
DLIB_CASSERT(b0c.is_set() == false,"");
DLIB_CASSERT(!a0 ,"");
DLIB_CASSERT(!b0 ,"");
DLIB_CASSERT(!a0c,"");
DLIB_CASSERT(!b0c,"");
DLIB_CASSERT(a1.is_set() == false,"");
DLIB_CASSERT(b1.is_set() == false,"");
DLIB_CASSERT(a1c.is_set() == false,"");
DLIB_CASSERT(b1c.is_set() == false,"");
DLIB_CASSERT(!a1 ,"");
DLIB_CASSERT(!b1 ,"");
DLIB_CASSERT(!a1c,"");
DLIB_CASSERT(!b1c,"");
DLIB_CASSERT(a2.is_set() == false,"");
DLIB_CASSERT(b2.is_set() == false,"");
DLIB_CASSERT(a2c.is_set() == false,"");
DLIB_CASSERT(b2c.is_set() == false,"");
DLIB_CASSERT(!a2,"");
DLIB_CASSERT(!b2,"");
DLIB_CASSERT(!a2c,"");
DLIB_CASSERT(!b2c,"");
DLIB_CASSERT(a3.is_set() == false,"");
DLIB_CASSERT(b3.is_set() == false,"");
DLIB_CASSERT(a3c.is_set() == false,"");
DLIB_CASSERT(b3c.is_set() == false,"");
DLIB_CASSERT(!a3,"");
DLIB_CASSERT(!b3,"");
DLIB_CASSERT(!a3c,"");
DLIB_CASSERT(!b3c,"");
DLIB_CASSERT(a4.is_set() == false,"");
DLIB_CASSERT(b4.is_set() == false,"");
DLIB_CASSERT(a4c.is_set() == false,"");
DLIB_CASSERT(b4c.is_set() == false,"");
DLIB_CASSERT(!a4,"");
DLIB_CASSERT(!b4,"");
DLIB_CASSERT(!a4c,"");
DLIB_CASSERT(!b4c,"");
DLIB_TEST(a0c == b0c);
DLIB_TEST(a1c == b1c);
DLIB_TEST(a2c == b2c);
DLIB_TEST(a3c == b3c);
DLIB_TEST(a4c == b4c);
DLIB_TEST((a0c != b0c) == false);
DLIB_TEST((a1c != b1c) == false);
DLIB_TEST((a2c != b2c) == false);
DLIB_TEST((a3c != b3c) == false);
DLIB_TEST((a4c != b4c) == false);
DLIB_TEST(a0.is_set() == false);
DLIB_TEST(b0.is_set() == false);
DLIB_TEST(a0c.is_set() == false);
DLIB_TEST(b0c.is_set() == false);
DLIB_TEST(!a0 );
DLIB_TEST(!b0 );
DLIB_TEST(!a0c);
DLIB_TEST(!b0c);
DLIB_TEST(a1.is_set() == false);
DLIB_TEST(b1.is_set() == false);
DLIB_TEST(a1c.is_set() == false);
DLIB_TEST(b1c.is_set() == false);
DLIB_TEST(!a1 );
DLIB_TEST(!b1 );
DLIB_TEST(!a1c);
DLIB_TEST(!b1c);
DLIB_TEST(a2.is_set() == false);
DLIB_TEST(b2.is_set() == false);
DLIB_TEST(a2c.is_set() == false);
DLIB_TEST(b2c.is_set() == false);
DLIB_TEST(!a2);
DLIB_TEST(!b2);
DLIB_TEST(!a2c);
DLIB_TEST(!b2c);
DLIB_TEST(a3.is_set() == false);
DLIB_TEST(b3.is_set() == false);
DLIB_TEST(a3c.is_set() == false);
DLIB_TEST(b3c.is_set() == false);
DLIB_TEST(!a3);
DLIB_TEST(!b3);
DLIB_TEST(!a3c);
DLIB_TEST(!b3c);
DLIB_TEST(a4.is_set() == false);
DLIB_TEST(b4.is_set() == false);
DLIB_TEST(a4c.is_set() == false);
DLIB_TEST(b4c.is_set() == false);
DLIB_TEST(!a4);
DLIB_TEST(!b4);
DLIB_TEST(!a4c);
DLIB_TEST(!b4c);
a0.set(helper,&test_helper::go0);
a0c.set(helper,&test_helper::go0);
DLIB_CASSERT(a0.is_set() == true,"");
DLIB_CASSERT(a0c.is_set() == true,"");
DLIB_CASSERT(b0.is_set() == false,"");
DLIB_CASSERT(b0c.is_set() == false,"");
DLIB_TEST(a0.is_set() == true);
DLIB_TEST(a0c.is_set() == true);
DLIB_TEST(b0.is_set() == false);
DLIB_TEST(b0c.is_set() == false);
DLIB_CASSERT(a0,"");
DLIB_CASSERT(a0c,"");
DLIB_CASSERT(!b0,"");
DLIB_CASSERT(!b0c,"");
DLIB_TEST(a0);
DLIB_TEST(a0c);
DLIB_TEST(!b0);
DLIB_TEST(!b0c);
a0 = a0;
DLIB_CASSERT(a0 == a0, "");
DLIB_CASSERT(!(a0 != a0),"");
DLIB_CASSERT(a0.is_set() == true,"");
DLIB_CASSERT(a0c.is_set() == true,"");
DLIB_CASSERT(b0.is_set() == false,"");
DLIB_CASSERT(b0c.is_set() == false,"");
DLIB_CASSERT(a0,"");
DLIB_CASSERT(a0c,"");
DLIB_CASSERT(!b0,"");
DLIB_CASSERT(!b0c,"");
DLIB_TEST(a0 == a0);
DLIB_TEST(!(a0 != a0));
DLIB_TEST(a0.is_set() == true);
DLIB_TEST(a0c.is_set() == true);
DLIB_TEST(b0.is_set() == false);
DLIB_TEST(b0c.is_set() == false);
DLIB_TEST(a0);
DLIB_TEST(a0c);
DLIB_TEST(!b0);
DLIB_TEST(!b0c);
swap(a0,b0);
swap(a0c,b0c);
DLIB_CASSERT(a0.is_set() == false,"");
DLIB_CASSERT(a0c.is_set() == false,"");
DLIB_CASSERT(b0.is_set() == true,"");
DLIB_CASSERT(b0c.is_set() == true,"");
DLIB_TEST(a0.is_set() == false);
DLIB_TEST(a0c.is_set() == false);
DLIB_TEST(b0.is_set() == true);
DLIB_TEST(b0c.is_set() == true);
DLIB_CASSERT(!a0,"");
DLIB_CASSERT(!a0c,"");
DLIB_CASSERT(b0,"");
DLIB_CASSERT(b0c,"");
DLIB_TEST(!a0);
DLIB_TEST(!a0c);
DLIB_TEST(b0);
DLIB_TEST(b0c);
a0 = b0;
DLIB_CASSERT(a0 == a0, "");
DLIB_CASSERT(a0 == b0, "");
DLIB_CASSERT(!(a0 != b0),"");
DLIB_CASSERT(a0.is_set() == true,"");
DLIB_CASSERT(a0c.is_set() == false,"");
DLIB_CASSERT(b0.is_set() == true,"");
DLIB_CASSERT(b0c.is_set() == true,"");
DLIB_TEST(a0 == a0);
DLIB_TEST(a0 == b0);
DLIB_TEST(!(a0 != b0));
DLIB_TEST(a0.is_set() == true);
DLIB_TEST(a0c.is_set() == false);
DLIB_TEST(b0.is_set() == true);
DLIB_TEST(b0c.is_set() == true);
DLIB_CASSERT(a0 ,"");
DLIB_CASSERT(!a0c,"");
DLIB_CASSERT(b0,"");
DLIB_CASSERT(b0c,"");
DLIB_TEST(a0 );
DLIB_TEST(!a0c);
DLIB_TEST(b0);
DLIB_TEST(b0c);
a0.clear();
a0c.clear();
b0.clear();
b0c.clear();
DLIB_CASSERT(a0.is_set() == false,"");
DLIB_CASSERT(a0c.is_set() == false,"");
DLIB_CASSERT(b0.is_set() == false,"");
DLIB_CASSERT(b0c.is_set() == false,"");
DLIB_TEST(a0.is_set() == false);
DLIB_TEST(a0c.is_set() == false);
DLIB_TEST(b0.is_set() == false);
DLIB_TEST(b0c.is_set() == false);
a1.set(helper,&test_helper::go1);
a1c.set(helper,&test_helper::go1);
DLIB_CASSERT(a1.is_set() == true,"");
DLIB_CASSERT(a1c.is_set() == true,"");
DLIB_CASSERT(b1.is_set() == false,"");
DLIB_CASSERT(b1c.is_set() == false,"");
DLIB_TEST(a1.is_set() == true);
DLIB_TEST(a1c.is_set() == true);
DLIB_TEST(b1.is_set() == false);
DLIB_TEST(b1c.is_set() == false);
swap(a1,b1);
swap(a1c,b1c);
DLIB_CASSERT(a1.is_set() == false,"");
DLIB_CASSERT(a1c.is_set() == false,"");
DLIB_CASSERT(b1.is_set() == true,"");
DLIB_CASSERT(b1c.is_set() == true,"");
DLIB_TEST(a1.is_set() == false);
DLIB_TEST(a1c.is_set() == false);
DLIB_TEST(b1.is_set() == true);
DLIB_TEST(b1c.is_set() == true);
DLIB_CASSERT(!a1,"");
DLIB_CASSERT(!a1c,"");
DLIB_CASSERT(b1,"");
DLIB_CASSERT(b1c,"");
DLIB_TEST(!a1);
DLIB_TEST(!a1c);
DLIB_TEST(b1);
DLIB_TEST(b1c);
a1 = b1;
DLIB_CASSERT(a1 == a1, "");
DLIB_CASSERT(a1 == b1, "");
DLIB_CASSERT(!(a1 != b1),"");
DLIB_CASSERT(a1.is_set() == true,"");
DLIB_CASSERT(a1c.is_set() == false,"");
DLIB_CASSERT(b1.is_set() == true,"");
DLIB_CASSERT(b1c.is_set() == true,"");
DLIB_TEST(a1 == a1);
DLIB_TEST(a1 == b1);
DLIB_TEST(!(a1 != b1));
DLIB_TEST(a1.is_set() == true);
DLIB_TEST(a1c.is_set() == false);
DLIB_TEST(b1.is_set() == true);
DLIB_TEST(b1c.is_set() == true);
a1.clear();
a1c.clear();
b1.clear();
b1c.clear();
DLIB_CASSERT(a1.is_set() == false,"");
DLIB_CASSERT(a1c.is_set() == false,"");
DLIB_CASSERT(b1.is_set() == false,"");
DLIB_CASSERT(b1c.is_set() == false,"");
DLIB_TEST(a1.is_set() == false);
DLIB_TEST(a1c.is_set() == false);
DLIB_TEST(b1.is_set() == false);
DLIB_TEST(b1c.is_set() == false);
a2.set(helper,&test_helper::go2);
a2c.set(helper,&test_helper::go2);
DLIB_CASSERT(a2.is_set() == true,"");
DLIB_CASSERT(a2c.is_set() == true,"");
DLIB_CASSERT(b2.is_set() == false,"");
DLIB_CASSERT(b2c.is_set() == false,"");
DLIB_TEST(a2.is_set() == true);
DLIB_TEST(a2c.is_set() == true);
DLIB_TEST(b2.is_set() == false);
DLIB_TEST(b2c.is_set() == false);
swap(a2,b2);
swap(a2c,b2c);
DLIB_CASSERT(a2.is_set() == false,"");
DLIB_CASSERT(a2c.is_set() == false,"");
DLIB_CASSERT(b2.is_set() == true,"");
DLIB_CASSERT(b2c.is_set() == true,"");
DLIB_CASSERT(!a2,"");
DLIB_CASSERT(!a2c,"");
DLIB_CASSERT(b2,"");
DLIB_CASSERT(b2c,"");
DLIB_TEST(a2.is_set() == false);
DLIB_TEST(a2c.is_set() == false);
DLIB_TEST(b2.is_set() == true);
DLIB_TEST(b2c.is_set() == true);
DLIB_TEST(!a2);
DLIB_TEST(!a2c);
DLIB_TEST(b2);
DLIB_TEST(b2c);
if (b2)
{
}
else
{
DLIB_CASSERT(false,"");
DLIB_TEST(false);
}
if (a2c)
{
DLIB_CASSERT(false,"");
DLIB_TEST(false);
}
else
{
DLIB_CASSERT(true,"");
DLIB_TEST(true);
}
a2 = b2;
DLIB_CASSERT(a2 == a2, "");
DLIB_CASSERT(a2 == b2, "");
DLIB_CASSERT(!(a2 != b2),"");
DLIB_CASSERT(a2.is_set() == true,"");
DLIB_CASSERT(a2c.is_set() == false,"");
DLIB_CASSERT(b2.is_set() == true,"");
DLIB_CASSERT(b2c.is_set() == true,"");
DLIB_TEST(a2 == a2);
DLIB_TEST(a2 == b2);
DLIB_TEST(!(a2 != b2));
DLIB_TEST(a2.is_set() == true);
DLIB_TEST(a2c.is_set() == false);
DLIB_TEST(b2.is_set() == true);
DLIB_TEST(b2c.is_set() == true);
a2.clear();
a2c.clear();
b2.clear();
b2c.clear();
DLIB_CASSERT(a2.is_set() == false,"");
DLIB_CASSERT(a2c.is_set() == false,"");
DLIB_CASSERT(b2.is_set() == false,"");
DLIB_CASSERT(b2c.is_set() == false,"");
DLIB_TEST(a2.is_set() == false);
DLIB_TEST(a2c.is_set() == false);
DLIB_TEST(b2.is_set() == false);
DLIB_TEST(b2c.is_set() == false);
a3.set(helper,&test_helper::go3);
a3c.set(helper,&test_helper::go3);
DLIB_CASSERT(a3.is_set() == true,"");
DLIB_CASSERT(a3c.is_set() == true,"");
DLIB_CASSERT(b3.is_set() == false,"");
DLIB_CASSERT(b3c.is_set() == false,"");
DLIB_TEST(a3.is_set() == true);
DLIB_TEST(a3c.is_set() == true);
DLIB_TEST(b3.is_set() == false);
DLIB_TEST(b3c.is_set() == false);
swap(a3,b3);
swap(a3c,b3c);
DLIB_CASSERT(a3.is_set() == false,"");
DLIB_CASSERT(a3c.is_set() == false,"");
DLIB_CASSERT(b3.is_set() == true,"");
DLIB_CASSERT(b3c.is_set() == true,"");
DLIB_TEST(a3.is_set() == false);
DLIB_TEST(a3c.is_set() == false);
DLIB_TEST(b3.is_set() == true);
DLIB_TEST(b3c.is_set() == true);
a3 = b3;
DLIB_CASSERT(a3 == a3, "");
DLIB_CASSERT(a3 == b3, "");
DLIB_CASSERT(!(a3 != b3),"");
DLIB_CASSERT(a3.is_set() == true,"");
DLIB_CASSERT(a3c.is_set() == false,"");
DLIB_CASSERT(b3.is_set() == true,"");
DLIB_CASSERT(b3c.is_set() == true,"");
DLIB_TEST(a3 == a3);
DLIB_TEST(a3 == b3);
DLIB_TEST(!(a3 != b3));
DLIB_TEST(a3.is_set() == true);
DLIB_TEST(a3c.is_set() == false);
DLIB_TEST(b3.is_set() == true);
DLIB_TEST(b3c.is_set() == true);
a3.clear();
a3c.clear();
b3.clear();
b3c.clear();
DLIB_CASSERT(a3.is_set() == false,"");
DLIB_CASSERT(a3c.is_set() == false,"");
DLIB_CASSERT(b3.is_set() == false,"");
DLIB_CASSERT(b3c.is_set() == false,"");
DLIB_TEST(a3.is_set() == false);
DLIB_TEST(a3c.is_set() == false);
DLIB_TEST(b3.is_set() == false);
DLIB_TEST(b3c.is_set() == false);
a4.set(helper,&test_helper::go4);
a4c.set(helper,&test_helper::go4);
DLIB_CASSERT(a4.is_set() == true,"");
DLIB_CASSERT(a4c.is_set() == true,"");
DLIB_CASSERT(b4.is_set() == false,"");
DLIB_CASSERT(b4c.is_set() == false,"");
DLIB_TEST(a4.is_set() == true);
DLIB_TEST(a4c.is_set() == true);
DLIB_TEST(b4.is_set() == false);
DLIB_TEST(b4c.is_set() == false);
swap(a4,b4);
swap(a4c,b4c);
DLIB_CASSERT(a4.is_set() == false,"");
DLIB_CASSERT(a4c.is_set() == false,"");
DLIB_CASSERT(b4.is_set() == true,"");
DLIB_CASSERT(b4c.is_set() == true,"");
DLIB_TEST(a4.is_set() == false);
DLIB_TEST(a4c.is_set() == false);
DLIB_TEST(b4.is_set() == true);
DLIB_TEST(b4c.is_set() == true);
a4 = b4;
a4 = b4;
a4 = b4;
a4 = b4;
DLIB_CASSERT(a4 == a4, "");
DLIB_CASSERT(a4 == b4, "");
DLIB_CASSERT(!(a4 != b4),"");
DLIB_CASSERT(a4.is_set() == true,"");
DLIB_CASSERT(a4c.is_set() == false,"");
DLIB_CASSERT(b4.is_set() == true,"");
DLIB_CASSERT(b4c.is_set() == true,"");
DLIB_TEST(a4 == a4);
DLIB_TEST(a4 == b4);
DLIB_TEST(!(a4 != b4));
DLIB_TEST(a4.is_set() == true);
DLIB_TEST(a4c.is_set() == false);
DLIB_TEST(b4.is_set() == true);
DLIB_TEST(b4c.is_set() == true);
a4.clear();
a4c.clear();
b4.clear();
b4c.clear();
DLIB_CASSERT(a4.is_set() == false,"");
DLIB_CASSERT(a4c.is_set() == false,"");
DLIB_CASSERT(b4.is_set() == false,"");
DLIB_CASSERT(b4c.is_set() == false,"");
DLIB_TEST(a4.is_set() == false);
DLIB_TEST(a4c.is_set() == false);
DLIB_TEST(b4.is_set() == false);
DLIB_TEST(b4c.is_set() == false);
a0.set(helper,&test_helper::go0);
......@@ -419,16 +419,16 @@ namespace
b0c = a0c;
helper.i = -1;
a0();
DLIB_CASSERT(helper.i == 0,"");
DLIB_TEST(helper.i == 0);
helper.i = -1;
b0();
DLIB_CASSERT(helper.i == 0,"");
DLIB_TEST(helper.i == 0);
helper.i = -1;
a0c();
DLIB_CASSERT(helper.i == 0,"");
DLIB_TEST(helper.i == 0);
helper.i = -1;
b0c();
DLIB_CASSERT(helper.i == 0,"");
DLIB_TEST(helper.i == 0);
a1.set(helper,&test_helper::go1);
......@@ -437,16 +437,16 @@ namespace
b1c = a1c;
helper.i = -1;
a1(1);
DLIB_CASSERT(helper.i == 1,"");
DLIB_TEST(helper.i == 1);
helper.i = -1;
b1(10);
DLIB_CASSERT(helper.i == 1*10,"");
DLIB_TEST(helper.i == 1*10);
helper.i = -1;
a1c(20);
DLIB_CASSERT(helper.i == 1*20,"");
DLIB_TEST(helper.i == 1*20);
helper.i = -1;
b1c(30);
DLIB_CASSERT(helper.i == 1*30,"");
DLIB_TEST(helper.i == 1*30);
a2.set(helper,&test_helper::go2);
......@@ -455,16 +455,16 @@ namespace
b2c = a2c;
helper.i = -1;
a2(1,2);
DLIB_CASSERT(helper.i == 2*1*2,"");
DLIB_TEST(helper.i == 2*1*2);
helper.i = -1;
b2(3,4);
DLIB_CASSERT(helper.i == 2*3*4,"");
DLIB_TEST(helper.i == 2*3*4);
helper.i = -1;
a2c(5,6);
DLIB_CASSERT(helper.i == 2*5*6,"");
DLIB_TEST(helper.i == 2*5*6);
helper.i = -1;
b2c(7,8);
DLIB_CASSERT(helper.i == 2*7*8,"");
DLIB_TEST(helper.i == 2*7*8);
a3.set(helper,&test_helper::go3);
......@@ -473,57 +473,57 @@ namespace
b3c = a3c;
helper.i = -1;
a3(1,2,3);
DLIB_CASSERT(helper.i == 3*1*2*3,"");
DLIB_TEST(helper.i == 3*1*2*3);
helper.i = -1;
b3(4,5,6);
DLIB_CASSERT(helper.i == 3*4*5*6,"");
DLIB_TEST(helper.i == 3*4*5*6);
helper.i = -1;
a3c(7,8,9);
DLIB_CASSERT(helper.i == 3*7*8*9,"");
DLIB_TEST(helper.i == 3*7*8*9);
helper.i = -1;
b3c(1,2,3);
DLIB_CASSERT(helper.i == 3*1*2*3,"");
DLIB_TEST(helper.i == 3*1*2*3);
a4.set(helper,&test_helper::go4);
a4c.set(helper,&test_helper::go4);
DLIB_CASSERT(a4 == a4c,"");
DLIB_TEST(a4 == a4c);
b4 = a4;
b4c = a4c;
helper.i = -1;
a4(1,2,3,4);
DLIB_CASSERT(helper.i == 4*1*2*3*4,"");
DLIB_TEST(helper.i == 4*1*2*3*4);
helper.i = -1;
b4(5,6,7,8);
DLIB_CASSERT(helper.i == 4*5*6*7*8,"");
DLIB_TEST(helper.i == 4*5*6*7*8);
helper.i = -1;
a4c(9,1,2,3);
DLIB_CASSERT(helper.i == 4*9*1*2*3,"");
DLIB_TEST(helper.i == 4*9*1*2*3);
helper.i = -1;
b4c(4,5,6,7);
DLIB_CASSERT(helper.i == 4*4*5*6*7,"");
DLIB_TEST(helper.i == 4*4*5*6*7);
DLIB_CASSERT(a4 == b4,"");
DLIB_CASSERT(a4,"");
DLIB_CASSERT(a4 == b4,"");
DLIB_TEST(a4 == b4);
DLIB_TEST(a4);
DLIB_TEST(a4 == b4);
a4.clear();
DLIB_CASSERT(a4 != b4,"");
DLIB_CASSERT(!a4,"");
DLIB_CASSERT(a4 == 0,"");
DLIB_CASSERT(a4 == a4,"");
DLIB_TEST(a4 != b4);
DLIB_TEST(!a4);
DLIB_TEST(a4 == 0);
DLIB_TEST(a4 == a4);
a4 = a4;
DLIB_CASSERT(a4 != b4,"");
DLIB_CASSERT(!a4,"");
DLIB_CASSERT(a4 == a4,"");
DLIB_TEST(a4 != b4);
DLIB_TEST(!a4);
DLIB_TEST(a4 == a4);
mfp_test_helper_other other;
a4.set(other,&mfp_test_helper_other::go4);
DLIB_CASSERT(a4 != b4,"");
DLIB_CASSERT(a4,"");
DLIB_CASSERT(a4 == a4,"");
DLIB_TEST(a4 != b4);
DLIB_TEST(a4);
DLIB_TEST(a4 == a4);
a4.set(helper,&test_helper::go4);
DLIB_CASSERT(a4 == b4,"");
DLIB_CASSERT(a4,"");
DLIB_CASSERT(a4 == a4,"");
DLIB_TEST(a4 == b4);
DLIB_TEST(a4);
DLIB_TEST(a4 == a4);
......
dlib/test/metaprogramming.cpp
View file @ 9a8ed037
......@@ -29,23 +29,23 @@ namespace
print_spinner();
DLIB_CASSERT(is_signed_type<signed char>::value == true,"");
DLIB_CASSERT(is_signed_type<signed short>::value == true,"");
DLIB_CASSERT(is_signed_type<signed int>::value == true,"");
DLIB_CASSERT(is_signed_type<signed long>::value == true,"");
DLIB_CASSERT(is_unsigned_type<signed char>::value == false,"");
DLIB_CASSERT(is_unsigned_type<signed short>::value == false,"");
DLIB_CASSERT(is_unsigned_type<signed int>::value == false,"");
DLIB_CASSERT(is_unsigned_type<signed long>::value == false,"");
DLIB_CASSERT(is_unsigned_type<unsigned char>::value == true,"");
DLIB_CASSERT(is_unsigned_type<unsigned short>::value == true,"");
DLIB_CASSERT(is_unsigned_type<unsigned int>::value == true,"");
DLIB_CASSERT(is_unsigned_type<unsigned long>::value == true,"");
DLIB_CASSERT(is_signed_type<unsigned char>::value == false,"");
DLIB_CASSERT(is_signed_type<unsigned short>::value == false,"");
DLIB_CASSERT(is_signed_type<unsigned int>::value == false,"");
DLIB_CASSERT(is_signed_type<unsigned long>::value == false,"");
DLIB_TEST(is_signed_type<signed char>::value == true);
DLIB_TEST(is_signed_type<signed short>::value == true);
DLIB_TEST(is_signed_type<signed int>::value == true);
DLIB_TEST(is_signed_type<signed long>::value == true);
DLIB_TEST(is_unsigned_type<signed char>::value == false);
DLIB_TEST(is_unsigned_type<signed short>::value == false);
DLIB_TEST(is_unsigned_type<signed int>::value == false);
DLIB_TEST(is_unsigned_type<signed long>::value == false);
DLIB_TEST(is_unsigned_type<unsigned char>::value == true);
DLIB_TEST(is_unsigned_type<unsigned short>::value == true);
DLIB_TEST(is_unsigned_type<unsigned int>::value == true);
DLIB_TEST(is_unsigned_type<unsigned long>::value == true);
DLIB_TEST(is_signed_type<unsigned char>::value == false);
DLIB_TEST(is_signed_type<unsigned short>::value == false);
DLIB_TEST(is_signed_type<unsigned int>::value == false);
DLIB_TEST(is_signed_type<unsigned long>::value == false);
COMPILE_TIME_ASSERT(is_signed_type<signed char>::value == true);
......
dlib/test/multithreaded_object.cpp
View file @ 9a8ed037
......@@ -24,28 +24,28 @@ namespace
public:
test1 ()
{
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
clear();
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
}
~test1 ()
{
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
stop();
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
wait();
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
}
private:
......@@ -56,36 +56,36 @@ namespace
public:
test2()
{
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
register_thread(*this,&test2::thread);
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
clear();
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
register_thread(*this,&test2::thread);
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
}
~test2()
{
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
stop();
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
wait();
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
}
private:
......@@ -103,28 +103,28 @@ namespace
public:
test3_c1()
{
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
register_thread(*this,&test3_c1::thread);
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
start();
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(is_running() == true,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(is_running() == true);
}
~test3_c1()
{
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_TEST(number_of_threads_registered() == 1);
stop();
DLIB_CASSERT(is_running() == false,"");
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_TEST(is_running() == false);
DLIB_TEST(number_of_threads_registered() == 1);
wait();
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
}
private:
......@@ -146,55 +146,55 @@ namespace
public:
test4_c2()
{
DLIB_CASSERT(number_of_threads_registered() == 0,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 0);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
register_thread(*this,&test4_c2::thread);
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
start();
DLIB_CASSERT(number_of_threads_registered() == 1,"");
DLIB_CASSERT(number_of_threads_alive() == 1,"");
DLIB_CASSERT(is_running() == true,"");
DLIB_TEST(number_of_threads_registered() == 1);
DLIB_TEST(number_of_threads_alive() == 1);
DLIB_TEST(is_running() == true);
register_thread(*this,&test4_c2::thread);
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(number_of_threads_alive() == 2,"");
DLIB_CASSERT(is_running() == true,"");
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 2);
DLIB_TEST(is_running() == true);
start();
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(number_of_threads_alive() == 2,"");
DLIB_CASSERT(is_running() == true,"");
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 2);
DLIB_TEST(is_running() == true);
start();
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(number_of_threads_alive() == 2,"");
DLIB_CASSERT(is_running() == true,"");
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 2);
DLIB_TEST(is_running() == true);
start();
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(number_of_threads_alive() == 2,"");
DLIB_CASSERT(is_running() == true,"");
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 2);
DLIB_TEST(is_running() == true);
start();
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(number_of_threads_alive() == 2,"");
DLIB_CASSERT(is_running() == true,"");
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 2);
DLIB_TEST(is_running() == true);
pause();
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(number_of_threads_alive() == 2,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 2);
DLIB_TEST(is_running() == false);
}
~test4_c2()
{
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(number_of_threads_alive() == 2,"");
DLIB_CASSERT(is_running() == false,"is_running(): " << is_running());
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 2);
DLIB_TEST_MSG(is_running() == false,"is_running(): " << is_running());
stop();
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(is_running() == false);
wait();
DLIB_CASSERT(number_of_threads_registered() == 2,"");
DLIB_CASSERT(number_of_threads_alive() == 0,"");
DLIB_CASSERT(is_running() == false,"");
DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
}
private:
......@@ -270,7 +270,7 @@ namespace
test4_c2 a4;
test5 a5;
}
DLIB_CASSERT(count == (i+1)*3,"");
DLIB_TEST(count == (i+1)*3);
}
count = 0;
......@@ -284,7 +284,7 @@ namespace
test5 a5;
dlib::sleep(50);
}
DLIB_CASSERT(count == (i+1)*3,"");
DLIB_TEST(count == (i+1)*3);
}
}
......
dlib/test/optimization.cpp
View file @ 9a8ed037
......@@ -129,37 +129,37 @@ namespace
total_count = 0;
x = p;
find_min_quasi_newton(wrap_function(apq<T>), wrap_function(der_apq<T>), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_quasi_newton got apq in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient(wrap_function(apq<T>), wrap_function(der_apq<T>), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got apq in " << total_count;
total_count = 0;
x = p;
find_min_quasi_newton(wrap_function(apq<T>), derivative(wrap_function(apq<T>)), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_quasi_newton got apq/noder in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient(wrap_function(apq<T>), derivative(wrap_function(apq<T>)), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got apq/noder in " << total_count;
total_count = 0;
x = p;
find_min_quasi_newton2(wrap_function(apq<T>), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_quasi_newton got apq/noder2 in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient2(wrap_function(apq<T>), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got apq/noder2 in " << total_count;
}
......@@ -181,26 +181,26 @@ namespace
total_count = 0;
x = p;
find_min_quasi_newton(&powell, derivative(&powell,1e-8), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-2),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-2),opt-x);
dlog << LINFO << "find_min_quasi_newton got powell/noder in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient(&powell, derivative(&powell,1e-9), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-2),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-2),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got powell/noder in " << total_count;
*/
total_count = 0;
x = p;
find_min_quasi_newton2(&powell, x, minf, eps, 1e-10);
DLIB_CASSERT(dlib::equal(x,opt, 1e-1),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-1),opt-x);
dlog << LINFO << "find_min_quasi_newton got powell/noder2 in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient2(&powell, x, minf, eps, 1e-10);
DLIB_CASSERT(dlib::equal(x,opt, 1e-1),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-1),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got powell/noder2 in " << total_count;
}
......@@ -221,37 +221,37 @@ namespace
total_count = 0;
x = p;
find_min_quasi_newton(&simple, &der_simple, x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_quasi_newton got simple in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient(&simple, &der_simple, x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got simple in " << total_count;
total_count = 0;
x = p;
find_min_quasi_newton(&simple, derivative(&simple), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_quasi_newton got simple/noder in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient(&simple, derivative(&simple), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got simple/noder in " << total_count;
total_count = 0;
x = p;
find_min_quasi_newton2(&simple, x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_quasi_newton got simple/noder2 in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient2(&simple, x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got simple/noder2 in " << total_count;
}
......@@ -271,39 +271,39 @@ namespace
total_count = 0;
x = p;
find_min_quasi_newton(&rosen, &der_rosen, x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-7),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-7),opt-x);
dlog << LINFO << "find_min_quasi_newton got rosen in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient(&rosen, &der_rosen, x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-5),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-5),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got rosen in " << total_count;
total_count = 0;
x = p;
find_min_quasi_newton(&rosen, derivative(&rosen), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-4),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-4),opt-x);
dlog << LINFO << "find_min_quasi_newton got rosen/noder in " << total_count;
total_count = 0;
x = p;
find_min_conjugate_gradient(&rosen, derivative(&rosen), x, minf, eps);
DLIB_CASSERT(dlib::equal(x,opt, 1e-4),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-4),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got rosen/noder in " << total_count;
/* This test fails
total_count = 0;
x = p;
find_min_quasi_newton2(&rosen, x, minf, eps, 1e-13);
DLIB_CASSERT(dlib::equal(x,opt, 1e-2),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-2),opt-x);
dlog << LINFO << "find_min_quasi_newton got rosen/noder2 in " << total_count;
*/
total_count = 0;
x = p;
find_min_conjugate_gradient2(&rosen, x, minf, eps, 1e-11);
DLIB_CASSERT(dlib::equal(x,opt, 1e-4),opt-x);
DLIB_TEST_MSG(dlib::equal(x,opt, 1e-4),opt-x);
dlog << LINFO << "find_min_conjugate_gradient got rosen/noder2 in " << total_count;
}
......@@ -404,32 +404,32 @@ namespace
matrix<double,2,1> m;
m(0) = -0.43;
m(1) = 0.919;
DLIB_CASSERT(dlib::equal(der_rosen(m) , derivative(&rosen)(m),1e-5),"");
DLIB_TEST(dlib::equal(der_rosen(m) , derivative(&rosen)(m),1e-5));
DLIB_CASSERT(std::abs(derivative(make_line_search_function(&rosen,m,m))(0) -
DLIB_TEST_MSG(std::abs(derivative(make_line_search_function(&rosen,m,m))(0) -
make_line_search_function(derivative(&rosen),m,m)(0)) < 1e-5,"");
DLIB_CASSERT(std::abs(derivative(make_line_search_function(&rosen,m,m))(1) -
DLIB_TEST_MSG(std::abs(derivative(make_line_search_function(&rosen,m,m))(1) -
make_line_search_function(derivative(&rosen),m,m)(1)) < 1e-5,"");
DLIB_CASSERT(std::abs(derivative(make_line_search_function(&rosen,m,m))(0) -
DLIB_TEST_MSG(std::abs(derivative(make_line_search_function(&rosen,m,m))(0) -
make_line_search_function(&der_rosen,m,m)(0)) < 1e-5,"");
DLIB_CASSERT(std::abs(derivative(make_line_search_function(&rosen,m,m))(1) -
DLIB_TEST_MSG(std::abs(derivative(make_line_search_function(&rosen,m,m))(1) -
make_line_search_function(&der_rosen,m,m)(1)) < 1e-5,"");
}
{
matrix<double,2,1> m;
m(0) = 1;
m(1) = 2;
DLIB_CASSERT(dlib::equal(der_rosen(m) , derivative(&rosen)(m),1e-5),"");
DLIB_TEST(dlib::equal(der_rosen(m) , derivative(&rosen)(m),1e-5));
DLIB_CASSERT(std::abs(derivative(make_line_search_function(&rosen,m,m))(0) -
DLIB_TEST_MSG(std::abs(derivative(make_line_search_function(&rosen,m,m))(0) -
make_line_search_function(derivative(&rosen),m,m)(0)) < 1e-5,"");
DLIB_CASSERT(std::abs(derivative(make_line_search_function(&rosen,m,m))(1) -
DLIB_TEST_MSG(std::abs(derivative(make_line_search_function(&rosen,m,m))(1) -
make_line_search_function(derivative(&rosen),m,m)(1)) < 1e-5,"");
DLIB_CASSERT(std::abs(derivative(make_line_search_function(&rosen,m,m))(0) -
DLIB_TEST_MSG(std::abs(derivative(make_line_search_function(&rosen,m,m))(0) -
make_line_search_function(&der_rosen,m,m)(0)) < 1e-5,"");
DLIB_CASSERT(std::abs(derivative(make_line_search_function(&rosen,m,m))(1) -
DLIB_TEST_MSG(std::abs(derivative(make_line_search_function(&rosen,m,m))(1) -
make_line_search_function(&der_rosen,m,m)(1)) < 1e-5,"");
}
......
dlib/test/pipe.cpp
View file @ 9a8ed037
......@@ -66,11 +66,11 @@ namespace
for (unsigned long i = 0; i < proc1_count; ++i)
{
int cur;
DLIB_CASSERT(p.dequeue(cur) == true,"");
DLIB_CASSERT(last + 1 == cur,"");
DLIB_TEST(p.dequeue(cur) == true);
DLIB_TEST(last + 1 == cur);
last = cur;
}
DLIB_CASSERT(p.size() == 0,"");
DLIB_TEST(p.size() == 0);
}
catch(exception& e)
{
......@@ -103,7 +103,7 @@ namespace
int cur;
while (p.dequeue(cur))
{
DLIB_CASSERT(last < cur,"");
DLIB_TEST(last < cur);
last = cur;
}
auto_mutex M(m);
......@@ -139,7 +139,7 @@ namespace
int cur;
while (p.dequeue_or_timeout(cur,100000))
{
DLIB_CASSERT(last < cur,"");
DLIB_TEST(last < cur);
last = cur;
}
auto_mutex M(m);
......@@ -184,47 +184,47 @@ namespace
pipe test_0(0), test2_0(0);
pipe test_1(1), test2_1(1);
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(test2.size() == 0,"");
DLIB_CASSERT(test_0.size() == 0,"");
DLIB_CASSERT(test2_0.size() == 0,"");
DLIB_CASSERT(test_1.size() == 0,"");
DLIB_CASSERT(test2_1.size() == 0,"");
DLIB_TEST(test.size() == 0);
DLIB_TEST(test2.size() == 0);
DLIB_TEST(test_0.size() == 0);
DLIB_TEST(test2_0.size() == 0);
DLIB_TEST(test_1.size() == 0);
DLIB_TEST(test2_1.size() == 0);
test.empty();
test2.empty();
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(test2.size() == 0,"");
DLIB_TEST(test.size() == 0);
DLIB_TEST(test2.size() == 0);
test_0.empty();
test2_0.empty();
DLIB_CASSERT(test_0.size() == 0,"");
DLIB_CASSERT(test2_0.size() == 0,"");
DLIB_TEST(test_0.size() == 0);
DLIB_TEST(test2_0.size() == 0);
test_1.empty();
test2_1.empty();
DLIB_CASSERT(test_1.size() == 0,"");
DLIB_CASSERT(test2_1.size() == 0,"");
DLIB_TEST(test_1.size() == 0);
DLIB_TEST(test2_1.size() == 0);
int a;
a = 3;
test.enqueue(a);
DLIB_CASSERT(test.size() == 1,"");
DLIB_TEST(test.size() == 1);
a = 5;
test.enqueue(a);
DLIB_CASSERT(test.size() == 2,"");
DLIB_TEST(test.size() == 2);
a = 0;
test.dequeue(a);
DLIB_CASSERT(a == 3,"");
DLIB_CASSERT(test.size() == 1,"");
DLIB_TEST(a == 3);
DLIB_TEST(test.size() == 1);
a = 0;
test.dequeue(a);
DLIB_CASSERT(a == 5,"");
DLIB_CASSERT(test.size() == 0,"");
DLIB_TEST(a == 5);
DLIB_TEST(test.size() == 0);
print_spinner();
......@@ -240,9 +240,9 @@ namespace
a = i;
test.enqueue(a);
}
DLIB_CASSERT(test.is_enqueue_enabled() == true,"");
DLIB_TEST(test.is_enqueue_enabled() == true);
test.disable_enqueue();
DLIB_CASSERT(test.is_enqueue_enabled() == false,"");
DLIB_TEST(test.is_enqueue_enabled() == false);
for (unsigned long i = 0; i < proc1_count; ++i)
{
a = i;
......@@ -259,11 +259,11 @@ namespace
}
test2.wait_for_num_blocked_dequeues(3);
DLIB_CASSERT(test2.size() == 0,"");
DLIB_TEST(test2.size() == 0);
test2.disable();
wait_for_threads();
DLIB_CASSERT(test2.size() == 0,"");
DLIB_TEST(test2.size() == 0);
test2.enable();
......@@ -283,11 +283,11 @@ namespace
}
test2.wait_for_num_blocked_dequeues(2);
DLIB_CASSERT(test2.size() == 0,"");
DLIB_TEST(test2.size() == 0);
test2.disable();
wait_for_threads();
DLIB_CASSERT(test2.size() == 0,"");
DLIB_TEST(test2.size() == 0);
}
......@@ -308,9 +308,9 @@ namespace
}
dlog << LTRACE << "0: 2";
DLIB_CASSERT(test_0.is_enqueue_enabled() == true,"");
DLIB_TEST(test_0.is_enqueue_enabled() == true);
test_0.disable_enqueue();
DLIB_CASSERT(test_0.is_enqueue_enabled() == false,"");
DLIB_TEST(test_0.is_enqueue_enabled() == false);
for (unsigned long i = 0; i < proc1_count; ++i)
{
a = i;
......@@ -330,11 +330,11 @@ namespace
print_spinner();
dlog << LTRACE << "0: 4";
test2_0.wait_for_num_blocked_dequeues(3);
DLIB_CASSERT(test2_0.size() == 0,"");
DLIB_TEST(test2_0.size() == 0);
test2_0.disable();
wait_for_threads();
DLIB_CASSERT(test2_0.size() == 0,"");
DLIB_TEST(test2_0.size() == 0);
dlog << LTRACE << "0: 5";
test2_0.enable();
......@@ -358,11 +358,11 @@ namespace
dlog << LTRACE << "0: 6";
test2_0.wait_for_num_blocked_dequeues(2);
DLIB_CASSERT(test2_0.size() == 0,"");
DLIB_TEST(test2_0.size() == 0);
test2_0.disable();
wait_for_threads();
DLIB_CASSERT(test2_0.size() == 0,"");
DLIB_TEST(test2_0.size() == 0);
dlog << LTRACE << "0: 7";
}
......@@ -380,9 +380,9 @@ namespace
a = i;
test_1.enqueue(a);
}
DLIB_CASSERT(test_1.is_enqueue_enabled() == true,"");
DLIB_TEST(test_1.is_enqueue_enabled() == true);
test_1.disable_enqueue();
DLIB_CASSERT(test_1.is_enqueue_enabled() == false,"");
DLIB_TEST(test_1.is_enqueue_enabled() == false);
for (unsigned long i = 0; i < proc1_count; ++i)
{
a = i;
......@@ -400,11 +400,11 @@ namespace
}
test2_1.wait_for_num_blocked_dequeues(3);
DLIB_CASSERT(test2_1.size() == 0,"");
DLIB_TEST(test2_1.size() == 0);
test2_1.disable();
wait_for_threads();
DLIB_CASSERT(test2_1.size() == 0,"");
DLIB_TEST(test2_1.size() == 0);
test2_1.enable();
......@@ -423,11 +423,11 @@ namespace
}
test2_1.wait_for_num_blocked_dequeues(2);
DLIB_CASSERT(test2_1.size() == 0,"");
DLIB_TEST(test2_1.size() == 0);
test2_1.disable();
wait_for_threads();
DLIB_CASSERT(test2_1.size() == 0,"");
DLIB_TEST(test2_1.size() == 0);
}
......@@ -435,19 +435,19 @@ namespace
test_0.enable_enqueue();
test_1.enable_enqueue();
DLIB_CASSERT(test.is_enabled(),"");
DLIB_CASSERT(test.is_enqueue_enabled(),"");
DLIB_CASSERT(test_0.is_enabled(),"");
DLIB_CASSERT(test_0.is_enqueue_enabled(),"");
DLIB_CASSERT(test_1.is_enabled(),"");
DLIB_CASSERT(test_1.is_enqueue_enabled(),"");
DLIB_TEST(test.is_enabled());
DLIB_TEST(test.is_enqueue_enabled());
DLIB_TEST(test_0.is_enabled());
DLIB_TEST(test_0.is_enqueue_enabled());
DLIB_TEST(test_1.is_enabled());
DLIB_TEST(test_1.is_enqueue_enabled());
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(test_0.size() == 0,"");
DLIB_CASSERT(test_1.size() == 0,"");
DLIB_CASSERT(test.max_size() == 10,"");
DLIB_CASSERT(test_0.max_size() == 0,"");
DLIB_CASSERT(test_1.max_size() == 1,"");
DLIB_TEST(test.size() == 0);
DLIB_TEST(test_0.size() == 0);
DLIB_TEST(test_1.size() == 0);
DLIB_TEST(test.max_size() == 10);
DLIB_TEST(test_0.max_size() == 0);
DLIB_TEST(test_1.max_size() == 1);
for (int i = 0; i < 100; ++i)
......@@ -460,61 +460,61 @@ namespace
test_1.enqueue_or_timeout(a,0);
}
DLIB_CASSERT(test.size() == 10,"size: " << test.size() );
DLIB_CASSERT(test_0.size() == 0,"size: " << test.size() );
DLIB_CASSERT(test_1.size() == 1,"size: " << test.size() );
DLIB_TEST_MSG(test.size() == 10,"size: " << test.size() );
DLIB_TEST_MSG(test_0.size() == 0,"size: " << test.size() );
DLIB_TEST_MSG(test_1.size() == 1,"size: " << test.size() );
for (int i = 0; i < 10; ++i)
{
a = 0;
DLIB_CASSERT(test.enqueue_or_timeout(a,10) == false,"");
DLIB_TEST(test.enqueue_or_timeout(a,10) == false);
a = 0;
DLIB_CASSERT(test_0.enqueue_or_timeout(a,10) == false,"");
DLIB_TEST(test_0.enqueue_or_timeout(a,10) == false);
a = 0;
DLIB_CASSERT(test_1.enqueue_or_timeout(a,10) == false,"");
DLIB_TEST(test_1.enqueue_or_timeout(a,10) == false);
}
DLIB_CASSERT(test.size() == 10,"size: " << test.size() );
DLIB_CASSERT(test_0.size() == 0,"size: " << test.size() );
DLIB_CASSERT(test_1.size() == 1,"size: " << test.size() );
DLIB_TEST_MSG(test.size() == 10,"size: " << test.size() );
DLIB_TEST_MSG(test_0.size() == 0,"size: " << test.size() );
DLIB_TEST_MSG(test_1.size() == 1,"size: " << test.size() );
for (int i = 0; i < 10; ++i)
{
a = 0;
DLIB_CASSERT(test.dequeue_or_timeout(a,0) == true,"");
DLIB_CASSERT(a == 1,"");
DLIB_TEST(test.dequeue_or_timeout(a,0) == true);
DLIB_TEST(a == 1);
}
DLIB_CASSERT(test.max_size() == 10,"");
DLIB_CASSERT(test_0.max_size() == 0,"");
DLIB_CASSERT(test_1.max_size() == 1,"");
DLIB_TEST(test.max_size() == 10);
DLIB_TEST(test_0.max_size() == 0);
DLIB_TEST(test_1.max_size() == 1);
a = 0;
DLIB_CASSERT(test_1.dequeue_or_timeout(a,0) == true,"");
DLIB_TEST(test_1.dequeue_or_timeout(a,0) == true);
DLIB_CASSERT(test.max_size() == 10,"");
DLIB_CASSERT(test_0.max_size() == 0,"");
DLIB_CASSERT(test_1.max_size() == 1,"");
DLIB_TEST(test.max_size() == 10);
DLIB_TEST(test_0.max_size() == 0);
DLIB_TEST(test_1.max_size() == 1);
DLIB_CASSERT(a == 1,"a: " << a);
DLIB_TEST_MSG(a == 1,"a: " << a);
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(test_0.size() == 0,"");
DLIB_CASSERT(test_1.size() == 0,"");
DLIB_TEST(test.size() == 0);
DLIB_TEST(test_0.size() == 0);
DLIB_TEST(test_1.size() == 0);
DLIB_CASSERT(test.dequeue_or_timeout(a,0) == false,"");
DLIB_CASSERT(test_0.dequeue_or_timeout(a,0) == false,"");
DLIB_CASSERT(test_1.dequeue_or_timeout(a,0) == false,"");
DLIB_CASSERT(test.dequeue_or_timeout(a,10) == false,"");
DLIB_CASSERT(test_0.dequeue_or_timeout(a,10) == false,"");
DLIB_CASSERT(test_1.dequeue_or_timeout(a,10) == false,"");
DLIB_TEST(test.dequeue_or_timeout(a,0) == false);
DLIB_TEST(test_0.dequeue_or_timeout(a,0) == false);
DLIB_TEST(test_1.dequeue_or_timeout(a,0) == false);
DLIB_TEST(test.dequeue_or_timeout(a,10) == false);
DLIB_TEST(test_0.dequeue_or_timeout(a,10) == false);
DLIB_TEST(test_1.dequeue_or_timeout(a,10) == false);
DLIB_CASSERT(test.size() == 0,"");
DLIB_CASSERT(test_0.size() == 0,"");
DLIB_CASSERT(test_1.size() == 0,"");
DLIB_TEST(test.size() == 0);
DLIB_TEST(test_0.size() == 0);
DLIB_TEST(test_1.size() == 0);
DLIB_CASSERT(found_error == false,"");
DLIB_TEST(found_error == false);
}
......
dlib/test/pixel.cpp
View file @ 9a8ed037
......@@ -43,21 +43,21 @@ namespace
assign_pixel(p_rgba,0);
assign_pixel(p_gray16,0);
DLIB_CASSERT(p_gray == 0,"");
DLIB_CASSERT(p_gray16 == 0,"");
DLIB_TEST(p_gray == 0);
DLIB_TEST(p_gray16 == 0);
DLIB_CASSERT(p_rgb.red == 0,"");
DLIB_CASSERT(p_rgb.green == 0,"");
DLIB_CASSERT(p_rgb.blue == 0,"");
DLIB_TEST(p_rgb.red == 0);
DLIB_TEST(p_rgb.green == 0);
DLIB_TEST(p_rgb.blue == 0);
DLIB_CASSERT(p_rgba.red == 0,"");
DLIB_CASSERT(p_rgba.green == 0,"");
DLIB_CASSERT(p_rgba.blue == 0,"");
DLIB_CASSERT(p_rgba.alpha == 255,"");
DLIB_TEST(p_rgba.red == 0);
DLIB_TEST(p_rgba.green == 0);
DLIB_TEST(p_rgba.blue == 0);
DLIB_TEST(p_rgba.alpha == 255);
DLIB_CASSERT(p_hsi.h == 0,"");
DLIB_CASSERT(p_hsi.s == 0,"");
DLIB_CASSERT(p_hsi.i == 0,"");
DLIB_TEST(p_hsi.h == 0);
DLIB_TEST(p_hsi.s == 0);
DLIB_TEST(p_hsi.i == 0);
assign_pixel(p_gray,10);
assign_pixel(p_gray16,10);
......@@ -65,24 +65,24 @@ namespace
assign_pixel(p_hsi,10);
assign_pixel(p_rgba,10);
DLIB_CASSERT(p_gray == 10,"");
DLIB_CASSERT(p_gray16 == 10,"");
DLIB_TEST(p_gray == 10);
DLIB_TEST(p_gray16 == 10);
DLIB_CASSERT(p_rgb.red == 10,"");
DLIB_CASSERT(p_rgb.green == 10,"");
DLIB_CASSERT(p_rgb.blue == 10,"");
DLIB_TEST(p_rgb.red == 10);
DLIB_TEST(p_rgb.green == 10);
DLIB_TEST(p_rgb.blue == 10);
DLIB_CASSERT(p_rgba.red == 10,"");
DLIB_CASSERT(p_rgba.green == 10,"");
DLIB_CASSERT(p_rgba.blue == 10,"");
DLIB_CASSERT(p_rgba.alpha == 255,"");
DLIB_TEST(p_rgba.red == 10);
DLIB_TEST(p_rgba.green == 10);
DLIB_TEST(p_rgba.blue == 10);
DLIB_TEST(p_rgba.alpha == 255);
DLIB_CASSERT(p_hsi.h == 0,"");
DLIB_CASSERT(p_hsi.s == 0,"");
DLIB_CASSERT(p_hsi.i == 10,"");
DLIB_TEST(p_hsi.h == 0);
DLIB_TEST(p_hsi.s == 0);
DLIB_TEST(p_hsi.i == 10);
assign_pixel(p_gray16,12345);
DLIB_CASSERT(p_gray16 == 12345,"");
DLIB_TEST(p_gray16 == 12345);
p_rgb.red = 255;
p_rgb.green = 100;
......@@ -94,44 +94,44 @@ namespace
assign_pixel(p_rgba,p_rgb);
assign_pixel(p_hsi,p_rgb);
DLIB_CASSERT(p_gray == (255+100+50)/3,"");
DLIB_TEST(p_gray == (255+100+50)/3);
DLIB_CASSERT(p_rgb.red == 255,"");
DLIB_CASSERT(p_rgb.green == 100,"");
DLIB_CASSERT(p_rgb.blue == 50,"");
DLIB_TEST(p_rgb.red == 255);
DLIB_TEST(p_rgb.green == 100);
DLIB_TEST(p_rgb.blue == 50);
DLIB_CASSERT(p_rgba.red == 255,"");
DLIB_CASSERT(p_rgba.green == 100,"");
DLIB_CASSERT(p_rgba.blue == 50,"");
DLIB_CASSERT(p_rgba.alpha == 255,"");
DLIB_TEST(p_rgba.red == 255);
DLIB_TEST(p_rgba.green == 100);
DLIB_TEST(p_rgba.blue == 50);
DLIB_TEST(p_rgba.alpha == 255);
DLIB_CASSERT(p_hsi.i > 0,"");
DLIB_CASSERT(p_hsi.s > 0,"");
DLIB_CASSERT(p_hsi.h > 0,"");
DLIB_TEST(p_hsi.i > 0);
DLIB_TEST(p_hsi.s > 0);
DLIB_TEST(p_hsi.h > 0);
assign_pixel(p_rgb,0);
DLIB_CASSERT(p_rgb.red == 0,"");
DLIB_CASSERT(p_rgb.green == 0,"");
DLIB_CASSERT(p_rgb.blue == 0,"");
DLIB_TEST(p_rgb.red == 0);
DLIB_TEST(p_rgb.green == 0);
DLIB_TEST(p_rgb.blue == 0);
assign_pixel(p_rgb, p_hsi);
DLIB_CASSERT(p_rgb.red > 251 ,(int)p_rgb.green);
DLIB_CASSERT(p_rgb.green > 96 && p_rgb.green < 104,(int)p_rgb.green);
DLIB_CASSERT(p_rgb.blue > 47 && p_rgb.blue < 53,(int)p_rgb.green);
DLIB_TEST_MSG(p_rgb.red > 251 ,(int)p_rgb.green);
DLIB_TEST_MSG(p_rgb.green > 96 && p_rgb.green < 104,(int)p_rgb.green);
DLIB_TEST_MSG(p_rgb.blue > 47 && p_rgb.blue < 53,(int)p_rgb.green);
assign_pixel(p_hsi2, p_hsi);
DLIB_CASSERT(p_hsi.h == p_hsi2.h,"");
DLIB_CASSERT(p_hsi.s == p_hsi2.s,"");
DLIB_CASSERT(p_hsi.i == p_hsi2.i,"");
DLIB_TEST(p_hsi.h == p_hsi2.h);
DLIB_TEST(p_hsi.s == p_hsi2.s);
DLIB_TEST(p_hsi.i == p_hsi2.i);
assign_pixel(p_hsi,0);
DLIB_CASSERT(p_hsi.h == 0,"");
DLIB_CASSERT(p_hsi.s == 0,"");
DLIB_CASSERT(p_hsi.i == 0,"");
DLIB_TEST(p_hsi.h == 0);
DLIB_TEST(p_hsi.s == 0);
DLIB_TEST(p_hsi.i == 0);
assign_pixel(p_hsi, p_rgba);
DLIB_CASSERT(p_hsi.h == p_hsi2.h,"");
DLIB_CASSERT(p_hsi.s == p_hsi2.s,"");
DLIB_CASSERT(p_hsi.i == p_hsi2.i,"");
DLIB_TEST(p_hsi.h == p_hsi2.h);
DLIB_TEST(p_hsi.s == p_hsi2.s);
DLIB_TEST(p_hsi.i == p_hsi2.i);
assign_pixel(p_rgba, 100);
assign_pixel(p_gray, 10);
......@@ -140,17 +140,17 @@ namespace
p_rgba.alpha = 0;
assign_pixel(p_gray, p_rgba);
DLIB_CASSERT(p_gray == 10,"");
DLIB_TEST(p_gray == 10);
assign_pixel(p_rgb, p_rgba);
DLIB_CASSERT(p_rgb.red == 10,"");
DLIB_CASSERT(p_rgb.green == 10,"");
DLIB_CASSERT(p_rgb.blue == 10,"");
DLIB_TEST(p_rgb.red == 10);
DLIB_TEST(p_rgb.green == 10);
DLIB_TEST(p_rgb.blue == 10);
assign_pixel(p_hsi, p_rgba);
assign_pixel(p_hsi2, p_rgb);
DLIB_CASSERT(p_hsi.h == 0,"");
DLIB_CASSERT(p_hsi.s == 0,"");
DLIB_CASSERT(p_hsi.i < p_hsi2.i+2 && p_hsi.i > p_hsi2.i -2,(int)p_hsi.i << " " << (int)p_hsi2.i);
DLIB_TEST(p_hsi.h == 0);
DLIB_TEST(p_hsi.s == 0);
DLIB_TEST_MSG(p_hsi.i < p_hsi2.i+2 && p_hsi.i > p_hsi2.i -2,(int)p_hsi.i << " " << (int)p_hsi2.i);
assign_pixel(p_rgba, 100);
assign_pixel(p_gray, 10);
......@@ -158,21 +158,21 @@ namespace
p_rgba.alpha = 128;
assign_pixel(p_gray, p_rgba);
assign_pixel(p_rgb, p_rgba);
DLIB_CASSERT(p_gray == (100 + 10)/2,"");
DLIB_CASSERT(p_rgb.red == (100 + 10)/2,"");
DLIB_CASSERT(p_rgb.green == (100 + 10)/2,"");
DLIB_CASSERT(p_rgb.blue == (100 + 10)/2,"");
DLIB_TEST(p_gray == (100 + 10)/2);
DLIB_TEST(p_rgb.red == (100 + 10)/2);
DLIB_TEST(p_rgb.green == (100 + 10)/2);
DLIB_TEST(p_rgb.blue == (100 + 10)/2);
assign_pixel(p_rgba, 100);
assign_pixel(p_gray, 10);
assign_pixel(p_rgb, 10);
DLIB_CASSERT(p_rgba.alpha == 255,"");
DLIB_TEST(p_rgba.alpha == 255);
assign_pixel(p_gray, p_rgba);
assign_pixel(p_rgb, p_rgba);
DLIB_CASSERT(p_gray == 100,"");
DLIB_CASSERT(p_rgb.red == 100,"");
DLIB_CASSERT(p_rgb.green == 100,"");
DLIB_CASSERT(p_rgb.blue == 100,"");
DLIB_TEST(p_gray == 100);
DLIB_TEST(p_rgb.red == 100);
DLIB_TEST(p_rgb.green == 100);
DLIB_TEST(p_rgb.blue == 100);
p_rgb.red = 1;
......@@ -208,20 +208,20 @@ namespace
deserialize(p_gray,sin);
deserialize(p_hsi,sin);
DLIB_CASSERT(p_rgb.red == 1,"");
DLIB_CASSERT(p_rgb.green == 2,"");
DLIB_CASSERT(p_rgb.blue == 3,"");
DLIB_TEST(p_rgb.red == 1);
DLIB_TEST(p_rgb.green == 2);
DLIB_TEST(p_rgb.blue == 3);
DLIB_CASSERT(p_rgba.red == 4,"");
DLIB_CASSERT(p_rgba.green == 5,"");
DLIB_CASSERT(p_rgba.blue == 6,"");
DLIB_CASSERT(p_rgba.alpha == 7,"");
DLIB_TEST(p_rgba.red == 4);
DLIB_TEST(p_rgba.green == 5);
DLIB_TEST(p_rgba.blue == 6);
DLIB_TEST(p_rgba.alpha == 7);
DLIB_CASSERT(p_gray == 8,"");
DLIB_TEST(p_gray == 8);
DLIB_CASSERT(p_hsi.h == 9,"");
DLIB_CASSERT(p_hsi.s == 10,"");
DLIB_CASSERT(p_hsi.i == 11,"");
DLIB_TEST(p_hsi.h == 9);
DLIB_TEST(p_hsi.s == 10);
DLIB_TEST(p_hsi.i == 11);
{
matrix<double,1,1> m_gray;
......@@ -231,28 +231,28 @@ namespace
m_hsi = pixel_to_vector<double>(p_hsi);
m_rgb = pixel_to_vector<double>(p_rgb);
DLIB_CASSERT(m_gray(0) == p_gray,"");
DLIB_CASSERT(m_rgb(0) == p_rgb.red,"");
DLIB_CASSERT(m_rgb(1) == p_rgb.green,"");
DLIB_CASSERT(m_rgb(2) == p_rgb.blue,"");
DLIB_CASSERT(m_hsi(0) == p_hsi.h,"");
DLIB_CASSERT(m_hsi(1) == p_hsi.s,"");
DLIB_CASSERT(m_hsi(2) == p_hsi.i,"");
DLIB_TEST(m_gray(0) == p_gray);
DLIB_TEST(m_rgb(0) == p_rgb.red);
DLIB_TEST(m_rgb(1) == p_rgb.green);
DLIB_TEST(m_rgb(2) == p_rgb.blue);
DLIB_TEST(m_hsi(0) == p_hsi.h);
DLIB_TEST(m_hsi(1) == p_hsi.s);
DLIB_TEST(m_hsi(2) == p_hsi.i);
DLIB_CASSERT(p_rgb.red == 1,"");
DLIB_CASSERT(p_rgb.green == 2,"");
DLIB_CASSERT(p_rgb.blue == 3,"");
DLIB_TEST(p_rgb.red == 1);
DLIB_TEST(p_rgb.green == 2);
DLIB_TEST(p_rgb.blue == 3);
DLIB_CASSERT(p_rgba.red == 4,"");
DLIB_CASSERT(p_rgba.green == 5,"");
DLIB_CASSERT(p_rgba.blue == 6,"");
DLIB_CASSERT(p_rgba.alpha == 7,"");
DLIB_TEST(p_rgba.red == 4);
DLIB_TEST(p_rgba.green == 5);
DLIB_TEST(p_rgba.blue == 6);
DLIB_TEST(p_rgba.alpha == 7);
DLIB_CASSERT(p_gray == 8,"");
DLIB_TEST(p_gray == 8);
DLIB_CASSERT(p_hsi.h == 9,"");
DLIB_CASSERT(p_hsi.s == 10,"");
DLIB_CASSERT(p_hsi.i == 11,"");
DLIB_TEST(p_hsi.h == 9);
DLIB_TEST(p_hsi.s == 10);
DLIB_TEST(p_hsi.i == 11);
assign_pixel(p_gray,0);
assign_pixel(p_hsi,0);
......@@ -262,20 +262,20 @@ namespace
vector_to_pixel(p_hsi, m_hsi);
vector_to_pixel(p_rgb, m_rgb);
DLIB_CASSERT(p_rgb.red == 1,"");
DLIB_CASSERT(p_rgb.green == 2,"");
DLIB_CASSERT(p_rgb.blue == 3,"");
DLIB_TEST(p_rgb.red == 1);
DLIB_TEST(p_rgb.green == 2);
DLIB_TEST(p_rgb.blue == 3);
DLIB_CASSERT(p_rgba.red == 4,"");
DLIB_CASSERT(p_rgba.green == 5,"");
DLIB_CASSERT(p_rgba.blue == 6,"");
DLIB_CASSERT(p_rgba.alpha == 7,"");
DLIB_TEST(p_rgba.red == 4);
DLIB_TEST(p_rgba.green == 5);
DLIB_TEST(p_rgba.blue == 6);
DLIB_TEST(p_rgba.alpha == 7);
DLIB_CASSERT(p_gray == 8,"");
DLIB_TEST(p_gray == 8);
DLIB_CASSERT(p_hsi.h == 9,"");
DLIB_CASSERT(p_hsi.s == 10,"");
DLIB_CASSERT(p_hsi.i == 11,"");
DLIB_TEST(p_hsi.h == 9);
DLIB_TEST(p_hsi.s == 10);
DLIB_TEST(p_hsi.i == 11);
}
}
......
dlib/test/queue.cpp
View file @ 9a8ed037
......@@ -46,42 +46,42 @@ namespace
enumerable<int>& e = q;
// I will use these DLIB_CASSERT macros to assert that conditions are true. If they are
// I will use these DLIB_TEST_MSG macros to assert that conditions are true. If they are
// false then it means we have detected an error in the queue object. CASSERT
// will then throw an exception which we will catch at the end of this function and
// report as an error/failed test.
DLIB_CASSERT(e.at_start() == true,"");
DLIB_TEST(e.at_start() == true);
int a = 0;
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q.at_start() == true,"");
DLIB_CASSERT(q.current_element_valid() == false, "");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q.at_start() == true);
DLIB_TEST(q.current_element_valid() == false);
q.sort();
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q.at_start() == true,"");
DLIB_CASSERT(q.current_element_valid() == false, "");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q.at_start() == true);
DLIB_TEST(q.current_element_valid() == false);
DLIB_CASSERT (q.move_next() == false,"");
DLIB_CASSERT (q.move_next() == false,"");
DLIB_CASSERT (q.move_next() == false,"");
DLIB_CASSERT (q.move_next() == false,"");
DLIB_CASSERT (q.move_next() == false,"");
DLIB_CASSERT (q.move_next() == false,"");
DLIB_TEST (q.move_next() == false);
DLIB_TEST (q.move_next() == false);
DLIB_TEST (q.move_next() == false);
DLIB_TEST (q.move_next() == false);
DLIB_TEST (q.move_next() == false);
DLIB_TEST (q.move_next() == false);
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q.at_start() == false,"");
DLIB_CASSERT(q.current_element_valid() == false, "");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q.at_start() == false);
DLIB_TEST(q.current_element_valid() == false);
q.reset();
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q.at_start() == true,"");
DLIB_CASSERT(q.current_element_valid() == false, "");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q.at_start() == true);
DLIB_TEST(q.current_element_valid() == false);
......@@ -95,8 +95,8 @@ namespace
q.clear();
q2.clear();
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q2.size() == 0,"");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q2.size() == 0);
for (int i = 0; i < 10000; ++i)
{
......@@ -106,13 +106,13 @@ namespace
q2.cat(q);
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q2.size() == 10000,"");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q2.size() == 10000);
int g = 0;
while (q2.move_next())
{
DLIB_CASSERT(q2.element() == g,g);
DLIB_TEST_MSG(q2.element() == g,g);
++g;
}
......@@ -120,11 +120,11 @@ namespace
{
int a = 0;
q2.dequeue(a);
DLIB_CASSERT(a == i,"");
DLIB_TEST(a == i);
}
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q2.size() == 0,"");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q2.size() == 0);
q.clear();
q2.clear();
......@@ -136,7 +136,7 @@ namespace
dlog << LTRACE << "creating big pre-sorted queue";
q.clear();
DLIB_CASSERT(q.size() == 0,"");
DLIB_TEST(q.size() == 0);
for (int i = 0; i < 10000; ++i)
{
......@@ -152,7 +152,7 @@ namespace
for (int i = 0; i < 10000; ++i)
{
q.dequeue(a);
DLIB_CASSERT(a == i,"");
DLIB_TEST(a == i);
}
......@@ -175,8 +175,8 @@ namespace
q.clear();
q2.clear();
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q2.size() == 0,"");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q2.size() == 0);
for (int i = 0; i < 1; ++i)
{
......@@ -186,15 +186,15 @@ namespace
q2.cat(q);
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q2.size() == 1,"");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q2.size() == 1);
g = 0;
while (q2.move_next())
{
DLIB_CASSERT(q2.element() == g,g);
DLIB_TEST_MSG(q2.element() == g,g);
++g;
}
......@@ -202,11 +202,11 @@ namespace
{
int a = 0;
q2.dequeue(a);
DLIB_CASSERT(a == i,"");
DLIB_TEST(a == i);
}
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q2.size() == 0,"");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q2.size() == 0);
q.clear();
q2.clear();
......@@ -238,64 +238,64 @@ namespace
while (q.move_next());
DLIB_CASSERT(q.at_start() == false,"");
DLIB_TEST(q.at_start() == false);
q.sort();
DLIB_CASSERT(q.at_start() == true,"");
DLIB_TEST(q.at_start() == true);
// serialize the state of q, then clear q, then
// load the state back into q.
ostringstream sout;
serialize(q,sout);
DLIB_CASSERT(q.at_start() == true,"");
DLIB_TEST(q.at_start() == true);
istringstream sin(sout.str());
q.clear();
deserialize(q,sin);
DLIB_CASSERT(q.at_start() == true,"");
DLIB_TEST(q.at_start() == true);
a = 0;
int last = 0;
while (q.move_next())
{
++a;
DLIB_CASSERT(last <= q.element(),"items weren't actually sorted");
DLIB_TEST_MSG(last <= q.element(),"items weren't actually sorted");
last = q.element();
DLIB_CASSERT(q.current_element_valid() == true,"");
DLIB_CASSERT(q.at_start() == false,"");
DLIB_CASSERT(q.current_element_valid() == true,"");
DLIB_TEST(q.current_element_valid() == true);
DLIB_TEST(q.at_start() == false);
DLIB_TEST(q.current_element_valid() == true);
}
DLIB_CASSERT(a == 10000,"some items were lost between the sorting and iterating");
DLIB_TEST_MSG(a == 10000,"some items were lost between the sorting and iterating");
DLIB_CASSERT(q.size() == 10000,"");
DLIB_TEST(q.size() == 10000);
swap(q,q2);
DLIB_CASSERT(q2.at_start() == false,"");
DLIB_CASSERT(q2.current_element_valid() == false, "");
DLIB_TEST(q2.at_start() == false);
DLIB_TEST(q2.current_element_valid() == false);
DLIB_CASSERT (q2.move_next() == false,"");
DLIB_CASSERT (q2.move_next() == false,"");
DLIB_CASSERT (q2.move_next() == false,"");
DLIB_CASSERT (q2.move_next() == false,"");
DLIB_CASSERT (q2.move_next() == false,"");
DLIB_CASSERT (q2.move_next() == false,"");
DLIB_TEST (q2.move_next() == false);
DLIB_TEST (q2.move_next() == false);
DLIB_TEST (q2.move_next() == false);
DLIB_TEST (q2.move_next() == false);
DLIB_TEST (q2.move_next() == false);
DLIB_TEST (q2.move_next() == false);
DLIB_CASSERT(q2.size() == 10000,"");
DLIB_CASSERT(q2.at_start() == false,"");
DLIB_CASSERT(q2.current_element_valid() == false, "");
DLIB_TEST(q2.size() == 10000);
DLIB_TEST(q2.at_start() == false);
DLIB_TEST(q2.current_element_valid() == false);
q2.clear();
q.swap(q2);
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q.at_start() == true,"");
DLIB_CASSERT(q.current_element_valid() == false, "");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q.at_start() == true);
DLIB_TEST(q.current_element_valid() == false);
}
......@@ -321,22 +321,22 @@ namespace
while (q.move_next())
{
++a;
DLIB_CASSERT(last <= q.element(),"items weren't actually sorted");
DLIB_CASSERT(q.current_element_valid() == true,"");
DLIB_TEST_MSG(last <= q.element(),"items weren't actually sorted");
DLIB_TEST(q.current_element_valid() == true);
}
DLIB_CASSERT(a == 1,"some items were lost between the sorting and iterating");
DLIB_TEST_MSG(a == 1,"some items were lost between the sorting and iterating");
DLIB_CASSERT(q.size() == 1,"");
DLIB_CASSERT(q.at_start() == false,"");
DLIB_CASSERT(q.current_element_valid() == false, "");
DLIB_TEST(q.size() == 1);
DLIB_TEST(q.at_start() == false);
DLIB_TEST(q.current_element_valid() == false);
q.clear();
DLIB_CASSERT(q.size() == 0,"");
DLIB_CASSERT(q.at_start() == true,"");
DLIB_CASSERT(q.current_element_valid() == false, "");
DLIB_TEST(q.size() == 0);
DLIB_TEST(q.at_start() == true);
DLIB_TEST(q.current_element_valid() == false);
}
......@@ -350,14 +350,14 @@ namespace
int a = 3;
q.enqueue(a);
}
DLIB_CASSERT(go.size() == 100,"");
DLIB_TEST(go.size() == 100);
for (int i = 0; i < 100; ++i)
{
int a = 9;
go.remove_any(a);
DLIB_CASSERT(a == 3,"");
DLIB_TEST(a == 3);
}
DLIB_CASSERT(go.size() == 0,"");
DLIB_TEST(go.size() == 0);
}
}
......
dlib/test/rand.cpp
View file @ 9a8ed037
......@@ -49,7 +49,7 @@ namespace
compressed_size = sout.str().size();
compressed_size *= 8;
compressed_size /= str.size();
DLIB_CASSERT(compressed_size >= 8, "order 0 bps: " << compressed_size);
DLIB_TEST_MSG(compressed_size >= 8, "order 0 bps: " << compressed_size);
dlog << LINFO << "order 0: " << compressed_size;
print_spinner();
......@@ -62,7 +62,7 @@ namespace
compressed_size = sout.str().size();
compressed_size *= 8;
compressed_size /= str.size();
DLIB_CASSERT(compressed_size >= 8, "order 1 bps: " << compressed_size);
DLIB_TEST_MSG(compressed_size >= 8, "order 1 bps: " << compressed_size);
dlog << LINFO << "order 1: " << compressed_size;
print_spinner();
......@@ -75,7 +75,7 @@ namespace
compressed_size = sout.str().size();
compressed_size *= 8;
compressed_size /= str.size();
DLIB_CASSERT(compressed_size >= 8, "order 4 bps: " << compressed_size);
DLIB_TEST_MSG(compressed_size >= 8, "order 4 bps: " << compressed_size);
dlog << LINFO << "order 4: " << compressed_size;
}
......@@ -101,22 +101,22 @@ namespace
rand r, r2;
DLIB_CASSERT(r.get_seed() == "","");
DLIB_TEST(r.get_seed() == "");
r.set_seed(seed.str());
DLIB_CASSERT(r.get_seed() == seed.str(),"");
DLIB_TEST(r.get_seed() == seed.str());
r.clear();
DLIB_CASSERT(r.get_seed() == "","");
DLIB_TEST(r.get_seed() == "");
swap(r,r2);
DLIB_CASSERT(r.get_seed() == "","");
DLIB_TEST(r.get_seed() == "");
r.set_seed(seed.str());
DLIB_CASSERT(r.get_seed() == seed.str(),"");
DLIB_TEST(r.get_seed() == seed.str());
swap(r,r2);
DLIB_CASSERT(r2.get_seed() == seed.str(),"");
DLIB_CASSERT(r.get_seed() == "","");
DLIB_TEST(r2.get_seed() == seed.str());
DLIB_TEST(r.get_seed() == "");
swap(r,r2);
DLIB_CASSERT(r.get_seed() == seed.str(),"");
DLIB_CASSERT(r2.get_seed() == "","");
DLIB_TEST(r.get_seed() == seed.str());
DLIB_TEST(r2.get_seed() == "");
print_spinner();
unsigned long size = 100000;
......
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