Changeset bf8a3f in git

Timestamp:

May 28, 2014, 11:01:58 AM (10 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

121ad4a2fe86746537b889b9ac969034ed1c0dd1

Parents:

d3c0a07150aa1213c3c3b5b69c6e7fcfacd56d73

git-author:

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

git-committer:

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

Message:

fix: 64 bits Long/paraplane.tst

Files:

• Singular/LIB/paraplanecurves.lib (modified) (2 diffs)
• libpolys/coeffs/longrat.cc (modified) (7 diffs)
• libpolys/coeffs/mpr_complex.cc (modified) (1 diff)

Singular/LIB/paraplanecurves.lib

@@ -1973 +1973 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-static proc polyModP(poly q, bigint p)
+proc polyModP(poly q, bigint p)
 "USAGE:  polyModP(q, p); q poly, p bigint
 RETURN:  takes each coefficient of q modulo p and returns the resulting poly
@@ -2064 +2064 @@
 "
 {
-  r;
-  p;
-  gcd(r,p);
   list L = extgcd(r, p);
   if (L[1] != 1) { ERROR("GCD of", r, "and", p, "should be 1."); }

libpolys/coeffs/longrat.cc

@@ -265 +265 @@
   if ( SR_HDL(n) & SR_INT )
   {
-    term = SR_TO_INT(n);
+    int nn=SR_TO_INT(n);
+    if ((long)nn==SR_TO_INT(n))
+       term = nn;
+    else
+    {
+        mpz_t dummy;
+        mpz_init_set_si(dummy, SR_TO_INT(n)); 
+        term = make_cf(dummy);   
+    }
   }
   else
@@ -534 +542 @@
   nlTest(i, r);
   nlNormalize(i,r);
-  if (SR_HDL(i) & SR_INT) return SR_TO_INT(i);
+  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;
+  }
   if (i->s==3)
   {
@@ -563 +578 @@
   nlTest(i, r);
   nlNormalize(i,r);
-  if (SR_HDL(i) &SR_INT) return (i);
+  if (SR_HDL(i) & SR_INT) return (i);
   if (i->s==3)
   {
@@ -786 +801 @@
   {
     LONG bb=SR_TO_INT(b);
-    LONG c=SR_TO_INT(a)%bb;
+    LONG c=SR_TO_INT(a) % bb;
+    if(c < 0)
+    {    
+        if(bb < 0)
+            c = c - bb;
+        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);
     return INT_TO_SR(c);
   }
   if (SR_HDL(a) & SR_INT)
   {
-    /* a is a small and b is a large int: -> a */
-    return a;
+    // a is a small and b is a large int: -> a 
+    //  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)
+    u->debug=123456;
+#endif
+    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);
+    }
+    /*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);
+    u=nlShort3(u);
+    nlTest(u,r);
+    return u;
   }
   number bb=NULL;
@@ -807 +871 @@
   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)
   {
@@ -2092 +2161 @@
   assume( getCoeffType(dst) == ID );
   assume( getCoeffType(src) == ID );
-
   if ((SR_HDL(a) & SR_INT)||(a==NULL))
   {
@@ -2693 +2761 @@
 
     nlInpGcd(cand, n, cf);
-
     assume( nlGreaterZero(cand,cf) );
 

libpolys/coeffs/mpr_complex.cc

@@ -458 +458 @@
         if (SR_HDL(num) & SR_INT)
         {
-          r= SR_TO_INT(num);
+          int nn = SR_TO_INT(num);
+          if((long)nn == SR_TO_INT(num))
+            r = SR_TO_INT(num);
+          else
+            r = gmp_float(SR_TO_INT(num));
         }
         else