Skip to content

GitLab

Commit d9248d83 authored by JasonPries's avatar JasonPries
Browse files

Change Mesh::Edges from type std::vector<Edge*> to std::Vector<Edge>

parent 0dce6596
Expand all Hide whitespace changes
Inline Side-by-side
src/Mesh/src/Mesh.cpp
View file @ d9248d83
This diff is collapsed.
src/Mesh/src/Mesh.h
View file @ d9248d83
......@@ -31,7 +31,7 @@ public:
bool in_triangle(Point const p, size_t ei) const;
bool is_constrained(size_t ei) const { return Edges[ei]->is_constrained(); };
bool is_constrained(size_t ei) const { return Edges[ei].is_constrained(); };
bool is_encroached(Point const p, size_t ei) const;
......@@ -41,7 +41,7 @@ public:
bool is_valid(size_t ei) const;
bool orientation(size_t ei) const { return Edges[ei]->Orientation; };
bool orientation(size_t ei) const { return Edges[ei].Orientation; };
bool refine();
......@@ -53,11 +53,11 @@ public:
double shortest_edge_length(size_t ei) const;
size_t next(size_t ei) const { return Edges[ei]->Next; };
size_t next(size_t ei) const { return Edges[ei].Next; };
size_t node(size_t ei) const { return Edges[ei]->Node; };
size_t node(size_t ei) const { return Edges[ei].Node; };
size_t node(Edge const *e) const { return e->Node; };
size_t node(Edge const e) const { return e.Node; };
size_t num_points() const { return Points.size(); };
......@@ -65,7 +65,7 @@ public:
size_t num_triangles() const { return Triangles.size(); };
size_t prev(size_t ei) const { return Edges[ei]->Prev; };
size_t prev(size_t ei) const { return Edges[ei].Prev; };
size_t size_points() const { return Points.size(); };
......@@ -73,45 +73,37 @@ public:
size_t size_triangles() const { return Triangles.size(); };
size_t twin(size_t ei) const { return Edges[ei]->Twin; };
size_t twin(size_t ei) const { return Edges[ei].Twin; };
void create();
void delete_me(); // TODO: refactor to non-pointer version
void save_as(std::string path, std::string file_name) const;
Curve const *constraint_curve(size_t ei) const { return Edges[ei]->ConstraintCurve; };
Curve const *constraint_curve(size_t ei) const { return Edges[ei].ConstraintCurve; };
Point circumcenter(size_t ei) const;
Point const base(Edge const *e) const { return Points[e->Node]; };
Point const base(Edge const e) const { return Points[e.Node]; };
Point const base(size_t ei) const { return Points[node(ei)]; };
Point const point(size_t i) const { return Points[i]; };
Point const point(Edge const *e) const { return Points[e->Node]; };
Point const point(Edge const e) const { return Points[e.Node]; };
Point const tip(Edge const *e) const { return Points[next(e)->Node]; };
Point const tip(Edge const e) const { return Points[next(e).Node]; };
Point const tip(size_t ei) const { return Points[node(next(ei))]; };
Edge const *edge(size_t i) const { return Edges[i]; };
Edge const *next(Edge const *e) const { return Edges[e->Next]; };
Edge *&next(Edge *e) { return Edges[e->Next]; };
Edge const edge(size_t i) const { return Edges[i]; };
Edge const *prev(Edge const *e) const { return Edges[e->Prev]; };
Edge const next(Edge const e) const { return Edges[e.Next]; };
Edge *&prev(Edge *e) { return Edges[e->Prev]; };
Edge const prev(Edge const e) const { return Edges[e.Prev]; };
Edge const *twin(Edge const *e) const { return Edges[e->Twin]; };
Edge const twin(Edge const e) const { return Edges[e.Twin]; };
Edge *&twin(Edge *e) { return Edges[e->Twin]; };
Edge const *triangle(size_t i) const { return Edges[Triangles[i]]; };
Edge const triangle(size_t i) const { return Edges[Triangles[i]]; };
LocateTriangleResult locate_triangle(Point const p, size_t &ei) const;
......@@ -128,7 +120,7 @@ protected:
std::vector<Curve const *> Curves;
std::vector<Contour const *> Contours;
std::vector<Point> Points;
std::vector<Edge *> Edges;
std::vector<Edge> Edges;
std::vector<size_t> Triangles;
private:
......@@ -138,13 +130,15 @@ private:
bool swap(size_t ei);
Edge *&new_edge() {
Edges.push_back(new Edge(Edges.size()));
return Edges.back();
auto new_edges(size_t num_new) {
for (size_t i = 0; i != num_new; ++i) {
Edges.push_back(Edge(Edges.size()));
}
return Edges.end();
}
Edge *&new_edge(size_t p, Curve *c, bool dir) {
Edges.push_back(new Edge(p, Edges.size(), c, dir));
Edge &new_edge(size_t p, Curve *c, bool dir) {
Edges.push_back(Edge(p, Edges.size(), c, dir));
return Edges.back();
}
......
test/Mesh/test_Mesh.cpp
View file @ d9248d83
......@@ -47,33 +47,33 @@ TEST(Mesh, create__triangle_domain) {
{ // Test edge and node connections
const Edge *e0 = m.edge(vmap[0]);
const Edge *e1 = m.edge(vmap[1]);
const Edge *e2 = m.edge(vmap[2]);
const Edge e0 = m.edge(vmap[0]);
const Edge e1 = m.edge(vmap[1]);
const Edge e2 = m.edge(vmap[2]);
EXPECT_TRUE(v0.x() == m.point(e0->node()).X);
EXPECT_TRUE(v0.y() == m.point(e0->node()).Y);
EXPECT_TRUE(e1->self() == e0->next());
EXPECT_TRUE(e2->self() == e0->prev());
EXPECT_TRUE(v0.x() == m.point(e0.node()).X);
EXPECT_TRUE(v0.y() == m.point(e0.node()).Y);
EXPECT_TRUE(e1.self() == e0.next());
EXPECT_TRUE(e2.self() == e0.prev());
EXPECT_TRUE(v1.x() == m.point(e1->node()).X);
EXPECT_TRUE(v1.y() == m.point(e1->node()).Y);
EXPECT_TRUE(e2->self() == e1->next());
EXPECT_TRUE(e0->self() == e1->prev());
EXPECT_TRUE(v1.x() == m.point(e1.node()).X);
EXPECT_TRUE(v1.y() == m.point(e1.node()).Y);
EXPECT_TRUE(e2.self() == e1.next());
EXPECT_TRUE(e0.self() == e1.prev());
EXPECT_TRUE(v2.x() == m.point(e2->node()).X);
EXPECT_TRUE(v2.y() == m.point(e2->node()).Y);
EXPECT_TRUE(e0->self() == e2->next());
EXPECT_TRUE(e1->self() == e2->prev());
EXPECT_TRUE(v2.x() == m.point(e2.node()).X);
EXPECT_TRUE(v2.y() == m.point(e2.node()).Y);
EXPECT_TRUE(e0.self() == e2.next());
EXPECT_TRUE(e1.self() == e2.prev());
}
{ // Test triangles
const Edge *e = m.triangle(0);
Point cc = m.circumcenter(e->self());
const Edge e = m.triangle(0);
Point cc = m.circumcenter(e.self());
EXPECT_NEAR(0.0, cc.X, TOL);
EXPECT_NEAR(sqrt(3.0) / 3.0, cc.Y, TOL);
double cr = m.circumradius(e->self());
double cr = m.circumradius(e.self());
EXPECT_NEAR(2.0 * sqrt(3.0) / 3.0, cr, TOL);
}
......@@ -81,7 +81,7 @@ TEST(Mesh, create__triangle_domain) {
forced_refinement(m, "triangle_domain_refine_loop", 7);
}
m.delete_me();
size_t i = m.num_points();
}
TEST(Mesh, create__square_domain) {
......@@ -146,16 +146,16 @@ TEST(Mesh, create__square_domain) {
EXPECT_TRUE(m.point((size_t)3) == m.point(m.edge(5)));
for (size_t i = 0; i < 5; i++) {
const Edge *e = m.edge(i);
EXPECT_TRUE(e->self() == m.edge(e->next())->prev());
EXPECT_TRUE(e->self() == m.edge(e->prev())->next());
const Edge e = m.edge(i);
EXPECT_TRUE(e.self() == m.edge(e.next()).prev());
EXPECT_TRUE(e.self() == m.edge(e.prev()).next());
}
}
// Test triangles
{
for (size_t i = 0; i < m.size_triangles(); ++i) {
Point cc = m.circumcenter(m.triangle(0)->self());
Point cc = m.circumcenter(m.triangle(0).self());
EXPECT_NEAR(0.5, cc.X, TOL);
EXPECT_NEAR(0.5, cc.Y, TOL);
}
......@@ -165,8 +165,6 @@ TEST(Mesh, create__square_domain) {
{
forced_refinement(m, "square_domain_refine_loop", 7);
}
m.delete_me();
}
TEST(Mesh, create__narrow_diamond_domain) {
......@@ -212,22 +210,22 @@ TEST(Mesh, create__narrow_diamond_domain) {
std::vector<size_t> vmap = map_verticies_to_points({v0, v1, v2, v3}, m);
for (size_t i = 5; i < 6; i++) {
const Edge *e = m.edge(5);
if (m.point(e->node()) == m.point(vmap[0])) {
EXPECT_TRUE(m.point(vmap[2]) == m.point(m.edge(e->next())->node()));
EXPECT_TRUE(m.point(vmap[2]) == m.point(m.edge(e->twin())->node()));
} else if (m.point(e->node()) == m.point(vmap[2])) {
EXPECT_TRUE(m.point(vmap[0]) == m.point(m.edge(e->next())->node()));
EXPECT_TRUE(m.point(vmap[0]) == m.point(m.edge(e->twin())->node()));
const Edge e = m.edge(5);
if (m.point(e.node()) == m.point(vmap[0])) {
EXPECT_TRUE(m.point(vmap[2]) == m.point(m.edge(e.next()).node()));
EXPECT_TRUE(m.point(vmap[2]) == m.point(m.edge(e.twin()).node()));
} else if (m.point(e.node()) == m.point(vmap[2])) {
EXPECT_TRUE(m.point(vmap[0]) == m.point(m.edge(e.next()).node()));
EXPECT_TRUE(m.point(vmap[0]) == m.point(m.edge(e.twin()).node()));
}
}
}
// Test triangle circumcenters
{
Point cc0 = m.circumcenter(m.triangle(0)->self()); // TODO: Write m.circumcenter(size_t)
Point cc1 = m.circumcenter(m.triangle(1)->self());
Point cc0 = m.circumcenter(m.triangle(0).self());
Point cc1 = m.circumcenter(m.triangle(1).self());
EXPECT_NEAR(0.0, cc0.X, TOL);
EXPECT_NEAR(0.75, std::abs(cc0.Y), TOL);
......@@ -242,8 +240,6 @@ TEST(Mesh, create__narrow_diamond_domain) {
{
forced_refinement(m, "narrow_diamond_domain_refine_loop", 7);
}
m.delete_me();
}
TEST(Mesh, create__narrow_rectangle_domain) {
......@@ -295,11 +291,11 @@ TEST(Mesh, create__narrow_rectangle_domain) {
EXPECT_NEAR(0.0, v5.Y, DBL_EPSILON);
for (size_t i = 0; i < 12; ++i) {
Edge const *e = m.edge(i);
Edge const e = m.edge(i);
if (m.point(e->node()) == m.point(vmap[2])) {
if (e->twin() != e->self()) {
EXPECT_TRUE(m.point(m.edge(e->twin())->node()) == v5);
if (m.point(e.node()) == m.point(vmap[2])) {
if (e.twin() != e.self()) {
EXPECT_TRUE(m.point(m.edge(e.twin()).node()) == v5);
}
}
}
......@@ -309,8 +305,6 @@ TEST(Mesh, create__narrow_rectangle_domain) {
{
forced_refinement(m, "narrow_rectangle_domain_refine_loop", 7);
}
m.delete_me();
}
TEST(Mesh, create__half_circle_domain) {
......@@ -352,8 +346,6 @@ TEST(Mesh, create__half_circle_domain) {
{
forced_refinement(m, "half_circle_domain_refine_loop", 7);
}
m.delete_me();
}
TEST(Mesh, create__horseshoe_domain) {
......@@ -380,16 +372,16 @@ TEST(Mesh, create__horseshoe_domain) {
{ // Test triangles, possibly redundant
for (size_t i = 0; i < m.size_edges(); ++i) {
EXPECT_TRUE(m.edge(m.edge(i)->next())->prev() == m.edge(i)->self());
EXPECT_TRUE(m.edge(m.edge(m.edge(m.edge(i)->next())->next())->prev())->prev() == m.edge(i)->self());
EXPECT_TRUE(m.edge(m.edge(m.edge(i)->next())->next())->next() == m.edge(i)->self());
EXPECT_TRUE(m.edge(m.edge(i).next()).prev() == m.edge(i).self());
EXPECT_TRUE(m.edge(m.edge(m.edge(m.edge(i).next()).next()).prev()).prev() == m.edge(i).self());
EXPECT_TRUE(m.edge(m.edge(m.edge(i).next()).next()).next() == m.edge(i).self());
EXPECT_TRUE(m.edge(m.edge(i)->prev())->next() == m.edge(i)->self());
EXPECT_TRUE(m.edge(m.edge(m.edge(m.edge(i)->prev())->prev())->next())->next() == m.edge(i)->self());
EXPECT_TRUE(m.edge(m.edge(m.edge(i)->prev())->prev())->prev() == m.edge(i)->self());
EXPECT_TRUE(m.edge(m.edge(i).prev()).next() == m.edge(i).self());
EXPECT_TRUE(m.edge(m.edge(m.edge(m.edge(i).prev()).prev()).next()).next() == m.edge(i).self());
EXPECT_TRUE(m.edge(m.edge(m.edge(i).prev()).prev()).prev() == m.edge(i).self());
if ((m.edge(i)->twin() != m.edge(i)->self())) {
EXPECT_TRUE(m.edge(m.edge(i)->twin())->node() == m.edge(m.edge(i)->next())->node());
if ((m.edge(i).twin() != m.edge(i).self())) {
EXPECT_TRUE(m.edge(m.edge(i).twin()).node() == m.edge(m.edge(i).next()).node());
}
}
}
......@@ -403,8 +395,6 @@ TEST(Mesh, create__horseshoe_domain) {
{
forced_refinement(m, "horseshoe_domain_refine_loop", 7);
}
m.delete_me();
}
TEST(Mesh, create__I_shaped_domain) {
......@@ -460,8 +450,6 @@ TEST(Mesh, create__I_shaped_domain) {
{
forced_refinement(m, "i_shaped_domain_mesh_refine_loop", 7);
}
m.delete_me();
}
TEST(Mesh, create__corner_square_domain) {
......@@ -513,8 +501,6 @@ TEST(Mesh, create__corner_square_domain) {
{ // Forced refinement
forced_refinement(m, "corner_square_domain_refine_loop", 7);
}
m.delete_me();
}
TEST(Mesh, create__square_in_square_domain) {
......@@ -560,8 +546,6 @@ TEST(Mesh, create__square_in_square_domain) {
m.refine();
m.save_as(SAVE_DIR, "square_in_square_domain_mesh_refine");
m.delete_me();
}
/*
......@@ -744,7 +728,7 @@ TEST(Mesh, locate_triangle__triangular_domain) {
std::vector<size_t> vmap = map_verticies_to_points({v0, v1, v2}, mesh);
for (size_t i = 0; i < mesh.size_edges(); ++i) {
Edge const *e;
Edge e;
Point vp;
size_t loc = i;
......@@ -754,17 +738,17 @@ TEST(Mesh, locate_triangle__triangular_domain) {
vp = ve0;
EXPECT_TRUE(mesh.locate_triangle(vp, loc) == LocateTriangleResult::Exterior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[0])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[1])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[0])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[1])));
vp = ve1;
EXPECT_TRUE(mesh.locate_triangle(vp, loc) == LocateTriangleResult::Exterior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[1])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[2])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[1])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[2])));
vp = ve2;
EXPECT_TRUE(mesh.locate_triangle(vp, loc) == LocateTriangleResult::Exterior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[2])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[0])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[2])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[0])));
}
// Corner Cases
......@@ -773,24 +757,24 @@ TEST(Mesh, locate_triangle__triangular_domain) {
ve2 = {0.5 - DBL_EPSILON, sqrt(3.0) / 2.0 + DBL_EPSILON};
for (size_t i = 0; i != mesh.size_edges(); ++i) {
Edge const *e;
Edge e;
Point vp;
size_t loc = i;
vp = ve0;
EXPECT_TRUE(mesh.locate_triangle(vp, loc) == LocateTriangleResult::Interior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[0])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[1])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[0])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[1])));
vp = ve1;
EXPECT_TRUE(mesh.locate_triangle(vp, loc) == LocateTriangleResult::Interior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[1])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[2])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[1])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[2])));
vp = ve2;
EXPECT_TRUE(mesh.locate_triangle(vp, loc) == LocateTriangleResult::Interior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[2])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[0])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[2])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[0])));
}
}
......@@ -808,13 +792,7 @@ TEST(Mesh, locate_triange__square_domain) {
s.solve();
s.build();
/*
std::vector<const Curve*> cc{ &l0,&l1,&l2,&l3 };
Contour cont{ cc };
std::vector<const Contour*> cv{ &cont };
Mesh mesh{ cv };
*/
Mesh mesh{s};
mesh.create();
......@@ -825,7 +803,6 @@ TEST(Mesh, locate_triange__square_domain) {
Point vi0{0.25, 0.25};
Point vi1{0.75, 0.75};
for (size_t i = 0; i < mesh.size_edges(); ++i) {
//Edge const *e;
Point vp;
size_t loc = i;
......@@ -844,29 +821,29 @@ TEST(Mesh, locate_triange__square_domain) {
Point ve2{0.5, 2.0};
Point ve3{-1.0, 0.5};
for (size_t i = 0; i < mesh.size_edges(); ++i) {
Edge const *e;
Edge e;
Point vp;
size_t loc = i;
vp = ve0;
EXPECT_TRUE(mesh.locate_triangle(vp,loc) == LocateTriangleResult::Exterior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[0])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[1])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[0])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[1])));
vp = ve1;
EXPECT_TRUE(mesh.locate_triangle(vp,loc) == LocateTriangleResult::Exterior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[1])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[2])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[1])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[2])));
vp = ve2;
EXPECT_TRUE(mesh.locate_triangle(vp,loc) == LocateTriangleResult::Exterior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[2])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[3])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[2])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[3])));
vp = ve3;
EXPECT_TRUE(mesh.locate_triangle(vp,loc) == LocateTriangleResult::Exterior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[3])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[0])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[3])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[0])));
}
// Exterior Edge Points
......@@ -876,7 +853,7 @@ TEST(Mesh, locate_triange__square_domain) {
ve3 = {0.0 - DBL_EPSILON, 0.5};
LocateTriangleResult result;
for (size_t i = 0; i < mesh.size_edges(); ++i) {
Edge const *e;
Edge e;
Point vp;
size_t loc = i;
......@@ -884,31 +861,29 @@ TEST(Mesh, locate_triange__square_domain) {
result = mesh.locate_triangle(vp,loc);
EXPECT_TRUE(result == LocateTriangleResult::Interior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[0])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[1])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[0])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[1])));
vp = ve1;
result = mesh.locate_triangle(vp,loc);
EXPECT_TRUE(result == LocateTriangleResult::Interior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[1])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[2])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[1])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[2])));
vp = ve2;
result = mesh.locate_triangle(vp,loc);
EXPECT_TRUE(result == LocateTriangleResult::Interior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[2])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[3])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[2])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[3])));
vp = ve3;
result = mesh.locate_triangle(vp,loc);
EXPECT_TRUE(result == LocateTriangleResult::Interior);
e = mesh.edge(loc);
EXPECT_TRUE((mesh.point(e->node()) == mesh.point(vmap[3])) && (mesh.point(mesh.edge(e->next())->node()) == mesh.point(vmap[0])));
EXPECT_TRUE((mesh.point(e.node()) == mesh.point(vmap[3])) && (mesh.point(mesh.edge(e.next()).node()) == mesh.point(vmap[0])));
}
Point vie{0.5, 0.5};
for (size_t i = 0; i < mesh.size_edges(); ++i) {
//const Edge *e = mesh.edge(i);
EXPECT_TRUE(mesh.locate_triangle(vie, i) == LocateTriangleResult::Interior);
}
}
\ No newline at end of file
test/Mesh/util.cpp
View file @ d9248d83
......@@ -10,30 +10,30 @@ bool edges_are_optimal(Mesh &m) {
bool edges_are_valid(Mesh &m) {
for (size_t i = 0;i < m.size_edges();++i) {
const Edge *e = m.edge(i);
const Edge e = m.edge(i);
EXPECT_TRUE(e->self() == m.edge(e->next())->prev());
EXPECT_TRUE(e->self() == m.edge(e->prev())->next());
EXPECT_TRUE(e->self() == m.edge(e->twin())->twin());
EXPECT_TRUE(e.self() == m.edge(e.next()).prev());
EXPECT_TRUE(e.self() == m.edge(e.prev()).next());
EXPECT_TRUE(e.self() == m.edge(e.twin()).twin());
if ((e->twin() != e->self())) {
EXPECT_TRUE(e->node() == m.edge(m.edge(e->twin())->next())->node());
EXPECT_TRUE(e->constraint_curve() == m.edge(e->twin())->constraint_curve());
if (e->constraint_curve() != nullptr) {
EXPECT_TRUE(e->orientation() != m.edge(e->twin())->orientation());
if ((e.twin() != e.self())) {
EXPECT_TRUE(e.node() == m.edge(m.edge(e.twin()).next()).node());
EXPECT_TRUE(e.constraint_curve() == m.edge(e.twin()).constraint_curve());
if (e.constraint_curve() != nullptr) {
EXPECT_TRUE(e.orientation() != m.edge(e.twin()).orientation());
}
EXPECT_FALSE(e->node() == m.edge(e->twin())->node());
EXPECT_FALSE(e.node() == m.edge(e.twin()).node());
}
if (e->constraint_curve() != nullptr) {
if (e->orientation()) {
EXPECT_TRUE(m.base(e) == *e->constraint_curve()->start());
EXPECT_TRUE(m.tip(e) == *e->constraint_curve()->end());
if (e.constraint_curve() != nullptr) {
if (e.orientation()) {
EXPECT_TRUE(m.base(e) == *e.constraint_curve()->start());
EXPECT_TRUE(m.tip(e) == *e.constraint_curve()->end());
}
else {
EXPECT_TRUE(m.base(e) == *e->constraint_curve()->end());
EXPECT_TRUE(m.tip(e) == *e->constraint_curve()->start());
EXPECT_TRUE(m.base(e) == *e.constraint_curve()->end());
EXPECT_TRUE(m.tip(e) == *e.constraint_curve()->start());
}
}
}
......
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