Skip to content

Commit

Permalink
Updated epsilon() values due to move from Boost.UTF (closes #9).
Browse files Browse the repository at this point in the history
  • Loading branch information
@demianmnave
demianmnave committed Aug 28, 2017
1 parent 736ef36 commit 87a8166
Show file tree
Hide file tree
Showing 18 changed files with 347 additions and 347 deletions.
76 changes: 38 additions & 38 deletions tests/mathlib/coordinate_conversion1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,35 @@ CATCH_TEST_CASE("from cartesian, to_polar1")
{
cml::vector2d x;
cml::polar_to_cartesian(x, 1., cml::rad(45.));
CATCH_CHECK(x[0] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[1] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[0] == Approx(.7071067811865).epsilon(1e-12));
CATCH_CHECK(x[1] == Approx(.7071067811865).epsilon(1e-12));
}

CATCH_TEST_CASE("from cartesian, to_polar2")
{
cml::vector2d x;
cml::polar_to_cartesian(1., cml::rad(45.), x);
CATCH_CHECK(x[0] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[1] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[0] == Approx(.7071067811865).epsilon(1e-12));
CATCH_CHECK(x[1] == Approx(.7071067811865).epsilon(1e-12));
}


CATCH_TEST_CASE("from cartesian, to_cylindrical1")
{
cml::vector3d x;
cml::cylindrical_to_cartesian(x, 2, 1., cml::rad(45.), 1.);
CATCH_CHECK(x[0] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[1] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[2] == Approx(1.).epsilon(.001));
CATCH_CHECK(x[0] == Approx(.7071067811865).epsilon(1e-12));
CATCH_CHECK(x[1] == Approx(.7071067811865).epsilon(1e-12));
CATCH_CHECK(x[2] == Approx(1.).epsilon(1e-12));
}

CATCH_TEST_CASE("from cartesian, to_cylindrical2")
{
cml::vector3d x;
cml::cylindrical_to_cartesian(1., cml::rad(45.), 1., 2, x);
CATCH_CHECK(x[0] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[1] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[2] == Approx(1.).epsilon(.001));
CATCH_CHECK(x[0] == Approx(.7071067811865).epsilon(1e-12));
CATCH_CHECK(x[1] == Approx(.7071067811865).epsilon(1e-12));
CATCH_CHECK(x[2] == Approx(1.).epsilon(1e-12));
}


Expand All @@ -54,19 +54,19 @@ CATCH_TEST_CASE("from cartesian, to_spherical1")
cml::vector3d x;
cml::spherical_to_cartesian(
x, 2, cml::colatitude, 1., cml::rad(45.), cml::rad(45.));
CATCH_CHECK(x[0] == Approx(.5).epsilon(.001));
CATCH_CHECK(x[1] == Approx(.5).epsilon(.001));
CATCH_CHECK(x[2] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[0] == Approx(.5).epsilon(1e-12));
CATCH_CHECK(x[1] == Approx(.5).epsilon(1e-12));
CATCH_CHECK(x[2] == Approx(.7071067811865).epsilon(1e-12));
}

CATCH_TEST_CASE("from cartesian, to_spherical2")
{
cml::vector3d x;
cml::spherical_to_cartesian(
1., cml::rad(45.), cml::rad(45.), 2, cml::colatitude, x);
CATCH_CHECK(x[0] == Approx(.5).epsilon(.001));
CATCH_CHECK(x[1] == Approx(.5).epsilon(.001));
CATCH_CHECK(x[2] == Approx(.707107).epsilon(.001));
CATCH_CHECK(x[0] == Approx(.5).epsilon(1e-12));
CATCH_CHECK(x[1] == Approx(.5).epsilon(1e-12));
CATCH_CHECK(x[2] == Approx(.7071067811865).epsilon(1e-12));
}


Expand All @@ -77,17 +77,17 @@ CATCH_TEST_CASE("to cartesian, from_polar1")
cml::vector2d x(std::sqrt(.5), std::sqrt(.5));
double radius, theta;
cml::cartesian_to_polar(x, radius, theta);
CATCH_CHECK(radius == Approx(1.).epsilon(.001));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(radius == Approx(1.).epsilon(1e-12));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(1e-12));
}

