Changeset 4a01eb in git

Timestamp:

Jul 4, 2019, 4:41:57 PM (5 years ago)

Author:

tthsqe12 <tthsqe12@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

a2ed8d68de2b01b51593ba6669b4af9cf437a407

Parents:

c7893eaae5e03161f0de3f3034ab79ed675510fe

Message:

use push terms instead of set coeff

File:

• libpolys/polys/flint_mpoly.cc (modified) (6 diffs)

libpolys/polys/flint_mpoly.cc

@@ -39 +39 @@
 void convSingPFlintMP(fmpq_mpoly_t res, fmpq_mpoly_ctx_t ctx, poly p, int lp, const ring r)
 {
-  int bits=SI_LOG2(r->bitmask);
-  fmpq_mpoly_init3(res,lp,bits,ctx);
-  fmpq_mpoly_resize(res,lp,ctx);
+  fmpq_mpoly_init2(res, lp, ctx);
   ulong* exp=(ulong*)omAlloc((r->N+1)*sizeof(ulong));
-  int i=0;
   while(p!=NULL)
   {
@@ -51 +48 @@
     #if SIZEOF_LONG==8
     p_GetExpVL(p,(int64*)exp,r);
-    fmpq_mpoly_set_term_exp_ui(res,i,exp,ctx);
+    fmpq_mpoly_push_term_fmpq_ui(res, c, exp, ctx);
     #else
     p_GetExpV(p,(int*)exp,r);
-    fmpq_mpoly_set_term_exp_ui(res,i,&(exp[1]),ctx);
-    #endif
-    fmpq_mpoly_set_term_coeff_fmpq(res,i,c,ctx);
+    fmpq_mpoly_push_term_fmpq_ui(res, c, &(exp[1]), ctx);
+    #endif
     fmpq_clear(c);
-    i++;
     pIter(p);
   }
-  //fmpq_mpoly_print_pretty(res,r->names,ctx);PrintLn();
+  fmpq_mpoly_reduce(res, ctx); // extra step for QQ ensures res has content canonically factored out
   omFreeSize(exp,(r->N+1)*sizeof(ulong));
 }
@@ -111 +106 @@
   return pres;
 }
+
 BOOLEAN convSingRFlintR(nmod_mpoly_ctx_t ctx, const ring r)
 {
@@ -158 +154 @@
 void convSingPFlintMP(nmod_mpoly_t res, nmod_mpoly_ctx_t ctx, poly p, int lp,const ring r)
 {
-  int bits=SI_LOG2(r->bitmask);
-  nmod_mpoly_init3(res,lp,bits,ctx);
-  nmod_mpoly_resize(res,lp,ctx);
+  nmod_mpoly_init2(res, lp, ctx);
   ulong* exp=(ulong*)omAlloc((r->N+1)*sizeof(ulong));
-  int i=0;
   while(p!=NULL)
   {
@@ -168 +161 @@
     #if SIZEOF_LONG==8
     p_GetExpVL(p,(int64*)exp,r);
-    nmod_mpoly_set_term_exp_ui(res,i,exp,ctx);
+    nmod_mpoly_push_term_ui_ui(res, (ulong)n, exp, ctx);
     #else
     p_GetExpV(p,(int*)exp,r);
-    nmod_mpoly_set_term_exp_ui(res,i,&(exp[1]),ctx);
-    #endif
-    nmod_mpoly_set_term_coeff_ui(res,i,(ulong)n,ctx);
-    i++;
+    nmod_mpoly_push_term_ui_ui(res, (ulong)n, &(exp[1]), ctx);
+    #endif
     pIter(p);
   }
-  //nmod_mpoly_print_pretty(res,r->names,ctx);PrintLn();
   omFreeSize(exp,(r->N+1)*sizeof(ulong));
 }
@@ -197 +187 @@
   return pres;
 }
+
 poly Flint_GCD_MP(poly p,int lp,poly q,int lq,nmod_mpoly_ctx_t ctx,const ring r)
 {