Changeset 1f9a84 in git for Singular/LIB/atkins.lib

Timestamp:

May 5, 2011, 2:19:42 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

750e704356a16e0d46bd540f5fe07a831a40cded

Parents:

d44974deb309558594f4d26a7d11c490304c77cf

Message:

more int division from the manual

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

File:

• Singular/LIB/atkins.lib (modified) (5 diffs)

Singular/LIB/atkins.lib

@@ -372 +372 @@
   ring R=(real,k),var(1),dp;
   poly f=imap(S,f);
-  ideal I=nt_solve(f,1.1,list(k,int(intPart(k/5))));
+  ideal I=nt_solve(f,1.1,list(k,k div 5));
   number c=leadcoef(I[1]);
   setring S;
@@ -427 +427 @@
   ti=impart(t);
   if(tr==-1/2){qr1=-1;}
-  if(tr==0){qr1=1;}
-  if((tr!=-1/2)&&(tr!=0))
-  {
-    tr=tr-round(tr);
-    qr1=expo(2*i*pi*tr,10*k);
+  else
+  {
+    if(tr==0){qr1=1;}
+    else
+    {
+      tr=tr-round(tr);
+      qr1=expo(2*i*pi*tr,10*k);
+    }
   }
 
@@ -441 +444 @@
   while(n<=k)
   {
-    m1=m1+(-1)^n*(q1^(n*(3*n-1)/2)+q1^(n*(3*n+1)/2));
-    m2=m2+(-1)^n*(q2^(n*(3*n-1)/2)+q2^(n*(3*n+1)/2));
+    m1=m1+(-1)^n*(q1^(n*(3*n-1) div 2)+q1^(n*(3*n+1) div 2));
+    m2=m2+(-1)^n*(q2^(n*(3*n-1) div 2)+q2^(n*(3*n+1) div 2));
     n++;
   }
@@ -725 +728 @@
     {
       a=random(0,p-1);
-      B=gcd((var(1)+a)^((p-1)/2)-1,A);
+      B=gcd((var(1)+a)^((p-1) div 2)-1,A);
       C=A/B;
     }
@@ -820 +823 @@
 
     if(printlevel>=1) {"List H of possibly suitable discriminants will be calculated.";}
-    H=disc(N,K/2);
+    H=disc(N,K div 2);
     if(printlevel>=1) {"H = "+string(H);pause();"";}