[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 256fdf95ea6bd144730d5e784534550fdfcad663
Author: Martin Lee <martinlee84 at web.de>
Date:   Thu Mar 22 15:51:23 2012 +0100

    chg: set interface back to official FLINT 2.3.alpha2

diff --git a/factory/FLINTconvert.cc b/factory/FLINTconvert.cc
index 16f6c27..18f26a4 100644
--- a/factory/FLINTconvert.cc
+++ b/factory/FLINTconvert.cc
@@ -265,9 +265,9 @@ convertFLINTnmod_poly_factor2FacCFFList (nmod_poly_factor_t fac,
 
   long i;
 
-  for (i = 0; i < fac->num; i++)
-    result.append (CFFactor (convertnmod_poly_t2FacCF ((nmod_poly_t &)fac->p[i],x),
-                             fac->exp[i]));
+  for (i = 0; i < fac->num_factors; i++)
+    result.append (CFFactor (convertnmod_poly_t2FacCF ((nmod_poly_t &)fac->factors[i],x),
+                             fac->exponents[i]));
   return result;
 }
 
diff --git a/factory/facMul.cc b/factory/facMul.cc
index 7ff5704..57fda94 100644
--- a/factory/facMul.cc
+++ b/factory/facMul.cc
@@ -568,7 +568,7 @@ modNTL (const CanonicalForm& F, const CanonicalForm& G, const modpk& b)
         fmpz_mod_poly_t FLINTF, FLINTG;
         convertFacCF2Fmpz_mod_poly_t (FLINTF, F, FLINTpk);
         convertFacCF2Fmpz_mod_poly_t (FLINTG, G, FLINTpk);
-        fmpz_mod_poly_rem (FLINTF, FLINTF, FLINTG);
+        fmpz_mod_poly_divrem (FLINTG, FLINTF, FLINTF, FLINTG);
         CanonicalForm result= convertFmpz_mod_poly_t2FacCF (FLINTF,F.mvar(),b);
         fmpz_mod_poly_clear (FLINTG);
         fmpz_mod_poly_clear (FLINTF);
@@ -2850,7 +2850,7 @@ uniFdivides (const CanonicalForm& A, const CanonicalForm& B)
     nmod_poly_t FLINTA, FLINTB;
     convertFacCF2nmod_poly_t (FLINTA, A);
     convertFacCF2nmod_poly_t (FLINTB, B);
-    nmod_poly_rem (FLINTA, FLINTB, FLINTA);
+    nmod_poly_divrem (FLINTB, FLINTA, FLINTB, FLINTA);
     bool result= nmod_poly_is_zero (FLINTA);
     nmod_poly_clear (FLINTA);
     nmod_poly_clear (FLINTB);

-- 
an open source computer algebra system