Changeset bb08d5 in git

Timestamp:

Mar 17, 2011, 7:42:35 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

96e408150a3505f749f97e0e806d6e654d0269bd

Parents:

e7463f6a2c8fb0cc7abe50aa54f387c997fec2d8

Message:

FIX: intDet -> det!
FIX: hermite/smith NFs are stored as list entries as well as attribues due to Singular inablility to handle attribs of attrib :(
FIX: updated isGroup

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

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

File:

• Singular/LIB/multigrading.lib (modified) (9 diffs)

Singular/LIB/multigrading.lib

@@ -46 +46 @@
 
 isSublattice(A,B);        test whether A is a sublattice of B
-imageLattice(P,L);        computes an integral basis for the image of the lattice L under the linear map P.
+imageLattice(P,L);        computes an integral basis for P(L)
 intRank(A);               computes the rank of the intmat A
 kernelLattice(P);         computes an integral basis for the kernel of the linear map P.
-latticeBasis(B);          compute an integral basis of the lattice B
+latticeBasis(B);          computes an integral basis of the lattice B
 preimageLattice(P,L);     computes an integral basis for the preimage of the lattice L under the linear map P.
-projectLattices(B);       compute a linear map of lattices having the primitive span of B as its kernel.
-intersectLattices(A,B);   compute an integral basis for the intersection of the lattices A and B.
+projectLattices(B);       computes a linear map of lattices having the primitive span of B as its kernel.
+intersectLattices(A,B);   computes an integral basis for the intersection of the lattices A and B.
 isIntegralSurjective(P);  test whether the map P of lattices is surjective.
 isPrimitiveSublattice(A); test whether A generates a primitive sublattice.
-intInverse(A);            compute the integral inverse matrix of the intmat A
+intInverse(A);            computes the integral inverse matrix of the intmat A
 intAdjoint(A,i,j);        delete row i and column j of the intmat A.
 integralSection(P);       for a given linear surjective map P of lattices this procedure returns an integral section of P.
-primitiveSpan(A);         compute a basis for the minimal primitive sublattice that contains the given vectors (by A).
+primitiveSpan(A);         computes a basis for the minimal primitive sublattice that contains the given vectors (by A).
 
 factorgroup(G,H);         create the group G mod H
@@ -328 +328 @@
 
   list G; // Please, note the order: Generators + Relations:
-  G[1] = S; G[2] = L;
+  G[1] = S;
+  G[2] = L;
+  // And now a quick-and-dirty fix of Singular inability to handle attribs of attribs:
+  // For the use of a group as an attribute for multigraded rings
+  G[3] = attrib(L, attrGroupHNF); 
+  G[4] = attrib(L, attrGroupSNF);
+  
 
   attrib(G, isGroup, (1==1)); // mark it "a group"
@@ -413 +419 @@
 "
 {
+  ERROR("areIsomorphicGroups: Not yet implemented!");
   return (1); // TRUE
 }
@@ -436 +443 @@
 //  if( !defined(a) ) { return(0); }
 //  if( typeof(a) != "int" ) { return(0); }
-//  if( !a ){ return(0); }
-
-
-  if( size(G) != 2 ){ return(0); }
+  if( defined(a) ){ if(typeof(a) == "int") { return(a); } }
+
+
+  if( (size(G) != 2) && (size(G) != 4) ){ return(0); }
   if( typeof(G[1]) != "intmat" ){ return(0); }
   if( typeof(G[2]) != "intmat" ){ return(0); }
   if( nrows(G[1]) != nrows(G[2]) ){ return(0); }
 
-  return(1==1);
+  return(1);
 }
 
@@ -825 +832 @@
       if( (!defined(M)) or (typeof(M) != "intmat") )
       {
-        M = hermiteNormalForm(T);
+        if( size(G) > 2 )
+        {
+          M = G[3];
+        } else
+        {
+          M = hermiteNormalForm(T);
+        }
       }
       return (M);
@@ -835 +848 @@
       if( (!defined(M)) or (typeof(M) != "intmat") )
       {
-        M = smithNormalForm(T);
+        if( size(G) > 2 )
+        {
+          M = G[4];
+        } else
+        {
+          M = smithNormalForm(T);
+        }
       }
       return (M);
@@ -4806 +4825 @@
 
   // should result in a (2x4)-matrix with columns
-  // [-1, 2], [2, −3], [-1, 0] and [0, 1].
+  // [-1, 2], [2, -3], [-1, 0] and [0, 1]
   intmat U = projectLattice(B);
 
@@ -4936 +4955 @@
       }
 
-      C[i,j] = d * s * intDet(Ad); // mult by d is equal to div by det
+      C[i,j] = d * s * det(Ad); // mult by d is equal to div by det
     }
   }
@@ -5063 +5082 @@
 
   // should be a matrix with two columns
-  // for example: [−2, 1, 0, 0], [3, −3, 0, 1]
+  // for example: [-2, 1, 0, 0], [3, -3, 0, 1]
   intmat U = integralSection(P);