Fixing cppcheck/clang format issues

NREL · Feb 24, 2021 · f2b8d95 · macumber · Feb 25, 2021 · macumber
1 parent 784f028
commit f2b8d95
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/utilities/geometry/Polygon.cpp b/src/utilities/geometry/Polygon.cpp
@@ -120,15 +120,19 @@ double Polygon3d::getPerimeter() {
 }
 
 bool Polygon3d::getIsClockwise() {
-  return true;
+  OptionalVector3d normal = getOutwardNormal(points);
+  if (normal == boost::none)
+    return true;
+  else
+    return normal.get().z() > 0;
 }
 
 Point3d Polygon3d::getCentroid() {
-  //boost::optional p = openstudio::getCentroid(points);
-  //if (p == boost::none)
-  return Point3d();
-  //else
-  //  return p.get();
+  boost::optional p = openstudio::getCentroid(points);
+  if (p == boost::none)
+	return Point3d();
+  else
+    return p.get();
 }
 
 //bool Polygon3d::PointInPolygon(Point3d testPoint) {

diff --git a/src/utilities/geometry/Polygon.hpp b/src/utilities/geometry/Polygon.hpp
@@ -46,7 +46,7 @@ class UTILITIES_API Polygon3d
   Polygon3d();
   Polygon3d(Point3dVector outerPth);
 
-  void setOuterPath(Point3dVector outerPth);
+  void setOuterPath(Point3dVector outerPath);
   Point3dVector getOuterPath() const;
   Point3dVectorVector getInnerPaths() const;
 

diff --git a/src/utilities/geometry/Test/Geometry_GTest.cpp b/src/utilities/geometry/Test/Geometry_GTest.cpp
@@ -1170,11 +1170,6 @@ TEST_F(GeometryFixture, Polygon_Basic_Angled) {
 
   Vector3d normal = testPolygon.outwardNormal();
 
-  auto v1 = normal.x();
-  auto v2 = normal.y();
-  auto v3 = normal.z();
-  auto v4 = normal.length();
-
   EXPECT_NEAR(0.24242, normal.x(), 0.001);
   EXPECT_NEAR(0, normal.y(), 0.001);
   EXPECT_NEAR(0.97017, normal.z(), 0.001);