Преглед на файлове

Minor update and style fix.

Former-commit-id: 1ae61ef5d3b9764f714049a678f9854bc9b76e72
Qingnan Zhou преди 9 години
родител
ревизия
a194d8ab77
променени са 2 файла, в които са добавени 17 реда и са изтрити 17 реда
  1. 12 12
      include/igl/sortrows.cpp
  2. 5 5
      include/igl/unique.cpp

+ 12 - 12
include/igl/sortrows.cpp

@@ -70,27 +70,27 @@ IGL_INLINE void igl::sortrows(
   {
   {
     IX(i) = i;
     IX(i) = i;
   }
   }
-  auto index_less_than = [&X, num_cols](size_t i, size_t j) {
-      for (size_t c=0; c<num_cols; c++) {
-          if (X.coeff(i, c) < X.coeff(j, c)) return true;
-          else if (X.coeff(j,c) < X.coeff(i,c)) return false;
-      }
-      return false;
-  };
-  auto index_greater_than = [&X, num_cols](size_t i, size_t j) {
+  if (ascending) {
+    auto index_less_than = [&X, num_cols](size_t i, size_t j) {
       for (size_t c=0; c<num_cols; c++) {
       for (size_t c=0; c<num_cols; c++) {
-          if (X.coeff(i, c) > X.coeff(j, c)) return true;
-          else if (X.coeff(j,c) > X.coeff(i,c)) return false;
+        if (X.coeff(i, c) < X.coeff(j, c)) return true;
+        else if (X.coeff(j,c) < X.coeff(i,c)) return false;
       }
       }
       return false;
       return false;
-  };
-  if (ascending) {
+    };
       std::sort(
       std::sort(
         IX.data(),
         IX.data(),
         IX.data()+IX.size(),
         IX.data()+IX.size(),
         index_less_than
         index_less_than
         );
         );
   } else {
   } else {
+    auto index_greater_than = [&X, num_cols](size_t i, size_t j) {
+      for (size_t c=0; c<num_cols; c++) {
+        if (X.coeff(i, c) > X.coeff(j, c)) return true;
+        else if (X.coeff(j,c) > X.coeff(i,c)) return false;
+      }
+      return false;
+    };
       std::sort(
       std::sort(
         IX.data(),
         IX.data(),
         IX.data()+IX.size(),
         IX.data()+IX.size(),

+ 5 - 5
include/igl/unique.cpp

@@ -221,11 +221,11 @@ IGL_INLINE void igl::unique_rows(
   }
   }
 
 
   auto index_equal = [&sortA, &num_cols](const size_t i, const size_t j) {
   auto index_equal = [&sortA, &num_cols](const size_t i, const size_t j) {
-      for (size_t c=0; c<num_cols; c++) {
-          if (sortA.coeff(i,c) != sortA.coeff(j,c))
-              return false;
-      }
-      return true;
+    for (size_t c=0; c<num_cols; c++) {
+      if (sortA.coeff(i,c) != sortA.coeff(j,c))
+        return false;
+    }
+    return true;
   };
   };
   vIA.erase(
   vIA.erase(
     std::unique(
     std::unique(