Changeset 9d6f3a in git

Timestamp:

Nov 4, 2009, 2:39:32 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '5d369c3cbad1a1bf2d5c856a48fb8a30b51cec3b')

Children:

d4a2c308a86a41c2637ba8e3d31b5ed78b9f2ee7

Parents:

151f85d6b8f7459eb6a91452f5ce85020f49ae7a

Message:

*hannes: use bigint instead of number

git-svn-id: file:///usr/local/Singular/svn/trunk@12238 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/LIB/modstd.lib (modified) (16 diffs)

Singular/LIB/modstd.lib

@@ -386 +386 @@
    poly result;
    number n;
-   number N=L[1];
+   bigint N=L[1];
    for(i=size(L);i>1;i--)
    {
@@ -393 +393 @@
    while(h!=0)
    {
-     n=Farey(N,leadcoef(h));
+     n=Farey(N,bigint(leadcoef(h)));
      result=result+n*p;
      h=h-lead(h);
@@ -420 +420 @@
    number n;
 
-   number N=L[1];
+   bigint N=L[1];
    for(i=2;i<=size(L);i++)
    {
@@ -449 +449 @@
      }
      n=chineseR(TT,L,N);
-     n=Farey(N,n);
+     n=Farey(N,bigint(n));
      result=result+n*p;
    }
@@ -466 +466 @@
    int i,j;
    number n;
-   number N=L[1];
+   bigint N=L[1];
    for(i=2;i<=size(L);i++)
    {
@@ -480 +480 @@
         if (p==0) {break;}
         p=p-lead(p);
-        n=Farey(N,leadcoef(p));
+        n=Farey(N,bigint(leadcoef(p)));
         result=result+n*leadmonom(p);
      }
@@ -488 +488 @@
 }
 ///////////////////////////////////////////////////////////////////////////////
-proc Farey (number P, number N)
+proc Farey (bigint P, bigint N)
 "USAGE:  Farey (P,N); P, N number;
 RETURN:  a rational number a/b such that a/b=N mod P
@@ -496 +496 @@
    if (P<0){P=-P;}
    if (N<0){N=N+P;}
-   number A,B,C,D,E;
+   bigint A,B,C,D,E;
    E=P;
    B=1;
@@ -503 +503 @@
         if (2*N^2<P)
         {
-           return(N/B);
+           return(number(N)/number(B));
         }
         D=E mod N;
-        C=A-(E-E mod N)/N*B;
+        C=A-(E div N)*B;
         E=N;
         N=D;
@@ -581 +581 @@
   kill r1;
   number c=p;
+  bigint cb=p;
   matrix G0=transpose(matrix(G));
-  G0= MmodN(G0+ (c)* G22,c^2);
-  matrix GF=fareyMatrix(G0,c^2);
-  Z=MmodN(Z+(c)*Z2,c^2);
+  G0= MmodN(G0+ (c)* G22,cb^2);
+  matrix GF=fareyMatrix(G0,cb^2);
+  Z=MmodN(Z+(c)*Z2,cb^2);
   matrix C=transpose(G);
   int n=3;
@@ -596 +597 @@
     M=redmat(G,G1,G22);
     Z2=-M*Z;
-    Z=MmodN(Z+(c^(n-1))*Z2,c^n);
-    G0= MmodN(G0+ (c^(n-1))* G22,c^n);
-    GF=fareyMatrix(G0,c^n);
+    Z=MmodN(Z+(c^(n-1))*Z2,cb^n);
+    G0= MmodN(G0+ (c^(n-1))* G22,cb^n);
+    GF=fareyMatrix(G0,cb^n);
     n++;
   }
@@ -691 +692 @@
 }
 ///////////////////////////////////////////////////////////////////////////
-proc fareyMatrix(matrix m,number N)
+proc fareyMatrix(matrix m,bigint N)
 "USAGE:  fareyMatrix(m,y); m matrix, y integer;
 RETURN:  a matrix k of the matrix m with Farey rational numbers a/b as coefficients
@@ -709 +710 @@
       if (p==0) {break;}
       p=p-lead(p);
-      n=Farey(N,leadcoef(p));
+      n=Farey(N,bigint(leadcoef(p)));
       result=result+n*leadmonom(p);
     }
@@ -726 +727 @@
 }
 ///////////////////////////////////////////////////////////////////////////
-proc MmodN(matrix Z,number N)
-"USAGE:  MmodN(Z,N);Z matrix, N number;
+proc MmodN(matrix Z,bigint N)
+"USAGE:  MmodN(Z,N);Z matrix, N bigint;
 RETURN:  the matrix Z mod N
 EXAMPLE: example MmodN;
@@ -742 +743 @@
       {
         m=leadmonom(Z[i,j][k]);
-        c=leadcoef(Z[i,j][k]) mod N;
+        c=bigint(leadcoef(Z[i,j][k])) mod N;
         p=p+c*m;
       }
@@ -755 +756 @@
    ring r = 0,(x,y,z),dp;
    matrix m[3][1]= x3+10668x2+10668, z4-12801z2+12802, y5-8728y3+14547;
-   number p=32003;
+   bigint p=32003;
    matrix b=MmodN(m,p^2);
    b;