Format

Author: zfergus

python/src/potentials/barrier_potential.cpp

@@ -57,7 +57,8 @@ void define_barrier_potential(py::module_& m)
             "hessian",
             py::overload_cast<
                 const Collisions&, const CollisionMesh&, const Eigen::MatrixXd&,
-                const ipc::PSDProjectionMethod>(&BarrierPotential::Potential::hessian, py::const_),
+                const PSDProjectionMethod>(
+                &BarrierPotential::Potential::hessian, py::const_),
             R"ipc_Qu8mg5v7(
             Compute the hessian of the barrier potential.
 
@@ -71,7 +72,7 @@ void define_barrier_potential(py::module_& m)
                 The hessian of all barrier potentials (not scaled by the barrier stiffness). This will have a size of |vertices|x|vertices|.
             )ipc_Qu8mg5v7",
             py::arg("collisions"), py::arg("mesh"), py::arg("vertices"),
-            py::arg("project_hessian_to_psd") = ipc::PSDProjectionMethod::NONE)
+            py::arg("project_hessian_to_psd") = PSDProjectionMethod::NONE)
         .def(
             "shape_derivative",
             py::overload_cast<
@@ -125,7 +126,8 @@ void define_barrier_potential(py::module_& m)
         .def(
             "hessian",
             py::overload_cast<
-                const Collision&, const VectorMax12d&, const PSDProjectionMethod>(
+                const Collision&, const VectorMax12d&,
+                const PSDProjectionMethod>(
                 &BarrierPotential::hessian, py::const_),
             R"ipc_Qu8mg5v7(
             Compute the hessian of the potential for a single collision.
@@ -138,7 +140,7 @@ void define_barrier_potential(py::module_& m)
                 The hessian of the potential.
             )ipc_Qu8mg5v7",
             py::arg("collision"), py::arg("x"),
-            py::arg("project_hessian_to_psd") = ipc::PSDProjectionMethod::NONE)
+            py::arg("project_hessian_to_psd") = PSDProjectionMethod::NONE)
         .def(
             "shape_derivative",
             [](const DistanceBasedPotential& self, const Collision& collision,

python/src/potentials/friction_potential.cpp

@@ -179,7 +179,8 @@ void define_friction_potential(py::module_& m)
         .def(
             "hessian",
             py::overload_cast<
-                const FrictionCollision&, const VectorMax12d&, const PSDProjectionMethod>(
+                const FrictionCollision&, const VectorMax12d&,
+                const PSDProjectionMethod>(
                 &FrictionPotential::hessian, py::const_),
             R"ipc_Qu8mg5v7(
             Compute the hessian of the potential for a single collision.

src/ipc/potentials/distance_based_potential.hpp

@@ -56,7 +56,8 @@ class DistanceBasedPotential : public Potential<Collisions> {
     MatrixMax12d hessian(
         const Collision& collision,
         const VectorMax12d& positions,
-        const PSDProjectionMethod project_hessian_to_psd = PSDProjectionMethod::NONE) const override;
+        const PSDProjectionMethod project_hessian_to_psd =
+            PSDProjectionMethod::NONE) const override;
 
     /// @brief Compute the shape derivative of the potential for a single collision.
     /// @param[in] collision The collision.

src/ipc/potentials/friction_potential.hpp

@@ -109,7 +109,8 @@ class FrictionPotential : public Potential<FrictionCollisions> {
     MatrixMax12d hessian(
         const FrictionCollision& collision,
         const VectorMax12d& velocities,
-        const PSDProjectionMethod project_hessian_to_psd = PSDProjectionMethod::NONE) const override;
+        const PSDProjectionMethod project_hessian_to_psd =
+            PSDProjectionMethod::NONE) const override;
 
     /// @brief Compute the friction force.
     /// @param collision The collision

src/ipc/potentials/potential.hpp

@@ -47,7 +47,8 @@ template <class TCollisions> class Potential {
         const TCollisions& collisions,
         const CollisionMesh& mesh,
         const Eigen::MatrixXd& X,
-        const PSDProjectionMethod project_hessian_to_psd = PSDProjectionMethod::NONE) const;
+        const PSDProjectionMethod project_hessian_to_psd =
+            PSDProjectionMethod::NONE) const;
 
     // -- Single collision methods ---------------------------------------------
 
@@ -72,7 +73,8 @@ template <class TCollisions> class Potential {
     virtual MatrixMax12d hessian(
         const TCollision& collision,
         const VectorMax12d& x,
-        const PSDProjectionMethod project_hessian_to_psd = PSDProjectionMethod::NONE) const = 0;
+        const PSDProjectionMethod project_hessian_to_psd =
+            PSDProjectionMethod::NONE) const = 0;
 };
 
 } // namespace ipc

src/ipc/utils/eigen_ext.hpp

@@ -152,8 +152,8 @@ template <
     int _MaxCols>
 Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>
 project_to_psd(
-    const Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>&
-        A, PSDProjectionMethod type = PSDProjectionMethod::CLAMP);
+    const Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>& A,
+    const PSDProjectionMethod method = PSDProjectionMethod::CLAMP);
 
 inline Eigen::Vector3d to_3D(const VectorMax3d& v)
 {

src/ipc/utils/eigen_ext.tpp

@@ -63,11 +63,12 @@ template <
     int _MaxCols>
 Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>
 project_to_psd(
-    const Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>& A, PSDProjectionMethod type)
+    const Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>& A,
+    const PSDProjectionMethod method)
 {
     assert(A.isApprox(A.transpose()) && "A must be symmetric");
 
-    if (type == PSDProjectionMethod::NONE)
+    if (method == PSDProjectionMethod::NONE)
         return A;
 
     // https://math.stackexchange.com/q/2776803
@@ -89,8 +90,7 @@ project_to_psd(
     // Save a little time and only project the negative values
     for (int i = 0; i < A.rows(); i++) {
         if (D.diagonal()[i] < 0.0) {
-            switch (type)
-            {
+            switch (method) {
             case PSDProjectionMethod::CLAMP:
                 D.diagonal()[i] = 0.0;
                 break;