Changeset aa4e28 in git for Singular

Timestamp:

Apr 9, 2024, 4:45:14 PM (6 weeks ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

806aa6c0fd11dd028cc4613b3207981bf99cd82a

Parents:

b731111a31281d6447b4a56ab74d5c5ca6660db9

Message:

HAVE_RINGS is default (p1)

Location:

Singular

Files:

• dyn_modules/gfanlib/tropicalStrategy.cc (modified) (1 diff)
• extra.cc (modified) (5 diffs)
• gentable.cc (modified) (5 diffs)
• iparith.cc (modified) (17 diffs)
• ipshell.cc (modified) (10 diffs)

Singular/dyn_modules/gfanlib/tropicalStrategy.cc

@@ -31 +31 @@
     int i = idPosConstant(I);
     if ((i != -1)
-    #ifdef HAVE_RINGS
     && (n_IsUnit(p_GetCoeff(I->m[i],currRing->cf),currRing->cf))
-    #endif
     )
       return -1;

Singular/extra.cc

@@ -104 +104 @@
 
 
-#ifdef HAVE_RINGS
 #include "kernel/GBEngine/ringgb.h"
-#endif
 
 #ifdef HAVE_F5
@@ -2963 +2961 @@
   #endif
   /*==================== redNF_ring =================*/
-  #ifdef HAVE_RINGS
       if (strcmp(sys_cmd, "redNF_ring")==0)
       {
@@ -2975 +2972 @@
       }
       else
-  #endif
   /*==================== Roune Hilb  =================*/
        if (strcmp(sys_cmd, "hilbroune") == 0)
@@ -3030 +3026 @@
   #endif
   /*==================== Testing groebner basis =================*/
-  #ifdef HAVE_RINGS
       if (strcmp(sys_cmd, "NF_ring")==0)
       {
@@ -3063 +3058 @@
       }
       else
-  #endif
     /*==================== sca:AltVar ==================================*/
   #ifdef HAVE_PLURAL

Singular/gentable.cc

@@ -18 +18 @@
 #include "Singular/tok.h"
 
-#ifdef HAVE_RINGS
-  #define RING_MASK        4
-  #define ZERODIVISOR_MASK 8
-#else
-  #define RING_MASK        0
-  #define ZERODIVISOR_MASK 0
-#endif
+#define RING_MASK        4
+#define ZERODIVISOR_MASK 8
 
 static inline int RingDependend(int t) { return (BEGIN_RING<t)&&(t<END_RING); }
@@ -877 +872 @@
         }
         #endif
-        #ifdef HAVE_RINGS
-        #endif
       }
     }
@@ -907 +900 @@
         }
         #endif
-        #ifdef HAVE_RINGS
-        #endif
       }
     }
@@ -937 +928 @@
         }
         #endif
-        #ifdef HAVE_RINGS
-        #endif
       }
     }
@@ -965 +954 @@
         }
         #endif
-        #ifdef HAVE_RINGS
-        #endif
     }
     i++;

Singular/iparith.cc

@@ -95 +95 @@
 #endif /* HAVE_PLURAL */
 
-#ifdef HAVE_RINGS
-  #define RING_MASK        4
-  #define ZERODIVISOR_MASK 8
-#else
-  #define RING_MASK        0
-  #define ZERODIVISOR_MASK 0
-#endif
+#define RING_MASK        4
+#define ZERODIVISOR_MASK 8
 #define ALLOW_PLURAL     1
 #define NO_NC            0
