template vector size

Huangzizhou · Huangzizhou · commit 182eb7281eaa · 2025-05-07T16:09:43.000-04:00
diff --git a/src/ipc/smooth_contact/distance/mollifier.hpp b/src/ipc/smooth_contact/distance/mollifier.hpp
@@ -4,11 +4,11 @@
 #include "edge_edge.hpp"
 
 namespace ipc {
-template <typename scalar>
+template <typename scalar, int dim>
 scalar point_edge_mollifier(
-    const Eigen::Ref<const VectorMax3<scalar>>& p,
-    const Eigen::Ref<const VectorMax3<scalar>>& e0,
-    const Eigen::Ref<const VectorMax3<scalar>>& e1,
+    const Eigen::Ref<const Vector<scalar, dim>>& p,
+    const Eigen::Ref<const Vector<scalar, dim>>& e0,
+    const Eigen::Ref<const Vector<scalar, dim>>& e1,
     const scalar& dist_sqr);
 
 std::array<HEAVISIDE_TYPE, 4> edge_edge_mollifier_type(
diff --git a/src/ipc/smooth_contact/distance/mollifier.tpp b/src/ipc/smooth_contact/distance/mollifier.tpp
@@ -3,11 +3,11 @@
 #include "mollifier.hpp"
 
 namespace ipc {
-template <typename scalar>
+template <typename scalar, int dim>
 scalar point_edge_mollifier(
-    const Eigen::Ref<const VectorMax3<scalar>>& p,
-    const Eigen::Ref<const VectorMax3<scalar>>& e0,
-    const Eigen::Ref<const VectorMax3<scalar>>& e1,
+    const Eigen::Ref<const Vector<scalar, dim>>& p,
+    const Eigen::Ref<const Vector<scalar, dim>>& e0,
+    const Eigen::Ref<const Vector<scalar, dim>>& e1,
     const scalar& dist_sqr)
 {
     const scalar denominator =
diff --git a/src/ipc/smooth_contact/distance/primitive_distance.tpp b/src/ipc/smooth_contact/distance/primitive_distance.tpp
@@ -17,24 +17,24 @@ public:
         typename PrimitiveDistType<Face, Point3>::type dtype)
     {
         return point_triangle_sqr_distance<T>(
-            x.tail(3) /* point */, x.head(3), x.segment(3, 3),
-            x.segment(6, 3) /* face */, dtype);
+            x.template tail<3>() /* point */, x.template head<3>(), x.template segment<3>(3),
+            x.template segment<3>(6) /* face */, dtype);
     }
 
     static Vector<T, dim> compute_closest_direction(
         const Vector<T, n_core_dofs>& x,
         typename PrimitiveDistType<Face, Point3>::type dtype)
     {
         return point_triangle_closest_point_direction<T>(
-            x.tail(3) /* point */, x.head(3), x.segment(3, 3),
-            x.segment(6, 3) /* face */, dtype);
+            x.template tail<3>() /* point */, x.template head<3>(), x.template segment<3>(3),
+            x.template segment<3>(6) /* face */, dtype);
     }
 
     static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)
     {
         return point_face_mollifier<T>(
-            x.tail(3) /* point */, x.head(3), x.segment(3, 3),
-            x.segment(6, 3) /* face */, dist_sqr);
+            x.template tail<3>() /* point */, x.template head<3>(), x.template segment<3>(3),
+            x.template segment<3>(6) /* face */, dist_sqr);
     }
 };
 
@@ -51,26 +51,26 @@ public:
         typename PrimitiveDistType<Edge3, Edge3>::type dtype)
     {
         return edge_edge_sqr_distance<T>(
-            x.head(3) /* edge 0 */, x.segment(3, 3) /* edge 0 */,
-            x.segment(6, 3) /* edge 1 */, x.tail(3) /* edge 1 */, dtype);
+            x.template head<3>() /* edge 0 */, x.template segment<3>(3) /* edge 0 */,
+            x.template segment<3>(6) /* edge 1 */, x.template tail<3>() /* edge 1 */, dtype);
     }
 
     static Vector<T, dim> compute_closest_direction(
         const Vector<T, n_core_dofs>& x,
         typename PrimitiveDistType<Edge3, Edge3>::type dtype)
     {
         return edge_edge_closest_point_direction<T>(
-            x.head(3) /* edge 0 */, x.segment(3, 3) /* edge 0 */,
-            x.segment(6, 3) /* edge 1 */, x.tail(3) /* edge 1 */, dtype);
+            x.template head<3>() /* edge 0 */, x.template segment<3>(3) /* edge 0 */,
+            x.template segment<3>(6) /* edge 1 */, x.template tail<3>() /* edge 1 */, dtype);
     }
 
     static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)
     {
         std::array<HEAVISIDE_TYPE, 4> types;
         types.fill(HEAVISIDE_TYPE::VARIANT);
         return edge_edge_mollifier<T>(
-            x.head(3) /* edge 0 */, x.segment(3, 3) /* edge 0 */,
-            x.segment(6, 3) /* edge 1 */, x.tail(3) /* edge 1 */, types,
+            x.template head<3>() /* edge 0 */, x.template segment<3>(3) /* edge 0 */,
+            x.template segment<3>(6) /* edge 1 */, x.template tail<3>() /* edge 1 */, types,
             dist_sqr);
     }
 };
