Changeset fff1bf in git for libpolys

Timestamp:

Mar 31, 2022, 2:19:28 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

03e31554a5f308d79b80ade9e36dd826ddb61c08

Parents:

c808198eb3569c6fecf1ebaacef81b08e8aea4ff

Message:

opt: p_Norm for Zp

File:

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

libpolys/polys/monomials/p_polys.cc

@@ -3797 +3797 @@
 void p_Norm(poly p1, const ring r)
 {
-  if (rField_is_Ring(r))
+  if (LIKELY(rField_is_Ring(r)))
   {
     if(!n_GreaterZero(pGetCoeff(p1),r->cf)) p1 = p_Neg(p1,r);
@@ -3803 +3803 @@
     // Werror("p_Norm not possible in the case of coefficient rings.");
   }
-  else if (p1!=NULL)
-  {
-    if (pNext(p1)==NULL)
+  else if (LIKELY(p1!=NULL))
+  {
+    if (UNLIKELY(pNext(p1)==NULL))
     {
       p_SetCoeff(p1,n_Init(1,r->cf),r);
@@ -3812 +3812 @@
     if (!n_IsOne(pGetCoeff(p1),r->cf))
     {
-      number k, c;
-      n_Normalize(pGetCoeff(p1),r->cf);
-      k = pGetCoeff(p1);
-      c = n_Init(1,r->cf);
-      pSetCoeff0(p1,c);
+      number k = pGetCoeff(p1);
+      pSetCoeff0(p1,n_Init(1,r->cf));
       poly h = pNext(p1);
-      if (rField_is_Zp(r))
+      if (LIKELY(rField_is_Zp(r)))
       {
         if (r->cf->ch>32003)
@@ -3825 +3822 @@
           while (h!=NULL)
           {
-            c=n_Mult(pGetCoeff(h),inv,r->cf);
+            number c=n_Mult(pGetCoeff(h),inv,r->cf);
             // no need to normalize
             p_SetCoeff(h,c,r);
@@ -3836 +3833 @@
           while (h!=NULL)
           {
-            c=n_Div(pGetCoeff(h),k,r->cf);
+            number c=n_Div(pGetCoeff(h),k,r->cf);
             // no need to normalize
             p_SetCoeff(h,c,r);
@@ -3845 +3842 @@
       else if(getCoeffType(r->cf)==n_algExt)
       {
+        n_Normalize(k,r->cf);
         number inv=n_Invers(k,r->cf);
         while (h!=NULL)
         {
-          c=n_Mult(pGetCoeff(h),inv,r->cf);
+          number c=n_Mult(pGetCoeff(h),inv,r->cf);
           // no need to normalize
-          // normalize already in nMult: Zp_a
+          // normalize already in nMult: Zp_a, Q_a
           p_SetCoeff(h,c,r);
           pIter(h);
         }
         n_Delete(&inv,r->cf);
+        n_Delete(&k,r->cf);
       }
       else
       {
+        n_Normalize(k,r->cf);
         while (h!=NULL)
         {
-          c=n_Div(pGetCoeff(h),k,r->cf);
+          number c=n_Div(pGetCoeff(h),k,r->cf);
           // no need to normalize: Z/p, R
-          // normalize already in nDiv: Q_a
           // remains: Q
-          if (rField_is_Q(r) && (!n_IsOne(c,r->cf))) n_Normalize(c,r->cf);
+          if (rField_is_Q(r)) n_Normalize(c,r->cf);
           p_SetCoeff(h,c,r);
           pIter(h);
         }
-      }
-      n_Delete(&k,r->cf);
+        n_Delete(&k,r->cf);
+      }
     }
     else