Changeset 6fd3a2 in git for Singular/LIB/primdec.lib

Timestamp:

Dec 7, 2007, 11:20:34 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b809a8a816d3540b354df0da574c2d8753d13879

Parents:

70c2cc2d9c397681c3678b4a007ae94378a277f6

Message:

*hannes/pfister: force redSB for finduni


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

File:

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

Singular/LIB/primdec.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: primdec.lib,v 1.135 2007-04-20 09:53:27 Singular Exp $";
+version="$Id: primdec.lib,v 1.136 2007-12-07 10:20:34 Singular Exp $";
 category="Commutative Algebra";
 info="
@@ -5724 +5724 @@
 static proc radicalReduction(ideal I, ideal ser, int allIndep, list #)
 {
-// allMaximal                1 -> Indicates that the reduction to the zerodim case
-//                       must be done for all indep set of the leading terms ideal
-//                                        0 -> Otherwise
-// ideal ser                Only for radicalKL. (Same as in radicalKL)
-// list #                        Only for radicalKL (If #[1] = 1, only equiradical is required.
-//                  It is used to set the value of done.)
+// allMaximal      1 -> Indicates that the reduction to the zerodim case
+//                    must be done for all indep set of the leading terms ideal
+//                 0 -> Otherwise
+// ideal ser       Only for radicalKL. (Same as in radicalKL)
+// list #          Only for radicalKL (If #[1] = 1, 
+//                    only equiradical is required.
+//                    It is used to set the value of done.)
 
   attrib(I, "isSB", 1);   // I needs to be a reduced standard basis
@@ -5786 +5787 @@
   //-------------------------------------------------------------------------
 
-  // SL 2006-04-24 1         If allIndep = 0, then it only computes one maximal
-  //                                        independent set.
-  //                                        This looks better for the new algorithm but not for KL
-  //                                        algorithm
+  // SL 2006-04-24 1   If allIndep = 0, then it only computes one maximal
+  //                     independent set.
+  //                     This looks better for the new algorithm but not for KL
+  //                     algorithm
   list parameters = allIndep;
   indep = newMaxIndependSetDp(I, parameters);
@@ -5873 +5874 @@
       op = option(get);
       option(redSB);
-      @j = interred(@j);  //to obtain a reduced standardbasis
-      attrib(@j, "isSB", 1);
+      @j = std(@j);  //to obtain a reduced standardbasis
       option(set, op);
 
@@ -5974 +5974 @@
   // SL 2006.04.11 2 Debug messages
 
-  // SL 2006.04.21 1         New variable "done".
-  //                                        It tells if the radical is already computed or
-  //                                        if it still has to be computed the radical of the new ideal I
+  // SL 2006.04.21 1    New variable "done".
+  //                      It tells if the radical is already computed or
+  //                      if it still has to be computed the radical of the new ideal I
   int done;
   if(((@wr == 1) && (dim(I)<jdim)) || (deg(I[1])==0) || (size(te) == 0))
@@ -5988 +5988 @@
   // SL 2006.04.21 2
 
-  // SL 2006.04.21 1         See details of the output at the beggining of this proc.
+  // SL 2006.04.21 1     See details of the output at the beginning of this proc.
   list result = rad, I, done;
   return(result);
   // SL 2006.04.21 2
 }
-
-
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -6006 +6004 @@
 // Output: ideal. Intersection of some primes of I different from the ones in P.
 {
-  int k = 1;                                // Counter
-  int good  = 0;                        // Checks if an element of P is in rad(I)
+  int k = 1;                     // Counter
+  int good  = 0;                 // Checks if an element of P is in rad(I)
 
   dbprint (printlevel-voice, "// We search for an element in P - sqrt(I).");
@@ -6027 +6025 @@
   if (P[k] != 1)
   {
+    intvec oo=option(get);
+    option(redSB);
     ideal J = sat(I, P[k])[1];
+    option(set,oo);
+
   }
   else
@@ -6040 +6042 @@
   dbprint(printlevel - voice, "// The dimension is ", dim(groebner(J)));
 
-  int allMaximal = 0;                   // Compute the zerodim reduction for only one indep set.
-  ideal re = 1;                           // No reduction is need, there are not redundant components.
-  list emptyList = list();   // Look for primes of any dimension, not only of max dimension.
+  int allMaximal = 0;   // Compute the zerodim reduction for only one indep set.
+  ideal re = 1;         // No reduction is need,
+                        //    there are not redundant components.
+  list emptyList = list();   // Look for primes of any dimension,
+                             //   not only of max dimension.
   list result = radicalReduction(J, re, allMaximal, emptyList);