Commit ca296a91 authored by Hans-Christian Ebke's avatar Hans-Christian Ebke
Browse files

Removed boost out of unit tests.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15509 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9ad5635e
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <ACG/Math/VectorT.hh> #include <ACG/Math/VectorT.hh>
#include <ACG/Math/GLMatrixT.hh> #include <ACG/Math/GLMatrixT.hh>
#include <ACG/Geometry/Spherical.hh> #include <ACG/Geometry/Spherical.hh>
#include <boost/assign.hpp>
namespace { namespace {
...@@ -66,11 +65,11 @@ TEST_F(Spherical, sphericalInnerAngleSum_zeroTriangle) { ...@@ -66,11 +65,11 @@ TEST_F(Spherical, sphericalInnerAngleSum_zeroTriangle) {
} }
TEST_F(Spherical, sphericalPolyhedralGaussCurv_pointPolyhedral) { TEST_F(Spherical, sphericalPolyhedralGaussCurv_pointPolyhedral) {
std::vector<Vec3d> normals = boost::assign::list_of<Vec3d> std::vector<Vec3d> normals;
(Vec3d(1, 0, 0)) normals.push_back(Vec3d(1, 0, 0));
(Vec3d(1, 0, 0)) normals.push_back(Vec3d(1, 0, 0));
(Vec3d(1, 0, 0)) normals.push_back(Vec3d(1, 0, 0));
(Vec3d(1, 0, 0)); normals.push_back(Vec3d(1, 0, 0));
EXPECT_NEAR(0, ACG::Geometry::sphericalPolyhedralGaussCurv<Vec3d>(normals.begin(), normals.end()), 1e-6); EXPECT_NEAR(0, ACG::Geometry::sphericalPolyhedralGaussCurv<Vec3d>(normals.begin(), normals.end()), 1e-6);
...@@ -88,25 +87,25 @@ TEST_F(Spherical, sphericalPolyhedralGaussCurv_linePolyhedral) { ...@@ -88,25 +87,25 @@ TEST_F(Spherical, sphericalPolyhedralGaussCurv_linePolyhedral) {
const Vec3d n1 = Vec3d(4, 5, 6).normalized(); const Vec3d n1 = Vec3d(4, 5, 6).normalized();
const Vec3d axis = (n1 % Vec3d(3, 1, 2)).normalized(); const Vec3d axis = (n1 % Vec3d(3, 1, 2)).normalized();
const std::vector<Vec3d> normals = boost::assign::list_of<Vec3d> std::vector<Vec3d> normals;
(rot(n1, axis, .1)) normals.push_back(rot(n1, axis, .1));
(rot(n1, axis, .2)) normals.push_back(rot(n1, axis, .2));
(rot(n1, axis, .05)) normals.push_back(rot(n1, axis, .05));
(rot(n1, axis, .09)) normals.push_back(rot(n1, axis, .09));
(rot(n1, axis, -.2)) normals.push_back(rot(n1, axis, -.2));
(rot(n1, axis, .01)) normals.push_back(rot(n1, axis, .01));
(rot(n1, axis, -.1)) normals.push_back(rot(n1, axis, -.1));
(rot(n1, axis, -.2)); normals.push_back(rot(n1, axis, -.2));
EXPECT_NEAR(0, ACG::Geometry::sphericalPolyhedralGaussCurv<Vec3d>(normals.begin(), normals.end()), 1e-6); EXPECT_NEAR(0, ACG::Geometry::sphericalPolyhedralGaussCurv<Vec3d>(normals.begin(), normals.end()), 1e-6);
} }
TEST_F(Spherical, sphericalPolyhedralGaussCurv_cubeCorner) { TEST_F(Spherical, sphericalPolyhedralGaussCurv_cubeCorner) {
{ {
std::vector<Vec3d> normals = boost::assign::list_of<Vec3d> std::vector<Vec3d> normals;
(Vec3d(1, 0, 0)) normals.push_back(Vec3d(1, 0, 0));
(Vec3d(0, 1, 0)) normals.push_back(Vec3d(0, 1, 0));
(Vec3d(0, 0, 1)); normals.push_back(Vec3d(0, 0, 1));
EXPECT_NEAR(M_PI_2, ACG::Geometry::sphericalPolyhedralGaussCurv<Vec3d>(normals.begin(), normals.end()), 1e-6); EXPECT_NEAR(M_PI_2, ACG::Geometry::sphericalPolyhedralGaussCurv<Vec3d>(normals.begin(), normals.end()), 1e-6);
} }
...@@ -114,12 +113,12 @@ TEST_F(Spherical, sphericalPolyhedralGaussCurv_cubeCorner) { ...@@ -114,12 +113,12 @@ TEST_F(Spherical, sphericalPolyhedralGaussCurv_cubeCorner) {
TEST_F(Spherical, sphericalPolyhedralGaussCurv_houseCorner) { TEST_F(Spherical, sphericalPolyhedralGaussCurv_houseCorner) {
std::vector<Vec3d> normals = boost::assign::list_of<Vec3d> std::vector<Vec3d> normals;
(Vec3d(0, 0, 1)) normals.push_back(Vec3d(0, 0, 1));
(Vec3d(0, 1, 0)) normals.push_back(Vec3d(0, 1, 0));
(Vec3d(0, 1, 0)) normals.push_back(Vec3d(0, 1, 0));
(Vec3d(0, 1, 0)) normals.push_back(Vec3d(0, 1, 0));
(Vec3d(1, 0, 0)); normals.push_back(Vec3d(1, 0, 0));
EXPECT_NEAR(-M_PI_2, ACG::Geometry::sphericalPolyhedralGaussCurv<Vec3d>(normals.begin(), normals.end()), 1e-6); EXPECT_NEAR(-M_PI_2, ACG::Geometry::sphericalPolyhedralGaussCurv<Vec3d>(normals.begin(), normals.end()), 1e-6);
} }
......
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