Changeset 777f8b in git

Timestamp:

Jan 15, 2015, 2:51:44 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

3176e6e1402d3ad808ee0b00f1589716317afe8f94cd934390f0792e899f3342e32c047ac7a34ec9

Parents:

863333d8d5bf4f26782057079f522aa791eab07b

Message:

chg: n_Int returns long instead of int

Files:

• Singular/dyn_modules/Order/nforder_elt.cc (modified) (1 diff)
• Singular/extra.cc (modified) (2 diffs)
• Singular/iparith.cc (modified) (4 diffs)
• Singular/test.cc (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (2 diffs)
• libpolys/coeffs/ffields.cc (modified) (2 diffs)
• libpolys/coeffs/gnumpc.cc (modified) (2 diffs)
• libpolys/coeffs/gnumpfl.cc (modified) (3 diffs)
• libpolys/coeffs/longrat.cc (modified) (7 diffs)
• libpolys/coeffs/modulop.cc (modified) (2 diffs)
• libpolys/coeffs/modulop.h (modified) (1 diff)
• libpolys/coeffs/rintegers.cc (modified) (5 diffs)
• libpolys/coeffs/rmodulo2m.cc (modified) (5 diffs)
• libpolys/coeffs/rmodulon.cc (modified) (3 diffs)
• libpolys/coeffs/shortfl.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/algext.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (2 diffs)
• libpolys/tests/coeffs_test.h (modified) (1 diff)

Singular/dyn_modules/Order/nforder_elt.cc

@@ -143 +143 @@
 }
    /// convertion to int, 0 if impossible
-static int EltInt(number &n, const coeffs r)
+static long EltInt(number &n, const coeffs r)
 
 {

Singular/extra.cc

@@ -712 +712 @@
       {
         WerrorS("field required");
-        return TRUE;
+        return TRUE;
       }
       matrix pMat  = (matrix)h->Data();
@@ -3711 +3711 @@
     else
   #endif
+/*==================== test64 =================*/
+  #if 0
+    if(strcmp(sys_cmd,"test64")==0)
+    {
+      long l=8;int i;
+      for(i=1;i<62;i++)
+      {
+        l=l<<1;
+        number n=n_Init(l,coeffs_BIGINT);
+        Print("%ld= ",l);n_Print(n,coeffs_BIGINT);
+        CanonicalForm nn=n_convSingNFactoryN(n,TRUE,coeffs_BIGINT);
+        n_Delete(&n,coeffs_BIGINT);
+        n=n_convFactoryNSingN(nn,coeffs_BIGINT);
+        PrintS(" F:");
+        n_Print(n,coeffs_BIGINT);
+        PrintLn();
+        n_Delete(&n,coeffs_BIGINT);
+      }
+      Print("SIZEOF_LONG=%d\n",SIZEOF_LONG);
+      return FALSE;
+    }
+    else
+   #endif
 /*==================== Error =================*/
       Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );

Singular/iparith.cc

@@ -239 +239 @@
 
 /*=================== simple helpers =================*/
+static int iin_Int(number &n,coeffs cf)
+{
+  long l=n_Int(n,cf);
+  int i=(int)l;
+  if ((long)i==l) return l;
+  return 0;
+}
 poly pHeadProc(poly p)
 {
@@ -4708 +4715 @@
     return TRUE;
   }
-  res->data = (char *)(long)n_Int(pGetCoeff(p),currRing->cf);
+  res->data = (char *)(long)iin_Int(pGetCoeff(p),currRing->cf);
   return FALSE;
 }
