Changeset 42aa8b8 in git for libpolys

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

9e74d36ab6179b1687991fad57ad4613a9816f7cd7295ff2c24f0d2b03594917a387c981bd47eedd

Parents:

ee121df974c1705dca6d334a16b69f52ee5fc0d4

Message:

activate 64bit repr. for Q

File:

• libpolys/coeffs/longrat.cc (modified) (7 diffs)

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
     {