Changeset 42aa8b8 in git

Timestamp:

Jun 3, 2014, 6:28:02 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9e74d36ab6179b1687991fad57ad4613a9816f7cd7295ff2c24f0d2b03594917a387c981bd47eedd

Parents:

ee121df974c1705dca6d334a16b69f52ee5fc0d4

Message:

activate 64bit repr. for Q

Files:

• Singular/links/ssiLink.cc (modified) (6 diffs)
• libpolys/coeffs/longrat.cc (modified) (7 diffs)

Singular/links/ssiLink.cc

@@ -62 +62 @@
 // 7->8: qring
 
-// 64 bit version:
-#if SIZEOF_LONG == 8
-#define MAX_NUM_SIZE 60
-#define POW_2_28 (1L<<60)
-#define LONG long
-#else
-// 32 bit version:
-#define MAX_NUM_SIZE 28
-#define POW_2_28 (1L<<28)
-#define LONG int
-#endif
-
 #define SSI_BASE 16
 typedef struct
@@ -101 +89 @@
 {
   //  if (currRing!=NULL)
-  //  Print("need to change the ring, currRing:%s, switch to: ssiRing%d\n",IDID(currRingHdl,nr);
+  //  Print("need to change the ring, currRing:%s, switch to: ssiRing%d\n",IDID(currRingHdl),nr);
   //  else
   //  Print("no ring, switch to ssiRing%d\n",nr);
@@ -132 +120 @@
 void ssiWriteBigInt(const ssiInfo *d, const number n)
 {
-  // syntax is as follows:
-  // case 2 Q:     3 4 <int>
-  //        or     3 3 <mpz_t nominator>
-  if(SR_HDL(n) & SR_INT)
-  {
-    fprintf(d->f_write,"4 %ld ",SR_TO_INT(n));
-    //if (d->f_debug!=NULL) fprintf(d->f_debug,"bigint: short \"%ld\" ",SR_TO_INT(n));
-  }
-  else if (n->s==3)
-  {
-    fputs("3 ",d->f_write);
-    mpz_out_str(d->f_write,10,n->z);
-    fputc(' ',d->f_write);
-    //gmp_fprintf(d->f_write,"3 %Zd ",n->z);
-    //if (d->f_debug!=NULL) gmp_fprintf(d->f_debug,"bigint: gmp \"%Zd\" ",n->z);
-  }
-  else WerrorS("illiegal bigint");
+ coeffs_BIGINT->cfWriteFd(n,d->f_write,coeffs_BIGINT);
 }
 
@@ -161 +133 @@
   //        or     3 5 <mpz_t raw nom.> <mpz_t raw denom.>
   //        or     3 6 <mpz_t raw nom.> <mpz_t raw denom.>
-  //        or     3 7 <mpz_t raw nom.>
+  //        or     3 8 <mpz_t raw nom.>
   if (getCoeffType(cf)==n_transExt)
   {
@@ -414 +386 @@
 }
 
-number ssiReadBigInt(const ssiInfo *d)
-{
-  int sub_type=-1;
-  sub_type=s_readint(d->f_read);
-  switch(sub_type)
-  {
-   case 3:
-     {// read int or mpz_t or mpz_t, mpz_t
-       number n=nlRInit(0);
-       s_readmpz(d->f_read,n->z);
-       n->s=sub_type;
-       return n;
-     }
-   case 4:
-     {
-       int dd;
-       dd=s_readint(d->f_read);
-       return INT_TO_SR(dd);
-     }
-   default:
-       Werror("error in reading bigint: invalid subtype %d",sub_type);
-       return NULL;
-   }
-}
-
 number ssiReadNumber_CF(const ssiInfo *d, const coeffs cf)
 {
@@ -461 +408 @@
   else Werror("coeffs not implemented in ssiReadNumber");
   return NULL;
+}
+
+number ssiReadBigInt(const ssiInfo *d)
+{
+  number n=ssiReadNumber_CF(d,coeffs_BIGINT);
+  if ((SR_HDL(n) & SR_INT)==0)
+  {
+    if (n->s!=3) Werror("invalid sub type in bigint:%d",n->s);
+  }
+  return n;
 }
 

libpolys/coeffs/longrat.cc

@@ -17 +17 @@
 
 // 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)
+#define POW_2_28_32 (1L<<28)
 #define LONG long
 #else
 #define MAX_NUM_SIZE 28
 #define POW_2_28 (1L<<28)
+#define POW_2_28_32 (1L<<28)
 #define LONG int
 #endif
@@ -802 +804 @@
     LONG bb=SR_TO_INT(b);
     LONG c=SR_TO_INT(a) % bb;
-    /*if(c < 0)
-    {
-        if(bb < 0)
-            c = c - bb;
-        else
-            c = c + bb;
-    }*/
-    /*if((((SR_TO_INT(a)) / (bb))*bb+c) != SR_TO_INT(a))
-    {
-        printf("\nERROR longrat:819\n");
-        printf("\na = %ld\n",SR_TO_INT(a));
-        printf("\nb = %ld\n",bb);
-        printf("\nc = %ld\n",c);
-    }*/
     return INT_TO_SR(c);
   }
   if (SR_HDL(a) & SR_INT)
   {
-    // a is a small and b is a large int: -> a
-    //  INCORRECT, IT COULD HAPPEN THAT b IS A SMALL NUMBER
-    number aa=ALLOC_RNUMBER();
-    mpz_init(aa->z);
-    mpz_set_si(aa->z, SR_TO_INT(a));
+    mpz_t aa;
+    mpz_init(aa);
+    mpz_set_si(aa, SR_TO_INT(a));
     u=ALLOC_RNUMBER();
 #if defined(LDEBUG)
@@ -831 +817 @@
     u->s = 3;
     mpz_init(u->z);
-    mpz_mod(u->z,aa->z,b->z);
-    if (mpz_isNeg(u->z))
-    {
-      if (mpz_isNeg(b->z))
-        mpz_sub(u->z,aa->z,b->z);
-      else
-        mpz_add(u->z,aa->z,b->z);
-    }
-    /*mpz_t dummy;
-    mpz_init(dummy);
-    mpz_fdiv_q(dummy, aa->z, b->z);
-    mpz_mul(dummy, dummy, b->z);
-    mpz_add(dummy, dummy, u->z);
-    if(mpz_cmp(dummy,aa->z) != 0)
-    {
-        printf("\nERROR longrat:911\n");
-        printf("\na = ");n_Print(aa,r);
-        gmp_printf("\ndummy = %Zd",dummy);
-        mpz_clear(dummy);mpz_init(dummy);mpz_tdiv_q(dummy, a->z, b->z);
-        gmp_printf("\na div b = %Zd\n u = ", dummy);
-        n_Print(u,r);
-    }
-    mpz_clear(dummy);*/
-    mpz_clear(aa->z);
-    #if defined(LDEBUG)
-    aa->debug=654324;
-    #endif
-    FREE_RNUMBER(aa);
+    mpz_mod(u->z,aa,b->z);
+    mpz_clear(aa);
     u=nlShort3(u);
     nlTest(u,r);
@@ -876 +836 @@
   u->s = 3;
   mpz_mod(u->z,a->z,b->z);
-  if (mpz_isNeg(u->z))
-  {
-    if (mpz_isNeg(b->z))
-      mpz_sub(u->z,u->z,b->z);
-    else
-      mpz_add(u->z,u->z,b->z);
-  }
   if (bb!=NULL)
   {
@@ -891 +844 @@
     FREE_RNUMBER(bb);
   }
-  /*mpz_t dummy;
-  mpz_init(dummy);
-    mpz_fdiv_q(dummy, a->z, b->z);
-    mpz_mul(dummy, dummy, b->z);
-    mpz_add(dummy, dummy, u->z);
-    if(mpz_cmp(dummy,a->z) != 0)
-    {
-        printf("\nERROR longrat:911\n");
-        printf("\na = ");n_Print(a,r);
-        gmp_printf("\ndummy = %Zd",dummy);
-        mpz_clear(dummy);mpz_init(dummy);mpz_tdiv_q(dummy, a->z, b->z);
-        gmp_printf("\na div b = %Zd\n u = ", dummy);
-        n_Print(u,r);
-    }
-    mpz_clear(dummy);*/
   u=nlShort3(u);
   nlTest(u,r);
@@ -1108 +1046 @@
   nlTest(a, r);
 #endif
-  //if (SR_HDL(a) & SR_INT) return (a==INT_TO_SR(-1L));
-  //return FALSE;
   return  (a==INT_TO_SR(-1L));
 }
@@ -2924 +2860 @@
     #else
     long nn=SR_TO_INT(n);
-    if ((nn<POW_2_28)&&(nn>= -POW_2_28))
-      fprintf(f,"4 %ld ",nn);
+    if ((nn<POW_2_28_32)&&(nn>= -POW_2_28_32))
+    {
+      int nnn=(int)nn;
+      fprintf(f,"4 %d ",nnn);
+    }
     else
     {