Changeset 2878a0 in git

Timestamp:

Jan 25, 2021, 1:42:29 PM (2 years ago)

Author:

Daniel Schultz <tthsqe12@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a4240a2134ce068c6a739e2f0dbc245af4ad8497

Parents:

d854d7ee2faa25bc4e7476b6668602d7f4f39384

git-author:

Daniel Schultz <tthsqe12@gmail.com>2021-01-25 13:42:29+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-01-26 11:36:58+01:00

Message:

fix zero divisor bug

File:

• factory/facHensel.cc (modified) (8 diffs)

factory/facHensel.cc

@@ -161 +161 @@
   CanonicalForm inv, leadingCoeff= Lc (F);
   CFListIterator i= bufFactors;
+
+  result = CFList();    // empty the list before writing into it?!
+
   if (bufFactors.getFirst().inCoeffDomain())
   {
@@ -789 +792 @@
   CFList recResult;
   CanonicalForm modMipo, mipo;
+#if HAVE_NTL
+  // no variables for ntl
+#else
+  fmpz_t bigpk;
+  fq_ctx_t fqctx;
+  fq_poly_t FLINTS, FLINTT, FLINTbuf3, FLINTbuf1, FLINTbuf2;
+  fq_t fcheck;
+#endif
+
   //here SW_RATIONAL is off
   On (SW_RATIONAL);
@@ -810 +822 @@
     if (fail)
     {
+next_prime:
       int i= 0;
-      while (cf_getBigPrime (i) < p)
+      while (cf_getBigPrime (i) <= p)
         i++;
       findGoodPrime (F, i);
@@ -874 +887 @@
   result.append (b (convertNTLZZ_pEX2CF (NTLS, x, gamma)));
   result.append (b (convertNTLZZ_pEX2CF (NTLT, x, gamma)));
-#else   // flint
-  fmpz_t bigpk;
-  fq_ctx_t fqctx;
-  fmpz_mod_poly_t FLINTmipo;
-  fq_poly_t FLINTS, FLINTT, FLINTbuf3, FLINTbuf1, FLINTbuf2;
-  fq_t fcheck;
+#else // HAVE_FLINT
 
   fmpz_init(bigpk); // does convert expect an initalized object?
   convertCF2Fmpz(bigpk, b.getpk());
-
+  fmpz_mod_poly_t FLINTmipo;
   convertFacCF2Fmpz_mod_poly_t(FLINTmipo, getMipo(gamma), bigpk);
-
 #if __FLINT_RELEASE >= 20700
   fmpz_mod_ctx_t bigpk_ctx;
@@ -891 +898 @@
   fq_ctx_init_modulus(fqctx, FLINTmipo, bigpk_ctx, "Z");
   fmpz_mod_ctx_clear(bigpk_ctx);
+  fmpz_mod_poly_clear(FLINTmipo, bigpk_ctx);
 #else
   fq_ctx_init_modulus(fqctx, FLINTmipo, "Z");
+  fmpz_mod_poly_clear(FLINTmipo);
 #endif
 
@@ -908 +917 @@
   if (!fq_is_one(fcheck, fqctx))
   {
-    printf("factory error: non-invertible element encountered\n");
-    abort();
+    fmpz_clear(bigpk);
+    fq_clear(fcheck, fqctx);
+    fq_poly_clear(FLINTS, fqctx);
+    fq_poly_clear(FLINTT, fqctx);
+    fq_poly_clear(FLINTbuf3, fqctx);
+    fq_poly_clear(FLINTbuf1, fqctx);
+    fq_poly_clear(FLINTbuf2, fqctx);
+    fq_ctx_clear(fqctx);
+    setReduce (alpha, false);
+    fail = true;
+    goto next_prime;
   }
 
@@ -928 +946 @@
     XGCD (NTLbuf3, NTLS, NTLT, NTLbuf3, convertFacCF2NTLZZ_pEX (buf1, NTLmipo));
     S= convertNTLZZ_pEX2CF (NTLS, x, gamma);
-#else // HAVE_FLINT
+#else
     fq_poly_clear(FLINTbuf1, fqctx); //convert expects uninitialized!
     convertFacCF2Fq_poly_t(FLINTbuf1, buf1, fqctx);
@@ -935 +953 @@
     if (!fq_is_one(fcheck, fqctx))
     {
-      printf("factory error: non-invertible element encountered\n");
-      abort();
+      fmpz_clear(bigpk);
+      fq_clear(fcheck, fqctx);
+      fq_poly_clear(FLINTS, fqctx);
+      fq_poly_clear(FLINTT, fqctx);
+      fq_poly_clear(FLINTbuf3, fqctx);
+      fq_poly_clear(FLINTbuf1, fqctx);
+      fq_poly_clear(FLINTbuf2, fqctx);
+      fq_ctx_clear(fqctx);
+      setReduce (alpha, false);
+      fail = true;
+      goto next_prime;
     }