Changeset e6f1e6 in git for libpolys

Timestamp:

May 17, 2016, 5:26:29 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6f203b6a99801e807e56ef784f79d4951204b9e5

Parents:

f8fb93d1bc922d1e97207d1d5b347fe1db1eedcf

Message:

code cleanup: HAVE_RINGS is mostly not needed

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (2 diffs)
• polys/kbuckets.cc (modified) (5 diffs)
• polys/monomials/p_polys.cc (modified) (11 diffs)
• polys/monomials/p_polys.h (modified) (1 diff)
• polys/monomials/ring.cc (modified) (2 diffs)
• polys/operations/p_Mult_q.cc (modified) (1 diff)
• polys/simpleideals.cc (modified) (5 diffs)

libpolys/coeffs/coeffs.h

@@ -744 +744 @@
 
 // Tests:
+#ifdef HAVE_RINGS
 static FORCE_INLINE BOOLEAN nCoeff_is_Ring_2toM(const coeffs r)
 { assume(r != NULL); return (getCoeffType(r)==n_Z2m); }
@@ -758 +759 @@
 static FORCE_INLINE BOOLEAN nCoeff_is_Ring(const coeffs r)
 { assume(r != NULL); return (r->is_field==0); }
+#else
+#define nCoeff_is_Ring_2toM(A) 0
+#define nCoeff_is_Ring_ModN(A) 0
+#define nCoeff_is_Ring_PtoM(A) 0
+#define nCoeff_is_Ring_Z(A)    0
+#define nCoeff_is_Ring(A)      0
+#endif
 
 /// returns TRUE, if r is a field or r has no zero divisors (i.e is a domain)

libpolys/polys/kbuckets.cc

@@ -588 +588 @@
       if (i<coef_start)
         bucket->buckets[i] = p_Mult_nn(bucket->buckets[i], n, r);
-#ifdef HAVE_RINGS
         /* Frank Seelisch on March 11, 2010:
            This looks a bit strange: The following "if" is indented
@@ -601 +600 @@
           kBucketAdjust(bucket, i);
         }
-#endif
       else
       if (bucket->coef[i]!=NULL)
@@ -613 +611 @@
 #else
       bucket->buckets[i] = p_Mult_nn(bucket->buckets[i], n, r);
-#ifdef HAVE_RINGS
       if (rField_is_Ring(r) && !(rField_is_Domain(r)))
       {
@@ -619 +616 @@
         kBucketAdjust(bucket, i);
       }
-#endif
 #endif
     }
@@ -719 +715 @@
   i = pLogLength(l1);
 
-#if defined(HAVE_RINGS)||defined(HAVE_PLURAL)
+#if defined(HAVE_PLURAL)
   if ((rField_is_Ring(r) && !(rField_is_Domain(r)))
   ||(rIsPluralRing(r)))

libpolys/polys/monomials/p_polys.cc

@@ -1221 +1221 @@
 
 /*2
-*test if a monomial /head term is a pure power
+*test if a monomial /head term is a pure power,
+* i.e. depends on only one variable
 */
 int p_IsPurePower(const poly p, const ring r)
 {
-#ifdef HAVE_RINGS
-  if (rField_is_Ring(r))
-          {
-          if (p == NULL) return 0;
-          if (!n_IsUnit(pGetCoeff(p), r->cf)) return 0;
-          }
-#endif
   int i,k=0;
 
@@ -2184 +2178 @@
           }
           if ((pNext(rc) != NULL)
-#ifdef HAVE_RINGS
              || rField_is_Ring(r)
-#endif
              )
             return p_Pow(p,i,r);
@@ -2230 +2222 @@
 
 
-#ifdef HAVE_RINGS
   if (rField_is_Ring(r))
   {
@@ -2255 +2246 @@
     return;
   }
-#endif
   number h,d;
   poly p;
@@ -2733 +2723 @@
   number d, h;
 
-#ifdef HAVE_RINGS
   if (rField_is_Ring(r))
   {
@@ -2740 +2729 @@
     return p;
   }
-#endif
 
   if (rField_is_Zp(r) && TEST_OPT_INTSTRATEGY)
@@ -3028 +3016 @@
   poly p;
 
-#ifdef HAVE_RINGS
   if (rField_is_Ring(r))
   {
@@ -3036 +3023 @@
     return;
   }
-#endif
 
   if (rField_is_Zp(r) && TEST_OPT_INTSTRATEGY)