CATCH_TEST_CASE("to cartesian, from_polar2")
{
cml::vector2d x(std::sqrt(.5), std::sqrt(.5));
double radius, theta, tolerance = 1e-7;
cml::cartesian_to_polar(x, radius, theta, tolerance);
CATCH_CHECK(radius == Approx(1.).epsilon(.001));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(radius == Approx(1.).epsilon(1e-12));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(1e-12));
}


Expand All @@ -96,29 +96,29 @@ CATCH_TEST_CASE("to cartesian, from_cylindrical1")
cml::vector3d x(std::sqrt(.5), std::sqrt(.5), 1.);
double radius, theta, height;
cml::cartesian_to_cylindrical(x, 2, radius, theta, height);
CATCH_CHECK(radius == Approx(1.).epsilon(.001));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(height == Approx(1.).epsilon(.001));
CATCH_CHECK(radius == Approx(1.).epsilon(1e-12));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(1e-12));
CATCH_CHECK(height == Approx(1.).epsilon(1e-12));
}

CATCH_TEST_CASE("to cartesian, from_cylindrical2")
{
cml::vector3d x(std::sqrt(.5), std::sqrt(.5), 1.);
double radius, theta, height, tolerance = 1e-7;
cml::cartesian_to_cylindrical(x, 2, radius, theta, height, tolerance);
CATCH_CHECK(radius == Approx(1.).epsilon(.001));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(height == Approx(1.).epsilon(.001));
CATCH_CHECK(radius == Approx(1.).epsilon(1e-12));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(1e-12));
CATCH_CHECK(height == Approx(1.).epsilon(1e-12));
}

CATCH_TEST_CASE("to cartesian, from_cylindrical3")
{
cml::vector3d x(std::sqrt(.5), std::sqrt(.5), 1.);
double radius, theta, height;
cml::cartesian_to_cylindrical(x, radius, theta, height, 2);
CATCH_CHECK(radius == Approx(1.).epsilon(.001));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(height == Approx(1.).epsilon(.001));
CATCH_CHECK(radius == Approx(1.).epsilon(1e-12));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(1e-12));
CATCH_CHECK(height == Approx(1.).epsilon(1e-12));
}


Expand All @@ -127,9 +127,9 @@ CATCH_TEST_CASE("to cartesian, from_spherical1")
cml::vector3d x(.5, .5, std::sqrt(.5));
double radius, theta, phi;
cml::cartesian_to_spherical(x, 2, cml::colatitude, radius, theta, phi);
CATCH_CHECK(radius == Approx(1.).epsilon(.001));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(phi == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(radius == Approx(1.).epsilon(1e-12));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(1e-12));
CATCH_CHECK(phi == Approx(cml::rad(45.)).epsilon(1e-12));
}

CATCH_TEST_CASE("to cartesian, from_spherical2")
Expand All @@ -138,9 +138,9 @@ CATCH_TEST_CASE("to cartesian, from_spherical2")
double radius, theta, phi, tolerance = 1e-7;
cml::cartesian_to_spherical(
x, 2, cml::colatitude, radius, theta, phi, tolerance);
CATCH_CHECK(radius == Approx(1.).epsilon(.001));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(phi == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(radius == Approx(1.).epsilon(1e-12));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(1e-12));
CATCH_CHECK(phi == Approx(cml::rad(45.)).epsilon(1e-12));
}

CATCH_TEST_CASE("to cartesian, from_spherical3")
Expand All @@ -149,9 +149,9 @@ CATCH_TEST_CASE("to cartesian, from_spherical3")
double radius, theta, phi;
cml::cartesian_to_spherical(
x, radius, theta, phi, 2, cml::colatitude);
CATCH_CHECK(radius == Approx(1.).epsilon(.001));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(phi == Approx(cml::rad(45.)).epsilon(.001));
CATCH_CHECK(radius == Approx(1.).epsilon(1e-12));
CATCH_CHECK(theta == Approx(cml::rad(45.)).epsilon(1e-12));
CATCH_CHECK(phi == Approx(cml::rad(45.)).epsilon(1e-12));
}


Expand Down
24 changes: 12 additions & 12 deletions tests/mathlib/frustum1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ CATCH_TEST_CASE("orthographic_planes1")
double planes[6][4]; // l, r, b, t, n ,f
cml::extract_frustum_planes(O, planes, cml::z_clip_neg_one);

