diff --git a/Tests/GeoLib/AutoCheckGenerators.cpp b/Tests/GeoLib/AutoCheckGenerators.cpp index 91ee1d081b865c44eb6d3d94be5637657b50e7be..4505fc23ae8913bcdf5d1a57b7f6e07ffee0d003 100644 --- a/Tests/GeoLib/AutoCheckGenerators.cpp +++ b/Tests/GeoLib/AutoCheckGenerators.cpp @@ -19,7 +19,7 @@ MathLib::Point3d reflect(MathLib::Point3d const& c, MathLib::Point3d const& p) std::array<double, 3>{{2 * c[0] - p[0], 2 * c[1] - p[1], 0.0}}); } -GeoLib::LineSegment translate(MathLib::Vector3 const& translation, +GeoLib::LineSegment translate(Eigen::Vector3d const& translation, GeoLib::LineSegment const& line_seg) { auto a = std::make_unique<GeoLib::Point>(line_seg.getBeginPoint()); diff --git a/Tests/GeoLib/AutoCheckGenerators.h b/Tests/GeoLib/AutoCheckGenerators.h index cb2d06a615df3714d8fede3e5691973e26adf422..58ee27a414a0ce9e1ce60e41ccc86f7850a0b536 100644 --- a/Tests/GeoLib/AutoCheckGenerators.h +++ b/Tests/GeoLib/AutoCheckGenerators.h @@ -16,7 +16,6 @@ #include "autocheck/autocheck.hpp" #include "MathLib/Point3d.h" -#include "MathLib/Vector3.h" #include "GeoLib/LineSegment.h" namespace autocheck @@ -75,7 +74,7 @@ struct SymmSegmentGeneratorXY std::function<MathLib::Point3d(MathLib::Point3d const&)> function; }; -GeoLib::LineSegment translate(MathLib::Vector3 const& translation, +GeoLib::LineSegment translate(Eigen::Vector3d const& translation, GeoLib::LineSegment const& line_seg); template <typename Gen = SymmSegmentGeneratorXY< diff --git a/Tests/GeoLib/TestBoundingSphere.cpp b/Tests/GeoLib/TestBoundingSphere.cpp index 6b08b883868c6689b67472a8ee670731aa2bef09..6d76af5e1e8cead860edc784c873f2f5f1ea5722 100644 --- a/Tests/GeoLib/TestBoundingSphere.cpp +++ b/Tests/GeoLib/TestBoundingSphere.cpp @@ -18,7 +18,6 @@ #include "GeoLib/MinimalBoundingSphere.h" #include "MathLib/Point3d.h" -#include "MathLib/Vector3.h" TEST(GeoLib, TestBoundingSphere) { diff --git a/Tests/GeoLib/TestLineSegmentIntersect2d.cpp b/Tests/GeoLib/TestLineSegmentIntersect2d.cpp index ee055d60966f426a22fdaa4a63422658ae107ac2..f3ef01b5ed1f9e278d61afbd70241a2650df1029 100644 --- a/Tests/GeoLib/TestLineSegmentIntersect2d.cpp +++ b/Tests/GeoLib/TestLineSegmentIntersect2d.cpp @@ -38,12 +38,12 @@ public: SymmSegmentGenerator segment_generator2 = SymmSegmentGenerator{point_generator2, std::bind(ac::reflect, point_generator2.center, std::placeholders::_1)}; - MathLib::Vector3 const translation_vector1 = {2,2,0}; + Eigen::Vector3d const translation_vector1 = {2, 2, 0}; PairSegmentGenerator pair_segment_generator1 = PairSegmentGenerator{ segment_generator1, std::bind(ac::translate, translation_vector1, std::placeholders::_1)}; - MathLib::Vector3 const translation_vector2 = {0,0,0}; + Eigen::Vector3d const translation_vector2 = {0, 0, 0}; PairSegmentGenerator pair_segment_generator2 = PairSegmentGenerator{ segment_generator1, std::bind(ac::translate, translation_vector2, std::placeholders::_1)}; diff --git a/Tests/GeoLib/TestSurfaceIsPointInSurface.cpp b/Tests/GeoLib/TestSurfaceIsPointInSurface.cpp index 8e4cc2eae795c69fead4723ff5c6d021a93fafa4..029d65c2ccc6555cb7e3d0b4088058c87fb4b508 100644 --- a/Tests/GeoLib/TestSurfaceIsPointInSurface.cpp +++ b/Tests/GeoLib/TestSurfaceIsPointInSurface.cpp @@ -129,10 +129,10 @@ TEST(GeoLib, SurfaceIsPointInSurface) std::vector<MeshLib::Node*> const& nodes(sfc_mesh->getNodes()); GeoLib::rotatePoints<MeshLib::Node>(rot_mat, nodes); - MathLib::Vector3 const normal(0,0,1.0); - MathLib::Vector3 const surface_normal(rot_mat * normal); + Eigen::Vector3d const normal({0, 0, 1.0}); + Eigen::Vector3d const surface_normal(rot_mat * normal); double const scaling(1e-6); - MathLib::Vector3 const displacement(scaling * surface_normal); + Eigen::Vector3d const displacement(scaling * surface_normal); GeoLib::GEOObjects geometries; MeshLib::convertMeshToGeo(*sfc_mesh, geometries);