Changeset 3ab2c6 in git

Timestamp:

Feb 19, 2020, 1:20:21 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

c824c00076c780d82b72182d73bd00ce123b3beb

Parents:

a962f61f9e0ac32ab10921651f4f7b6903387331

Message:

fix: cyclotomic was defined in invar.lib and finvar.lib (removed from invar)

Location:

Singular/LIB

Files:

• finvar.lib (modified) (1 diff)
• invar.lib (modified) (3 diffs)

Singular/LIB/finvar.lib

@@ -124 +124 @@
       min=s[2,1];
     }
-    if (n*j==i)                        // the earliest possible point to break
-    { break;
-    }
+    if (n*j==i) break;                 // the earliest possible point to break
     j++;
   }

Singular/LIB/invar.lib

@@ -16 +16 @@
   SLreynolds(f)          applies the Reynolds operator to f
   torusreynolds(f)       applies the Reynolds operator to f if the group is a torus or a finite group.
-  cyclotomic(n,z)        the n-th cyclotomic polynomial in the variable z.
 ";
 LIB "matrix.lib";
+LIB "finvar.lib"; // for cyclotomic
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -362 +362 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-// cyclotomic(n,z) gives the n-th cyclotomic polynomial in z, where z is
-// a variable.
-////////////////////////////////////////////////////////////////////////////////
-proc cyclotomic(n,poly z)
-"USAGE: cyclotomic(n,z) int n, variable z
-RETURNS:  the n-th cyclotomic polynomial in z"
-{       poly h=z**n-1;
-        ideal id=h;
-        id=std(id);
-        poly f=z-1;
-        int i=prime(n-1);
-        while(i<>2)
-                {if (n%i==0) {f=f*(z**(n div i)-1);};
-                i=prime(i-1);};
-        if (n%2==0) {f=f*(z**(n div 2)-1);};
-        h=h/gcd(f,h);
-        return(h/leadcoef(h));
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // finite(n) sets the current group to a finite group of order n.
 ////////////////////////////////////////////////////////////////////////////////
@@ -396 +376 @@
 {       ring group=0,(g(1),g(2)),dp(2);
         export group;
-        ideal groupideal=g(2)^n-1,cyclotomic(n,g(1));
+        ideal groupideal=g(2)^n-1,cyclotomic(n);
         groupideal=std(groupideal);
         export groupideal;