Changeset 353a42 in git

Timestamp:

Jul 25, 2018, 3:02:56 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

1becad6a5d5cdf8123f9ba9b4b8b35707bc413a9

Parents:

149551bc36c7d4cfd949a5205a03754e14555e59

Message:

chg: nCoeff_si_Ring_Z/rField_is_Ring_Z -> nCoeff_is_Z/rField_is_Z

Files:

• Singular/dyn_modules/Order/lattice.cc (modified) (1 diff)
• Singular/dyn_modules/gfanlib/tropicalStrategy.cc (modified) (2 diffs)
• Singular/iparith.cc (modified) (8 diffs)
• Singular/ipshell.cc (modified) (3 diffs)
• kernel/GBEngine/kstd1.cc (modified) (2 diffs)
• kernel/GBEngine/kstd2.cc (modified) (1 diff)
• kernel/GBEngine/kutil.cc (modified) (4 diffs)
• kernel/linear_algebra/MinorInterface.cc (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (3 diffs)
• libpolys/coeffs/longrat.cc (modified) (1 diff)
• libpolys/coeffs/modulop.cc (modified) (1 diff)
• libpolys/coeffs/rintegers.cc (modified) (2 diffs)
• libpolys/coeffs/rmodulo2m.cc (modified) (1 diff)
• libpolys/coeffs/rmodulon.cc (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (2 diffs)
• libpolys/tests/coeffs_test.h (modified) (1 diff)

Singular/dyn_modules/Order/lattice.cc

@@ -963 +963 @@
 
     //char = 0
-    if ( !(nCoeff_is_Ring_Z(coef) || nCoeff_is_R(coef) || nCoeff_is_Q(coef) ||
+    if ( !(nCoeff_is_Z(coef) || nCoeff_is_R(coef) || nCoeff_is_Q(coef) ||
             nCoeff_is_long_R(coef) || nCoeff_is_long_C(coef)) ){
         WerrorS("Ground field not implemented!\n");

Singular/dyn_modules/gfanlib/tropicalStrategy.cc

@@ -39 +39 @@
     if (i != -1) pDelete(&vv->m[i]);
     d = scDimInt(vv, currRing->qideal);
-    if (rField_is_Ring_Z(currRing) && (i==-1)) d++;
+    if (rField_is_Z(currRing) && (i==-1)) d++;
     idDelete(&vv);
     return d;
@@ -152 +152 @@
   extraReductionAlgorithm(noExtraReduction)
 {
-  assume(rField_is_Q(r) || rField_is_Zp(r) || rField_is_Ring_Z(r));
+  assume(rField_is_Q(r) || rField_is_Zp(r) || rField_is_Z(r));
   if (!completelyHomogeneous)
   {

Singular/iparith.cc

@@ -1915 +1915 @@
     if (i != -1) pDelete(&vv->m[i]);
     long d = (long)scDimInt(vv, ww);
-    if (rField_is_Ring_Z(currRing) && (i == -1)) d++;
+    if (rField_is_Z(currRing) && (i == -1)) d++;
     res->data = (char *)d;
     idDelete(&vv); idDelete(&ww);
@@ -2374 +2374 @@
 {
 #ifdef HAVE_RINGS
-  if (rField_is_Ring_Z(currRing))
+  if (rField_is_Z(currRing))
   {
     PrintS("// NOTE: computation of Hilbert series etc. is being\n");
@@ -3782 +3782 @@
   SPrintStart();
 #ifdef HAVE_RINGS
-  if (rField_is_Ring_Z(currRing))
+  if (rField_is_Z(currRing))
   {
     PrintS("// NOTE: computation of degree is being performed for\n");
@@ -3931 +3931 @@
     {
       d = (long)scDimInt(vv, currRing->qideal);
-      if(rField_is_Ring_Z(currRing))
+      if(rField_is_Z(currRing))
         d++;
     }
@@ -3965 +3965 @@
         dcurr = (long)scDimInt(vc, currRing->qideal);
         // the following assumes the ground rings to be either zero- or one-dimensional
-        if((j==-1) && rField_is_Ring_Z(currRing))
+        if((j==-1) && rField_is_Z(currRing))
         {
           // should also be activated for other euclidean domains as groundfield
@@ -4145 +4145 @@
 {
 #ifdef HAVE_RINGS
-  if (rField_is_Ring_Z(currRing))
+  if (rField_is_Z(currRing))
   {
     PrintS("// NOTE: computation of Hilbert series etc. is being\n");
@@ -4160 +4160 @@
 {
 #ifdef HAVE_RINGS
-  if (rField_is_Ring_Z(currRing))
+  if (rField_is_Z(currRing))
   {
     PrintS("// NOTE: computation of Hilbert series etc. is being\n");
@@ -5848 +5848 @@
   }
 #ifdef HAVE_RINGS
-  if (rField_is_Ring_Z(currRing))
+  if (rField_is_Z(currRing))
   {
     PrintS("// NOTE: computation of Hilbert series etc. is being\n");

Singular/ipshell.cc

@@ -1810 +1810 @@
   // ----------------------------------------
   // 1: modulo
-  if (nCoeff_is_Ring_Z(C)) return;
+  if (nCoeff_is_Z(C)) return;
   lists LL=(lists)omAlloc0Bin(slists_bin);
   LL->Init(2);
@@ -1827 +1827 @@
 #ifdef HAVE_RINGS
   lists L=(lists)omAlloc0Bin(slists_bin);
-  if (rField_is_Ring_Z(R)) L->Init(1);
+  if (rField_is_Z(R)) L->Init(1);
   else                     L->Init(2);
   h->rtyp=LIST_CMD;
@@ -1839 +1839 @@
   // ----------------------------------------
   // 1: module
-  if (rField_is_Ring_Z(R)) return;
+  if (rField_is_Z(R)) return;
   lists LL=(lists)omAlloc0Bin(slists_bin);
   LL->Init(2);

kernel/GBEngine/kstd1.cc

@@ -1755 +1755 @@
 //    }
 //  }
-  if(nCoeff_is_Ring_Z(currRing->cf))
+  if(nCoeff_is_Z(currRing->cf))
     finalReduceByMon(strat);
   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
@@ -2172 +2172 @@
     #if PRE_INTEGER_CHECK
     //the preinteger check strategy is not for modules
-    if(rField_is_Ring(currRing) && nCoeff_is_Ring_Z(currRing->cf) && strat->ak <= 0)
+    if(nCoeff_is_Z(currRing->cf) && strat->ak <= 0)
     {
       ideal FCopy = idCopy(F);

kernel/GBEngine/kstd2.cc

@@ -2209 +2209 @@
   if (!errorreported)
   {
-    if(rField_is_Ring_Z(currRing))
+    if(rField_is_Z(currRing))
     {
       for(int i = 0;i<=strat->sl;i++)

kernel/GBEngine/kutil.cc

@@ -10664 +10664 @@
 poly preIntegerCheck(const ideal Forig, const ideal Q)
 {
-  assume(nCoeff_is_Ring_Z(currRing->cf));
-  if(!nCoeff_is_Ring_Z(currRing->cf))
+  if(!nCoeff_is_Z(currRing->cf))
     return NULL;
   ideal F = idCopy(Forig);
@@ -10832 +10831 @@
 void postReduceByMon(LObject* h, kStrategy strat)
 {
-  if(!nCoeff_is_Ring_Z(currRing->cf))
+  if(!nCoeff_is_Z(currRing->cf))
       return;
   poly pH = h->GetP();
@@ -10900 +10899 @@
 void postReduceByMonSig(LObject* h, kStrategy strat)
 {
-  if(!nCoeff_is_Ring_Z(currRing->cf))
+  if(!nCoeff_is_Z(currRing->cf))
       return;
   poly hSig = h->sig;
@@ -10992 +10991 @@
                           i.e. after exitBuchMora */
   /* do not use strat->S, strat->sl as they may be out of sync*/
-  if(!nCoeff_is_Ring_Z(currRing->cf))
+  if(!nCoeff_is_Z(currRing->cf))
       return;
   poly p,pp;

kernel/linear_algebra/MinorInterface.cc

@@ -208 +208 @@
   {
     if ((k == 0) && (strcmp(algorithm, "Bareiss") == 0)
-        && (!rField_is_Ring_Z(currRing)) && (!allDifferent))
+        && (!rField_is_Z(currRing)) && (!allDifferent))
     {
       /* In this case, we call an optimized procedure, dating back to

libpolys/coeffs/coeffs.h

@@ -753 +753 @@
 { assume(r != NULL); return (getCoeffType(r)==n_Znm); }
 
-static FORCE_INLINE BOOLEAN nCoeff_is_Ring_Z(const coeffs r)
-{ assume(r != NULL); return (getCoeffType(r)==n_Z); }
-
 static FORCE_INLINE BOOLEAN nCoeff_is_Ring(const coeffs r)
 { assume(r != NULL); return (r->is_field==0); }
@@ -762 +759 @@
 #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
@@ -835 +831 @@
 
 static FORCE_INLINE BOOLEAN nCoeff_is_Q(const coeffs r)
-{ assume(r != NULL); return getCoeffType(r)==n_Q && (r->is_field); }
+{
+  assume(r != NULL);
+  #if SI_INTEGER_VARIANT==1
+  return getCoeffType(r)==n_Q && (r->is_field);
+  #else
+  return getCoeffType(r)==n_Q;
+  #endif
+}
 
 static FORCE_INLINE BOOLEAN nCoeff_is_Z(const coeffs r)
-{ assume(r != NULL); return getCoeffType(r)==n_Z || ((getCoeffType(r)==n_Q) && (!r->is_field)); }
+{
+  assume(r != NULL);
+  #if SI_INTEGER_VARIANT==1
+  return ((getCoeffType(r)==n_Q) && (!r->is_field));
+  #else
+  return getCoeffType(r)==n_Z;
+  #endif
+}
 
 static FORCE_INLINE BOOLEAN nCoeff_is_Zn(const coeffs r)

libpolys/coeffs/longrat.cc

@@ -2342 +2342 @@
   }
 #ifdef HAVE_RINGS
-  if (src->rep==n_rep_gmp) // nCoeff_is_Ring_Z(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Ring_ModN(src))
+  if (src->rep==n_rep_gmp) // nCoeff_is_Z(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Ring_ModN(src))
   {
     return nlMapGMP;

libpolys/coeffs/modulop.cc

@@ -660 +660 @@
     return npMapMachineInt;
   }
-  if (src->rep==n_rep_gmp) //nCoeff_is_Ring_Z(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Ring_ModN(src))
+  if (src->rep==n_rep_gmp) //nCoeff_is_Z(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Ring_ModN(src))
   {
     return npMapGMP;
   }
-  if (src->rep==n_rep_gap_gmp) //nCoeff_is_Ring_Z(src)
+  if (src->rep==n_rep_gap_gmp) //nCoeff_is_Z(src)
   {
     return npMapZ;

libpolys/coeffs/rintegers.cc

@@ -347 +347 @@
   /* dst = nrn */
   if ((src->rep==n_rep_gmp)
-  && (nCoeff_is_Ring_Z(src) || nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src)))
+  && (nCoeff_is_Z(src) || nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src)))
   {
     return ndCopyMap; //nrzCopyMap;
   }
-  if ((src->rep==n_rep_gap_gmp) /*&& nCoeff_is_Ring_Z(src)*/)
+  if ((src->rep==n_rep_gap_gmp) /*&& nCoeff_is_Z(src)*/)
   {
     return ndCopyMap; //nrzCopyMap;
@@ -1634 +1634 @@
     return nrzModNMap;
 
-  if ((src->rep==n_rep_gap_gmp) && nCoeff_is_Ring_Z(src))
+  if ((src->rep==n_rep_gap_gmp) && nCoeff_is_Z(src))
   {
     return ndCopyMap; //nrzCopyMap;
   }
-  if (src->rep==n_rep_gap_rat) /*&& nCoeff_is_Ring_Z(src)) Q, bigint*/
+  if (src->rep==n_rep_gap_rat) /*&& nCoeff_is_Z(src)) Q, bigint*/
   {
     return nrzMapQ;

libpolys/coeffs/rmodulo2m.cc

@@ -682 +682 @@
     return nr2mMapProject;
   }
-  if ((src->rep==n_rep_gmp) && nCoeff_is_Ring_Z(src))
+  if ((src->rep==n_rep_gmp) && nCoeff_is_Z(src))
   {
     return nr2mMapGMP;
   }
-  if ((src->rep==n_rep_gap_gmp) /*&& nCoeff_is_Ring_Z(src)*/)
+  if ((src->rep==n_rep_gap_gmp) /*&& nCoeff_is_Z(src)*/)
   {
     return nr2mMapZ;
   }
-  if ((src->rep==n_rep_gap_rat) && (nCoeff_is_Q(src)||nCoeff_is_Ring_Z(src)))
+  if ((src->rep==n_rep_gap_rat) && (nCoeff_is_Q(src)||nCoeff_is_Z(src)))
   {
     return nr2mMapQ;

libpolys/coeffs/rmodulon.cc

@@ -816 +816 @@
 {
   /* dst = nrn */
-  if ((src->rep==n_rep_gmp) && nCoeff_is_Ring_Z(src))
+  if ((src->rep==n_rep_gmp) && nCoeff_is_Z(src))
   {
     return nrnMapZ;
   }
-  if ((src->rep==n_rep_gap_gmp) /*&& nCoeff_is_Ring_Z(src)*/)
+  if ((src->rep==n_rep_gap_gmp) /*&& nCoeff_is_Z(src)*/)
   {
     return nrnMapZ;

libpolys/polys/clapsing.cc

@@ -58 +58 @@
 
   Off(SW_RATIONAL);
-  if (rField_is_Q(r) || rField_is_Zp(r) || rField_is_Ring_Z(r)
+  if (rField_is_Q(r) || rField_is_Zp(r) || rField_is_Z(r)
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
@@ -512 +512 @@
   poly res=NULL;
   On(SW_RATIONAL);
-  if (rField_is_Zp(r) || rField_is_Q(r)
+  if (rField_is_Zp(r) || rField_is_Q(r) || rField_is_Z(r)
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
-    setCharacteristic( rChar(r) );
-    CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );
-    res = convFactoryPSingP( F * G,r );
-  }
-  else if (rField_is_Ring_Z(r))
-  {
-    Off(SW_RATIONAL);
+    if (rField_is_Z(r)) Off(SW_RATIONAL);
     setCharacteristic( rChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );

libpolys/polys/monomials/ring.cc

@@ -5128 +5128 @@
   if (rField_is_Q_a(r))    return getCoeffType(r->cf);
   if (rField_is_long_C(r)) return n_long_C;
-  if (rField_is_Ring_Z(r)) return n_Z;
+  if (rField_is_Z(r))         return n_Z;
   if (rField_is_Ring_ModN(r)) return n_Zn;
   if (rField_is_Ring_PtoM(r)) return n_Znm;

libpolys/polys/monomials/ring.h

@@ -476 +476 @@
 { assume(r != NULL); assume(r->cf != NULL); return ( nCoeff_is_Ring_PtoM(r->cf) ); }
 
-static inline BOOLEAN rField_is_Ring_Z(const ring r)
-{ assume(r != NULL); assume(r->cf != NULL); return ( nCoeff_is_Ring_Z(r->cf) ); }
-
 static inline BOOLEAN rField_is_Ring(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Ring(r->cf); }
@@ -492 +489 @@
 #define rField_is_Ring_ModN(A) (0)
 #define rField_is_Ring_PtoM(A) (0)
-#define rField_is_Ring_Z(A) (0)
 #define rField_is_Domain(A) (1)
 #define rField_has_Units(A) (1)

libpolys/tests/coeffs_test.h

@@ -271 +271 @@
       TS_ASSERT( !nCoeff_is_Ring_ModN( r ));
       TS_ASSERT( !nCoeff_is_Ring_PtoM( r ));
-      TS_ASSERT( !nCoeff_is_Ring_Z( r ));
+      TS_ASSERT( !nCoeff_is_Z( r ));
       TS_ASSERT( !nCoeff_is_Ring( r ));
       TS_ASSERT( !nCoeff_is_Zp( r ));