Changeset 121ad4 in git

Timestamp:

May 28, 2014, 5:59:44 PM (9 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

75424e3a56f41323abd6d3f9936e00e102ff6a6d

Parents:

bf8a3f589c629892975963ad0be2ec5ad3f6bf50

git-author:

Adi Popescu <adi_popescum@yahoo.de>2014-05-28 17:59:44+02:00

git-committer:

Adi Popescu <adi_popescum@yahoo.de>2014-05-28 18:03:11+02:00

Message:

fix: 64bit nlIntMod, positive result

File:

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

libpolys/coeffs/longrat.cc

@@ -802 +802 @@
     LONG bb=SR_TO_INT(b);
     LONG c=SR_TO_INT(a) % bb;
-    if(c < 0)
+    /*if(c < 0)
     {    
         if(bb < 0)
@@ -808 +808 @@
         else
             c = c + bb;
-    }
-    //printf("\nnlIntMod SR_TO_INT\n");
-    //n_Print(a,r);
-    //printf("\na =  %ld\n",SR_TO_INT(a));
-    //n_Print(b, r);
-    //printf("\nb =  %ld\n",bb);
-    //printf("\nc =  %ld\n",c);
+    }*/
+    /*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);
   }
@@ -820 +821 @@
   {
     // a is a small and b is a large int: -> a 
-    //  INCORRECT, IT COULD HAPPEN THAT B IS A SMALL NUMBER
+    //  INCORRECT, IT COULD HAPPEN THAT b IS A SMALL NUMBER
     number aa;
-    //mpz_ptr aa=NULL;
-    //aa=(mpz_ptr)omAlloc(sizeof(mpz_t));
     aa=ALLOC_RNUMBER();
     mpz_init(aa->z);
     mpz_set_si(aa->z, SR_TO_INT(a));
-    //mpz_init_set_si(aa,SR_TO_INT(a));
     u=ALLOC_RNUMBER();
 #if defined(LDEBUG)
@@ -842 +840 @@
           mpz_add(u->z,aa->z,b->z);
     }
-    /*if( !n_GreaterZero(a,r) )
-    {
-        if( !n_GreaterZero(b,r) )
-            a = r->cfSub(a,b,r);
-        else
-            a = r->cfAdd(a,b,r);
-    }*/
-    //printf("\nnlIntMod a\n");
-    //printf("\na =  ");n_Print(a,r);printf("\n");
-    //gmp_printf("\nb =  %Zd",b);n_Print(b,r);printf("\n");
-    //printf("\nc =  ");n_Print(a,r);printf("\n");
-    //gmp_printf("\nc =  %Zd",u->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);*/
+    if (aa!=NULL)
+    {
+      mpz_clear(aa->z);
+    #if defined(LDEBUG)
+      aa->debug=654324;
+    #endif
+      FREE_RNUMBER(aa);
+    }
     u=nlShort3(u);
     nlTest(u,r);
@@ -871 +880 @@
   u->s = 3;
   mpz_mod(u->z,a->z,b->z);
-  //printf("\nnlIntMod mpz_t\n");
-  //gmp_printf("\na =  %Zd\n",a);
-  //n_Print(b, r);
-  //gmp_printf("\nb =  %Zd\n",b);
-  //gmp_printf("\nc =  %Zd\n",u);
-  if (bb!=NULL)
-  {
-    mpz_clear(bb->z);
-#if defined(LDEBUG)
-    bb->debug=654324;
-#endif
-    FREE_RNUMBER(bb);
-  }
   if (mpz_isNeg(u->z))
   {
@@ -891 +887 @@
       mpz_add(u->z,u->z,b->z);
   }
+  if (bb!=NULL)
+  {
+    mpz_clear(bb->z);
+#if defined(LDEBUG)
+    bb->debug=654324;
+#endif
+    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);