@@ -88,24 +88,24 @@ public:
         typename PrimitiveDistType<Edge2, Point2>::type dtype)
     {
         return PointEdgeDistance<T, dim>::point_edge_sqr_distance(
-            x.tail(2) /* point */, x.head(2) /* edge */,
-            x.segment(2, 2) /* edge */, dtype);
+            x.template tail<2>() /* point */, x.template head<2>() /* edge */,
+            x.template segment<2>(2) /* edge */, dtype);
     }
 
     static Vector<T, dim> compute_closest_direction(
         const Vector<T, n_core_dofs>& x,
         typename PrimitiveDistType<Edge2, Point2>::type dtype)
     {
         return PointEdgeDistance<T, dim>::point_edge_closest_point_direction(
-            x.tail(2) /* point */, x.head(2) /* edge */,
-            x.segment(2, 2) /* edge */, dtype);
+            x.template tail<2>() /* point */, x.template head<2>() /* edge */,
+            x.template segment<2>(2) /* edge */, dtype);
     }
 
     static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)
     {
-        return point_edge_mollifier<T>(
-            x.tail(2) /* point */, x.segment(2, 2) /* edge */,
-            x.head(2) /* edge */, dist_sqr);
+        return point_edge_mollifier<T, 2>(
+            x.template tail<2>() /* point */, x.template segment<2>(2) /* edge */,
+            x.template head<2>() /* edge */, dist_sqr);
     }
 };
 
@@ -122,24 +122,24 @@ public:
         typename PrimitiveDistType<Edge3, Point3>::type dtype)
     {
         return PointEdgeDistance<T, dim>::point_edge_sqr_distance(
-            x.tail(3) /* point */, x.head(3) /* edge */,
-            x.segment(3, 3) /* edge */, dtype);
+            x.template tail<3>() /* point */, x.template head<3>() /* edge */,
+            x.template segment<3>(3) /* edge */, dtype);
     }
 
     static Vector<T, dim> compute_closest_direction(
         const Vector<T, n_core_dofs>& x,
         typename PrimitiveDistType<Edge3, Point3>::type dtype)
     {
         return PointEdgeDistance<T, dim>::point_edge_closest_point_direction(
-            x.tail(3) /* point */, x.head(3) /* edge */,
-            x.segment(3, 3) /* edge */, dtype);
+            x.template tail<3>() /* point */, x.template head<3>() /* edge */,
+            x.template segment<3>(3) /* edge */, dtype);
     }
 
     static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)
     {
-        return point_edge_mollifier<T>(
-            x.tail(3) /* point */, x.segment(3, 3) /* edge */,
-            x.head(3) /* edge */, dist_sqr);
+        return point_edge_mollifier<T, 3>(
+            x.template tail<3>() /* point */, x.template segment<3>(3) /* edge */,
+            x.template head<3>() /* edge */, dist_sqr);
     }
 };
 
@@ -155,14 +155,14 @@ public:
         const Vector<T, n_core_dofs>& x,
         typename PrimitiveDistType<Point2, Point2>::type dtype)
     {
-        return (x.tail(2) - x.head(2)).squaredNorm();
+        return (x.template tail<2>() - x.template head<2>()).squaredNorm();
     }
 
     static Vector<T, dim> compute_closest_direction(
         const Vector<T, n_core_dofs>& x,
         typename PrimitiveDistType<Point2, Point2>::type dtype)
     {
-        return x.tail(2) - x.head(2);
+        return x.template tail<2>() - x.template head<2>();
     }
 
     static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)
@@ -183,14 +183,14 @@ public:
         const Vector<T, n_core_dofs>& x,
         typename PrimitiveDistType<Point3, Point3>::type dtype)
     {
-        return (x.tail(3) - x.head(3)).squaredNorm();
+        return (x.template tail<3>() - x.template head<3>()).squaredNorm();
     }
 
     static Vector<T, dim> compute_closest_direction(
         const Vector<T, n_core_dofs>& x,
         typename PrimitiveDistType<Point3, Point3>::type dtype)
     {
-        return x.tail(3) - x.head(3);
+        return x.template tail<3>() - x.template head<3>();
     }
 
     static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)