CATCH_CHECK(planes[0][0] == Approx(1.).epsilon(.001));
CATCH_CHECK(planes[1][0] == Approx(-1.).epsilon(.001));
CATCH_CHECK(planes[2][1] == Approx(1.).epsilon(.001));
CATCH_CHECK(planes[3][1] == Approx(-1.).epsilon(.001));
CATCH_CHECK(planes[4][2] == Approx(-1.).epsilon(.001));
CATCH_CHECK(planes[5][2] == Approx(1.).epsilon(.001));
CATCH_CHECK(planes[0][0] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(planes[1][0] == Approx(-1.).epsilon(1e-12));
CATCH_CHECK(planes[2][1] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(planes[3][1] == Approx(-1.).epsilon(1e-12));
CATCH_CHECK(planes[4][2] == Approx(-1.).epsilon(1e-12));
CATCH_CHECK(planes[5][2] == Approx(1.).epsilon(1e-12));
}

CATCH_TEST_CASE("perspective_planes1")
Expand All @@ -42,12 +42,12 @@ CATCH_TEST_CASE("perspective_planes1")
double planes[6][4]; // l, r, b, t, n ,f
cml::extract_frustum_planes(O, planes, cml::z_clip_neg_one);

CATCH_CHECK(planes[0][0] == Approx(.002).epsilon(.001));
CATCH_CHECK(planes[1][0] == Approx(-.002).epsilon(.001));
CATCH_CHECK(planes[2][1] == Approx(.002).epsilon(.001));
CATCH_CHECK(planes[3][1] == Approx(-.002).epsilon(.001));
CATCH_CHECK(planes[4][2] == Approx(-1.).epsilon(.001));
CATCH_CHECK(planes[5][2] == Approx(1.).epsilon(.001));
CATCH_CHECK(planes[0][0] == Approx(.0019999960).epsilon(1e-12));
CATCH_CHECK(planes[1][0] == Approx(-.0019999960).epsilon(1e-12));
CATCH_CHECK(planes[2][1] == Approx(.0019999960).epsilon(1e-12));
CATCH_CHECK(planes[3][1] == Approx(-.0019999960).epsilon(1e-12));
CATCH_CHECK(planes[4][2] == Approx(-1.).epsilon(1e-12));
CATCH_CHECK(planes[5][2] == Approx(1.).epsilon(1e-12));
}

// -------------------------------------------------------------------------
Expand Down
60 changes: 30 additions & 30 deletions tests/mathlib/matrix_projection1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ CATCH_TEST_CASE("orthographic, rh1")
// l, r, b, t, near, far