@@ -2412 +2407 @@
 static BOOLEAN jjHILBERT2(leftv res, leftv u, leftv v)
 {
-#ifdef HAVE_RINGS
   if (rField_is_Z(currRing))
   {
@@ -2418 +2412 @@
     PrintS("//       performed for generic fibre, that is, over Q\n");
   }
-#endif
   assumeStdFlag(u);
   intvec *module_w=(intvec*)atGet(u,"isHomog",INTVEC_CMD);
@@ -4051 +4044 @@
 {
   SPrintStart();
-#ifdef HAVE_RINGS
   if (rField_is_Z(currRing))
   {
@@ -4057 +4049 @@
     PrintS("//       generic fibre, that is, over Q\n");
   }
-#endif
   assumeStdFlag(v);
   intvec *module_w=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
@@ -4164 +4155 @@
   if (rIsLPRing(currRing))
   {
-#ifdef HAVE_RINGS
     if (rField_is_Ring(currRing))
     {
@@ -4170 +4160 @@
       return TRUE;
     }
-#endif
     if (currRing->qideal != NULL)
     {
@@ -4349 +4338 @@
 static BOOLEAN jjHILBERT(leftv, leftv v)
 {
-#ifdef HAVE_RINGS
   if (rField_is_Z(currRing))
   {
@@ -4355 +4343 @@
     PrintS("//       performed for generic fibre, that is, over Q\n");
   }
-#endif
   assumeStdFlag(v);
   intvec *module_w=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
@@ -4364 +4351 @@
 static BOOLEAN jjHILBERT_IV(leftv res, leftv v)
 {
-#ifdef HAVE_RINGS
   if (rField_is_Z(currRing))
   {
@@ -4370 +4356 @@
     PrintS("//       performed for generic fibre, that is, over Q\n");
   }
-#endif
   res->data=(void *)hSecondSeries((intvec *)v->Data());
   return FALSE;
@@ -5517 +5502 @@
   if (rIsLPRing(currRing))
   {
-#ifdef HAVE_RINGS
     if (rField_is_Ring(currRing))
     {
@@ -5523 +5507 @@
       return TRUE;
     }
-#endif
     if (currRing->qideal != NULL)
     {
@@ -6238 +6221 @@
     return TRUE;
   }
-#ifdef HAVE_RINGS
   if (rField_is_Z(currRing))
   {
@@ -6244 +6226 @@
     PrintS("//       performed for generic fibre, that is, over Q\n");
   }
-#endif
   assumeStdFlag(u);
   intvec *module_w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
@@ -6266 +6247 @@
 static BOOLEAN jjHILBERT3Qt(leftv res, leftv u, leftv v, leftv w)
 {
-#ifdef HAVE_RINGS
   if (rField_is_Z(currRing))
   {
@@ -6272 +6252 @@
     PrintS("//       performed for generic fibre, that is, over Q\n");
   }
-#endif
   assumeStdFlag(u);
   ring Qt =(ring)v->Data();

Singular/ipshell.cc

@@ -1885 +1885 @@
 }
 
-#ifdef HAVE_RINGS
 static void rDecomposeRing_41(leftv h,const coeffs C)
 /* field is R or C */
@@ -1912 +1911 @@
   L->m[1].data=(void *)LL;
 }
-#endif
 
 void rDecomposeRing(leftv h,const ring R)
 /* field is R or C */
 {
-#ifdef HAVE_RINGS
   lists L=(lists)omAlloc0Bin(slists_bin);
   if (rField_is_Z(R)) L->Init(1);
@@ -1940 +1937 @@
   L->m[1].rtyp=LIST_CMD;
   L->m[1].data=(void *)LL;
-#else
-  WerrorS("rDecomposeRing");
-#endif
 }
 
@@ -1960 +1954 @@
     rDecomposeC_41(res,C);
   }
-#ifdef HAVE_RINGS
   else if (nCoeff_is_Ring(C))
   {
     rDecomposeRing_41(res,C);
   }
-#endif
   else if ( C->extRing!=NULL )// nCoeff_is_algExt(r->cf))
   {
@@ -2308 +2300 @@
 }
 
-#ifdef HAVE_RINGS
 void rComposeRing(lists L, ring R)
 /* field is R or C */
@@ -2400 +2391 @@
   mpz_clear(modBase);
 }
-#endif
 
 static void rRenameVars(ring R)
@@ -2849 +2839 @@
     lists LL=(lists)L->m[0].Data();
 
-#ifdef HAVE_RINGS
     if (LL->m[0].Typ() == STRING_CMD) // 1st comes a string?
     {
@@ -2855 +2844 @@
     }
     else
-#endif
     if (LL->nr < 3)
       rComposeC(LL,R); // R, long_R, long_C
@@ -5808 +5796 @@
     assume( cf != NULL );
   }
-#ifdef HAVE_RINGS
   else if ((pn->name != NULL) && (strcmp(pn->name, "integer") == 0))
   {
@@ -5895 +5882 @@
     mpz_clear(modBase);
   }
-#endif
   // ring NEW = OLD, (), (); where OLD is a polynomial ring...
   else if ((pn->Typ()==RING_CMD) && (P == 1))