--- ./bundled/singular/apps/ideal/include/internal/singularRingManager.h.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/apps/ideal/include/internal/singularRingManager.h 2014-11-08 20:00:00.000000000 -0700
@@ -22,7 +22,7 @@
#include "polymake/client.h"
#include "polymake/Map.h"
-#include <Singular/libsingular.h>
+#include <libsingular.h>
#include "polymake/ideal/internal/singularTermOrderData.h"
#include "polymake/ideal/internal/singularTermOrderMap.h"
#include "polymake/ideal/internal/singularConvertTypes.h"
--- ./bundled/singular/apps/ideal/include/internal/singularTermOrderData.h.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/apps/ideal/include/internal/singularTermOrderData.h 2014-11-08 20:00:00.000000000 -0700
@@ -21,7 +21,7 @@
#include "polymake/Ring.h"
#include "polymake/Polynomial.h"
-#include "Singular/libsingular.h"
+#include <libsingular.h>
namespace polymake {
namespace ideal {
--- ./bundled/singular/apps/ideal/include/internal/singularTermOrderMap.h.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/apps/ideal/include/internal/singularTermOrderMap.h 2014-11-08 20:00:00.000000000 -0700
@@ -20,7 +20,7 @@
#include "polymake/Map.h"
#include "polymake/ideal/internal/singularTermOrderData.h"
-#include <Singular/libsingular.h>
+#include <libsingular.h>
namespace polymake {
namespace ideal {
--- ./bundled/singular/apps/ideal/include/internal/singularUtils.h.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/apps/ideal/include/internal/singularUtils.h 2014-11-08 20:00:00.000000000 -0700
@@ -18,7 +18,7 @@
#define POLYMAKE_IDEAL_INTERNAL_SINGULAR_UTILS_H
// Singular includes
-#include <Singular/libsingular.h>
+#include <libsingular.h>
// polymake includes
#include "polymake/client.h"
--- ./bundled/singular/apps/ideal/src/singularConvertTypes.cc.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/apps/ideal/src/singularConvertTypes.cc 2014-11-08 20:00:00.000000000 -0700
@@ -53,7 +53,7 @@ number convert_Rational_to_number(const
mpz_set(num,numerator(r).get_rep());
mpz_init(denom);
mpz_set(denom,denominator(r).get_rep());
- return nlInit2gmp(num,denom,NULL);
+ return nlInit2gmp(num,denom);
}
@@ -86,7 +86,7 @@ poly convert_Polynomial_to_poly(const Po
p_SetExp(monomial,k+1,term->first[k],ring);
}
p_Setm(monomial,ring);
- p = p_Sub(p, monomial,ring);
+ p = p_Add_q(p, p_Neg(monomial, ring), ring);
}
return p;
}
--- ./bundled/singular/apps/ideal/src/singularIdeal.cc.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/apps/ideal/src/singularIdeal.cc 2014-11-08 20:00:00.000000000 -0700
@@ -16,9 +16,9 @@
#include <dlfcn.h>
-#include <Singular/libsingular.h>
-#include <kernel/combinatorics/stairc.h>
-#include <coeffs/mpr_complex.h>
+#include <libsingular.h>
+#include <singular/stairc.h>
+#include <singular/mpr_complex.h>
#include "polymake/ideal/singularIdeal.h"
#include "polymake/ideal/internal/singularTermOrderData.h"
@@ -110,7 +110,7 @@ public:
SingularIdeal_wrap* initial_ideal() const {
check_ring(singRing);
- ::ideal res = id_Head(singIdeal,IDRING(singRing));
+ ::ideal res = idHead(singIdeal);
SingularIdeal_wrap* initial = new SingularIdeal_impl(res,singRing);
id_Delete(&res,currRing);
return initial;
@@ -195,12 +195,12 @@ public:
ring solring = (ring)iiRETURNEXPR.Data();
// avoid redefinition message
BITSET oldverb;
- SI_SAVE_OPT2(oldverb);
- si_opt_2 &= ~Sy_bit(V_REDEFINE);
+ oldverb = verbose;
+ verbose &= ~Sy_bit(V_REDEFINE);
// switch to the new returned ring
idhdl solRingHdl=enterid("solveRing", 0, RING_CMD, &IDROOT, FALSE);
IDRING(solRingHdl)=solring;
- SI_RESTORE_OPT2(oldverb);
+ verbose = oldverb;
rSetHdl(solRingHdl);
// retrieve solution list SOL from the interpreter
idhdl sol = ggetid("SOL");
--- ./bundled/singular/apps/ideal/src/singularInit.cc.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/apps/ideal/src/singularInit.cc 2014-11-08 20:00:00.000000000 -0700
@@ -80,8 +80,8 @@ void init_singular()
cerr << "*** singular siInit done. ***" << endl;
#else
// make singular library loading quiet
- si_opt_2 &= ~Sy_bit(V_LOAD_LIB);
- si_opt_2 &= ~Sy_bit(V_REDEFINE);
+ verbose &= ~Sy_bit(V_LOAD_LIB);
+ verbose &= ~Sy_bit(V_REDEFINE);
#endif
singular_initialized = 1;
}
--- ./bundled/singular/apps/ideal/src/singularUtils.cc.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/apps/ideal/src/singularUtils.cc 2014-11-08 20:00:00.000000000 -0700
@@ -16,7 +16,7 @@
#include <dlfcn.h>
-#include <Singular/libsingular.h>
+#include <libsingular.h>
#include "polymake/client.h"
#include "polymake/Matrix.h"
--- ./bundled/singular/configure.pl.orig 2014-10-13 06:14:22.000000000 -0600
+++ ./bundled/singular/configure.pl 2014-11-08 20:00:00.000000000 -0700
@@ -45,12 +45,12 @@ sub proceed {
chomp $singularprefix;
# yes we need it twice ...
- $Libs = join(" ",$LDflags =~ m/(-l\w+)/g) . " -lpolys -lomalloc";
+ $Libs = join(" ",$LDflags =~ m/(-l\w+)/g) . " -lsingular";
$LDflags =~ s/ -l\w+//g;
$LDflags =~ s/-L(\S+)/-L$1 -Wl,-rpath,$1/g;
my $error=Polymake::Configure::build_test_program(<<"---", CXXflags => $CXXflags, LDflags => $LDflags, Libs => $Libs);
-#include "Singular/libsingular.h"
+#include "libsingular.h"
#include <string>
int main() {
char* cpath = omStrDup("$singularprefix/lib/libSingular.$lib_ext");