Changeset 249d81 in git

Timestamp:

Jul 7, 2020, 12:52:39 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

914b60371b89ca64f4de49c2623ae8ed3cbe48b9d0adb23686023dffa37da6380408f9f10d314ae4

Parents:

2570f085de2f12e59dac4ee40e02b9172adb8559

Message:

factory: suppoirt FLINT 2.5.2

Location:

factory

Files:

• FLINTconvert.cc (modified) (2 diffs)
• cf_map_ext.cc (modified) (8 diffs)

factory/FLINTconvert.cc

@@ -384 +384 @@
   bool save_sym_ff= isOn (SW_SYMMETRIC_FF);
   if (save_sym_ff) Off (SW_SYMMETRIC_FF);
+  #if __FLINT_RELEASE >= 20503
   nmod_poly_t res;
   nmod_poly_init(res,getCharacteristic());
+  #endif
   for (CFIterator i= f; i.hasTerms(); i++)
   {
@@ -399 +401 @@
     {
       STICKYASSERT (i.exp() <= fq_nmod_ctx_degree(ctx), "convertFacCF2Fq_nmod_t: element is not reduced");
+      #if __FLINT_RELEASE >= 20503
       nmod_poly_set_coeff_ui (res, i.exp(), c.intval());
-    }
-  }
+      #else
+      nmod_poly_set_coeff_ui (result, i.exp(), c.intval());
+      #endif
+    }
+  }
+  #if __FLINT_RELEASE >= 20503
   fq_nmod_init(result,ctx);
   fq_nmod_set_nmod_poly(result,res,ctx);
+  #endif
   if (save_sym_ff) On (SW_SYMMETRIC_FF);
 }

factory/cf_map_ext.cc

@@ -352 +352 @@
   int d= degree (mipo);
   int p= getCharacteristic ();
-  #ifdef HAVE_FLINT
+  #if defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20503)
   nmod_poly_t FLINT_mipo;
   nmod_poly_init(FLINT_mipo,p);
@@ -369 +369 @@
   do
   {
-    #ifdef HAVE_FLINT
+    #if defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20503)
     nmod_poly_randtest_monic_irreducible(FLINT_mipo, FLINTrandom, d+1);
     mipo2=convertnmod_poly_t2FacCF(FLINT_mipo,Variable(1));
@@ -386 +386 @@
       return 0;
   } while (1);
-  #ifdef HAVE_FLINT
+  #if defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20503)
   nmod_poly_clear(FLINT_mipo);
   // convert alpha_mipo
@@ -451 +451 @@
     CanonicalForm primElemMipo= findMinPoly (primElem, alpha);
     int p= getCharacteristic ();
-    #ifdef HAVE_FLINT
+    #if defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20503)
     // convert mipo1
     nmod_poly_t mipo1;
@@ -505 +505 @@
   }
   int p= getCharacteristic ();
-  #ifdef HAVE_FLINT
+  #if defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20503)
   // convert mipo
   nmod_poly_t mipo1;
@@ -576 +576 @@
 }
 
-#ifdef HAVE_FLINT
+#if defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20503)
 /*
     g is in Fp[x]
@@ -631 +631 @@
   ASSERT (F.isUnivariate() && F.mvar()==alpha,"expected element of F_p(alpha)");
 
-  #if defined(HAVE_NTL) && !defined(HAVE_FLINT)
-  if (fac_NTL_char != getCharacteristic())
-  {
-    fac_NTL_char= getCharacteristic();
-    zz_p::init (getCharacteristic());
-  }
-  zz_pX NTLF= convertFacCF2NTLzzpX (F);
-  int d= degree (getMipo (alpha));
-
-  zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo(alpha));
-  zz_pE::init (NTLMipo);
-  vec_zz_p pows;
-  pows.SetLength (2*d);
-
-  zz_pE powNTLF;
-  set (powNTLF);
-  zz_pE NTLFE= to_zz_pE (NTLF);
-  zz_pX buf;
-  for (int i= 0; i < 2*d; i++)
-  {
-    buf= rep (powNTLF);
-    buf.rep.SetLength (d);
-    pows [i]= buf.rep[0];
-    powNTLF *= NTLFE;
-  }
-
-  zz_pX NTLMinPoly;
-  MinPolySeq (NTLMinPoly, pows, d);
-
-  return convertNTLzzpX2CF (NTLMinPoly, Variable (1));
-  #elif defined(HAVE_FLINT)
+  #if defined(HAVE_FLINT) && (__FLINT_RELEASE >= 20503)
   nmod_poly_t FLINT_F,FLINT_alpha,g;
   nmod_poly_init(g,getCharacteristic());
@@ -672 +642 @@
   nmod_poly_clear(g);
   return res;
+  #elif defined(HAVE_NTL)
+  if (fac_NTL_char != getCharacteristic())
+  {
+    fac_NTL_char= getCharacteristic();
+    zz_p::init (getCharacteristic());
+  }
+  zz_pX NTLF= convertFacCF2NTLzzpX (F);
+  int d= degree (getMipo (alpha));
+
+  zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo(alpha));
+  zz_pE::init (NTLMipo);
+  vec_zz_p pows;
+  pows.SetLength (2*d);
+
+  zz_pE powNTLF;
+  set (powNTLF);
+  zz_pE NTLFE= to_zz_pE (NTLF);
+  zz_pX buf;
+  for (int i= 0; i < 2*d; i++)
+  {
+    buf= rep (powNTLF);
+    buf.rep.SetLength (d);
+    pows [i]= buf.rep[0];
+    powNTLF *= NTLFE;
+  }
+
+  zz_pX NTLMinPoly;
+  MinPolySeq (NTLMinPoly, pows, d);
+
+  return convertNTLzzpX2CF (NTLMinPoly, Variable (1));
   #endif
 }