Changeset 4abcd2 in git

Timestamp:

Jun 29, 2019, 3:08:10 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

03bb93fba98bf9a4940362065c868e03f40d30490c8bd5e3c25fc9eee3515f8acf944ee5ebe1696b38f64f390d4436be348da6ef47e2af0b9b28e73bd9ee4473fdf11f08fe02b858ed26cfb2acacddb7

Parents:

6fe48efa5355b153c6b4c1888a39b03726d3ca4c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-06-29 15:08:10+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-06-29 15:08:45+02:00

Message:

add: gcd via flint (over QQ,ZZ/p)

Location:

libpolys/polys

Files:

• clapsing.cc (modified) (3 diffs)
• flint_mpoly.cc (modified) (1 diff)
• flint_mpoly.h (modified) (2 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))
+  {
+    nmod_mpoly_ctx_t ctx;
+    if (!convSingRFlintR(ctx,r))
+    {
+      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))
+    {
+//    printf("FlintQ\n");
+      poly res=Flint_GCD_MP(f,pLength(f),g,pLength(g),ctx,r);
+      res=p_Cleardenom(res,r);
+    }
+  }
+  #endif
+  #endif
   Off(SW_RATIONAL);
   if (rField_is_Q(r) || rField_is_Zp(r) || rField_is_Z(r)
@@ -63 +86 @@
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) );
     res=convFactoryPSingP( gcd( F, G ) , r);
-    if (rField_is_Zp(r)) p_Norm(res,r);
+    if ( rField_is_Zp(r)) p_Norm(res,r);
   }
   // and over Q(a) / Fp(a)

libpolys/polys/flint_mpoly.cc

@@ -195 +195 @@
   return pres;
 }
+poly Flint_GCD_MP(poly p,int lp,poly q,int lq,nmod_mpoly_ctx_t ctx,const ring r)
+{
+  nmod_mpoly_t pp,qq,res;
+  convSingPFlintMP(pp,ctx,p,lp,r);
+  convSingPFlintMP(qq,ctx,q,lq,r);
+  int bits=SI_LOG2(r->bitmask);
+  nmod_mpoly_init3(res,lp*lq,bits,ctx);
+  int ok=nmod_mpoly_gcd(res,pp,qq,ctx);
+  poly pres;
+  if (ok)
+  {
+    pres=convFlintMPSingP(res,ctx,r);
+    p_Test(pres,r);
+  }
+  else
+  {
+    pres=p_One(r);
+  }
+  nmod_mpoly_clear(res,ctx);
+  nmod_mpoly_clear(pp,ctx);
+  nmod_mpoly_clear(qq,ctx);
+  nmod_mpoly_ctx_clear(ctx);
+  return pres;
+}
+
+poly Flint_GCD_MP(poly p,int lp,poly q,int lq,fmpq_mpoly_ctx_t ctx,const ring r)
+{
+  fmpq_mpoly_t pp,qq,res;
+  convSingPFlintMP(pp,ctx,p,lp,r);
+  convSingPFlintMP(qq,ctx,q,lq,r);
+  int bits=SI_LOG2(r->bitmask);
+  fmpq_mpoly_init3(res,lp*lq,bits,ctx);
+  int ok=fmpq_mpoly_gcd(res,pp,qq,ctx);
+  poly pres;
+  if (ok)
+  {
+    pres=convFlintMPSingP(res,ctx,r);
+    p_Test(pres,r);
+  }
+  else
+  {
+    pres=p_One(r);
+  }
+  fmpq_mpoly_clear(res,ctx);
+  fmpq_mpoly_clear(pp,ctx);
+  fmpq_mpoly_clear(qq,ctx);
+  fmpq_mpoly_ctx_clear(ctx);
+  return pres;
+}
 #endif
 #endif

libpolys/polys/flint_mpoly.h

@@ -13 +13 @@
 
 #if __FLINT_RELEASE >= 20503
-#include <flint/fmpz.h>
 #include <flint/fmpq.h>
-#include <flint/fmpz_poly.h>
 #include <flint/fmpq_poly.h>
 #include <flint/fmpq_mpoly.h>
@@ -27 +25 @@
 poly convFlintMPSingP(nmod_mpoly_t p, nmod_mpoly_ctx_t ctx, const ring r);
 poly Flint_Mult_MP(poly p,int lp,poly q,int lq,nmod_mpoly_ctx_t ctx, const ring r);
+poly Flint_GCD_MP(poly p,int lp,poly q,int lq,nmod_mpoly_ctx_t ctx,const ring r);
+poly Flint_GCD_MP(poly p,int lp,poly q,int lq,fmpq_mpoly_ctx_t ctx,const ring r);
 #endif
 #endif