@@ -5405 +5412 @@
 {
   number n=(number)u->CopyD(); // n_Int may call n_Normalize
-  res->data=(char *)(long)n_Int(n,currRing->cf);
+  res->data=(char *)(long)iin_Int(n,currRing->cf);
   n_Delete(&n,currRing->cf);
   return FALSE;
@@ -5412 +5419 @@
 {
   number n=(number)u->Data();
-  res->data=(char *)(long)n_Int(n,coeffs_BIGINT );
+  res->data=(char *)(long)iin_Int(n,coeffs_BIGINT );
   return FALSE;
 }

Singular/test.cc

@@ -376 +376 @@
      errorreported = 0; // reset error handling
   else
-     printf("typeof returned type %d, >>%s<<\n",r1.Typ(),r1.Data());
+     printf("typeof returned type %d, >>%s<<\n",r1.Typ(),(char*)r1.Data());
 
   // clean up r1:

libpolys/coeffs/coeffs.h

@@ -182 +182 @@
    int     (*cfSize)(number n, const coeffs r);
 
-   /// convertion to int, 0 if impossible
-   int     (*cfInt)(number &n, const coeffs r);
+   /// convertion to long, 0 if impossible
+   long    (*cfInt)(number &n, const coeffs r);
 
    /// Converts a non-negative number n into a GMP number, 0 if impossible
@@ -544 +544 @@
 /// conversion of n to an int; 0 if not possible
 /// in Z/pZ: the representing int lying in (-p/2 .. p/2]
-static FORCE_INLINE int n_Int(number &n,       const coeffs r)
+static FORCE_INLINE long n_Int(number &n,       const coeffs r)
 { STATISTIC(n_Int); assume(r != NULL); assume(r->cfInt!=NULL); return r->cfInt(n,r); }
 

libpolys/coeffs/ffields.cc

@@ -25 +25 @@
 number  nfInit        (long i, const coeffs r);
 number  nfParameter   (int i, const coeffs r);
-int     nfInt         (number &n, const coeffs r);
+long    nfInt         (number &n, const coeffs r);
 number  nfAdd         (number a, number b, const coeffs r);
 number  nfSub         (number a, number b, const coeffs r);
@@ -245 +245 @@
 * number -> int
 */
-int nfInt (number &, const coeffs )
-{
-  return 0;
+long nfInt (number &n, const coeffs )
+{
+  return (long)n;
 }
 

libpolys/coeffs/gnumpc.cc

@@ -41 +41 @@
 BOOLEAN  ngcIsZero(number za, const coeffs r);
 number   ngcInit(long i, const coeffs r);
-int      ngcInt(number &n, const coeffs r);
+long     ngcInt(number &n, const coeffs r);
 number   ngcNeg(number za, const coeffs r);
 number   ngcInvers(number a, const coeffs r);
@@ -108 +108 @@
 * convert number to int
 */
-int ngcInt(number &i, const coeffs r)
-{
-  assume( getCoeffType(r) == ID );
-
-  return (int)((gmp_complex*)i)->real();
+long ngcInt(number &i, const coeffs r)
+{
+  assume( getCoeffType(r) == ID );
+
+  return ((gmp_complex*)i)->real();
 }
 

libpolys/coeffs/gnumpfl.cc

@@ -41 +41 @@
 BOOLEAN  ngfIsZero(number za, const coeffs r);
 number   ngfInit(long i, const coeffs r);
-int      ngfInt(number &n, const coeffs r);
+long     ngfInt(number &n, const coeffs r);
 number   ngfNeg(number za, const coeffs r);
 number   ngfInvers(number a, const coeffs r);
@@ -82 +82 @@
 * convert number to int
 */
-int ngfInt(number &i, const coeffs r)
+long ngfInt(number &i, const coeffs r)
 {
   assume( getCoeffType(r) == ID );
@@ -88 +88 @@
   double d=(double)*(gmp_float*)i;
   if (d<0.0)
-    return (int)(d-0.5);
+    return (long)(d-0.5);
   else
-    return (int)(d+0.5);
+    return (long)(d+0.5);
 }
 
 int ngfSize(number n, const coeffs r)
 {
-  int i = ngfInt(n, r);
+  long i = ngfInt(n, r);
   /* basically return the largest integer in n;
      only if this happens to be zero although n != 0,

libpolys/coeffs/longrat.cc

@@ -54 +54 @@
 BOOLEAN  nlGreater(number a, number b, const coeffs r);
 BOOLEAN  nlIsMOne(number a, const coeffs r);
-int      nlInt(number &n, const coeffs r);
+long     nlInt(number &n, const coeffs r);
 number   nlBigInt(number &n);
 
@@ -95 +95 @@
 
 // 64 bit version:
-#if SIZEOF_LONG == 8
-//#if 0
+//#if SIZEOF_LONG == 8
+#if 0
 #define MAX_NUM_SIZE 60
 #define POW_2_28 (1L<<60)
@@ -193 +193 @@
   assume( getCoeffType(src) == n_Zp );
 
-  number to = nlInit(npInt(from,src), dst); // FIXME? TODO? // extern int     npInt         (number &n, const coeffs r);
+  number to = nlInit(npInt(from,src), dst); // FIXME? TODO? // extern long     npInt         (number &n, const coeffs r);
 
   return to;
@@ -609 +609 @@
 * convert number to int
 */
-int nlInt(number &i, const coeffs r)
+long nlInt(number &i, const coeffs r)
 {
   nlTest(i, r);
@@ -615 +615 @@
   if (SR_HDL(i) & SR_INT)
   {
-    int dummy = SR_TO_INT(i);
-    if((long)dummy == SR_TO_INT(i))
-        return SR_TO_INT(i);
-    else
-        return 0;
+    return SR_TO_INT(i);
   }
   if (i->s==3)
   {
     if(mpz_size1(i->z)>MP_SMALL) return 0;
-    int ul=(int)mpz_get_si(i->z);
-    if (mpz_cmp_si(i->z,(long)ul)!=0) return 0;
+    long ul=mpz_get_si(i->z);
+    if (mpz_cmp_si(i->z,ul)!=0) return 0;
     return ul;
   }
   mpz_t tmp;
-  int ul;
+  long ul;
   mpz_init(tmp);
   MPZ_DIV(tmp,i->z,i->n);
@@ -635 +631 @@
   else
   {
-    ul=(int)mpz_get_si(tmp);
-    if (mpz_cmp_si(tmp,(long)ul)!=0) ul=0;
+    ul=mpz_get_si(tmp);
+    if (mpz_cmp_si(tmp,ul)!=0) ul=0;
   }
   mpz_clear(tmp);
@@ -953 +949 @@
 coeffs nlQuot1(number c, const coeffs r)
 {
-  int ch = r->cfInt(c, r);
+  long ch = r->cfInt(c, r);
   mpz_ptr dummy;
   dummy = (mpz_ptr) omAlloc(sizeof(mpz_t));

libpolys/coeffs/modulop.cc

@@ -31 +31 @@
 number  npMult        (number a, number b, const coeffs r);
 number  npInit        (long i, const coeffs r);
-int     npInt         (number &n, const coeffs r);
+long    npInt         (number &n, const coeffs r);
 number  npAdd         (number a, number b,const coeffs r);
 number  npSub         (number a, number b,const coeffs r);
@@ -143 +143 @@
  * convert a number to an int in (-p/2 .. p/2]
  */
-int npInt(number &n, const coeffs r)
+long npInt(number &n, const coeffs r)
 {
   n_Test(n, r);
 
-  if ((long)n > (((long)r->ch) >>1)) return (int)((long)n -((long)r->ch));
-  else                               return (int)((long)n);
+  if ((long)n > (((long)r->ch) >>1)) return ((long)n -((long)r->ch));
+  else                               return ((long)n);
 }
 

libpolys/coeffs/modulop.h

@@ -125 +125 @@
 
 // The folloing is reused inside gnumpc.cc, gnumpfl.cc and longrat.cc
-int     npInt         (number &n, const coeffs r);
+long    npInt         (number &n, const coeffs r);
 
 // The following is currently used in OPAE.cc, OPAEQ.cc and OPAEp.cc for setting their SetMap...

libpolys/coeffs/rintegers.cc

@@ -38 +38 @@
 number  nrzMult        (number a, number b, const coeffs r);
 number  nrzInit        (long i, const coeffs r);
-int     nrzInt         (number &n, const coeffs r);
+long    nrzInt         (number &n, const coeffs r);
 number  nrzAdd         (number a, number b, const coeffs r);
 number  nrzSub         (number a, number b, const coeffs r);
@@ -182 +182 @@
  * convert a number to int
  */
-int nrzInt(number &n, const coeffs)
-{
-  return (int) mpz_get_si( (mpz_ptr)n);
+long nrzInt(number &n, const coeffs)
+{
+  return mpz_get_si( (mpz_ptr)n);
 }
 
@@ -468 +468 @@
 coeffs nrzQuot1(number c, const coeffs r)
 {
-    int ch = r->cfInt(c, r);
+    long ch = r->cfInt(c, r);
     mpz_ptr dummy;
     dummy = (mpz_ptr) omAlloc(sizeof(mpz_t));
@@ -1069 +1069 @@
  * convert a number to int
  */
-int nrzInt(number &n, const coeffs)
+long nrzInt(number &n, const coeffs)
 {
   if (n_Z_IS_SMALL(n)) return SR_TO_INT(n);
-  return (int) mpz_get_si( (mpz_ptr)n);
+  return mpz_get_si( (mpz_ptr)n);
 }
 #if CF_DEBUG
@@ -1692 +1692 @@
     if(n_Z_IS_SMALL(c))
     {
-      int ch = r->cfInt(c, r);
+      long ch = r->cfInt(c, r);
       mpz_init_set_ui(dummy, ch);
     }

libpolys/coeffs/rmodulo2m.cc

@@ -32 +32 @@
 number  nr2mMult        (number a, number b, const coeffs r);
 number  nr2mInit        (long i, const coeffs r);
-int     nr2mInt         (number &n, const coeffs r);
+long    nr2mInt         (number &n, const coeffs r);
 number  nr2mAdd         (number a, number b, const coeffs r);
 number  nr2mSub         (number a, number b, const coeffs r);
@@ -118 +118 @@
 {
     coeffs rr;
-    int ch = r->cfInt(c, r);
+    long ch = r->cfInt(c, r);
     mpz_t a,b;
     mpz_init_set(a, r->modNumber);
@@ -340 +340 @@
  * convert a number to an int in ]-k/2 .. k/2],
  * where k = 2^m; i.e., an int in ]-2^(m-1) .. 2^(m-1)];
- * note that the code computes a long which will then
- * automatically casted to int
  */
-static long nr2mLong(number &n, const coeffs r)
+long nr2mInt(number &n, const coeffs r)
 {
   unsigned long nn = (unsigned long)(unsigned long)n & r->mod2mMask;
@@ -351 +349 @@
   else
     return (long)((unsigned long)nn);
-}
-int nr2mInt(number &n, const coeffs r)
-{
-  return (int)nr2mLong(n,r);
 }
 
@@ -834 +828 @@
 void nr2mWrite (number &a, const coeffs r)
 {
-  long i = nr2mLong(a, r);
+  long i = nr2mInt(a, r);
   StringAppend("%ld", i);
 }

libpolys/coeffs/rmodulon.cc

@@ -34 +34 @@
 number  nrnMult        (number a, number b, const coeffs r);
 number  nrnInit        (long i, const coeffs r);
-int     nrnInt         (number &n, const coeffs r);
+long    nrnInt         (number &n, const coeffs r);
 number  nrnAdd         (number a, number b, const coeffs r);
 number  nrnSub         (number a, number b, const coeffs r);
@@ -118 +118 @@
 {
     coeffs rr;
-    int ch = r->cfInt(c, r);
+    long ch = r->cfInt(c, r);
     mpz_t a,b;
     mpz_init_set(a, r->modNumber);
@@ -261 +261 @@
  * convert a number to int
  */
-int nrnInt(number &n, const coeffs)
-{
-  return (int)mpz_get_si((mpz_ptr) n);
+long nrnInt(number &n, const coeffs)
+{
+  return mpz_get_si((mpz_ptr) n);
 }
 

libpolys/coeffs/shortfl.cc

@@ -32 +32 @@
 number  nrMult        (number a, number b, const coeffs r);
 number  nrInit        (long i, const coeffs r);
-int     nrInt         (number &n, const coeffs r);
+long    nrInt         (number &n, const coeffs r);
 number  nrAdd         (number a, number b, const coeffs r);
 number  nrSub         (number a, number b, const coeffs r);
@@ -117 +117 @@
 * convert a number to int
 */
-int nrInt(number &n, const coeffs r)
-{
-  assume( getCoeffType(r) == ID );
-
-  int i;
+long nrInt(number &n, const coeffs r)
+{
+  assume( getCoeffType(r) == ID );
+
+  long i;
   float f = nf(n).F();
   if (((float)(-MAX_INT_VAL-1) <= f) || ((float)MAX_INT_VAL >= f))
-    i = (int)f;
+    i = (long)f;
   else
     i = 0;

libpolys/polys/ext_fields/algext.cc

@@ -88 +88 @@
 BOOLEAN  naIsZero(number a, const coeffs cf);
 number   naInit(long i, const coeffs cf);
-int      naInt(number &a, const coeffs cf);
+long     naInt(number &a, const coeffs cf);
 number   naNeg(number a, const coeffs cf);
 number   naInvers(number a, const coeffs cf);
@@ -356 +356 @@
 }
 
-int naInt(number &a, const coeffs cf)
+long naInt(number &a, const coeffs cf)
 {
   naTest(a);

libpolys/polys/ext_fields/transext.cc

@@ -104 +104 @@
 BOOLEAN  ntIsZero(number a, const coeffs cf);
 number   ntInit(long i, const coeffs cf);
-int      ntInt(number &a, const coeffs cf);
+long     ntInt(number &a, const coeffs cf);
 number   ntNeg(number a, const coeffs cf);
 number   ntInvers(number a, const coeffs cf);
@@ -628 +628 @@
 }
 
-int ntInt(number &a, const coeffs cf)
+long ntInt(number &a, const coeffs cf)
 {
   //check_N(a,cf);

libpolys/tests/coeffs_test.h

@@ -499 +499 @@
      number q5 = n_Mult(q3, q4, cf);
      TS_ASSERT(n_Test(q5, cf));
-     Print("21/2 * 30 = %d\n", n_Int(q5, cf));
+     Print("21/2 * 30 = %ld\n", n_Int(q5, cf));
      TS_ASSERT(n_Test(q5, cf));
      n_Delete(&q1, cf);