瀏覽代碼

Found and fixed a bug, updated a non-descriptive assert

Former-commit-id: 5122b773119c4e369a1059a93a3a6fcb5e6da9e6
GavinBarill 7 年之前
父節點
當前提交
3ef4c15733
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      include/igl/fast_winding_number.cpp

+ 3 - 3
include/igl/fast_winding_number.cpp

@@ -30,14 +30,14 @@ template <typename DerivedP, typename DerivedA, typename DerivedN,
     
     
       int m = children.size();
       int m = children.size();
       int num_terms;
       int num_terms;
+    
+      assert(expansion_order < 3 && expansion_order >= 0 && "m must be less than n");
       if(expansion_order == 0){
       if(expansion_order == 0){
           num_terms = 3;
           num_terms = 3;
       } else if(expansion_order ==1){
       } else if(expansion_order ==1){
           num_terms = 3 + 9;
           num_terms = 3 + 9;
       } else if(expansion_order == 2){
       } else if(expansion_order == 2){
           num_terms = 3 + 9 + 27;
           num_terms = 3 + 9 + 27;
-      } else {
-          assert(false);
       }
       }
     
     
       R.resize(m);
       R.resize(m);
@@ -52,7 +52,7 @@ template <typename DerivedP, typename DerivedA, typename DerivedN,
           Eigen::Matrix<real_cm,1,3> masscenter;
           Eigen::Matrix<real_cm,1,3> masscenter;
           masscenter << 0,0,0;
           masscenter << 0,0,0;
           Eigen::Matrix<real_ec,1,3> zeroth_expansion;
           Eigen::Matrix<real_ec,1,3> zeroth_expansion;
-          masscenter << 0,0,0;
+          zeroth_expansion << 0,0,0;
           real_p areatotal = 0.0;
           real_p areatotal = 0.0;
           for(int j = 0; j < point_indices.at(index).size(); j++){
           for(int j = 0; j < point_indices.at(index).size(); j++){
               int curr_point_index = point_indices.at(index).at(j);
               int curr_point_index = point_indices.at(index).at(j);