Changeset 837062d in git

Timestamp:

Mar 14, 2019, 4:47:34 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b0e0160986d9991e7d5712943e2779967a201ecc

Parents:

34ee120584348ffdd171335e368f086111c83d06

Message:

add: more flint<->singular conversions (QQ,ZZ)

Location:

libpolys/polys

Files:

• flintconv.cc (modified) (2 diffs)
• flintconv.h (modified) (1 diff)

libpolys/polys/flintconv.cc

@@ -15 +15 @@
 #if __FLINT_RELEASE >= 20500
 #include "coeffs/coeffs.h"
+#include "coeffs/longrat.h"
 #include "polys/monomials/p_polys.h"
 
@@ -43 +44 @@
 }
 
-void convSingNFlintN(fmpz_t f, mpz_t z)
+number convFlintNSingN (fmpz_t f)
+{
+  mpz_t z;
+  mpz_init(z);
+  fmpz_get_mpz(z,f);
+  number n;
+  nlMPZ(z,n,NULL);
+  return n;
+}
+number convFlintNSingN (fmpq_t f)
+{
+  number z=ALLOC_RNUMBER();
+#if defined(LDEBUG)
+  z->debug=123456;
+#endif
+  fmpz_get_mpz_frac(z->z,z->n,f);
+  nlNormalize(z,NULL);
+  return z;
+}
+
+void convSingNFlintN(fmpz_t f, mpz_t n)
 {
   fmpz_init(f);
-  fmpz_set_mpz(f,z);
+  fmpz_set_mpz(f,n);
+}
+
+void convSingNFlintN(fmpz_t f, number n)
+{
+  fmpz_init(f);
+  fmpz_set_mpz(f,(mpz_ptr)n);
+}
+
+void convSingNFlintN(fmpq_t f, number n)
+{
+  fmpq_init(f);
+  if (SR_HDL(n)&SR_INT)
+    fmpq_set_si(f,SR_TO_INT(n),1);
+  else if (n->s<3)
+  {
+    fmpz_set_mpz(fmpq_numref(f), n->z);
+    fmpz_set_mpz(fmpq_denref(f), n->n);
+  }
+  else
+  {
+    mpz_t one;
+    mpz_init_set_si(one,1);
+    fmpz_set_mpz(fmpq_numref(f), n->z);
+    fmpz_set_mpz(fmpq_denref(f), one);
+    mpz_clear(one);
+  }
 }
 

libpolys/polys/flintconv.h

@@ -41 +41 @@
 void convFlintNSingN (mpz_t z, fmpz_t f);
 void convSingNFlintN(fmpz_t f, mpz_t z);
+void convSingNFlintN(fmpz_t f, number n);
+void convSingNFlintN(fmpq_t f, number n);
+number convFlintNSingN (fmpz_t f);
+number convFlintNSingN (fmpq_t f);
+
 bigintmat*  singflint_LLL(bigintmat* A, bigintmat* T);
 intvec* singflint_LLL(intvec* A, intvec* T);