Changeset e554162 in git

Timestamp:

Nov 22, 2011, 7:19:05 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cdfcdb8287f66bc6070028082cbbc6eff10e609b')

Children:

8433482547cae25e8b3bbd39d7a1e85adcd3e5ae

Parents:

737b7c8c465e4892fcc4bee81dfba341b05829ac

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-22 19:19:05+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-23 01:24:53+01:00

Message:

CHG: INT_MAX -> MAX_INT_VAL

Files:

• Singular/grammar.cc (modified) (1 diff)
• Singular/grammar.y (modified) (1 diff)
• Singular/mpsr_GetPoly.cc (modified) (1 diff)
• Singular/pcv.cc (modified) (1 diff)
• dyn_modules/pcv.mod (modified) (1 diff)
• kernel/gfan.cc (modified) (5 diffs)
• kernel/hdegree.cc (modified) (1 diff)
• kernel/hilb.cc (modified) (1 diff)
• kernel/spectrum.cc (modified) (1 diff)
• libpolys/misc/mylimits.h (modified) (1 diff)
• libpolys/polys/sparsmat.cc (modified) (1 diff)

Singular/grammar.cc

@@ -403 +403 @@
    The default value of `YYMAXDEPTH', if you do not define it, is 10000.
 */
-#define YYMAXDEPTH INT_MAX
+#define YYMAXDEPTH MAX_INT_VAL
 
 extern int   yylineno;

Singular/grammar.y

@@ -99 +99 @@
    The default value of `YYMAXDEPTH', if you do not define it, is 10000.
 */
-#define YYMAXDEPTH INT_MAX
+#define YYMAXDEPTH MAX_INT_VAL
 
 extern int   yylineno;

Singular/mpsr_GetPoly.cc

@@ -271 +271 @@
     mp_failr(IMP_GetUint32(link, &ui));
     // check whether u_int can be casted safely to int
-    if (ui < INT_MAX)
+    if (ui < MAX_INT_VAL)
       *x = nlInit(ui, currRing);
     else

Singular/pcv.cc

@@ -213 +213 @@
     d+=pGetExp(m,i+1);
     dn=pcvIndex[i][d];
-    if(dn>INT_MAX-n)
+    if(dn>MAX_INT_VAL-n)
     {
       i=currRing->N;

dyn_modules/pcv.mod

@@ -329 +329 @@
     d+=pGetExp(m,i+1);
     dn=pcvIndex[i][d];
-    if(dn>INT_MAX-n)
+    if(dn>MAX_INT_VAL-n)
     {
       i=pVariables;

kernel/gfan.cc

@@ -1387 +1387 @@
         for (int ii=0;ii<(this->numVars);ii++)
         {
-                if( (*ivIntPointOfCone)[ii]>INT_MAX ) 
-                        WarnS("Interior point exceeds INT_MAX!\n");
+                if( (*ivIntPointOfCone)[ii]>MAX_INT_VAL ) 
+                        WarnS("Interior point exceeds MAX_INT_VAL!\n");
                 //Compute intgcd
                 ggT=int64gcd(ggT,(*ivIntPointOfCone)[ii]);
@@ -1399 +1399 @@
                 {
                         (*ivIntPointOfCone)[ii] /= ggT;
-                        if( (*ivIntPointOfCone)[ii]>INT_MAX ) WarnS("Interior point still exceeds INT_MAX after GCD!\n");
+                        if( (*ivIntPointOfCone)[ii]>MAX_INT_VAL ) WarnS("Interior point still exceeds MAX_INT_VAL after GCD!\n");
                 }
         }
@@ -2706 +2706 @@
         {                               
                 A[jj]=(*ivw)[jj];
-                if((*ivw)[jj]>=INT_MAX) WarnS("A[jj] exceeds INT_MAX in gcone::rCopyAndAddWeight!\n");
+                if((*ivw)[jj]>=MAX_INT_VAL) WarnS("A[jj] exceeds MAX_INT_VAL in gcone::rCopyAndAddWeight!\n");
         }                       
         res->wvhdl[0]=(int *)A;
@@ -2748 +2748 @@
                 A1[jj]=(*ivw)[jj];
                 A2[jj]=-(*fNormal)[jj];
-                if((*ivw)[jj]>=INT_MAX || (*fNormal)[jj]>=INT_MAX) WarnS("A[jj] exceeds INT_MAX in gcone::rCopyAndAddWeight2!\n");
+                if((*ivw)[jj]>=MAX_INT_VAL || (*fNormal)[jj]>=MAX_INT_VAL) WarnS("A[jj] exceeds MAX_INT_VAL in gcone::rCopyAndAddWeight2!\n");
         }                       
         res->wvhdl[0]=(int *)A1;
@@ -3726 +3726 @@
         {
                 A[jj]=(*ivw)[jj];
-                if((*ivw)[jj]>=INT_MAX) WarnS("A[jj] exceeds INT_MAX in gcone::replaceDouble_ringorder_a_ByASingleOne!\n");
+                if((*ivw)[jj]>=MAX_INT_VAL) WarnS("A[jj] exceeds MAX_INT_VAL in gcone::replaceDouble_ringorder_a_ByASingleOne!\n");
         }       
         //delete ivw; //Not needed if this->getIntPoint(TRUE)

kernel/hdegree.cc

@@ -1060 +1060 @@
   int i, j, Istc = Nstc;
 
-  y = INT_MAX;
+  y = MAX_INT_VAL;
   for (i=Nstc-1; i>=0; i--)
   {

kernel/hilb.cc

@@ -52 +52 @@
     if (z > Ql[j])
     {
-      if (z>(INT_MAX)/2)
+      if (z>(MAX_INT_VAL)/2)
       {
        Werror("interal arrays too big");

kernel/spectrum.cc

@@ -231 +231 @@
 static inline  int     isLeadMonomial( poly m,ideal stdJ, const ring r )
 {
-  int     length = INT_MAX;
+  int     length = MAX_INT_VAL;
   int     result = -1;
 

libpolys/misc/mylimits.h

@@ -10 +10 @@
 #define _MYLIMITS_H
 
-static const int MAX_INT_VAL = 2147483647;
+/* Maximum/minimum value an `signed int' can hold. */
+// #define MAX_INT_VAL        2147483647
+#ifndef MAX_INT_VAL
+#define MAX_INT_VAL     (2147483647)
+#endif
+
+#ifndef MIN_INT_VAL
+#define MIN_INT_VAL     (-MAX_INT_VAL-1)
+#endif
+
 
 #define ULONG_MAX (~0L)

libpolys/polys/sparsmat.cc

@@ -45 +45 @@
 #define SM_MIN_LENGTH_BUCKET MIN_LENGTH_BUCKET - 5
 #else
-#define SM_MIN_LENGTH_BUCKET    INT_MAX
+#define SM_MIN_LENGTH_BUCKET    MAX_INT_VAL
 #endif