Changeset f489c7b in git for libpolys/polys/monomials/p_polys.cc

Timestamp:

Feb 27, 2018, 5:37:19 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'd0474371d8c5d8068ab70bfb42719c97936b18a6')

Children:

dab4204fd4f4fe227449dacf9c07d0f7f036bdd8

Parents:

617c8e724541d5f5c39e8ee6708e0e2d8905d332

Message:

opt: p_Content

File:

• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -624 +624 @@
       case ringorder_am:
         b1=si_min(b1,r->N);
-        /* no break, continue as ringorder_a*/
+        /* no break, continue as ringorder_a*/
       case ringorder_a:
         for (k=b0 /*r->block0[i]*/;k<=b1 /*r->block1[i]*/;k++)
@@ -2239 +2239 @@
 {
   if (ph==NULL) return;
+  const coeffs cf=r->cf;
   if (pNext(ph)==NULL)
   {
-    p_SetCoeff(ph,n_Init(1,r->cf),r);
-  }
-  if (r->cf->cfSubringGcd==ndGcd) /* trivial gcd*/ return;
+    p_SetCoeff(ph,n_Init(1,cf),r);
+  }
+  if (cf->cfSubringGcd==ndGcd) /* trivial gcd*/ return;
   number h=p_InitContent(ph,r); /* first guess of a gcd of all coeffs */
-  poly p=ph;
+  poly p;
+  if(n_IsOne(h,cf))
+  {
+    goto content_finish;
+  }
+  p=ph;
   // take the SubringGcd of all coeffs
   while (p!=NULL)
   {
-    n_Normalize(pGetCoeff(p),r->cf);
-    number d=n_SubringGcd(h,pGetCoeff(p),r->cf);
-    n_Delete(&h,r->cf);
+    n_Normalize(pGetCoeff(p),cf);
+    number d=n_SubringGcd(h,pGetCoeff(p),cf);
+    n_Delete(&h,cf);
     h = d;
-    if(n_IsOne(h,r->cf))
-    {
-      break;
+    if(n_IsOne(h,cf))
+    {
+      goto content_finish;
     }
     pIter(p);
   }
-  // if foundi<>1, divide by it
-  if(!n_IsOne(h,r->cf))
-  {
-    p = ph;
-    while (p!=NULL)
-    {
-      number d = n_ExactDiv(pGetCoeff(p),h,r->cf);
-      p_SetCoeff(p,d,r);
-      pIter(p);
-    }
-  }
+  // if found<>1, divide by it
+  p = ph;
+  while (p!=NULL)
+  {
+    number d = n_ExactDiv(pGetCoeff(p),h,cf);
+    p_SetCoeff(p,d,r);
+    pIter(p);
+  }
+content_finish:
   n_Delete(&h,r->cf);
   // and last: check leading sign: