#include "cl_sysdep.h"
// Specification.
-#include "cl_numtheory.h"
+#include "cln/numtheory.h"
// Implementation.
#include "cl_I.h"
-#include "cl_abort.h"
+#include "cln/abort.h"
#undef floor
-#include <math.h>
+#include <cmath>
#define floor cln_floor
+namespace cln {
+
// Algorithm 1 (for very small p only):
// Try different values.
// Assume p is prime and a nonzero square in Z/pZ.
}
const pol2 square (const pol2& u)
{
- return pol2(::square(u.c0) + ::square(u.c1)*a, (u.c0*u.c1)<<1);
+ return pol2(cln::square(u.c0) + cln::square(u.c1)*a, (u.c0*u.c1)<<1);
}
const pol2 expt_pos (const pol2& x, const cl_I& y)
{
if (c1inv.condition)
return c1inv.condition;
var cl_MI z = -u.c0*c1inv;
- if (::square(z) == a)
+ if (cln::square(z) == a)
return gcd_result(1,z);
else
return gcd_result(0);
}
}
+#if defined(__GNUC__) && defined(__s390__) && (__GNUC__ == 2) // Workaround GCC-bug (see below)
+ struct cl_sylow2gen_property : public cl_property {
+ SUBCLASS_cl_property();
+ public:
+ cl_I h_rep;
+ // Constructor.
+ cl_sylow2gen_property (const cl_symbol& k, const cl_MI& h) : cl_property (k), h_rep (h.rep) {}
+ };
+#endif
+
// Algorithm 3 (for p > 2 only):
// Tonelli-Shanks.
// [Cohen, A Course in Computational Algebraic Number Theory,
// Since this computation is a bit costly, we cache its result
// on the ring's property list.
static const cl_symbol key = (cl_symbol)(cl_string)"generator of 2-Sylow subgroup of (Z/pZ)^*";
+#if !(defined(__GNUC__) && defined(__s390__) && (__GNUC__ == 2)) // Workaround GCC-bug (see above)
struct cl_sylow2gen_property : public cl_property {
SUBCLASS_cl_property();
public:
// Constructor.
cl_sylow2gen_property (const cl_symbol& k, const cl_MI& h) : cl_property (k), h_rep (h.rep) {}
};
+#endif
var cl_sylow2gen_property* prop = (cl_sylow2gen_property*) R->get_property(key);
if (prop)
h = cl_MI(R,prop->h_rep);
var uintL l = integer_length(p);
var uintL e = ord2(p-1);
//if (e > 30 && e > l/(log((double)l)*0.72-1))
- if (e > 30 && e > l/(log((double)l)*0.92-2.41))
+ if (e > 30 && e > l/(::log((double)l)*0.92-2.41))
// Algorithm 2.
return cantor_zassenhaus_sqrt(R,a);
else
// Algorithm 3.
return tonelli_shanks_sqrt(R,a);
}
+
+} // namespace cln