diff --git a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp index 3133ee8696..42b8cd7127 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp +++ b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp @@ -523,7 +523,7 @@ void LscmRelax::rotate_by_min_bound_area() double x_distance = x_proj.maxCoeff() - x_proj.minCoeff(); double y_distance = y_proj.maxCoeff() - y_proj.minCoeff(); double area = x_distance * y_distance; - if (min_area == 0 or area < min_area) + if (min_area == 0 || area < min_area) { min_area = area; min_phi = phi; diff --git a/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp b/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp index 452803c3c1..63eb5409e8 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp +++ b/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp @@ -70,8 +70,8 @@ std::function get_basis(int degree, int i, Eigen::VectorXd knots double t_this = knots[i]; double t_next = knots[i+1]; if (t == knots[0]) - return (double)(t_next >= t and t >= t_this); - return (double)(t_next >= t and t > t_this); + return (double)(t_next >= t && t >= t_this); + return (double)(t_next >= t && t > t_this); }; } else @@ -114,12 +114,12 @@ std::function get_basis_derivative(int order, int degree, int i, return [degree, i, knots, order](double t) { double out = 0; - if (not (knots[i + degree] - knots[i] == 0)) + if (!(knots[i + degree] - knots[i] == 0)) { out += get_basis(degree - 1, i, knots)(t) * degree / (knots[i + degree] - knots[i]); } - if (not (knots[i + degree + 1] - knots[i + 1] == 0)) + if (!(knots[i + degree + 1] - knots[i + 1] == 0)) { out -= get_basis(degree - 1, i + 1, knots)(t) * degree / (knots[i + degree + 1] - knots[i + 1]); @@ -132,12 +132,12 @@ std::function get_basis_derivative(int order, int degree, int i, return [degree, i, knots, order](double t) { double out = 0; - if (not (knots[i + degree] - knots[i] == 0)) + if (!(knots[i + degree] - knots[i] == 0)) { out += get_basis_derivative(order - 1, degree - 1, i, knots)(t) * degree / (knots[i + degree] - knots[i]); } - if (not (knots[i + degree + 1] - knots[i + 1] == 0)) + if (!(knots[i + degree + 1] - knots[i + 1] == 0)) { out -= get_basis_derivative(order - 1, degree - 1, i + 1, knots)(t) * degree / (knots[i + degree + 1] - knots[i + 1]);