Changeset 6188f04 in git

Timestamp:

Jan 14, 2014, 4:31:03 PM (10 years ago)

Author:

Janko Boehm <boehm@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

3ec6eca5156711f5fab6a2d21c403e256f154188

Parents:

bbb8fa401a826c3aa9827457718f04c4da962e1d

Message:

Integrated locnormal.lib into reesclos.lib

Location:

Singular/LIB

Files:

• locnormal.lib (modified) (2 diffs)
• reesclos.lib (modified) (7 diffs)

Singular/LIB/locnormal.lib

@@ -142 +142 @@
   ideal J = minor(jacob(IMin), nvars(basering) - d, I);
   t=timer;
-  J = modStd(J);
-  if (printTimings==1) {"Time for modStd Jacobian "+string(timer-t);}
+  int ch = char(basering);
+  if (ch==0) {J = modStd(J);} else {J = std(J);}
+  if (printTimings==1) {"Time for modStd/std Jacobian "+string(timer-t);}
 
   setring R;
@@ -198 +199 @@
 
   t=timer;
-  resu = modStd(resu);
-  if (printTimings==1) {
-     "Time for combining the local results, modStd "+string(timer-t);
+  if (ch==0) {resu = modStd(resu);} else {resu = std(resu);}
+  if (printTimings==1) {
+     "Time for combining the local results, modStd/std "+string(timer-t);
   }
 

Singular/LIB/reesclos.lib

@@ -24 +24 @@
 ";
 
-LIB "normal.lib";       // for HomJJ
+LIB "locnormal.lib";       // for HomJJ
 LIB "standard.lib";     // for groebner
 
@@ -103 +103 @@
 
 static
-proc ClosureRees (list L)
-"USAGE:    ClosureRees (L); L a list
+proc ClosureRees (list L, int useLocNormal)
+"USAGE:    ClosureRees (L,useLocNormal); L a list, useLocNormal an integer
 ASSUME:   L is a list containing
           - a ring L[1], inside L[1] an ideal ker such that L[1]/ker is
@@ -123 +123 @@
   setring R(1);                   // declaration of variables used later
   ideal ker(1)=ker;               // in STEP 2
-  list nor = normal(ker);
-  list preimages=nor[2];
+  if (useLocNormal==1) {
+      list preimages1 = locNormal(ker);
+      ideal preimagesI=preimages1[1];
+      list preimagesL = list(preimagesI[2..size(preimagesI)])+list(preimagesI[1]);
+      ideal preimages = ideal(preimagesL[1..size(preimagesL)]);
+  } else {
+      list nor = normal(ker);
+      ideal preimages=nor[2][1];
+  }
   setring Kxt;
   map psi=R(1),mapI;              // from ReesAlgebra: the map Rees->Kxt
-  ideal images=(psi(preimages))[1];
+  ideal images=psi(preimages);
   ideal psii = images[size(images)]*ideal(psi);
   list imagesl = images[1..size(images)];
@@ -265 +272 @@
 
 proc normalI(ideal I, list #)
-"USAGE:    normalI (I [,p[,r]]); I an ideal, p and r optional integers
+"USAGE:    normalI (I [,p [,r [,l]]]); I an ideal, p, r, and l optional integers
 RETURN:   the integral closure of I, ..., I^p, where I is an ideal in the
           polynomial ring R=k[x(1),...x(n)]. If p is not given, or p==0,
@@ -273 +280 @@
           is given and r==1, normalI starts with a check whether I is already a
           radical ideal.
+          If l==1 then locNormal instead of normal is used to compute normalization.
           The result is a list containing the closure of the desired powers of
           I as ideals of the basering.
@@ -305 +313 @@
 
   int testrad=0;      // do the radical check?
+  int uselocNormal=0;
   if (size(#)>1)
   {
     testrad=#[2];
+    if (size(#)==3) {
+                 uselocNormal=#[3];
+    }
   }
 
@@ -363 +375 @@
 
   setring Kxt;
-  list images = ClosureRees(Rees);
+  list images = ClosureRees(Rees,uselocNormal);
 
   // ClosureRees was done after the first HomJJ-call