The rref should be called outside the for loop

ttadano · Jun 18, 2018 · 9936d5d · 9936d5d
1 parent ea89378
commit 9936d5d
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/alm/constraint.cpp b/alm/constraint.cpp
@@ -205,13 +205,12 @@ void Constraint::setup()
 //                remove_redundant_rows(nparam, const_self[order], eps8);
             }
 
-
             for (it_const = const_translation[order].begin();
                  it_const != const_translation[order].end(); ++it_const) {
                 for (i = 0; i < nparam; ++i) arr_tmp[i] = (*it_const).w_const[i];
                 const_self[order].push_back(ConstraintClass(nparam, arr_tmp));
-                remove_redundant_rows(nparam, const_self[order], eps8);
             }
+            remove_redundant_rows(nparam, const_self[order], eps8);
 
             if (const_rotation_self[order].size() > 0) {
                 for (it_const = const_rotation_self[order].begin();
@@ -222,16 +221,6 @@ void Constraint::setup()
                 remove_redundant_rows(nparam, const_self[order], eps8);
             }
 
-/*
-            if (const_symmetry[order].size() > 0) {
-                for (it_const = const_symmetry[order].begin();
-                     it_const != const_symmetry[order].end(); ++it_const) {
-                    for (i = 0; i < nparam; ++i) arr_tmp[i] = (*it_const).w_const[i];
-                    const_self[order].push_back(ConstraintClass(nparam, arr_tmp));
-                }
-                remove_redundant_rows(nparam, const_self[order], eps8);
-            }
-*/
             memory->deallocate(arr_tmp);
             const_translation[order].clear();
             const_rotation_self[order].clear();
@@ -1736,7 +1725,7 @@ void Constraint::rref(int nrows,
 
         if (icol == ncols) break;
 
-        if (std::abs(mat[pivot][icol]) > tolerance) ++nrank;
+        if (std::abs(mat[pivot][icol]) >= tolerance) ++nrank;
 
         if (pivot != irow) {
             //#pragma omp parallel for private(tmp)