Merge pull request #207 from libigl/alecjacobson/vectors [ci skip]

alecjacobson · web-flow · commit 22cd4a3e1f55 · 2023-09-02T12:59:45.000-04:00
make vector types actually vectors so new slice changes in libigl don't complain
diff --git a/src/crouzeix_raviart_cotmatrix.cpp b/src/crouzeix_raviart_cotmatrix.cpp
@@ -59,7 +59,7 @@ npe_begin_code()
   assert_valid_tet_or_tri_mesh_23d(v, f);
   EigenSparseLike<npe_Matrix_v> l;
   EigenDenseLike<npe_Matrix_f> e;
-  EigenDenseLike<npe_Matrix_f> emap;
+  Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> emap;
   igl::crouzeix_raviart_cotmatrix(v, f, l, e, emap);
   return std::make_tuple(npe::move(l), npe::move(e), npe::move(emap));
 
diff --git a/src/crouzeix_raviart_massmatrix.cpp b/src/crouzeix_raviart_massmatrix.cpp
@@ -62,7 +62,7 @@ npe_begin_code()
   assert_valid_tet_or_tri_mesh_23d(v, f);
   EigenSparseLike<npe_Matrix_v> m;
   EigenDenseLike<npe_Matrix_f> e;
-  EigenDenseLike<npe_Matrix_f> emap;
+  Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> emap;
   igl::crouzeix_raviart_massmatrix(v, f, m, e, emap);
   return std::make_tuple(npe::move(m), npe::move(e), npe::move(emap));
 
diff --git a/src/ears.cpp b/src/ears.cpp
@@ -45,8 +45,8 @@ npe_arg(f, dense_int, dense_long, dense_longlong)
 npe_begin_code()
 
   assert_valid_tri_mesh_faces(f);
-  EigenDenseLike<npe_Matrix_f> ear;
-  EigenDenseLike<npe_Matrix_f> ear_opp;
+  Eigen::Matrix<npe_Scalar_f,Eigen::Dynamic,1> ear;
+  Eigen::Matrix<npe_Scalar_f,Eigen::Dynamic,1> ear_opp;
   igl::ears(f, ear, ear_opp);
   return std::make_tuple(npe::move(ear), npe::move(ear_opp));
 
diff --git a/src/extract_non_manifold_edge_curves.cpp b/src/extract_non_manifold_edge_curves.cpp
@@ -57,7 +57,7 @@ npe_arg(u_e2_e, std::vector<std::vector<int> >)
 npe_begin_code()
   assert_valid_tri_mesh_faces(f);
 
-  EigenDenseLike<npe_Matrix_f> emap;
+  Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> emap;
 
 
   std::vector<std::vector<size_t> > curves;
diff --git a/src/heat_geodesic.cpp b/src/heat_geodesic.cpp
@@ -48,7 +48,7 @@ npe_begin_code()
 
   EigenDenseLike<npe_Matrix_v> v_copy = v;
   EigenDenseLike<npe_Matrix_f> f_copy = f;
-  EigenDenseLike<npe_Matrix_f> gamma_copy = gamma;
+  Eigen::Matrix<npe_Scalar_f,Eigen::Dynamic,1> gamma_copy = gamma;
 
   Eigen::Matrix<npe_Scalar_v, Eigen::Dynamic, 1> d_copy;
   igl::HeatGeodesicsData<npe_Scalar_v> data;
diff --git a/src/intrinsic_delaunay_triangulation.cpp b/src/intrinsic_delaunay_triangulation.cpp
@@ -125,7 +125,7 @@ npe_begin_code()
   EigenDense<npe_Scalar_f_in> f;
   EigenDense<npe_Scalar_f_in> e;
   EigenDense<npe_Scalar_f_in> u_e;
-  EigenDense<npe_Scalar_f_in> emap;
+  Eigen::Matrix<npe_Scalar_f_in,Eigen::Dynamic,1> emap;
   std::vector<std::vector<npe_Scalar_f_in>> u_e2_e;
   igl::intrinsic_delaunay_triangulation(l_in, f_in, l, f, e, u_e, emap, u_e2_e);
   std::vector<std::vector<typename EigenDenseInt::Scalar>> u_e2_e_copy;