Original file line number	Diff line number	Diff line change
`@@ -17,24 +17,24 @@ public:`
`17`	`17`	`typename PrimitiveDistType<Face, Point3>::type dtype)`
`18`	`18`	`{`
`19`	`19`	`return point_triangle_sqr_distance<T>(`
`20`		`- x.tail(3) /* point */, x.head(3), x.segment(3, 3),`
`21`		`- x.segment(6, 3) /* face */, dtype);`
	`20`	`+ x.template tail<3>() /* point */, x.template head<3>(), x.template segment<3>(3),`
	`21`	`+ x.template segment<3>(6) /* face */, dtype);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`static Vector<T, dim> compute_closest_direction(`
`25`	`25`	`const Vector<T, n_core_dofs>& x,`
`26`	`26`	`typename PrimitiveDistType<Face, Point3>::type dtype)`
`27`	`27`	`{`
`28`	`28`	`return point_triangle_closest_point_direction<T>(`
`29`		`- x.tail(3) /* point */, x.head(3), x.segment(3, 3),`
`30`		`- x.segment(6, 3) /* face */, dtype);`
	`29`	`+ x.template tail<3>() /* point */, x.template head<3>(), x.template segment<3>(3),`
	`30`	`+ x.template segment<3>(6) /* face */, dtype);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)`
`34`	`34`	`{`
`35`	`35`	`return point_face_mollifier<T>(`
`36`		`- x.tail(3) /* point */, x.head(3), x.segment(3, 3),`
`37`		`- x.segment(6, 3) /* face */, dist_sqr);`
	`36`	`+ x.template tail<3>() /* point */, x.template head<3>(), x.template segment<3>(3),`
	`37`	`+ x.template segment<3>(6) /* face */, dist_sqr);`
`38`	`38`	`}`
`39`	`39`	`};`
`40`	`40`
`@@ -51,26 +51,26 @@ public:`
`51`	`51`	`typename PrimitiveDistType<Edge3, Edge3>::type dtype)`
`52`	`52`	`{`
`53`	`53`	`return edge_edge_sqr_distance<T>(`
`54`		`- x.head(3) /* edge 0 /, x.segment(3, 3) / edge 0 */,`
`55`		`- x.segment(6, 3) /* edge 1 /, x.tail(3) / edge 1 */, dtype);`
	`54`	`+ x.template head<3>() /* edge 0 /, x.template segment<3>(3) / edge 0 */,`
	`55`	`+ x.template segment<3>(6) /* edge 1 /, x.template tail<3>() / edge 1 */, dtype);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`static Vector<T, dim> compute_closest_direction(`
`59`	`59`	`const Vector<T, n_core_dofs>& x,`
`60`	`60`	`typename PrimitiveDistType<Edge3, Edge3>::type dtype)`
`61`	`61`	`{`
`62`	`62`	`return edge_edge_closest_point_direction<T>(`
`63`		`- x.head(3) /* edge 0 /, x.segment(3, 3) / edge 0 */,`
`64`		`- x.segment(6, 3) /* edge 1 /, x.tail(3) / edge 1 */, dtype);`
	`63`	`+ x.template head<3>() /* edge 0 /, x.template segment<3>(3) / edge 0 */,`
	`64`	`+ x.template segment<3>(6) /* edge 1 /, x.template tail<3>() / edge 1 */, dtype);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)`
`68`	`68`	`{`
`69`	`69`	`std::array<HEAVISIDE_TYPE, 4> types;`
`70`	`70`	`types.fill(HEAVISIDE_TYPE::VARIANT);`
`71`	`71`	`return edge_edge_mollifier<T>(`
`72`		`- x.head(3) /* edge 0 /, x.segment(3, 3) / edge 0 */,`
`73`		`- x.segment(6, 3) /* edge 1 /, x.tail(3) / edge 1 */, types,`
	`72`	`+ x.template head<3>() /* edge 0 /, x.template segment<3>(3) / edge 0 */,`
	`73`	`+ x.template segment<3>(6) /* edge 1 /, x.template tail<3>() / edge 1 */, types,`
