From aac4a828e877fcd450cce2b3adeb3f36c421cb25 Mon Sep 17 00:00:00 2001 From: Karsten Rink <karsten.rink@ufz.de> Date: Tue, 23 Sep 2014 16:22:19 +0200 Subject: [PATCH] formatting issues --- MeshLib/Elements/Element.h | 4 ++-- MeshLib/Elements/TemplateLine.h | 4 ++-- MeshLib/Elements/TemplatePrism.h | 4 ++-- MeshLib/Elements/TemplatePyramid.h | 4 ++-- MeshLib/Elements/TemplateQuad.h | 4 ++-- MeshLib/Elements/TemplateTet.h | 4 ++-- MeshLib/Elements/TemplateTri.h | 4 ++-- Tests/MeshLib/TestPntInElement.cpp | 16 ++++++++-------- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h index 5e402eff727..72308445b4f 100644 --- a/MeshLib/Elements/Element.h +++ b/MeshLib/Elements/Element.h @@ -155,8 +155,8 @@ public: /// Returns true if these two indeces form an edge and false otherwise virtual bool isEdge(unsigned i, unsigned j) const = 0; - /// Returns true if the given point is not located outside of the element - virtual bool isPntInElement(GeoLib::Point const& pnt) const = 0; + /// Returns true if the given point is not located outside of the element + virtual bool isPntInElement(GeoLib::Point const& pnt) const = 0; /** * Tests if the element is geometrically valid. diff --git a/MeshLib/Elements/TemplateLine.h b/MeshLib/Elements/TemplateLine.h index 858ef66944d..3ae74c36b07 100644 --- a/MeshLib/Elements/TemplateLine.h +++ b/MeshLib/Elements/TemplateLine.h @@ -115,8 +115,8 @@ public: return false; } - /// Returns true if pnt is located on the line segment and false otherwise - bool isPntInElement(GeoLib::Point const& pnt) const; + /// Returns true if pnt is located on the line segment and false otherwise + bool isPntInElement(GeoLib::Point const& pnt) const; /** * Tests if the element is geometrically valid. diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h index c390e99e9cf..4b32a2e359c 100644 --- a/MeshLib/Elements/TemplatePrism.h +++ b/MeshLib/Elements/TemplatePrism.h @@ -102,8 +102,8 @@ public: /// Returns true if these two indeces form an edge and false otherwise bool isEdge(unsigned i, unsigned j) const; - /// Returns true if the given point is not located outside of the prism - bool isPntInElement(GeoLib::Point const& pnt) const; + /// Returns true if the given point is not located outside of the prism + bool isPntInElement(GeoLib::Point const& pnt) const; /** * Tests if the element is geometrically valid. diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h index c12f169cc08..3c0a0d2f509 100644 --- a/MeshLib/Elements/TemplatePyramid.h +++ b/MeshLib/Elements/TemplatePyramid.h @@ -100,8 +100,8 @@ public: /// Returns true if these two indeces form an edge and false otherwise bool isEdge(unsigned i, unsigned j) const; - /// Returns true if the given point is not located outside of the pyramid - bool isPntInElement(GeoLib::Point const& pnt) const; + /// Returns true if the given point is not located outside of the pyramid + bool isPntInElement(GeoLib::Point const& pnt) const; /** * Tests if the element is geometrically valid. diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h index f7fd8e0889c..032e16eb70e 100644 --- a/MeshLib/Elements/TemplateQuad.h +++ b/MeshLib/Elements/TemplateQuad.h @@ -89,8 +89,8 @@ public: /// Returns true if these two indeces form an edge and false otherwise bool isEdge(unsigned i, unsigned j) const; - /// Returns true if the given point is not located outside of the quad - bool isPntInElement(GeoLib::Point const& pnt) const { return isPntInside(pnt); } + /// Returns true if the given point is not located outside of the quad + bool isPntInElement(GeoLib::Point const& pnt) const { return isPntInside(pnt); } /** * Check if the 3d GeoLib::Point is inside of the quad element. diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h index 530cbf09714..6b89f180506 100644 --- a/MeshLib/Elements/TemplateTet.h +++ b/MeshLib/Elements/TemplateTet.h @@ -99,8 +99,8 @@ public: /// Returns true if these two indeces form an edge and false otherwise bool isEdge(unsigned i, unsigned j) const; - /// Returns true if the given point is not located outside of the tetrahedron - bool isPntInElement(GeoLib::Point const& pnt) const; + /// Returns true if the given point is not located outside of the tetrahedron + bool isPntInElement(GeoLib::Point const& pnt) const; /** * Tests if the element is geometrically valid. diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h index 325efe914b3..8f340dd4255 100644 --- a/MeshLib/Elements/TemplateTri.h +++ b/MeshLib/Elements/TemplateTri.h @@ -93,8 +93,8 @@ public: /// Returns true if these two indices form an edge and false otherwise bool isEdge(unsigned idx1, unsigned idx2) const; - /// Returns true if the given point is not located outside of the triangle - bool isPntInElement(GeoLib::Point const& pnt) const { return isPntInside(pnt); } + /// Returns true if the given point is not located outside of the triangle + bool isPntInElement(GeoLib::Point const& pnt) const { return isPntInside(pnt); } /** * Check if the 3d GeoLib::Point is inside of the element. diff --git a/Tests/MeshLib/TestPntInElement.cpp b/Tests/MeshLib/TestPntInElement.cpp index b4d6b097d16..20e4a0a138a 100644 --- a/Tests/MeshLib/TestPntInElement.cpp +++ b/Tests/MeshLib/TestPntInElement.cpp @@ -27,14 +27,14 @@ std::vector<MeshLib::Node*> createNodes() { - std::vector<MeshLib::Node*> nodes; - nodes.push_back(new MeshLib::Node(0,0,0)); - nodes.push_back(new MeshLib::Node(1,0,0)); - nodes.push_back(new MeshLib::Node(1,1,0)); + std::vector<MeshLib::Node*> nodes; + nodes.push_back(new MeshLib::Node(0,0,0)); + nodes.push_back(new MeshLib::Node(1,0,0)); + nodes.push_back(new MeshLib::Node(1,1,0)); nodes.push_back(new MeshLib::Node(0,1,0)); - nodes.push_back(new MeshLib::Node(0,0,1)); - nodes.push_back(new MeshLib::Node(1,0,1)); - nodes.push_back(new MeshLib::Node(1,1,1)); + nodes.push_back(new MeshLib::Node(0,0,1)); + nodes.push_back(new MeshLib::Node(1,0,1)); + nodes.push_back(new MeshLib::Node(1,1,1)); nodes.push_back(new MeshLib::Node(0,1,1)); return nodes; } @@ -93,4 +93,4 @@ TEST(IsPntInElement, Hex) ASSERT_EQ(true, hex.isPntInElement(pnt)); pnt = GeoLib::Point(1.01,0.99,0.99); ASSERT_EQ(false, hex.isPntInElement(pnt)); -} \ No newline at end of file +} -- GitLab