cml::vector4d o = O * cml::vector4d(.5, .5, 0., 1.);
CATCH_CHECK(o[0] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[1] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[0] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(o[1] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(0 == Approx(o[2]).epsilon(0).margin(1e-7));
CATCH_CHECK(o[3] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[3] == Approx(1.).epsilon(1e-12));
}

CATCH_TEST_CASE("orthographic, rh2")
Expand All @@ -35,10 +35,10 @@ CATCH_TEST_CASE("orthographic, rh2")
// width x height, near, far

cml::vector4d o = O * cml::vector4d(.5, .5, 0., 1.);
CATCH_CHECK(o[0] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[1] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[0] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(o[1] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(0 == Approx(o[2]).epsilon(0).margin(1e-7));
CATCH_CHECK(o[3] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[3] == Approx(1.).epsilon(1e-12));
}

CATCH_TEST_CASE("orthographic, lh1")
Expand All @@ -49,10 +49,10 @@ CATCH_TEST_CASE("orthographic, lh1")
// l, r, b, t, near, far

cml::vector4d o = O * cml::vector4d(.5, .5, 0., 1.);
CATCH_CHECK(o[0] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[1] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[2] == Approx(.5).epsilon(.001));
CATCH_CHECK(o[3] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[0] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(o[1] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(o[2] == Approx(.5).epsilon(1e-12));
CATCH_CHECK(o[3] == Approx(1.).epsilon(1e-12));
}

CATCH_TEST_CASE("orthographic, lh2")
Expand All @@ -62,10 +62,10 @@ CATCH_TEST_CASE("orthographic, lh2")
// width x height, near, far

cml::vector4d o = O * cml::vector4d(.5, .5, 0., 1.);
CATCH_CHECK(o[0] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[1] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[2] == Approx(.5).epsilon(.001));
CATCH_CHECK(o[3] == Approx(1.).epsilon(.001));
CATCH_CHECK(o[0] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(o[1] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(o[2] == Approx(.5).epsilon(1e-12));
CATCH_CHECK(o[3] == Approx(1.).epsilon(1e-12));
}


Expand All @@ -79,10 +79,10 @@ CATCH_TEST_CASE("perspective, rh1")
// l, r, b, t, near, far

cml::vector4d p = P * cml::vector4d(.5, .5, 1., 1.);
CATCH_CHECK(p[0] == Approx(.001).epsilon(.001));
CATCH_CHECK(p[1] == Approx(.001).epsilon(.001));
CATCH_CHECK(p[2] == Approx(-1.004).epsilon(.001));
CATCH_CHECK(p[3] == Approx(-1.).epsilon(.001));
CATCH_CHECK(p[0] == Approx(.001).epsilon(1e-12));
CATCH_CHECK(p[1] == Approx(.001).epsilon(1e-12));
CATCH_CHECK(p[2] == Approx(-1.004004004004).epsilon(1e-12));
CATCH_CHECK(p[3] == Approx(-1.).epsilon(1e-12));
}

CATCH_TEST_CASE("perspective, rh2")
Expand All @@ -92,10 +92,10 @@ CATCH_TEST_CASE("perspective, rh2")
// width x height, near, far

cml::vector4d p = P * cml::vector4d(.5, .5, 1., 1.);
CATCH_CHECK(p[0] == Approx(.001).epsilon(.001));
CATCH_CHECK(p[1] == Approx(.001).epsilon(.001));
CATCH_CHECK(p[2] == Approx(-1.004).epsilon(.001));
CATCH_CHECK(p[3] == Approx(-1.).epsilon(.001));
CATCH_CHECK(p[0] == Approx(.001).epsilon(1e-12));
CATCH_CHECK(p[1] == Approx(.001).epsilon(1e-12));
CATCH_CHECK(p[2] == Approx(-1.004004004004).epsilon(1e-12));
CATCH_CHECK(p[3] == Approx(-1.).epsilon(1e-12));
}

CATCH_TEST_CASE("perspective, lh1")
Expand All @@ -106,10 +106,10 @@ CATCH_TEST_CASE("perspective, lh1")
// l, r, b, t, near, far

cml::vector4d p = P * cml::vector4d(.5, .5, 1., 1.);
CATCH_CHECK(p[0] == Approx(.001).epsilon(.001));
CATCH_CHECK(p[1] == Approx(.001).epsilon(.001));
CATCH_CHECK(p[2] == Approx(1.).epsilon(.001));
CATCH_CHECK(p[3] == Approx(1.).epsilon(.001));
CATCH_CHECK(p[0] == Approx(.001).epsilon(1e-12));
CATCH_CHECK(p[1] == Approx(.001).epsilon(1e-12));
CATCH_CHECK(p[2] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(p[3] == Approx(1.).epsilon(1e-12));
}

CATCH_TEST_CASE("perspective, lh2")
Expand All @@ -119,10 +119,10 @@ CATCH_TEST_CASE("perspective, lh2")
// width x height, near, far

cml::vector4d p = P * cml::vector4d(.5, .5, 1., 1.);
CATCH_CHECK(p[0] == Approx(.001).epsilon(.001));
CATCH_CHECK(p[1] == Approx(.001).epsilon(.001));
CATCH_CHECK(p[2] == Approx(1.).epsilon(.001));
CATCH_CHECK(p[3] == Approx(1.).epsilon(.001));
CATCH_CHECK(p[0] == Approx(.001).epsilon(1e-12));
CATCH_CHECK(p[1] == Approx(.001).epsilon(1e-12));
CATCH_CHECK(p[2] == Approx(1.).epsilon(1e-12));
CATCH_CHECK(p[3] == Approx(1.).epsilon(1e-12));
}


Expand Down
Loading

0 comments on commit 87a8166

Please sign in to comment.