Changeset 58603f in git for factory/FLINTconvert.cc

Timestamp:

Aug 4, 2019, 9:34:39 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2f9e3f171a90f561e7a3c81734eb72998dc8fe82

Parents:

112c79d4f91036791f523bcfbb261d1ba63c2d8f557b878dd8c840afb5ec95de122ba27a0ec99926

Message:

Merge branch 'spielwiese' into machine_learning

File:

• factory/FLINTconvert.cc (modified) (9 diffs)

factory/FLINTconvert.cc

@@ -163 +163 @@
   if (f.isImm ())
   {
-    fmpz_set_si (fmpq_numref (result), f.intval());
-    fmpz_set_si (fmpq_denref (result), 1);
+    fmpq_set_si (result, f.intval(), 1);
   }
   else if(f.inQ())
@@ -182 +181 @@
     fmpz_set_mpz (fmpq_numref (result), gmp_val);
     mpz_clear (gmp_val);
-    fmpz_set_si (fmpq_denref (result), 1);
+    fmpz_one(fmpq_denref(result));
   }
   else
@@ -574 +573 @@
   else
   {
-    int c=f.intval();
-    if (c<0) c+=getCharacteristic();
+    int c=f.intval(); // with Off(SW_SYMMETRIC_FF): 0<=c<p
     nmod_mpoly_push_term_ui_ui(result,c,exp,ctx);
   }
@@ -608 +606 @@
   ulong * exp = (ulong*)Alloc(N*sizeof(ulong));
   memset(exp,0,N*sizeof(ulong));
+  bool save_sym_ff= isOn (SW_SYMMETRIC_FF);
+  if (save_sym_ff) Off (SW_SYMMETRIC_FF);
   convFlint_RecPP( f, exp, res, ctx, N );
+  if (save_sym_ff) On(SW_SYMMETRIC_FF);
   Free(exp,N*sizeof(ulong));
 }
@@ -692 +693 @@
   convFactoryPFlintMP(F,f,ctx,N);
   convFactoryPFlintMP(G,g,ctx,N);
-  nmod_mpoly_init3(res,lF+lG,bits+1,ctx);
+  nmod_mpoly_init(res,ctx);
   nmod_mpoly_mul(res,f,g,ctx);
   nmod_mpoly_clear(g,ctx);
@@ -713 +714 @@
   convFactoryPFlintMP(F,f,ctx,N);
   convFactoryPFlintMP(G,g,ctx,N);
-  fmpq_mpoly_init3(res,lF+lG,bits+1,ctx);
+  fmpq_mpoly_init(res,ctx);
   fmpq_mpoly_mul(res,f,g,ctx);
   fmpq_mpoly_clear(g,ctx);
@@ -737 +738 @@
   convFactoryPFlintMP(F,f,ctx,N);
   convFactoryPFlintMP(G,g,ctx,N);
-  nmod_mpoly_init3(res,lf,bits,ctx);
+  nmod_mpoly_init(res,ctx);
   int ok=nmod_mpoly_gcd(res,f,g,ctx);
   nmod_mpoly_clear(g,ctx);
@@ -750 +751 @@
   return RES;
 }
+
+static CanonicalForm b_content ( const CanonicalForm & f )
+{
+    if ( f.inCoeffDomain() )
+        return f;
+    else
+    {
+        CanonicalForm result = 0;
+        CFIterator i;
+        for ( i = f; i.hasTerms() && (!result.isOne()); i++ )
+            result=bgcd( b_content(i.coeff()) , result );
+        return result;
+    }
+}
+
 
 CanonicalForm gcdFlintMP_QQ(const CanonicalForm& F, const CanonicalForm& G)
@@ -779 +795 @@
     }
     RES=convFlintMPFactoryP(res,ctx,N);
+    // gcd(2x,4x) should be 2x, so RES should also have the gcd(lc(F),lc(G))
+    RES*=bgcd(b_content(F),b_content(G));
   }
   fmpq_mpoly_clear(res,ctx);