Changeset db347cb in git

Timestamp:

Oct 6, 2012, 1:02:39 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

95197e27d1277756b09bcdadc0b4e418cd280274

Parents:

20c54056198f825ef62888512342886cf96c82a6

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-10-06 13:02:39+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-10-06 13:03:40+02:00

Message:

fix from master: exceptional cases (algebra.lib), rename sum (modstd.lib)

Location:

Singular/LIB

Files:

• algebra.lib (modified) (5 diffs)
• modstd.lib (modified) (18 diffs)

Singular/LIB/algebra.lib

@@ -3 +3 @@
 //new proc  nonZeroEntry(id), used to fix a bug in proc finitenessTest
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id$";
+version="$Id: algebra.lib 14661 2012-03-05 11:00:14Z motsak $";
 category="Commutative Algebra";
 info="
@@ -329 +329 @@
 @end format
 NOTE:    Three different algorithms are used depending on c = 1,2,3.
-         If c is not given or c=0, a heuristically best method is choosen.
+         If c is not given or c=0, a heuristically best method is chosen.
          The basering may be a quotient ring.
          To access to the ring l[2] and see ker you must give the ring a name,
@@ -532 +532 @@
 @end format
 NOTE:    Three differnt algorithms are used depending on c = 1,2,3.
-         If c is not given or c=0, a heuristically best method is choosen.
+         If c is not given or c=0, a heuristically best method is chosen.
          The basering may be a quotient ring. However, if the preimage ring is
          a quotient ring, say pr = P/I, consider phi as a map from P and then
@@ -799 +799 @@
 "
 {
-   if ( deg(i[1]) <= 0)
-   {
-     list l = ideal(0),i;
+   i=simplify(i,2);
+   if ( i== 0)
+   {
+     list l = maxideal(1),maxideal(1);
      return( l );
    }
@@ -821 +822 @@
    i = j[2];
    int d = dim(j[1]);
-   if ( d == 0)
+   if ( d <= 0)
    {
      setring r;
-     list l = ideal(0),maxideal(1);
+     list l = maxideal(1),ideal(0);
      return( l );
    }

Singular/LIB/modstd.lib

@@ -1 +1 @@
 ////////////////////////////////////////////////////////////////////////////////
-version="$Id: modstd.lib 14375 2011-08-23 09:29:47Z steidel $";
+version="$Id: modstd.lib 15103 2012-07-11 10:00:13Z motsak $";
 category = "Commutative Algebra";
 info="
@@ -421 +421 @@
    int i,p;
    int ncores = 1;
-   
+
 //-----------------  Initialize optional parameter ncores  ---------------------
    if(size(#) > 0)
@@ -438 +438 @@
       }
    }
-   
+
    if(size(#) == 0)
    {
@@ -692 +692 @@
       kill HomR;
    }
-   
+
    if(variant == 4)
    {
@@ -711 +711 @@
    ideal I = cyclic(4);
    int p = 181;
-   list P = modpStd(I,p,5);
+   list P = modpStd(I,p,2);
    P;
 
+   ring r2 = 0, x(1..5), lp;
+   ideal I = cyclic(5);
    int q = 32003;
-   list Q = modpStd(I,q,2);
+   list Q = modpStd(I,q,4);
    Q;
 }
@@ -732 +734 @@
 RETURN:  a standard basis of I if no warning appears;
 NOTE:    The procedure computes a standard basis of I (over the rational
-         numbers) by using  modular methods.
+         numbers) by using modular methods.
          By default the procedure computes a standard basis of I for sure, but
          if the optional parameter #[2] = 0, it computes a standard basis of I
@@ -774 +776 @@
          int exactness = 1;
          if(n1 >= 10)
-         { 
+         {
             int n2 = n1 + 1;
             int n3 = n1;
@@ -789 +791 @@
          int exactness = #[2];
          if(n1 >= 10)
-         { 
+         {
             int n2 = n1 + 1;
             int n3 = n1;
@@ -864 +866 @@
          variant = 1;
          if(printlevel >= 10) { "variant = 1"; }
-         
+
          rl[1] = L[5];
          def @r = ring(rl);
@@ -907 +909 @@
                def @r = ring(rl);
                setring @r;
-               
+
                def @s = changeord("dp");
                setring @s;
@@ -920 +922 @@
                   variant = 3;
                   if(printlevel >= 10) { "variant = 3"; }
-                  
+
                   int nvar@r = nvars(@r);
                   intvec w;
@@ -937 +939 @@
                   intvec hi = hilb(Id(1), 1, W);
                }
-               
+
                setring R0;
                kill @r,@s;
@@ -1078 +1080 @@
    {
       tt = timer; rt = rtimer;
-      
+
       if(printlevel >= 10) { "size(L) = "+string(size(L)); }
-         
+
       if(n1 > 1)
       {
@@ -1218 +1220 @@
 
          attrib(J,"isSB",1);
-         
+
          if(exactness == 0)
          {
@@ -1225 +1227 @@
             return(J);
          }
-         
+
          if(exactness == 1)
          {
@@ -1429 +1431 @@
    {
       i++;
-      G1 = ideal(1/(p^i) * sum(F*PrevZ,(-1)*PrevG));
+      G1 = ideal(1/(p^i) * sum_id(F*PrevZ,(-1)*PrevG));
       setring S;
       G1 = imap(R,G1);
       G2 = reduce(G1,Gp);
-      G3 = sum(G1,(-1)*G2);
+      G3 = sum_id(G1,(-1)*G2);
       M = lift(Gp,G3);
       Z2 = (-1)*Z*M;
@@ -1440 +1442 @@
       G2 = imap(S,G2);
       Z2 = imap(S,Z2);
-      PrevG = sum(PrevG, module(p^i*G2));
-      PrevZ = sum(PrevZ, multiply(poly(p^i),Z2));
+      PrevG = sum_id(PrevG, module(p^i*G2));
+      PrevZ = sum_id(PrevZ, multiply(poly(p^i),Z2));
       testG1 = farey(ideal(PrevG),p^(i+1));
       attrib(testG1,"isSB",1);
@@ -1473 +1475 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-static proc sum(list #)
+static proc sum_id(list #)
 {
    if(typeof(#[1])=="ideal")