Changeset 3d5b277 in git for libpolys/polys/operations/p_Mult_q.cc

Timestamp:

Jul 25, 2019, 1:23:11 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

35a153cf7acb82519d52d0b74581e9a193d15765

Parents:

c9824e54c705dcaedb3b991c6bf81f9f974e758d3f94cbdb24129f0002a999ab5fb63a34f0fc933d

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-07-25 13:23:11+02:00

git-committer:

GitHub <noreply@github.com>2019-07-25 13:23:11+02:00

Message:

Merge pull request #945 from tthsqe12/let_flint_borrow

let flint borrow large integer coeffs in some cases

File:

• libpolys/polys/operations/p_Mult_q.cc (modified) (5 diffs)

libpolys/polys/operations/p_Mult_q.cc

@@ -67 +67 @@
 }
 
+static void pqLengthApprox(poly p, poly q, int &lp, int &lq, const int min)
+{
+  int l = 0;
+
+  do
+  {
+    if (p == NULL)
+    {
+      lp=l;
+      lq=l+(q!=NULL);
+      return;
+    }
+    if (q == NULL) /* && p!=NULL */
+    {
+      lp=l+1;
+      lq=l;
+      return;
+    }
+    if (l>min) /* && p,q!=NULL */
+    {
+      lp=l; lq=l;
+      return;
+    }
+    pIter(p);
+    pIter(q);
+    l++;
+  }
+  while (1);
+}
+
 
 static poly _p_Mult_q_Bucket(poly p, const int lp,
@@ -290 +320 @@
   poly pt;
 
-  pqLength(p, q, lp, lq, MIN_LENGTH_FACTORY);
+  // MIN_LENGTH_FACTORY must be >= MIN_LENGTH_FACTORY_QQ, MIN_FLINT_QQ, MIN_FLINT_Zp 20
+  pqLengthApprox(p, q, lp, lq, MIN_LENGTH_FACTORY);
 
   if (lp < lq)
@@ -309 +340 @@
     if (pure_polys && rField_is_Q(r) && !convSingRFlintR(ctx,r))
     {
-      lp=pLength(p);
-      //printf("mul in flint\n");
-      poly res=Flint_Mult_MP(p,lp,q,lq,ctx,r);
+      // lq is a lower bound for the length of p and  q
+      poly res=Flint_Mult_MP(p,lq,q,lq,ctx,r);
       if (!copy)
       {
@@ -325 +355 @@
     if (pure_polys && rField_is_Zp(r) && !convSingRFlintR(ctx,r))
     {
-      lp=pLength(p);
-      //printf("mul in flint\n");
-      poly res=Flint_Mult_MP(p,lp,q,lq,ctx,r);
+      // lq is a lower bound for the length of p and  q
+      poly res=Flint_Mult_MP(p,lq,q,lq,ctx,r);
       if (!copy)
       {
@@ -357 +386 @@
   {
     lp=pLength(p);
-    assume(lq == pLength(q));
+    lq=pLength(q);
     return _p_Mult_q_Bucket(p, lp, q, lq, copy, r);
   }