Changeset 8d8fef in git for libpolys/polys/clapsing.cc

Timestamp:

Jul 29, 2019, 11:36:09 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

feed60bef09898f675e0f8605ed0ac0eaa8bed5a

Parents:

da1ec3de158a4f05384b9a83be86fc4c1942ec5fc1b9ababa50e8059dd847da0957f50aea901e6a8

Message:

Merge branch 'machine_learning' of github.com:MHeymann/Sources into machine_learning

File:

• libpolys/polys/clapsing.cc (modified) (5 diffs)

libpolys/polys/clapsing.cc

@@ -20 +20 @@
 #include "monomials/ring.h"
 #include "simpleideals.h"
+#include "polys/flintconv.h"
+#include "polys/flint_mpoly.h"
 
 
@@ -55 +57 @@
     return p_GcdMon(g,f,r);
   }
-
+  #ifdef HAVE_FLINT
+  #if __FLINT_RELEASE >= 20503
+  if (rField_is_Zp(r) && (r->cf->ch>500))
+  {
+    nmod_mpoly_ctx_t ctx;
+    if (!convSingRFlintR(ctx,r))
+    {
+      // leading coef. 1
+      return Flint_GCD_MP(f,pLength(f),g,pLength(g),ctx,r);
+    }
+  }
+  else 
+  if (rField_is_Q(r))
+  {
+    fmpq_mpoly_ctx_t ctx;
+    if (!convSingRFlintR(ctx,r))
+    {
+      // leading coef. positive, all coeffs in Z
+      poly res=Flint_GCD_MP(f,pLength(f),g,pLength(g),ctx,r);
+      res=p_Cleardenom(res,r);
+      return res;
+    }
+  }
+  #endif
+  #endif
   Off(SW_RATIONAL);
   if (rField_is_Q(r) || rField_is_Zp(r) || rField_is_Z(r)
@@ -63 +89 @@
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) );
     res=convFactoryPSingP( gcd( F, G ) , r);
+    if ( rField_is_Zp(r))
+      p_Norm(res,r); // leading coef. 1
+    else if (rField_is_Q(r) && (!n_GreaterZero(pGetCoeff(res),r->cf)))
+      res = p_Neg(res,r); // leading coef. positive, all coeffs in Z
   }
   // and over Q(a) / Fp(a)
@@ -81 +111 @@
       prune (a);
       if (!b1) Off(SW_USE_QGCD);
+      if ( rField_is_Zp_a(r)) p_Norm(res,r); // leading coef. 1
     }
     else
@@ -559 +590 @@
 {
   poly res=NULL;
+
+  #ifdef HAVE_FLINT
+  #if __FLINT_RELEASE >= 20503
+  /*
+    If the division is not exact, control will pass to factory where the
+    polynomials can be divided using the ordering that factory chooses.
+  */
+  if (rField_is_Zp(r))
+  {
+    nmod_mpoly_ctx_t ctx;
+    if (!convSingRFlintR(ctx,r))
+    {
+      res = Flint_Divide_MP(f,pLength(f),g,pLength(g),ctx,r);
+      if (res != NULL)
+        return res;
+    }
+  }
+  else
+  if (rField_is_Q(r))
+  {
+    fmpq_mpoly_ctx_t ctx;
+    if (!convSingRFlintR(ctx,r))
+    {
+      res = Flint_Divide_MP(f,pLength(f),g,pLength(g),ctx,r);
+      if (res != NULL)
+        return res;
+    }
+  }
+  #endif
+  #endif
+
   On(SW_RATIONAL);
   if (rField_is_Zp(r) || rField_is_Q(r)