diff --git a/src/per_edge_normals.cpp b/src/per_edge_normals.cpp
@@ -59,7 +59,7 @@ npe_begin_code()
   assert_valid_3d_tri_mesh(v, f);
   EigenDenseLike<npe_Matrix_v> n;
   EigenDenseLike<npe_Matrix_f> e;
-  EigenDenseLike<npe_Matrix_f> emap;
+  Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> emap;
   igl::per_edge_normals(v, f, igl::PerEdgeNormalsWeightingType(weight), fn, n, e, emap);
   return std::make_tuple(npe::move(n), npe::move(e), npe::move(emap));
 
diff --git a/src/ramer_douglas_peucker.cpp b/src/ramer_douglas_peucker.cpp
@@ -51,10 +51,10 @@ npe_begin_code()
 
 
   EigenDense<npe_Scalar_p> s;
-  Eigen::Matrix<typename EigenDenseInt::Scalar, Eigen::Dynamic, 1> j_copy;
+  Eigen::VectorXi j_copy;
   EigenDense<npe_Scalar_p> q;
   igl::ramer_douglas_peucker(p, tol, s, j_copy, q);
-  EigenDenseInt j = j_copy;
+  EigenDenseInt j = j_copy.template cast<decltype(j)::Scalar>();
   return std::make_tuple(npe::move(s), npe::move(j), npe::move(q));
 
 npe_end_code()
diff --git a/src/random_points_on_mesh.cpp b/src/random_points_on_mesh.cpp
@@ -51,7 +51,7 @@ npe_begin_code()
 
   assert_valid_23d_tri_mesh(v, f);
   EigenDenseLike<npe_Matrix_v> b;
-  EigenDenseLike<npe_Matrix_f> fi;
+  Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> fi;
   EigenDenseLike<npe_Matrix_v> x;
   igl::random_points_on_mesh(n, v, f, b, fi, x);
   return std::make_tuple(npe::move(b), npe::move(fi), npe::move(x));
diff --git a/src/remove_duplicate_vertices.cpp b/src/remove_duplicate_vertices.cpp
@@ -65,7 +65,8 @@ npe_begin_code()
   assert_nonzero_rows(v, "v");
   Eigen::MatrixXd v_copy = v.template cast<double>();
   Eigen::MatrixXd sv;
-  EigenDenseLike<npe_Matrix_f> svi, svj, sf;
+  Eigen::Matrix<npe_Scalar_f,Eigen::Dynamic,1> svi, svj;
+  EigenDenseLike<npe_Matrix_f> sf;
   igl::remove_duplicate_vertices(v_copy, f, epsilon, sv, svi, svj, sf);
   EigenDenseFloat sv_row_major = sv;
   return std::make_tuple(npe::move(sv_row_major), npe::move(svi), npe::move(svj), npe::move(sf));
diff --git a/src/remove_duplicates.cpp b/src/remove_duplicates.cpp
diff --git a/src/remove_unreferenced.cpp b/src/remove_unreferenced.cpp
@@ -56,7 +56,8 @@ npe_begin_code()
 
   assert_valid_tet_or_tri_mesh_23d(v, f);
   EigenDenseLike<npe_Matrix_v> nv;
-  EigenDenseLike<npe_Matrix_f> nf, i, j;
+  EigenDenseLike<npe_Matrix_f> nf;
+  Eigen::Matrix<npe_Scalar_f,Eigen::Dynamic,1> i, j;
   igl::remove_unreferenced(v, f, nv, nf, i, j);
   return std::make_tuple(npe::move(nv), npe::move(nf), npe::move(i), npe::move(j));
 
diff --git a/src/resolve_duplicated_faces.cpp b/src/resolve_duplicated_faces.cpp
@@ -60,8 +60,10 @@ npe_begin_code()
   // TODO: remove __copy
   // same problem that DerivedF1 causes problem, can be prevented
   Eigen::MatrixXi f1_copy = f1.template cast<int>();
-  EigenDenseLike<npe_Matrix_f1> f2, j;
-  igl::resolve_duplicated_faces(f1_copy, f2, j);
+  Eigen::MatrixXi f2_copy;
+  Eigen::Matrix<npe_Scalar_f1,Eigen::Dynamic,1> j;
+  igl::resolve_duplicated_faces(f1_copy, f2_copy, j);
+  EigenDenseLike<npe_Matrix_f1> f2 = f2_copy.template cast<npe_Scalar_f1>();
   return std::make_tuple(npe::move(f2), npe::move(j));
 
 npe_end_code()
