Changeset 7152fa in git

Timestamp:

May 30, 2014, 4:52:30 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

29cbfc58717330e765f1af9ef017a028621f797a

Parents:

75424e3a56f41323abd6d3f9936e00e102ff6a6d

Message:

more changes for 64bit: number representation in Q

Files:

• Singular/LIB/paraplanecurves.lib (modified) (3 diffs)
• libpolys/coeffs/longrat.cc (modified) (8 diffs)

Singular/LIB/paraplanecurves.lib

@@ -1973 +1973 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-proc polyModP(poly q, bigint p)
+static 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
@@ -2015 +2015 @@
     return (-1);
   }
+
   /* For p > 32003, we use Cantor-Zassenhaus' algorithm: */
   def br = basering;
@@ -2109 +2110 @@
     // 3) lift (x1, x2, ..., xk) in Z/p1^e1 * ... * Z/pk^ek
     //    to x in Z/m via Chinese remainder theorem
+
     list roots;
     // 2.1):

libpolys/coeffs/longrat.cc

@@ -271 +271 @@
     {
         mpz_t dummy;
-        mpz_init_set_si(dummy, SR_TO_INT(n)); 
-        term = make_cf(dummy);   
+        mpz_init_set_si(dummy, SR_TO_INT(n));
+        term = make_cf(dummy);
     }
   }
@@ -542 +542 @@
   nlTest(i, r);
   nlNormalize(i,r);
-  if (SR_HDL(i) & SR_INT) 
+  if (SR_HDL(i) & SR_INT)
   {
     int dummy = SR_TO_INT(i);
@@ -803 +803 @@
     LONG c=SR_TO_INT(a) % bb;
     /*if(c < 0)
-    {    
+    {
         if(bb < 0)
             c = c - bb;
@@ -820 +820 @@
   if (SR_HDL(a) & SR_INT)
   {
-    // a is a small and b is a large int: -> a 
+    // a is a small and b is a large int: -> a
     //  INCORRECT, IT COULD HAPPEN THAT b IS A SMALL NUMBER
-    number aa;
-    aa=ALLOC_RNUMBER();
+    number aa=ALLOC_RNUMBER();
     mpz_init(aa->z);
     mpz_set_si(aa->z, SR_TO_INT(a));
@@ -831 +830 @@
 #endif
     u->s = 3;
-    mpz_init(u->z); 
+    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 (mpz_isNeg(b->z))
+        mpz_sub(u->z,aa->z,b->z);
+      else
+        mpz_add(u->z,aa->z,b->z);
     }
     /*mpz_t dummy;
@@ -855 +854 @@
     }
     mpz_clear(dummy);*/
-    if (aa!=NULL)
-    {
-      mpz_clear(aa->z);
+    mpz_clear(aa->z);
     #if defined(LDEBUG)
-      aa->debug=654324;
+    aa->debug=654324;
     #endif
-      FREE_RNUMBER(aa);
-    }
+    FREE_RNUMBER(aa);
     u=nlShort3(u);
     nlTest(u,r);
@@ -2985 +2981 @@
          s_readmpz(f,n->z);
          n->s=3; /*sub_type*/
+         #if SIZEOF_LONG == 8
+         n=nlShort3(n);
+         #endif
          return n;
        }
@@ -3011 +3010 @@
          s_readmpz_base (f,n->z, SSI_BASE);
          n->s=sub_type=3; /*subtype-5*/
+         #if SIZEOF_LONG == 8
+         n=nlShort3(n);
+         #endif
          return n;
        }