`74`	`74`	`dist_sqr);`
`75`	`75`	`}`
`76`	`76`	`};`
`@@ -88,24 +88,24 @@ public:`
`88`	`88`	`typename PrimitiveDistType<Edge2, Point2>::type dtype)`
`89`	`89`	`{`
`90`	`90`	`return PointEdgeDistance<T, dim>::point_edge_sqr_distance(`
`91`		`- x.tail(2) /* point /, x.head(2) / edge */,`
`92`		`- x.segment(2, 2) /* edge */, dtype);`
	`91`	`+ x.template tail<2>() /* point /, x.template head<2>() / edge */,`
	`92`	`+ x.template segment<2>(2) /* edge */, dtype);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`static Vector<T, dim> compute_closest_direction(`
`96`	`96`	`const Vector<T, n_core_dofs>& x,`
`97`	`97`	`typename PrimitiveDistType<Edge2, Point2>::type dtype)`
`98`	`98`	`{`
`99`	`99`	`return PointEdgeDistance<T, dim>::point_edge_closest_point_direction(`
`100`		`- x.tail(2) /* point /, x.head(2) / edge */,`
`101`		`- x.segment(2, 2) /* edge */, dtype);`
	`100`	`+ x.template tail<2>() /* point /, x.template head<2>() / edge */,`
	`101`	`+ x.template segment<2>(2) /* edge */, dtype);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)`
`105`	`105`	`{`
`106`		`- return point_edge_mollifier<T>(`
`107`		`- x.tail(2) /* point /, x.segment(2, 2) / edge */,`
`108`		`- x.head(2) /* edge */, dist_sqr);`
	`106`	`+ return point_edge_mollifier<T, 2>(`
	`107`	`+ x.template tail<2>() /* point /, x.template segment<2>(2) / edge */,`
	`108`	`+ x.template head<2>() /* edge */, dist_sqr);`
`109`	`109`	`}`
`110`	`110`	`};`
`111`	`111`
`@@ -122,24 +122,24 @@ public:`
`122`	`122`	`typename PrimitiveDistType<Edge3, Point3>::type dtype)`
`123`	`123`	`{`
`124`	`124`	`return PointEdgeDistance<T, dim>::point_edge_sqr_distance(`
`125`		`- x.tail(3) /* point /, x.head(3) / edge */,`
`126`		`- x.segment(3, 3) /* edge */, dtype);`
	`125`	`+ x.template tail<3>() /* point /, x.template head<3>() / edge */,`
	`126`	`+ x.template segment<3>(3) /* edge */, dtype);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`static Vector<T, dim> compute_closest_direction(`
`130`	`130`	`const Vector<T, n_core_dofs>& x,`
`131`	`131`	`typename PrimitiveDistType<Edge3, Point3>::type dtype)`
`132`	`132`	`{`
`133`	`133`	`return PointEdgeDistance<T, dim>::point_edge_closest_point_direction(`
`134`		`- x.tail(3) /* point /, x.head(3) / edge */,`
`135`		`- x.segment(3, 3) /* edge */, dtype);`
	`134`	`+ x.template tail<3>() /* point /, x.template head<3>() / edge */,`
	`135`	`+ x.template segment<3>(3) /* edge */, dtype);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)`
`139`	`139`	`{`
`140`		`- return point_edge_mollifier<T>(`
`141`		`- x.tail(3) /* point /, x.segment(3, 3) / edge */,`
`142`		`- x.head(3) /* edge */, dist_sqr);`
	`140`	`+ return point_edge_mollifier<T, 3>(`
	`141`	`+ x.template tail<3>() /* point /, x.template segment<3>(3) / edge */,`
	`142`	`+ x.template head<3>() /* edge */, dist_sqr);`
`143`	`143`	`}`
`144`	`144`	`};`
`145`	`145`
`@@ -155,14 +155,14 @@ public:`
`155`	`155`	`const Vector<T, n_core_dofs>& x,`
`156`	`156`	`typename PrimitiveDistType<Point2, Point2>::type dtype)`
`157`	`157`	`{`
`158`		`- return (x.tail(2) - x.head(2)).squaredNorm();`
	`158`	`+ return (x.template tail<2>() - x.template head<2>()).squaredNorm();`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`static Vector<T, dim> compute_closest_direction(`
`162`	`162`	`const Vector<T, n_core_dofs>& x,`
`163`	`163`	`typename PrimitiveDistType<Point2, Point2>::type dtype)`
`164`	`164`	`{`
`165`		`- return x.tail(2) - x.head(2);`
	`165`	`+ return x.template tail<2>() - x.template head<2>();`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)`
`@@ -183,14 +183,14 @@ public:`
`183`	`183`	`const Vector<T, n_core_dofs>& x,`
`184`	`184`	`typename PrimitiveDistType<Point3, Point3>::type dtype)`
`185`	`185`	`{`
`186`		`- return (x.tail(3) - x.head(3)).squaredNorm();`
	`186`	`+ return (x.template tail<3>() - x.template head<3>()).squaredNorm();`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`static Vector<T, dim> compute_closest_direction(`
`190`	`190`	`const Vector<T, n_core_dofs>& x,`
`191`	`191`	`typename PrimitiveDistType<Point3, Point3>::type dtype)`
`192`	`192`	`{`
`193`		`- return x.tail(3) - x.head(3);`
	`193`	`+ return x.template tail<3>() - x.template head<3>();`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`static T mollifier(const Vector<T, n_core_dofs>& x, const T& dist_sqr)`