diff --git a/src/sharp_edges.cpp b/src/sharp_edges.cpp
@@ -65,7 +65,7 @@ npe_begin_code()
   EigenDense<npe_Scalar_f> se;
   EigenDense<npe_Scalar_f> e;
   EigenDense<npe_Scalar_f> ue;
-  EigenDense<npe_Scalar_f> emap;
+  Eigen::Matrix<npe_Scalar_f,Eigen::Dynamic,1> emap;
   std::vector<std::vector<typename EigenDenseInt::Scalar>> u_e2_e;
   std::vector<typename EigenDenseInt::Scalar> sharp;
   igl::sharp_edges(v, f, angle, se, e, ue, emap, u_e2_e, sharp);
diff --git a/src/signed_distance.cpp b/src/signed_distance.cpp
@@ -89,7 +89,7 @@ npe_begin_code()
     Eigen::MatrixXi F = f.template cast<int>();
 
     EigenDenseLike<npe_Matrix_p> S;
-    EigenDenseLike<npe_Matrix_f> I;
+    Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> I;
     EigenDenseLike<npe_Matrix_v> C;
     EigenDenseLike<npe_Matrix_v> N;
 
diff --git a/src/simplify_polyhedron.cpp b/src/simplify_polyhedron.cpp
@@ -66,7 +66,7 @@ npe_begin_code()
 
   EigenDenseLike<npe_Matrix_ov> v = v_copy.template cast < typename npe_Matrix_ov::Scalar >();
   EigenDenseLike<npe_Matrix_of> f = f_copy.template cast<typename npe_Matrix_of::Scalar>();
-  EigenDenseLike<npe_Matrix_of> j = j_copy.template cast<typename npe_Matrix_of::Scalar>();
+  Eigen::Matrix<npe_Scalar_of,Eigen::Dynamic,1> j = j_copy.template cast<typename npe_Matrix_of::Scalar>();
 
   return std::make_tuple(npe::move(v), npe::move(f), npe::move(j));
 
diff --git a/src/unique_edge_map.cpp b/src/unique_edge_map.cpp
@@ -58,7 +58,7 @@ npe_begin_code()
 
   EigenDenseLike<npe_Matrix_f> E;
   EigenDenseLike<npe_Matrix_f> uE;
-  EigenDenseLike<npe_Matrix_f> EMAP;
+  Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> EMAP;
   std::vector<std::vector<typename EigenDenseInt::Scalar>> uE2E;
   igl::unique_edge_map(f, E, uE, EMAP, uE2E);
   return std::make_tuple(npe::move(E), npe::move(uE), npe::move(EMAP), uE2E);
diff --git a/src/unique_simplices.cpp b/src/unique_simplices.cpp
@@ -45,8 +45,8 @@ npe_begin_code()
   assert_valid_tet_or_tri_mesh_faces(f);
 
   EigenDenseLike<npe_Matrix_f> ff;
-  EigenDenseLike<npe_Matrix_f> ia;
-  EigenDenseLike<npe_Matrix_f> ic;
+  Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> ia;
+  Eigen::Matrix<npe_Scalar_f, Eigen::Dynamic, 1> ic;
   igl::unique_simplices(f, ff, ia, ic);
   return std::make_tuple(npe::move(ff), npe::move(ia), npe::move(ic));
 
diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -841,16 +841,6 @@ def test_remove_duplicate_vertices(self):
         self.assertTrue(svj.flags.c_contiguous)
         self.assertTrue(sf.flags.c_contiguous)
 
-    def test_remove_duplicates(self):
-        epsilon = 1e-6
-        nv, nf = igl.remove_duplicates(self.v1, self.f1, epsilon)
-        self.assertEqual(nv.dtype, self.v1.dtype)
-        self.assertEqual(nf.dtype, self.f1.dtype)
-        self.assertTrue(nv.shape[0] > 0 and nv.shape[1] > 0)
-        self.assertTrue(nf.shape[0] > 0)
-        self.assertTrue(nv.flags.c_contiguous)
-        self.assertTrue(nf.flags.c_contiguous)
-
     def test_remove_unreferenced(self):
         nv, nf, i, j = igl.remove_unreferenced(self.v1, self.f1)
         self.assertEqual(nv.shape[1], self.v1.shape[1])
