Browse Source

Merge branch 'main' of github.com:libigl/libigl into vfonov-tri_tri_intersect

Alec Jacobson 2 years ago
parent
commit
80a25584e9
2 changed files with 3 additions and 2 deletions
  1. 1 1
      .github/workflows/continuous.yml
  2. 2 1
      include/igl/copyleft/comiso/nrosy.cpp

+ 1 - 1
.github/workflows/continuous.yml

@@ -136,7 +136,7 @@ jobs:
             -DLIBIGL_COPYLEFT_CGAL=ON ^
             -B build ^
             -S .
-          cmake --build build -j1
+          cmake --build build -j2
 
       - name: Tests
         run: cd build; ctest --verbose -j2

+ 2 - 1
include/igl/copyleft/comiso/nrosy.cpp

@@ -390,7 +390,8 @@ void igl::copyleft::comiso::NRosyField::solveRoundings()
   gmm::row_matrix< gmm::wsvector< double > > gmm_C(0, n);
 
   COMISO::ConstrainedSolver cs;
-  cs.solve(gmm_C, gmm_A, x, gmm_b, ids_to_round, 0.0, false, true);
+  cs.solve(gmm_C, gmm_A, x, gmm_b, ids_to_round, 0.0, false);
+
 
   // Copy the result back
   for(unsigned i=0; i<F.rows(); ++i)