Created
March 9, 2022 15:57
-
-
Save WPettersson/e1fb0efbc015155f1a5ddb28109804d5 to your computer and use it in GitHub Desktop.
(Don't apply!) fixing compilation issue with Regina
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -Naur regina-normal-regina-95b1a26/engine/enumerate/hilbertprimal-impl.h regina-new/engine/enumerate/hilbertprimal-impl.h | |
--- regina-normal-regina-95b1a26/engine/enumerate/hilbertprimal-impl.h 2021-12-18 09:27:19.000000000 +0000 | |
+++ regina-new/engine/enumerate/hilbertprimal-impl.h 2022-03-09 15:49:24.924398783 +0000 | |
@@ -47,7 +47,6 @@ | |
#include "enumerate/hilbertprimal.h" | |
#include "enumerate/maxadmissible.h" | |
#include "enumerate/validityconstraints.h" | |
-#include "libnormaliz/cone.h" | |
#include "maths/vector.h" | |
#include "progress/progresstracker.h" | |
#include "utilities/intutils.h" | |
@@ -156,22 +155,16 @@ | |
v.push_back(mpz_class((*rit)[i].rawData())); | |
} | |
} | |
- libnormaliz::Cone<mpz_class> cone( | |
- libnormaliz::Type::integral_closure, input); | |
- libnormaliz::ConeProperties wanted( | |
- libnormaliz::ConeProperty::HilbertBasis); | |
- cone.deactivateChangeOfPrecision(); | |
- cone.compute(wanted); | |
- | |
- if (! cone.isComputed(libnormaliz::ConeProperty::HilbertBasis)) { | |
- // TODO: Bail properly. | |
- std::cerr << "ERROR: Hilbert basis not computed!" << std::endl; | |
- continue; | |
- } | |
- const std::vector<std::vector<mpz_class> > basis = | |
- cone.getHilbertBasis(); | |
- for (hlit = basis.begin(); hlit != basis.end(); ++hlit) | |
- finalBasis.insert(*hlit); | |
+ | |
+// if (! cone.isComputed(libnormaliz::ConeProperty::HilbertBasis)) { | |
+// // TODO: Bail properly. | |
+// std::cerr << "ERROR: Hilbert basis not computed!" << std::endl; | |
+// continue; | |
+// } | |
+// const std::vector<std::vector<mpz_class> > basis = | |
+// cone.getHilbertBasis(); | |
+// for (hlit = basis.begin(); hlit != basis.end(); ++hlit) | |
+// finalBasis.insert(*hlit); | |
} | |
if (tracker) | |
diff -Naur regina-normal-regina-95b1a26/engine/surface/enumerator.cpp regina-new/engine/surface/enumerator.cpp | |
--- regina-normal-regina-95b1a26/engine/surface/enumerator.cpp 2021-12-18 09:27:19.000000000 +0000 | |
+++ regina-new/engine/surface/enumerator.cpp 2022-03-09 15:50:13.944629162 +0000 | |
@@ -36,6 +36,7 @@ | |
#include "enumerate/hilbertcd.h" | |
#include "enumerate/hilbertdual.h" | |
#include "enumerate/hilbertprimal.h" | |
+#include "libnormaliz/cone.h" | |
#include "enumerate/treetraversal.h" | |
#include "maths/matrixops.h" | |
#include "maths/matrix.h" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment