Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
alecjacobson committed Feb 7, 2023
2 parents facf32e + 484e9fb commit c034da0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/exact_geodesic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ npe_begin_code()
//assert_cols_equals(fs, 1, "fs");
//assert_cols_equals(vt, 1, "vt");
//assert_cols_equals(ft, 1, "ft");
EigenDenseLike<npe_Matrix_v> d;
Eigen::Matrix<typename npe_Matrix_v::Scalar,Eigen::Dynamic,1> d;
igl::exact_geodesic(v, f, vs, fs, vt, ft, d);
return npe::move(d);

Expand Down
2 changes: 1 addition & 1 deletion src/vector_area_matrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ npe_arg(f, dense_int, dense_long, dense_longlong)
npe_begin_code()

assert_valid_tri_mesh_faces(f);
EigenSparseLike<npe_Matrix_f> a;
Eigen::SparseMatrix<double> a;
igl::vector_area_matrix(f, a);
return npe::move(a);

Expand Down
1 change: 1 addition & 0 deletions tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ def test_read_dmat(self):
# sparse matrix, no flag attribute
def test_vector_area_matrix(self):
a = igl.vector_area_matrix(self.f)
self.assertEqual(a.dtype, "float64")
self.assertEqual(a.shape[0], a.shape[1])
self.assertEqual(a.shape[0], self.v.shape[0]*2)

Expand Down

0 comments on commit c034da0

Please sign in to comment.