Changeset fbea8d in git

Timestamp:

Oct 23, 2020, 2:44:10 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

882ae62b212bc502c8321c242be959710e5781a6

Parents:

9ade119ff312b238c0c9914260660919505e0254

Message:

factorize with Flint 2.7.0

File:

• factory/cf_factor.cc (modified) (7 diffs)

factory/cf_factor.cc

@@ -44 +44 @@
 #ifdef HAVE_FLINT
 #include "FLINTconvert.h"
+#if (__FLINT_RELEASE >= 20700)
+#include <flint/nmod_mpoly_factor.h>
+#include <flint/fmpq_mpoly_factor.h>
+#endif
 #endif
 
@@ -144 +148 @@
       }
       else
-        printf("+%ld",f.intval());
+      {
+        long l=f.intval();
+        if (l<0) printf("%ld",l);
+        else     printf("+%ld",l);
+      }
     }
     else
@@ -508 +516 @@
 #endif
 #if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
-      // Use Factory without NTL: char p, univariate
+      // Use Factory without NTL and without FLINT: char p, univariate
       {
         if ( isOn( SW_BERLEKAMP ) )
@@ -520 +528 @@
     else // char p, multivariate
     {
+      On (SW_RATIONAL);
       #if defined(HAVE_NTL)
       if (issqrfree)
       {
         CFList factors;
-        Variable alpha;
         if (CFFactory::gettype() == GaloisFieldDomain)
           factors= GFSqrfFactorize (f);
@@ -534 +542 @@
       else
       {
-        Variable alpha;
         if (CFFactory::gettype() == GaloisFieldDomain)
           F= GFFactorize (f);
@@ -540 +547 @@
           F= FpFactorize (f);
       }
+      #elif defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20700)
+      nmod_mpoly_ctx_t ctx;
+      nmod_mpoly_ctx_init(ctx,f.level(),ORD_LEX,getCharacteristic());
+      nmod_mpoly_t Flint_f;
+      nmod_mpoly_init(Flint_f,ctx);
+      convFactoryPFlintMP(f,Flint_f,ctx,f.level());
+      nmod_mpoly_factor_t factors;
+      nmod_mpoly_factor_init(factors,ctx);
+      if (issqrfree) nmod_mpoly_factor_squarefree(factors,Flint_f,ctx);
+      else           nmod_mpoly_factor(factors,Flint_f,ctx);
+      nmod_mpoly_t fac;
+      nmod_mpoly_init(fac,ctx);
+      CanonicalForm cf_fac;
+      int cf_exp;
+      cf_fac=nmod_mpoly_factor_get_constant_ui(factors,ctx);
+      F.append(CFFactor(cf_fac,1));
+      for(int i=nmod_mpoly_factor_length(factors,ctx)-1; i>=0; i--)
+      {
+         nmod_mpoly_factor_get_base(fac,factors,i,ctx);
+         cf_fac=convFlintMPFactoryP(fac,ctx,f.level());
+         cf_exp=nmod_mpoly_factor_get_exp_si(factors,i,ctx);
+         F.append(CFFactor(cf_fac,cf_exp));
+      }
+      nmod_mpoly_factor_clear(factors,ctx);
+      nmod_mpoly_clear(Flint_f,ctx);
+      nmod_mpoly_ctx_clear(ctx);
       #else
-      factoryError ("multivariate factorization depends on NTL(missing)");
+      factoryError ("multivariate factorization depends on NTL/FLINT(missing)");
       return CFFList (CFFactor (f, 1));
       #endif
@@ -616 +649 @@
     else // multivariate,  char 0
     {
-      #ifdef HAVE_NTL
+      #if 0 //defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20700)
       On (SW_RATIONAL);
+      fmpq_mpoly_ctx_t ctx;
+      fmpq_mpoly_ctx_init(ctx,f.level(),ORD_LEX);
+      fmpq_mpoly_t Flint_f;
+      fmpq_mpoly_init(Flint_f,ctx);
+      convFactoryPFlintMP(fz,Flint_f,ctx,fz.level());
+      fmpq_mpoly_factor_t factors;
+      fmpq_mpoly_factor_init(factors,ctx);
+      int rr;
+      if (issqrfree) rr=fmpq_mpoly_factor_squarefree(factors,Flint_f,ctx);
+      else           rr=fmpq_mpoly_factor(factors,Flint_f,ctx);
+      if (rr==0) printf("fail\n");
+      fmpq_mpoly_t fac;
+      fmpq_mpoly_init(fac,ctx);
+      CanonicalForm cf_fac;
+      int cf_exp;
+      fmpq_t c;
+      fmpq_init(c);
+      fmpq_mpoly_factor_get_constant_fmpq(c,factors,ctx);
+      cf_fac=convertFmpq2CF(c);
+      fmpq_clear(c);
+      if (!cf_fac.isOne()) F.append(CFFactor(cf_fac,1));
+      for(int i=fmpq_mpoly_factor_length(factors,ctx)-1; i>=0; i--)
+      {
+         fmpq_mpoly_factor_get_base(fac,factors,i,ctx);
+         cf_fac=convFlintMPFactoryP(fac,ctx,f.level());
+         cf_exp=fmpq_mpoly_factor_get_exp_si(factors,i,ctx);
+         F.append(CFFactor(cf_fac,cf_exp));
+      }
+      fmpq_mpoly_factor_clear(factors,ctx);
+      fmpq_mpoly_clear(Flint_f,ctx);
+      fmpq_mpoly_ctx_clear(ctx);
+      #elif defined(HAVE_NTL)
       if (issqrfree)
       {
+        On (SW_RATIONAL);
         CFList factors= ratSqrfFactorize (fz);
         for (CFListIterator i= factors; i.hasItem(); i++)