Эх сурвалжийг харах

areamatrix --> vector_area_matrix

Former-commit-id: 972804e9a58104b53edcfd480fdddca857a634df
Alec Jacobson 11 жил өмнө
parent
commit
77260d4aac

+ 2 - 2
include/igl/lscm.cpp

@@ -7,7 +7,7 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 #include "lscm.h"
 
-#include <igl/areamatrix.h>
+#include <igl/vector_area_matrix.h>
 #include <igl/cotmatrix.h>
 //#include <igl/kronecker_product.h>
 #include <igl/repdiag.h>
@@ -27,7 +27,7 @@ IGL_INLINE void igl::lscm(
   
   // Assemble the area matrix (note that A is #Vx2 by #Vx2)
   SparseMatrix<double> A;
-  igl::areamatrix(F,A);
+  igl::vector_area_matrix(F,A);
 
   // Assemble the cotan laplacian matrix
   SparseMatrix<double> L;

+ 3 - 3
include/igl/areamatrix.cpp → include/igl/vector_area_matrix.cpp

@@ -5,7 +5,7 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#include "areamatrix.h"
+#include "vector_area_matrix.h"
 #include <vector>
 
 // Bug in unsupported/Eigen/SparseExtra needs iostream first
@@ -16,7 +16,7 @@
 #include <igl/boundary_faces.h>
 
 template <typename DerivedF, typename Scalar>
-IGL_INLINE void igl::areamatrix(
+IGL_INLINE void igl::vector_area_matrix(
   const Eigen::PlainObjectBase<DerivedF> & F,
   Eigen::SparseMatrix<Scalar>& A)
 {
@@ -52,5 +52,5 @@ IGL_INLINE void igl::areamatrix(
 
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template specialization
-template void igl::areamatrix<Eigen::Matrix<int, -1, -1, 0, -1, -1>, double>(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::SparseMatrix<double, 0, int>&);
+template void igl::vector_area_matrix<Eigen::Matrix<int, -1, -1, 0, -1, -1>, double>(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::SparseMatrix<double, 0, int>&);
 #endif

+ 2 - 2
include/igl/areamatrix.h → include/igl/vector_area_matrix.h

@@ -29,13 +29,13 @@ namespace igl
   //   A  #Vx2 by #Vx2 area matrix
   //
   template <typename DerivedF, typename Scalar>
-  IGL_INLINE void areamatrix(
+  IGL_INLINE void vector_area_matrix(
     const Eigen::PlainObjectBase<DerivedF> & F,
     Eigen::SparseMatrix<Scalar>& A);
 }
 
 #ifndef IGL_STATIC_LIBRARY
-#  include "areamatrix.cpp"
+#  include "vector_area_matrix.cpp"
 #endif
 
 #endif