Changeset 9e20b9f in git

Timestamp:

Jul 5, 2020, 4:13:40 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

d6c852edab73f91c0b7fd573de9f4cb9c4880d7bf8d27e1651a82b4063c80d3de252b7aee270308f

Parents:

89005e409e564feafbec751f5c65109638c47368

Message:

ichange order: better readability

File:

• factory/facFqBivar.cc (modified) (2 diffs)

factory/facFqBivar.cc

@@ -805 +805 @@
 Variable chooseExtension (const Variable & alpha, const Variable& beta, int k)
 {
-  #if defined(HAVE_FLINT)
-  nmod_poly_t Irredpoly;
-  nmod_poly_init(Irredpoly,getCharacteristic());
-  #elif defined(HAVE_NTL)
-  if (fac_NTL_char != getCharacteristic())
-  {
-    fac_NTL_char= getCharacteristic();
-    zz_p::init (getCharacteristic());
-  }
-  zz_pX NTLIrredpoly;
-  #endif
   int i=1, m= 2;
   // extension of F_p needed
@@ -839 +828 @@
   }
   #if defined(HAVE_FLINT)
+  nmod_poly_t Irredpoly;
+  nmod_poly_init(Irredpoly,getCharacteristic());
   nmod_poly_randtest_monic_irreducible(Irredpoly,FLINTrandom,i*m+1);
   CanonicalForm newMipo= convertnmod_poly_t2FacCF(Irredpoly,Variable (1));
   #elif defined(HAVE_NTL)
+  if (fac_NTL_char != getCharacteristic())
+  {
+    fac_NTL_char= getCharacteristic();
+    zz_p::init (getCharacteristic());
+  }
+  zz_pX NTLIrredpoly;
   BuildIrred (NTLIrredpoly, i*m);
   CanonicalForm newMipo= convertNTLzzpX2CF (NTLIrredpoly, Variable (1));