@@ -3577 +3563 @@
 void p_Norm(poly p1, const ring r)
 {
-#ifdef HAVE_RINGS
   if (rField_is_Ring(r))
   {
@@ -3583 +3568 @@
     // Werror("p_Norm not possible in the case of coefficient rings.");
   }
-  else
-#endif
-  if (p1!=NULL)
+  else if (p1!=NULL)
   {
     if (pNext(p1)==NULL)
@@ -4395 +4378 @@
   if (pLength(p1) != pLength(p2))
     return FALSE;
-#ifdef HAVE_RINGS
   if (rField_is_Ring(r))
   {
     if (!n_DivBy(p_GetCoeff(p1, r), p_GetCoeff(p2, r), r)) return FALSE;
   }
-#endif
   n=n_Div(p_GetCoeff(p1,r),p_GetCoeff(p2,r),r);
   while ((p1 != NULL) /*&& (p2 != NULL)*/)

libpolys/polys/monomials/p_polys.h

@@ -1807 +1807 @@
 {
   if (p == NULL) return FALSE;
-#ifdef HAVE_RINGS
   if (rField_is_Ring(r))
     return (p_LmIsConstant(p, r) && n_IsUnit(pGetCoeff(p),r->cf));
-#endif
   return p_LmIsConstant(p, r);
 }

libpolys/polys/monomials/ring.cc

@@ -3375 +3375 @@
   if ( (r->cf->extRing!=NULL)
       || rField_is_Q(r)
-#ifdef HAVE_RINGS
       || rField_is_Ring(r)
-#endif
   )
     r->options |= Sy_bit(OPT_INTSTRATEGY);
@@ -5118 +5116 @@
   if (rField_is_Q_a(r))    return getCoeffType(r->cf);
   if (rField_is_long_C(r)) return n_long_C;
-  #ifdef HAVE_RINGS
-   if (rField_is_Ring_Z(r)) return n_Z;
-   if (rField_is_Ring_ModN(r)) return n_Zn;
-   if (rField_is_Ring_PtoM(r)) return n_Znm;
-   if (rField_is_Ring_2toM(r)) return  n_Z2m;
-  #endif
+  if (rField_is_Ring_Z(r)) return n_Z;
+  if (rField_is_Ring_ModN(r)) return n_Zn;
+  if (rField_is_Ring_PtoM(r)) return n_Znm;
+  if (rField_is_Ring_2toM(r)) return  n_Z2m;
 
   return n_unknown;

libpolys/polys/operations/p_Mult_q.cc

@@ -70 +70 @@
   assume(p != NULL && pNext(p) != NULL && q != NULL && pNext(q) != NULL);
   pAssume1(! pHaveCommonMonoms(p, q));
-#ifdef HAVE_RINGS
   assume(!rField_is_Ring(r) || rField_is_Domain(r));
-#endif
   assume(lp >= 1 && lq >= 1);
   p_Test(p, r);

libpolys/polys/simpleideals.cc

@@ -267 +267 @@
         if (id->m[j]!=NULL)
         {
-#ifdef HAVE_RINGS
           if (rField_is_Ring(r))
           {
@@ -281 +280 @@
             if (p_ComparePolys(id->m[i], id->m[j],r)) p_Delete(&id->m[j],r);
           }
-#else
-          if (p_ComparePolys(id->m[i], id->m[j],r)) p_Delete(&id->m[j],r);
-#endif
         }
       }
@@ -357 +353 @@
         if (id->m[j]!=NULL)
         {
-#ifdef HAVE_RINGS
           if (rField_is_Ring(r))
           {
@@ -372 +367 @@
           else
           {
-#endif
-          /* the case of a ground field: */
-          if (p_DivisibleBy(id->m[i], id->m[j],r))
-          {
-            p_Delete(&id->m[j],r);
+            /* the case of a ground field: */
+            if (p_DivisibleBy(id->m[i], id->m[j],r))
+            {
+              p_Delete(&id->m[j],r);
+            }
+            else if (p_DivisibleBy(id->m[j], id->m[i],r))
+            {
+              p_Delete(&id->m[i],r);
+              break;
+            }
           }
-          else if (p_DivisibleBy(id->m[j], id->m[i],r))
-          {
-            p_Delete(&id->m[i],r);
-            break;
-          }
-#ifdef HAVE_RINGS
-          }
-#endif
         }
       }
@@ -1433 +1425 @@
       if (componentIsUsed[j]==0)
       {
-#ifdef HAVE_RINGS
         if (p_LmIsConstantComp(p,r) &&
             (!rField_is_Ring(r) || n_IsUnit(pGetCoeff(p),r->cf)))
         {
-#else
-        if (p_LmIsConstantComp(p,r))
-        {
-#endif
           generator = i;
           componentIsUsed[j] = 1;