Changeset dbf609 in git

Timestamp:

Feb 5, 2015, 3:13:02 PM (9 years ago)

Author:

Stephan Oberfranz <oberfran@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

4052dce8271d3f66d409017a24c00744665f670a

Parents:

7023cea48460891d8d8145b55190cccabdc8074170bc378d051d27d991eb0d71f4a460fa0f1007b1

Message:

---
Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese

Files:

• .gdbinit (modified) (1 diff)
• Singular/LIB/dmod.lib (modified) (1 diff)
• Singular/LIB/general.lib (modified) (1 diff)
• Singular/LIB/gmssing.lib (modified) (1 diff)
• Singular/LIB/grobcov.lib (modified) (1 diff)
• Singular/LIB/grwalk.lib (modified) (9 diffs)
• Singular/LIB/modwalk.lib (modified) (22 diffs, 1 prop)
• Singular/LIB/reszeta.lib (modified) (1 diff)
• Singular/LIB/rwalk.lib (modified) (11 diffs, 1 prop)
• Singular/LIB/schreyer.lib (modified) (10 diffs)
• Singular/LIB/swalk.lib (modified) (1 prop)
• Singular/extra.cc (modified) (11 diffs)
• Singular/ipassign.cc (modified) (15 diffs)
• Singular/ipshell.h (modified) (1 diff)
• Singular/singular-libs (modified) (1 diff)
• Singular/walk.cc (modified) (142 diffs, 1 prop)
• Singular/walk.h (modified) (1 diff, 1 prop)
• Tst/Old/m139si.res.gz.uu (modified) (2 diffs)
• Tst/Old/m24si.res.gz.uu (modified) (1 diff)
• Tst/Short/countedref_s.res.gz.uu (modified) (1 diff)
• Tst/Short/countedref_s.tst (modified) (1 diff)
• doc/NEWS.texi (modified) (1 diff)

.gdbinit

@@ -1 +1 @@
 break dErrorBreak
 
+#break omReportError # use in case of problems with omaloc
+#break dPolyReportError # use in case of problems with polynomial arithmetic
+             
 
 

Singular/LIB/dmod.lib

@@ -6311 +6311 @@
   vector V = M2[1];
   number bcand = leadcoef(V[1]); // 1st component
-  V[1]=0;
+  V=V-V[1];
   number ct = content(V); // content of the cofactors
   poly CF = ct*V[ncols(J)]; // polynomial in K[s]<x,dx>, cofactor to F

Singular/LIB/general.lib

@@ -682 +682 @@
 "
 {  int ii,jj,s,n = 0,0,1,0;
+   string id_typ=typeof(id);
+   if ((id_typ!="ideal")
+   and (id_typ!="module")
+   and (id_typ!="matrix")
+   and (id_typ!="list")
+   and (id_typ!="intvec")) { return (id,0); }
    intvec v;
    if ( defined(basering) ) { def P = basering; }

Singular/LIB/gmssing.lib

@@ -932 +932 @@
   module U,U0,U1,U2;
   matrix N;
-  s=0;
   for(i=size(F);i>=1;i--)
   {

Singular/LIB/grobcov.lib

@@ -85 +85 @@
 @*         grobcov, cgsdr,
 @*         generate the global rings
-@*         @R   (Q[a][x]),
-@*         @P   (Q[a]),
-@*         @RP  (Q[x,a])
+@*         Grobcov::@R   (Q[a][x]),
+@*         Grobcov::@P   (Q[a]),
+@*         Grobcov::@RP  (Q[x,a])
 @*         that are used inside and killed before the output.
 @*         If you want to use some internal routine you must

Singular/LIB/grwalk.lib

@@ -255 +255 @@
 }
 
-proc gwalk(ideal Go, list #)
-"SYNTAX: gwalk(ideal i);
-         gwalk(ideal i, intvec v, intvec w);
+proc gwalk(ideal Go, int reduction,int printout, list #)
+"SYNTAX: gwalk(ideal i, int reduction, int printout);
+         gwalk(ideal i, int reduction, int printout, intvec v, intvec w);
 TYPE:    ideal
 PURPOSE: compute the standard basis of the ideal, calculated via
@@ -284 +284 @@
    //print("//** help ring = " + string(basering));
    ideal G = fetch(xR, Go);
-   G = system("Mwalk", G, curr_weight, target_weight,basering);
+   G = system("Mwalk", G, curr_weight, target_weight,basering,reduction,printout);
 
    setring xR;
@@ -300 +300 @@
   ring r = 32003,(z,y,x), lp;
   ideal I = y3+xyz+y2z+xz3, 3+xy+x2y+y2z;
-  gwalk(I);
+  gwalk(I,0,1);
 }
 
@@ -346 +346 @@
 }
 
-proc fwalk(ideal Go, list #)
-"SYNTAX: fwalk(ideal i);
-         fwalk(ideal i, intvec v, intvec w);
+proc fwalk(ideal Go, int reduction, int printout, list #)
+"SYNTAX: fwalk(ideal i,int reductioin);
+         fwalk(ideal i, int reduction intvec v, intvec w);
 TYPE:    ideal
 PURPOSE: compute the standard basis of the ideal w.r.t. the
@@ -372 +372 @@
 
    ideal G = fetch(xR, Go);
-   G = system("Mfwalk", G, curr_weight, target_weight);
+   G = system("Mfwalk", G, curr_weight, target_weight, reduction, printout);
 
    setring xR;
@@ -387 +387 @@
     ring r = 32003,(z,y,x), lp;
     ideal I = y3+xyz+y2z+xz3, 3+xy+x2y+y2z;
-    fwalk(I);
+    int reduction = 1;
+    int printout = 1;
+    fwalk(I,reduction,printout);
 }
 
@@ -437 +439 @@
 }
 
-proc pwalk(ideal Go, int n1, int n2, list #)
-"SYNTAX: pwalk(int d, ideal i, int n1, int n2);
-         pwalk(int d, ideal i, int n1, int n2, intvec v, intvec w);
+proc pwalk(ideal Go, int n1, int n2, int reduction, int printout, list #)
+"SYNTAX: pwalk(int d, ideal i, int n1, int n2, int reduction, int printout);
+         pwalk(int d, ideal i, int n1, int n2, int reduction, int printout, intvec v, intvec w);
 TYPE:    ideal
 PURPOSE: compute the standard basis of the ideal, calculated via
@@ -477 +479 @@
   ideal G = fetch(xR, Go);
 
+<<<<<<< HEAD
+  G = system("Mpwalk",G,n1,n2,curr_weight,target_weight,nP,reduction,printout);
+ 
+=======
   G = system("Mpwalk", G, n1, n2, curr_weight, target_weight,nP);
 
+>>>>>>> f533f6f7667328bccb271b19b2f603aaebe41596
   setring xR;
   //kill Go;
@@ -492 +499 @@
     ring r = 32003,(z,y,x), lp;
     ideal I = y3+xyz+y2z+xz3, 3+xy+x2y+y2z;
-    //I = std(I);
-    //ring rr = 32003,(z,y,x),lp;
-    //ideal I = fetch(r,I);
-    pwalk(I,2,2);
+    int reduction = 1;
+    int printout = 2;
+    pwalk(I,2,2,reduction,printout);
 }
 

Singular/LIB/modwalk.lib

@@ -16 +16 @@
 
 PROCEDURES:
+modpWalk(ideal,int,int,int[,int,int,int,int])    standard basis conversion of I in prime characteristic
 modWalk(ideal,int,int[,int,int,int,int]);        standard basis conversion of I using modular methods (chinese remainder)
 ";
@@ -29 +30 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-static proc modpWalk(def II, int p, int variant, list #)
+proc modpWalk(def II, int p, int variant, int reduction, list #)
 "USAGE:  modpWalk(I,p,#); I ideal, p integer, variant integer
 ASSUME:  If size(#) > 0, then
@@ -80 +81 @@
     }
   }
+<<<<<<< HEAD
+=======
 
 //-------------------------  make i homogeneous  -----------------------------
@@ -106 +109 @@
   }
 
+>>>>>>> f533f6f7667328bccb271b19b2f603aaebe41596
 //-------------------------  compute a standard basis mod p  -----------------------------
-
   if(variant == 1)
   {
     if(size(#)>0)
     {
-      i = rwalk(i,radius,pert_deg,#);
-     // rwalk(i,radius,pert_deg,#); std(i);
+      i = rwalk(i,radius,pert_deg,reduction,#);
     }
     else
     {
-      i = rwalk(i,radius,pert_deg);
+      i = rwalk(i,radius,pert_deg,reduction);
     }
   }
@@ -124 +126 @@
     if(size(#) == 2)
     {
-      i = gwalk(i,#);
+      i = gwalk(i,reduction,#);
     }
     else
     {
-      i = gwalk(i);
+      i = gwalk(i,reduction);
     }
   }
@@ -135 +137 @@
     if(size(#) == 2)
     {
-      i = frandwalk(i,radius,#);
+      i = frandwalk(i,radius,reduction,#);
     }
     else
     {
-      i = frandwalk(i,radius);
+      i = frandwalk(i,radius,reduction);
     }
   }
@@ -157 +159 @@
     if(size(#) == 2)
     {
-     i=prwalk(i,radius,pert_deg,pert_deg,#);
+     i=prwalk(i,radius,pert_deg,pert_deg,reduction,#);
     }
     else
     {
-      i=prwalk(i,radius,pert_deg,pert_deg);
+      i=prwalk(i,radius,pert_deg,pert_deg,reduction);
     }
   }
@@ -168 +170 @@
     if(size(#) == 2)
     {
-      i=pwalk(i,pert_deg,pert_deg,#);
+      i=pwalk(i,pert_deg,pert_deg,reduction,#);
     }
     else
     {
+<<<<<<< HEAD
+      i=pwalk(i,pert_deg,pert_deg,reduction);
+=======
       i=pwalk(i,pert_deg,pert_deg);
     }
@@ -189 +194 @@
         kill HomR;
       }
-    }
-  }
+>>>>>>> f533f6f7667328bccb271b19b2f603aaebe41596
+    }
+  }
+
   setring R0;
   return(list(fetch(@r,i),p));
@@ -204 +211 @@
   ring ra = 0,x(1..4),(a(a),lp);
   ideal I = std(cyclic(4));
+  int reduction = 1;
   ring rb = 0,x(1..4),(a(b),lp);
   ideal I = imap(ra,I);
-  modpWalk(I,p,1,a,b);
+  modpWalk(I,p,1,reduction,a,b);
   std(I);
 }
@@ -212 +220 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-proc modWalk(def II, int variant, list #)
+proc modWalk(def II, int variant, int reduction, list #)
 "USAGE:  modWalk(II); II ideal or list(ideal,int)
 ASSUME:  If variant =
@@ -487 +495 @@
   if(n2 > 4)
   {
-  //  L[5] = prime(random(an,en));
+    L[5] = prime(random(an,en));
   }
   if(printlevel >= 10)
@@ -504 +512 @@
     for(i=1; i<=size(L); i++)
     {
-      Arguments[i] = list(II,L[i],variant,list(curr_weight,target_weight));
+      Arguments[i] = list(II,L[i],variant,reduction,list(curr_weight,target_weight));
     }
   }
@@ -511 +519 @@
     for(i=1; i<=size(L); i++)
     {
-      Arguments[i] = list(II,L[i],variant);
+      Arguments[i] = list(II,L[i],variant,reduction);
     }
   }
@@ -528 +536 @@
 //-------------------  Now all leading ideals are the same  --------------------
 //-------------------  Lift results to basering via farey  ---------------------
-
     tt = timer; rt = rtimer;
     N = T2[1];
@@ -545 +552 @@
 
 //----------------  Test if we already have a standard basis of I --------------
-
     tt = timer; rt = rtimer;
-    pTest = pTestSB(I,J,L,variant);
-    //pTest = primeTestSB(I,J,L,variant);
+    pTest = primeTest(J, prime(random(1000000000,2134567879)));
     if(printlevel >= 10)
     {
@@ -596 +601 @@
     }
 //--------------  We do not already have a standard basis of I, therefore do the main computation for more primes  --------------
-
     T1 = H;
     T2 = N;
@@ -613 +617 @@
       for(i=j; i<=size(L); i++)
       {
-        //Arguments[i-j+1] = list(II,L[i],variant,list(curr_weight,target_weight));
-        Arguments[size(Arguments)+1] = list(II,L[i],variant,list(curr_weight,target_weight));
+        Arguments[size(Arguments)+1] = list(II,L[i],variant,reduction,list(curr_weight,target_weight));
       }
     }
@@ -621 +624 @@
       for(i=j; i<=size(L); i++)
       {
-        //Arguments[i-j+1] = list(II,L[i],variant);
-        Arguments[size(Arguments)+1] = list(II,L[i],variant);
+        Arguments[size(Arguments)+1] = list(II,L[i],variant,reduction);
       }
     }
@@ -632 +634 @@
     for(i=1; i<=size(PP); i++)
     {
-      //P[size(P) + 1] = PP[i];
       T1[size(T1) + 1] = PP[i][1];
       T2[size(T2) + 1] = bigint(PP[i][2]);
@@ -649 +650 @@
   echo = 2;
   ring R=0,(x,y,z),lp;
-  ideal I=-x+y2z-z,xz+1,x2+y2-1;
-  // I is a standard basis in dp
-  ideal J = modWalk(I,1);
+  ideal I= y3+xyz+y2z+xz3, 3+xy+x2y+y2z;
+  int reduction = 0;
+  ideal J = modWalk(I,1,1);
   J;
 }
@@ -772 +773 @@
   return(J);
 }
-//////////////////////////////////////////////////////////////////////////////////
-static proc primeTestSB(def II, ideal J, list L, int variant, list #)
-"USAGE:  primeTestSB(I,J,L,variant,#); I,J ideals, L intvec of primes, variant int
-RETURN:  1 (resp. 0) if for a randomly chosen prime p that is not in L
-         J mod p is (resp. is not) a standard basis of I mod p
-EXAMPLE: example primeTestSB; shows an example
-"
-{
-if(typeof(II) == "ideal")
-  {
-  ideal I = II;
-  int radius = 2;
-  }
-if(typeof(II) == "list")
-  {
-  ideal I = II[1];
-  int radius = II[2];
-  }
-
-int i,j,k,p;
-def R = basering;
-list r = ringlist(R);
-
-while(!j)
-  {
-  j = 1;
-  p = prime(random(1000000000,2134567879));
-  for(i = 1; i <= size(L); i++)
-    {
-    if(p == L[i])
-      {
-      j = 0;
-      break;
-      }
-    }
-  if(j)
-    {
-    for(i = 1; i <= ncols(I); i++)
-      {
-      for(k = 2; k <= size(I[i]); k++)
-        {
-        if((denominator(leadcoef(I[i][k])) mod p) == 0)
-          {
-          j = 0;
-          break;
-          }
-        }
-      if(!j)
-        {
-        break;
-        }
-      }
-    }
-  if(j)
-    {
-    if(!primeTest(I,p))
-      {
-      j = 0;
-      }
-    }
-  }
-r[1] = p;
-def @R = ring(r);
-setring @R;
-ideal I = imap(R,I);
-ideal J = imap(R,J);
-attrib(J,"isSB",1);
-
-int t = timer;
-j = 1;
-if(isIncluded(I,J) == 0)
-  {
-  j = 0;
-  }
-if(printlevel >= 11)
-  {
-  "isIncluded(I,J) takes "+string(timer - t)+" seconds";
-  "j = "+string(j);
-  }
-t = timer;
-if(j)
-  {
-  if(size(#) > 0)
-    {
-    ideal K = modpWalk(I,p,variant,#)[1];
-    }
-  else
-    {
-    ideal K = modpWalk(I,p,variant)[1];
-    }
-  t = timer;
-  if(isIncluded(J,K) == 0)
-    {
-    j = 0;
-    }
-  if(printlevel >= 11)
-    {
-    "isIncluded(K,J) takes "+string(timer - t)+" seconds";
-    "j = "+string(j);
-    }
-  }
-setring R;
-
-return(j);
-}
-example
-{ "EXAMPLE:"; echo = 2;
-   intvec L = 2,3,5;
-   ring r = 0,(x,y,z),lp;
-   ideal I = x+1,x+y+1;
-   ideal J = x+1,y;
-   primeTestSB(I,I,L,1);
-   primeTestSB(I,J,L,1);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-static proc pTestSB(ideal I, ideal J, list L, int variant, list #)
-"USAGE:  pTestSB(I,J,L,variant,#); I,J ideals, L intvec of primes, variant int
-RETURN:  1 (resp. 0) if for a randomly chosen prime p that is not in L
-         J mod p is (resp. is not) a standard basis of I mod p
-EXAMPLE: example pTestSB; shows an example
-"
-{
-   int i,j,k,p;
-   def R = basering;
-   list r = ringlist(R);
-
-   while(!j)
-   {
-      j = 1;
-      p = prime(random(1000000000,2134567879));
-      for(i = 1; i <= size(L); i++)
-      {
-         if(p == L[i]) { j = 0; break; }
-      }
-      if(j)
-      {
-         for(i = 1; i <= ncols(I); i++)
-         {
-            for(k = 2; k <= size(I[i]); k++)
-            {
-               if((denominator(leadcoef(I[i][k])) mod p) == 0) { j = 0; break; }
-            }
-            if(!j){ break; }
-         }
-      }
-      if(j)
-      {
-         if(!primeTest(I,p)) { j = 0; }
-      }
-   }
-   r[1] = p;
-   def @R = ring(r);
-   setring @R;
-   ideal I = imap(R,I);
-   ideal J = imap(R,J);
-   attrib(J,"isSB",1);
-
-   int t = timer;
-   j = 1;
-   if(isIncluded(I,J) == 0) { j = 0; }
-
-   if(printlevel >= 11)
-   {
-      "isIncluded(I,J) takes "+string(timer - t)+" seconds";
-      "j = "+string(j);
-   }
-
-   t = timer;
-   if(j)
-   {
-      if(size(#) > 0)
-      {
-         ideal K = modpStd(I,p,variant,#[1])[1];
-      }
-      else
-      {
-         ideal K = groebner(I);
-      }
-      t = timer;
-      if(isIncluded(J,K) == 0) { j = 0; }
-
-      if(printlevel >= 11)
-      {
-         "isIncluded(J,K) takes "+string(timer - t)+" seconds";
-         "j = "+string(j);
-      }
-   }
-   setring R;
-   return(j);
-}
-example
-{ "EXAMPLE:"; echo = 2;
-   intvec L = 2,3,5;
-   ring r = 0,(x,y,z),dp;
-   ideal I = x+1,x+y+1;
-   ideal J = x+1,y;
-   pTestSB(I,I,L,2);
-   pTestSB(I,J,L,2);
-}
+
 ////////////////////////////////////////////////////////////////////////////////
 static proc mixedTest()

Singular/LIB/reszeta.lib

@@ -4265 +4265 @@
              if(savedCent==1)
              {
-               vector otherComp;
-               otherComp[M[int(leadcoef(path[1,ncols(path)])),size(BO[4])-1]]
-                        =1;
+               vector otherComp=
+               gen(M[int(leadcoef(path[1,ncols(path)])),size(BO[4])-1]);
              }
              kill savedCent;

Singular/LIB/rwalk.lib

@@ -10 +10 @@
 rwalk(ideal,int,int[,intvec,intvec]);   standard basis of ideal via Random Walk algorithm
 rwalk(ideal,int[,intvec,intvec]);       standard basis of ideal via Random Perturbation Walk algorithm
-frwalk(ideal,int[,intvec,intvec]);      standard basis of ideal via Random Fractal Walk algorithm
+frandwalk(ideal,int[,intvec,intvec]);      standard basis of ideal via Random Fractal Walk algorithm
 ";
 
@@ -141 +141 @@
  * Random Walk  *
  ****************/
-proc rwalk(ideal Go, int radius, int pert_deg, list #)
+proc rwalk(ideal Go, int radius, int pert_deg, int reduction, int printout, list #)
 "SYNTAX: rwalk(ideal i, int radius);
          if size(#)>0 then rwalk(ideal i, int radius, intvec v, intvec w);
+         intermediate Groebner bases are not reduced if reduction = 0
 TYPE:    ideal
 PURPOSE: compute the standard basis of the ideal, calculated via
@@ -178 +179 @@
 
 ideal G = fetch(xR, Go);
-G = system("Mrwalk", G, curr_weight, target_weight, radius, pert_deg, basering);
+G = system("Mrwalk", G, curr_weight, target_weight, radius, pert_deg, reduction, printout);
 
 setring xR;
@@ -196 +197 @@
   int radius = 1;
   int perturb_deg = 2;
-  rwalk(I,radius,perturb_deg);
+  int reduction = 0;
+  int printout = 1;
+  rwalk(I,radius,perturb_deg,reduction,printout);
 }
 
@@ -202 +205 @@
  * Perturbation Walk with random element *
  *****************************************/
-proc prwalk(ideal Go, int radius, int o_pert_deg, int t_pert_deg, list #)
+proc prwalk(ideal Go, int radius, int o_pert_deg, int t_pert_deg, int reduction, int printout, list #)
 "SYNTAX: rwalk(ideal i, int radius);
          if size(#)>0 then rwalk(ideal i, int radius, intvec v, intvec w);
@@ -227 +230 @@
   OSCTW= OrderStringalp_NP("al", #);
   }
+int nP = OSCTW[1];
 string ord_str = OSCTW[2];
 intvec curr_weight = OSCTW[3]; // original weight vector
@@ -238 +242 @@
 
 ideal G = fetch(xR, Go);
-G = system("Mprwalk", G, curr_weight, target_weight, radius, o_pert_deg, t_pert_deg, basering);
+G = system("Mprwalk", G, curr_weight, target_weight, radius, o_pert_deg, t_pert_deg,
+           nP, reduction, printout);
 
 setring xR;
@@ -257 +262 @@
   int o_perturb_deg = 2;
   int t_perturb_deg = 2;
-  prwalk(I,radius,o_perturb_deg,t_perturb_deg);
+  int reduction = 0;
+  int printout = 2;
+  prwalk(I,radius,o_perturb_deg,t_perturb_deg,reduction,printout);
 }
 
@@ -263 +270 @@
  * Fractal Walk with random element *
  ************************************/
-proc frandwalk(ideal Go, int radius, list #)
-"SYNTAX: frwalk(ideal i, int radius);
-         frwalk(ideal i, int radius, intvec v, intvec w);
+proc frandwalk(ideal Go, int radius, int reduction, int printout, list #)
+"SYNTAX: frwalk(ideal i, int radius, int reduction, int printout);
+         frwalk(ideal i, int radius, int reduction, int printout, intvec v, intvec w);
 TYPE:    ideal
 PURPOSE: compute the standard basis of the ideal, calculated via
@@ -299 +306 @@
    ideal G = fetch(xR, Go);
    int pert_deg = 2;
-   G = system("Mfrwalk", G, curr_weight, target_weight, radius);
+
+   G = system("Mfrwalk", G, curr_weight, target_weight, radius, reduction, printout);
 
    setring xR;
@@ -314 +322 @@
     ring r = 0,(z,y,x), lp;
     ideal I = y3+xyz+y2z+xz3, 3+xy+x2y+y2z;
-    frandwalk(I,2);
-}
+    int reduction = 0;
+    frandwalk(I,2,0,1);
+}

Singular/LIB/schreyer.lib

@@ -1 @@
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 version="version schreyer.lib 4.0.0.0 Jun_2013 "; // $Id$
 category="General purpose";
 info="
-LIBRARY: schreyer.lib     Schreyer resolution computations and helpers for @code{derham.lib}
+LIBRARY: schreyer.lib Schreyer resolution computations and helpers for derham.lib
 AUTHOR:  Oleksandr Motsak <U@D>, where U={motsak}, D={mathematik.uni-kl.de}
 KEYWORDS: Schreyer ordering; Schreyer resolution; syzygy
 OVERVIEW:
-@* The library contains several procedures for computing a/part of Schreyer resoltion (cf. [SFO]),
-   and some helpers for @code{derham.lib} (which requires resolutions over the homogenized Weyl algebra) for that purpose.
-@* The input for any resolution computation is a set of vectors @code{M} in form of a module over some basering @code{R}.
-   The helpers works both in the commutative and non-commutative setting (cf. [MO]), that is the ring @code{R} may be non-commutative,
-   in which case the ring ordering over it must be global. They produce/work with partial Schreyer resolutions of @code{(R^rank(M))/M}
-   in form of a specially constructed ring (endowed with a special ring ordering that will be extended in the
-   course of a resolution computation) containing a list of modules @code{RES} and a module @code{MRES}:
-@* @code{RES}: the list of modules contains the images of maps (also called syzygy modules) substituting the
-     computed beginning of a Schreyer resolution, that is, each syzygy module is given by a Groebner basis
-     with respect to the corresponding Schreyer ordering.
-@* @code{RES}: the list of modules which starts with a zero map given by @code{rank(M)} zero generators indicating that the image of
-     the first differential map is zero. The second map @code{RES[2]} is given by @code{M}, which indicates that
-     the resolution of @code{(R^rank(M))/M} is being computed.
-@* @code{MRES}: the module is a direct sum of modules from @code{RES} and thus comprises all computed differentials.
-@* Syzygies are shifted so that @code{gen(i)} is mapped to @code{MRES[i]} under the differential map.
-NOTE:
-@* Here, we call a free resolution a Schreyer resolution if each syzygy module is given by a Groebner basis
-     with respect to the corresponding Schreyer ordering.
-@* A Schreyer resolution can be much bigger than a minimal resolution of the same module, but may be easier to construct.
-@* The Schreyer ordering succesively extends the starting module ordering on @code{M} (defined in Singular by the basering @code{R})
-     and is extended to higher syzygies using the following definition:
-@*        a < b if and only if (d(a) < d(b)) OR ( (d(a) = d(b) AND (comp(a) < comp(b)) ),
-@* where @code{d(a)} is the image of an under the differential (given by @code{MRES}),
-     and @code{comp(a)} is the module component, for any module terms @code{a} and @code{b} from the same higher syzygy module.
-NOTE:
-@* most comutations require the dynamic or built-in module @code{syzextra}, which will be auto-leaded on demand.
-PROCEDURES:
-  Sres(M,len)     helper for computing Schreyer resolution of module M of maximal length len
-  Ssyz(M)         helper for computing Schreyer resolution of module M of length 1
-  Scontinue(len)  helper for extending currently active resolution by (at most) len syszygies
-  s_res(M, len)   compute Schreyer resolution of module M of maximal length len via LiftTree method from [BMSS]
+The library contains several procedures for computing a/part of Schreyer
+resoltion (cf. [SFO]), and some helpers for derham.lib (which requires
+resolutions over the homogenized Weyl algebra) for that purpose.
+The input for any resolution computation is a set of vectors M in form of a
+module over some basering R. The helpers works both in the commutative and
+non-commutative setting (cf. [MO]), that is the ring R may be non-commutative,
+in which case the ring ordering over it must be global. They produce/work with
+partial Schreyer resolutions of (R^rank(M))/M in form of a specially constructed
+ring (endowed with a special ring ordering that will be extended in the course
+of a resolution computation) containing the following objects:
+@* RES: the list of modules contains the images of maps (also called syzygy
+modules) substituting the computed beginning of a Schreyer resolution, that is,
+each syzygy module is given by a Groebner basis with respect to the
+corresponding Schreyer ordering. RES starts with a zero map given by rank(M)
+zero generators indicating that the image of the first differential map is
+zero. The second map RES[2] is given by M, which indicates that the resolution
+of (R^rank(M))/M is being computed.
+@* MRES: the module is a direct sum of modules from RES and thus comprises all
+computed differentials. Syzygies are shifted so that gen(i) is mapped to MRES[i]
+under the differential map.
+@* Here, we call a free resolution a Schreyer resolution if each syzygy
+module is given by a Groebner basis with respect to the corresponding Schreyer
+ordering. A Schreyer resolution can be much bigger than a minimal resolution of
+the same module, but may be easier to construct. The Schreyer ordering
+succesively extends the starting module ordering on M (defined in Singular by
+the basering R) and is extended to higher syzygies using the following
+definition:
+@* a < b if and only if (d(a)<d(b)) OR ( (d(a)=d(b) AND (comp(a)<comp(b)) ),
+@* where d(a) is the image of an under the differential (given by MRES), and
+comp(a) is the module component, for any module terms a and b from the same
+higher syzygy module.
+
+NOTE: Since most comutations require the module syzextra.so, please be make sure
+ to build it into Singular on Windows.
+
 REFERENCES:
 @*
-[BMSS] Burcin, E., Motsak, O., Schreyer, F.-O., Steenpass, A.: NEW ALGORITHMS TO COMPUTE SYZYGIES, 2014.
+[BMSS] Burcin, E., Motsak, O., Schreyer, F.-O., Steenpass, A.:
+Refined algorithms to compute syzygies, 2015 (to appear).
 @*
-[SFO]  Schreyer, F.O.: Die Berechnung von Syzygien mit dem verallgemeinerten Weierstrassschen Divisionssatz,
-       Master's thesis, Univ. Hamburg, 1980.
+[SFO]  Schreyer, F.O.: Die Berechnung von Syzygien mit dem verallgemeinerten
+Weierstrassschen Divisionssatz, Master's thesis, Univ. Hamburg, 1980.
 @*
-[MO]   Motsak, O.: Non-commutative Computer Algebra with applications: Graded commutative algebra and related
-       structures in Singular with applications, Ph.D. thesis, TU Kaiserslautern, 2010.
+[MO]   Motsak, O.: Non-commutative Computer Algebra with applications:
+Graded commutative algebra and related structures in Singular with applications,
+Ph.D. thesis, TU Kaiserslautern, 2010.
+
+PROCEDURES:
+  s_res(M,l)   compute Schreyer resolution via LiftTree method from [BMSS]
+  Sres(M,l)    helper for computing Schreyer resolution
+  Ssyz(M)      helper for computing Schreyer resolution of module M of length 1
+  Scontinue(l) helper for extending currently active resolution
+
+SEE ALSO: syz, sres, lres, res
 ";
 
@@ -600 +614 @@
   }
 
-  def opts = option(get); 
+  def opts = option(get);
   option(redSB); option(redTail);
     M = simplify(interred(groebner(M)), 1 + 2 + 4 + 32); // NOTE: we require interreduced GB for input
   option(set, opts); kill opts;
-  
+
 //  int @IS_A_SB = attrib(M, "isSB");  if( !@IS_A_SB )  {  } else  {  }
 // attrib(M, "isSB", 1);
@@ -789 +803 @@
     attrib(S, "NOCACHING", 0);
   }
-  
+
 
   // maybe resetting existing ring attributes!
@@ -1402 +1416 @@
         def @c =   Syzextra::leadcomp(s); int k = int(@c);
 
-        if( @TREEOUTPUT ){ "\CHILD{", (s), "}{", ( @b*L[k]), "}"; }
+        if( @TREEOUTPUT ){ "\CHILD{", (s), "}{", ( @b*L[k]), "}"; }
 
         s = s + SSTraverseTail(@b, T[k], L, T, #); // !!!
@@ -1563 +1577 @@
       {
         @b =   Syzextra::leadmonomial(syz_2);
-        k =  int(  Syzextra::leadcomp(syz_2));
-
-        if( @TREEOUTPUT ){ "\CHILD{", (syz_2), "}{", ( lead(spoly)), "}"; }
+        k =  int(  Syzextra::leadcomp(syz_2));
+
+        if( @TREEOUTPUT ){ "\CHILD{", (syz_2), "}{", ( lead(spoly)), "}"; }
 
         spoly = spoly + @b * T[k];
@@ -2158 +2172 @@
 
 // cannot be automatically used via overloading :(
-proc SRES_list(def SR)
+static proc SRES_list(def SR)
 "USAGE:  SRES_list(resolution)
 RETURN:  list
@@ -2474 +2488 @@
 }
 
+
+// Further recognized switches are the following attributes of @code{Schreyer::SSinit} procedure:
+// LEAD2SYZ, TAILREDSYZ, HYBRIDNF, DEBUG, ...
+
 proc s_res(def I, int l)
 "USAGE:  s_res(ideal/module M, int len)
-RETURN:  resolution object or SRES
-PURPOSE: compute a Schreyer resolution of M of length at most len (see [BMSS])
+RETURN:  resolution object over basering
+PURPOSE: compute a non-minimal Schreyer free resolution of M of length at most len via the LiftTree algorithm described in [BMSS].
 NOTE:    If given len is zero then nvars(basering) + 1 is used instead.
-@* This functions is not related to other helpers from this library.
+@* This functions is not related to the helpers from this library. This procedure works in only in commutative case.
 @* One can switch on computation protocol and statistic (depending on the build) by setting the @code{prot} option.
-@* Further recognized switches are the following attributes of @code{Schreyer::SSinit} procedure:
-LEAD2SYZ, TAILREDSYZ, HYBRIDNF
-DEBUG, ...
-SEE ALSO: sres
+SEE ALSO: sres, lres, Sres
 EXAMPLE: example s_res; shows an example
 "
@@ -2518 +2533 @@
   ring R;
   module M = maxideal(1); M;
-  def  rs = s_res(M, 0);
-  print(rs);
-  print(betti(rs, 0)); // non-minimal betties
-  print(SRES_list(rs));
-  print(betti(rs, 1)); //minimal betties
+  s_res(M, 0); // Koszul complex
+  list rs = _; // get syzygies
+  print(betti(rs, 0), "betti"); // non-minimal betties
   print(minres(rs));
+  print(betti(rs, 1), "betti"); //minimal betties
 }
 
@@ -2732 +2746 @@
   attrib(SSinit, "PROFILE", 0);
   attrib(SSinit, "IGNORETAILS", 0); // not only frame
-  
+
   attrib(SSinit, "NOCACHING", 0);
 
@@ -2787 +2801 @@
   ideal I = -x2y+26/17xy2+70/17y3+96/121x2z+63/82xyz+115/11y2z-8114xz2-40/79yz2+16/125z3+3023x2u-123/70xyu+3395y2u-81/119xzu-23/66yzu+3626z2u+18/53xu2+111/58yu2-34/39zu2+53/40u3-94/17x2v-10/19xyv+81/88y2v-91/33xzv-9967yzv-103/4z2v-26/109xuv+69/97yuv+92/17zuv-19/96u2v+10/21xv2+6147yv2+32/113zv2-79/82uv2-77/51v3,4347x2y-9017xy2+11327y3+18/79x2z-93/43xyz-35/47y2z+14704xz2+10727yz2-1764z3-612x2u+20/107xyu-103/89y2u-39/2xzu+2345yzu+10251z2u-9984xu2-10299yu2+113/118zu2+37/91u3+2/31x2v+9552xyv-47/100y2v-3242xzv+113/27yzv-11271z2v-13/79xuv+15917yuv+5/114zuv+103/119u2v-21/55xv2-59/19yv2+101/68zv2-7817uv2-112/29v3,7228x2y-111/113xy2+5913y3+6/43x2z-11251xyz+27/121y2z+97/96xz2-7398yz2-97/114z3+38/15x2u+5005xyu-41/126y2u-61/116xzu+89/9yzu-4087z2u+26/15xu2-92/103yu2+21/68zu2-4027u3+97/91x2v+5150xyv-4/47y2v-2310xzv+7307yzv-77/86z2v+30/83xuv+413yuv-50zuv-103/106u2v+105/73xv2-109/98yv2+59/63zv2+715uv2+963v3,x3+3487x2y-9744xy2-13276y3-15213x2z-118/51xyz+101/104y2z+2754xz2+9111yz2-17/94z3+11136x2u-43/82xyu-9/41y2u-7306xzu-6839yzu+5692z2u-14682xu2+37/80yu2-85/97zu2-6186u3+34/15x2v+84/109xyv+5086y2v+27/112xzv-3/40yzv+19/120z2v+11222xuv+38/55yuv-24/83zuv+15814u2v-111/61xv2+49/44yv2+125/81zv2+1933uv2-19/71v3;
   TestSSresAttribs(I, Name);
-  kill @p, Name, R;  
+  kill @p, Name, R;
 
   string Name = "rat.d8.g6"; int @p=31991; ring R = (@p),(x,y,z,u,v), dp;

Singular/extra.cc

@@ -1864 +1864 @@
     if (strcmp(sys_cmd, "Mwalk") == 0)
     {
-      const short t[]={4,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,RING_CMD};
+      const short t[]={6,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,RING_CMD,INT_CMD,INT_CMD};
       if (!iiCheckTypes(h,t,1)) return TRUE;
       if (((intvec*) h->next->Data())->length() != currRing->N &&
@@ -1875 +1875 @@
       ideal arg1 = (ideal) h->Data();
       intvec* arg2 = (intvec*) h->next->Data();
-      intvec* arg3   =  (intvec*) h->next->next->Data();
-      ring arg4   =  (ring) h->next->next->next->Data();
-      ideal result = (ideal) Mwalk(arg1, arg2, arg3,arg4);
+      intvec* arg3 = (intvec*) h->next->next->Data();
+      ring arg4 = (ring) h->next->next->next->Data();
+      int arg5 = (int) (long) h->next->next->next->next->Data();
+      int arg6 = (int) (long) h->next->next->next->next->next->Data();
+      ideal result = (ideal) Mwalk(arg1, arg2, arg3, arg4, arg5, arg6);
       res->rtyp = IDEAL_CMD;
       res->data =  result;
@@ -1913 +1915 @@
     if (strcmp(sys_cmd, "Mpwalk") == 0)
     {
-      const short t[]={6,IDEAL_CMD,INT_CMD,INT_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD};
+      const short t[]={8,IDEAL_CMD,INT_CMD,INT_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD,INT_CMD,INT_CMD};
       if (!iiCheckTypes(h,t,1)) return TRUE;
       if(((intvec*) h->next->next->next->Data())->length() != currRing->N &&
@@ -1927 +1929 @@
       intvec* arg5 = (intvec*) h->next->next->next->next->Data();
       int arg6 = (int) (long) h->next->next->next->next->next->Data();
-      ideal result = (ideal) Mpwalk(arg1, arg2, arg3, arg4, arg5,arg6);
+      int arg7 = (int) (long) h->next->next->next->next->next->next->Data();
+      int arg8 = (int) (long) h->next->next->next->next->next->next->next->Data();
+      ideal result = (ideal) Mpwalk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
       res->rtyp = IDEAL_CMD;
       res->data =  result;
@@ -1939 +1943 @@
     if (strcmp(sys_cmd, "Mrwalk") == 0)
     {
-      const short t[]={6,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD,INT_CMD,RING_CMD};
+      const short t[]={7,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD,INT_CMD,INT_CMD,INT_CMD};
       if (!iiCheckTypes(h,t,1)) return TRUE;
-      if((((intvec*) h->next->Data())->length() != currRing->N &&
-         ((intvec*) h->next->next->Data())->length() != currRing->N ) &&
-         (((intvec*) h->next->Data())->length() != (currRing->N)*(currRing->N) &&
-         ((intvec*) h->next->next->Data())->length() != (currRing->N)*(currRing->N) ))
+      if(((intvec*) h->next->Data())->length() != currRing->N &&
+         ((intvec*) h->next->Data())->length() != (currRing->N)*(currRing->N) &&
+         ((intvec*) h->next->next->Data())->length() != currRing->N &&
+         ((intvec*) h->next->next->Data())->length() != (currRing->N)*(currRing->N) )
       {
         Werror("system(\"Mrwalk\" ...) intvecs not of length %d or %d\n",
@@ -1955 +1959 @@
       int arg4 = (int)(long) h->next->next->next->Data();
       int arg5 = (int)(long) h->next->next->next->next->Data();
-      ring arg6 = (ring) h->next->next->next->next->next->Data();
-      ideal result = (ideal) Mrwalk(arg1, arg2, arg3, arg4, arg5, arg6);
+      int arg6 = (int)(long) h->next->next->next->next->next->Data();
+      int arg7 = (int)(long) h->next->next->next->next->next->next->Data();
+      ideal result = (ideal) Mrwalk(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
       res->rtyp = IDEAL_CMD;
       res->data =  result;
@@ -2018 +2023 @@
     if (strcmp(sys_cmd, "Mfwalk") == 0)
     {
-      const short t[]={3,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD};
+      const short t[]={5,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD,INT_CMD};
       if (!iiCheckTypes(h,t,1)) return TRUE;
       if (((intvec*) h->next->Data())->length() != currRing->N &&
@@ -2025 +2030 @@
         Werror("system(\"Mfwalk\" ...) intvecs not of length %d\n",
                  currRing->N);
-        return TRUE;
-      }
-      ideal arg1 = (ideal) h->Data();
-      intvec* arg2 = (intvec*) h->next->Data();
-      intvec* arg3   =  (intvec*) h->next->next->Data();
-      ideal result = (ideal) Mfwalk(arg1, arg2, arg3);
-      res->rtyp = IDEAL_CMD;
-      res->data =  result;
-      return FALSE;
-    }
-    else
-  #endif
-  /*==================== Mfrwalk =================*/
-  #ifdef HAVE_WALK
-    if (strcmp(sys_cmd, "Mfrwalk") == 0)
-    {
-      const short t[]={6,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD,INT_CMD,RING_CMD};
-      if (!iiCheckTypes(h,t,1)) return TRUE;
-      if (((intvec*) h->next->Data())->length() != currRing->N &&
-          ((intvec*) h->next->next->Data())->length() != currRing->N)
-      {
-        Werror("system(\"Mfrwalk\" ...) intvecs not of length %d\n",currRing->N);
         return TRUE;
       }
@@ -2053 +2036 @@
       intvec* arg3 = (intvec*) h->next->next->Data();
       int arg4 = (int)(long) h->next->next->next->Data();
-      ideal result = (ideal) Mfrwalk(arg1, arg2, arg3, arg4);
+      int arg5 = (int)(long) h->next->next->next->next->Data();
+      ideal result = (ideal) Mfwalk(arg1, arg2, arg3, arg4, arg5);
       res->rtyp = IDEAL_CMD;
       res->data =  result;
@@ -2059 +2043 @@
     }
     else
+  #endif
+  /*==================== Mfrwalk =================*/
+  #ifdef HAVE_WALK
+    if (strcmp(sys_cmd, "Mfrwalk") == 0)
+    {
+      const short t[]={6,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD,INT_CMD,INT_CMD};
+      if (!iiCheckTypes(h,t,1)) return TRUE;
+/*
+      if (((intvec*) h->next->Data())->length() != currRing->N &&
+          ((intvec*) h->next->next->Data())->length() != currRing->N)
+      {
+        Werror("system(\"Mfrwalk\" ...) intvecs not of length %d\n",currRing->N);
+        return TRUE;
+      }
+*/
+      if((((intvec*) h->next->Data())->length() != currRing->N &&
+         ((intvec*) h->next->next->Data())->length() != currRing->N ) &&
+         (((intvec*) h->next->Data())->length() != (currRing->N)*(currRing->N) &&
+         ((intvec*) h->next->next->Data())->length() != (currRing->N)*(currRing->N) ))
+      {
+        Werror("system(\"Mfrwalk\" ...) intvecs not of length %d or %d\n",
+               currRing->N,(currRing->N)*(currRing->N));
+        return TRUE;
+      }
+
+      ideal arg1 = (ideal) h->Data();
+      intvec* arg2 = (intvec*) h->next->Data();
+      intvec* arg3 = (intvec*) h->next->next->Data();
+      int arg4 = (int)(long) h->next->next->next->Data();
+      int arg5 = (int)(long) h->next->next->next->next->Data();
+      int arg6 = (int)(long) h->next->next->next->next->next->Data();
+      ideal result = (ideal) Mfrwalk(arg1, arg2, arg3, arg4, arg5, arg6);
+      res->rtyp = IDEAL_CMD;
+      res->data =  result;
+      return FALSE;
+    }
+    else
   /*==================== Mprwalk =================*/
     if (strcmp(sys_cmd, "Mprwalk") == 0)
     {
-      const short t[]={7,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD,INT_CMD,INT_CMD,RING_CMD};
+      const short t[]={9,IDEAL_CMD,INTVEC_CMD,INTVEC_CMD,INT_CMD,INT_CMD,INT_CMD,INT_CMD,INT_CMD,INT_CMD};
       if (!iiCheckTypes(h,t,1)) return TRUE;
-      if (((intvec*) h->next->Data())->length() != currRing->N &&
-          ((intvec*) h->next->next->Data())->length() != currRing->N )
-      {
-        Werror("system(\"Mrwalk\" ...) intvecs not of length %d\n",
-               currRing->N);
+      if((((intvec*) h->next->Data())->length() != currRing->N &&
+         ((intvec*) h->next->next->Data())->length() != currRing->N ) &&
+         (((intvec*) h->next->Data())->length() != (currRing->N)*(currRing->N) &&
+         ((intvec*) h->next->next->Data())->length() != (currRing->N)*(currRing->N) ))
+      {
+        Werror("system(\"Mrwalk\" ...) intvecs not of length %d or %d\n",
+               currRing->N,(currRing->N)*(currRing->N));
         return TRUE;
       }
@@ -2077 +2100 @@
       int arg5 = (int)(long) h->next->next->next->next->Data();
       int arg6 = (int)(long) h->next->next->next->next->next->Data();
-      ring arg7 = (ring) h->next->next->next->next->next->next->Data();
-      ideal result = (ideal) Mprwalk(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+      int arg7 = (int)(long) h->next->next->next->next->next->next->Data();
+      int arg8 = (int)(long) h->next->next->next->next->next->next->next->Data();
+      int arg9 = (int)(long) h->next->next->next->next->next->next->next->next->Data();
+      ideal result = (ideal) Mprwalk(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
       res->rtyp = IDEAL_CMD;
       res->data =  result;

Singular/ipassign.cc

@@ -950 +950 @@
 * assign a = b
 */
-static BOOLEAN jiAssign_1(leftv l, leftv r)
+static BOOLEAN jiAssign_1(leftv l, leftv r, BOOLEAN toplevel)
 {
   int rt=r->Typ();
@@ -960 +960 @@
 
   int lt=l->Typ();
-  if (/*(*/ lt==0 /*)*/) /*&&(l->name!=NULL)*/
+  if (lt==0)
   {
     if (!errorreported) Werror("left side `%s` is undefined",l->Fullname());
@@ -1009 +1009 @@
   }
   leftv ld=l;
-  if ((l->rtyp==IDHDL)&&(lt!=QRING_CMD)&&(lt!=RING_CMD))
-    ld=(leftv)l->data;
+  if (l->rtyp==IDHDL)
+  {
+    if ((lt!=QRING_CMD)&&(lt!=RING_CMD))
+      ld=(leftv)l->data;
+  }
+  else if (toplevel)
+  {
+    WerrorS("error in assign: left side is not an l-value");
+    return TRUE;
+  }
   if (lt>MAX_TOK)
   {
@@ -1193 +1201 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t);
+    nok=jiAssign_1(l,&t,TRUE);
     l->next=h;
     if (nok) return TRUE;
@@ -1227 +1235 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t);
+    nok=jiAssign_1(l,&t,TRUE);
     l->next=h;
     t.CleanUp();
@@ -1465 +1473 @@
       idhdl hh=NULL;
       if ((l->rtyp==IDHDL)&&(l->Typ()==DEF_CMD)) hh=(idhdl)l->data;
-      nok=jiAssign_1(l,&t);
+      nok=jiAssign_1(l,&t,TRUE);
       if (hh!=NULL) { ipMoveId(hh);hh=NULL;}
       l->next=h;
@@ -1541 +1549 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t);
+    nok=jiAssign_1(l,&t,TRUE);
     if (nok)
     {
@@ -1599 +1607 @@
     memset(&tmp,0,sizeof(sleftv));
     tmp.rtyp=DEF_CMD;
-    b=iiAssign(&tmp,r);
+    b=iiAssign(&tmp,r,FALSE);
     ld->CleanUp();
     memcpy(ld,&tmp,sizeof(sleftv));
@@ -1611 +1619 @@
     tmp.rtyp=r->Typ();
     tmp.data=(char*)idrecDataInit(r->Typ());
-    b=iiAssign(&tmp,r);
+    b=iiAssign(&tmp,r,FALSE);
     ld->CleanUp();
     memcpy(ld,&tmp,sizeof(sleftv));
@@ -1617 +1625 @@
   else
   {
-    b=iiAssign(ld,r);
+    b=iiAssign(ld,r,FALSE);
     if (l->e!=NULL) l->e->next=ld->e;
     ld->e=NULL;
@@ -1646 +1654 @@
   return b;
 }
-BOOLEAN iiAssign(leftv l, leftv r)
+BOOLEAN iiAssign(leftv l, leftv r, BOOLEAN toplevel)
 {
   if (errorreported) return TRUE;
@@ -1664 +1672 @@
     IDFLAG((idhdl)l->data)=0;
     l->attribute=NULL;
+    toplevel=FALSE;
   }
   else if (l->attribute!=NULL)
@@ -1746 +1755 @@
       &&((lt==rt)||(lt!=LIST_CMD)))
       {
-        b=jiAssign_1(l,r);
+        b=jiAssign_1(l,r,toplevel);
         if (l->rtyp==IDHDL)
         {
@@ -1771 +1780 @@
       )
       {
-        b=jiAssign_1(l,r);
+        b=jiAssign_1(l,r,toplevel);
         if((l->rtyp==IDHDL)&&(l->data!=NULL))
         {
@@ -1858 +1867 @@
       }
       if ((hh->next==NULL)&&(hh->Typ()==IDEAL_CMD))
-        return jiAssign_1(l,hh); /* map-assign: map f=r,i; */
+        return jiAssign_1(l,hh,toplevel); /* map-assign: map f=r,i; */
       //no break, handle the rest like an ideal:
       map_assign=TRUE;

Singular/ipshell.h

@@ -173 +173 @@
 /* ================================================================== */
 /* Assigments : */
-BOOLEAN iiAssign(leftv left, leftv right);
+BOOLEAN iiAssign(leftv left, leftv right, BOOLEAN toplevel=TRUE);
 
 typedef BOOLEAN (*proci)(leftv,leftv,Subexpr);

Singular/singular-libs

@@ -52 +52 @@
         realizationMatroids.lib resources.lib ringgb.lib \
         schreyer.lib symodstd.lib derham.lib polybori.lib ellipticcovers.lib \
-        schubert.lib tasks.lib tropical.lib hdepth.lib
+        schubert.lib tasks.lib tropical.lib hdepth.lib gradedModules.lib
 
 PLIBS = bimodules.lib bfun.lib central.lib dmod.lib dmodapp.lib dmodvar.lib\

Singular/walk.cc

@@ -429 +429 @@
 #endif
 
-#ifdef CHECK_IDEAL_MWALK
+//#ifdef CHECK_IDEAL_MWALK
 static void idString(ideal L, const char* st)
 {
@@ -441 +441 @@
   Print(" %s;", pString(L->m[nL-1]));
 }
-#endif
+//#endif
 
 #if defined(CHECK_IDEAL_MWALK) || defined(ENDWALKS)
@@ -558 +558 @@
   }
   return p0;
+}
+
+/*****************************************************************************
+ * compute the gcd of the entries of the vectors curr_weight and diff_weight *
+ *****************************************************************************/
+static int simplify_gcd(intvec* curr_weight, intvec* diff_weight)
+{
+  int j;
+  int nRing = currRing->N;
+  int gcd_tmp = (*curr_weight)[0];
+  for (j=1; j<nRing; j++)
+  {
+    gcd_tmp = gcd(gcd_tmp, (*curr_weight)[j]);
+    if(gcd_tmp == 1)
+    {
+      break;
+    }
+  }
+  if(gcd_tmp != 1)
+  {
+    for (j=0; j<nRing; j++)
+    {
+    gcd_tmp = gcd(gcd_tmp, (*diff_weight)[j]);
+    if(gcd_tmp == 1)
+      {
+        break;
+      }
+    }
+  }
+  return gcd_tmp;
 }
 
@@ -953 +983 @@
 }
 
-/*****************************************************************************
-* create a weight matrix order as intvec of an extra weight vector (a(iv),lp)*
-******************************************************************************/
+/*********************************************************************************
+* create a weight matrix order as intvec of an extra weight vector (a(iv),M(iw)) *
+**********************************************************************************/
 intvec* MivMatrixOrderRefine(intvec* iv, intvec* iw)
 {
+<<<<<<< HEAD
+  assume((iv->length())*(iv->length()) == iw->length());
+  int i,j, nR = iv->length();
+  
+=======
   assume(iv->length() == iw->length());
   int i, nR = iv->length();
 
+>>>>>>> f533f6f7667328bccb271b19b2f603aaebe41596
   intvec* ivm = new intvec(nR*nR);
 
@@ -966 +1002 @@
   {
     (*ivm)[i] = (*iv)[i];
-    (*ivm)[i+nR] = (*iw)[i];
-  }
-  for(i=2; i<nR; i++)
-  {
-    (*ivm)[i*nR+i-2] = 1;
+  }
+  for(i=1; i<nR; i++)
+  {
+    for(j=0; j<nR; j++)
+    {
+      (*ivm)[j+i*nR] = (*iw)[j+i*nR];
+    }
   }
   return ivm;
@@ -1859 +1897 @@
 }
 
+
+/**************************************************************
+ * Look for the position of the smallest absolut value in vec *
+ **************************************************************/
+static int MivAbsMaxArg(intvec* vec)
+{
+  int k = MivAbsMax(vec);
+  int i=0;
+  while(1)
+  {
+    if((*vec)[i] == k || (*vec)[i] == -k)
+    {
+      break;
+    }
+    i++;
+  }
+  return i;
+}
+
+
 /**********************************************************************
  * Compute a next weight vector between curr_weight and target_weight *
@@ -1873 +1931 @@
 
   int nRing = currRing->N;
-  int checkRed, j, kkk, nG = IDELEMS(G);
+  int checkRed, j, nG = IDELEMS(G);
   intvec* ivtemp;
 
@@ -1911 +1969 @@
   mpz_init(dcw);
 
-  //int tn0, tn1, tz1, ncmp, gcd_tmp, ntmp;
   int gcd_tmp;
   intvec* diff_weight = MivSub(target_weight, curr_weight);
@@ -1917 +1974 @@
   intvec* diff_weight1 = MivSub(target_weight, curr_weight);
   poly g;
-  //poly g, gw;
+
   for (j=0; j<nG; j++)
   {
@@ -1979 +2036 @@
     }
   }
-//Print("\n// Alloc Size = %d \n", nRing*sizeof(mpz_t));
+  //Print("\n// Alloc Size = %d \n", nRing*sizeof(mpz_t));
   mpz_t *vec=(mpz_t*)omAlloc(nRing*sizeof(mpz_t));
 
 
-  // there is no 0<t<1 and define the next weight vector that is equal to the current weight vector
+  // there is no 0<t<1 and define the next weight vector that is equal
+  // to the current weight vector
   if(mpz_cmp(t_nenner, t_null) == 0)
   {
@@ -2054 +2112 @@
 #endif
 
-  //  BOOLEAN isdwpos;
-
-  // construct a new weight vector
+// construct a new weight vector and check whether vec[j] is overflow,
+// i.e. vec[j] > 2^31.
+// If vec[j] doesn't overflow, define a weight vector. Otherwise,
+// report that overflow appears. In the second case, test whether the
+// the correctness of the new vector plays an important role
+
   for (j=0; j<nRing; j++)
   {
@@ -2100 +2161 @@
     }
   }
-
+  // reduce the vector with the gcd
+  if(mpz_cmp_si(ggt,1) != 0)
+  {
+    for (j=0; j<nRing; j++)
+    {
+      mpz_divexact(vec[j], vec[j], ggt);
+    }
+  }
 #ifdef  NEXT_VECTORS_CC
   PrintS("\n// gcd of elements of the vector: ");
@@ -2106 +2174 @@
 #endif
 
-/**********************************************************************
-* construct a new weight vector and check whether vec[j] is overflow, *
-* i.e. vec[j] > 2^31.                                                 *
-* If vec[j] doesn't overflow, define a weight vector. Otherwise,      *
-* report that overflow appears. In the second case, test whether the  *
-* the correctness of the new vector plays an important role           *
-**********************************************************************/
-  kkk=0;
   for(j=0; j<nRing; j++)
     {
@@ -2129 +2189 @@
 
   REDUCTION:
+  checkRed = 1;
   for (j=0; j<nRing; j++)
   {
-    (*diff_weight)[j] = mpz_get_si(vec[j]);
-  }
-  while(MivAbsMax(diff_weight) >= 5)
-  {
-    for (j=0; j<nRing; j++)
-    {
-      if(mpz_cmp_si(ggt,1)==0)
-      {
-        (*diff_weight1)[j] = floor(0.1*(*diff_weight)[j] + 0.5);
-        // Print("\n//  vector[%d] = %d \n",j+1, (*diff_weight1)[j]);
-      }
-      else
-      {
-        mpz_divexact(vec[j], vec[j], ggt);
-        (*diff_weight1)[j] = floor(0.1*(*diff_weight)[j] + 0.5);
-        // Print("\n//  vector[%d] = %d \n",j+1, (*diff_weight1)[j]);
-      }
-/*
-      if((*diff_weight1)[j] == 0)
-      {
-        kkk = kkk + 1;
-      }
-*/
-    }
-
-
-/*
-    if(kkk > nRing - 1)
-    {
-      // diff_weight was reduced to zero
-      // Print("\n // MwalkNextWeightCC: geaenderter Vector gleich Null! \n");
-      goto TEST_OVERFLOW;
-    }
-*/
-
-    if(test_w_in_ConeCC(G,diff_weight1) != 0)
-    {
-      Print("\n// MwalkNextWeightCC: geaenderter vector liegt in Groebnerkegel! \n");
-      for (j=0; j<nRing; j++)
-      {
-        (*diff_weight)[j] = (*diff_weight1)[j];
-      }
-      if(MivAbsMax(diff_weight) < 5)
-      {
-        checkRed = 1;
-        goto SIMPLIFY_GCD;
-      }
-    }
-    else
-    {
-      // Print("\n// MwalkNextWeightCC: geaenderter vector liegt nicht in Groebnerkegel! \n");
-      break;
-    }
+    (*diff_weight1)[j] = mpz_get_si(vec[j]);
+  }
+  while(test_w_in_ConeCC(G,diff_weight1))
+  {
+    for(j=0; j<nRing; j++)
+    {
+      (*diff_weight)[j] = (*diff_weight1)[j];
+      mpz_set_si(vec[j], (*diff_weight)[j]);      
+    }
+    for(j=0; j<nRing; j++)
+    {
+      (*diff_weight1)[j] = floor(0.1*(*diff_weight)[j] + 0.5);
+    }
+  }
+  if(MivAbsMax(diff_weight)>10000)
+  {
+    for(j=0; j<nRing; j++)
+    {
+      (*diff_weight1)[j] = (*diff_weight)[j];
+    }
+    j = 0;
+    while(test_w_in_ConeCC(G,diff_weight1))
+    {
+      (*diff_weight)[j] = (*diff_weight1)[j];
+      mpz_set_si(vec[j], (*diff_weight)[j]);
+      j = MivAbsMaxArg(diff_weight1);
+      (*diff_weight1)[j] = floor(0.1*(*diff_weight1)[j] + 0.5);
+    }
+    goto SIMPLIFY_GCD;
   }
 
@@ -2222 +2259 @@
    mpz_clear(t_null);
 
-
-
   if(Overflow_Error == FALSE)
   {
     Overflow_Error = nError;
   }
- rComplete(currRing);
-  for(kkk=0; kkk<IDELEMS(G);kkk++)
-  {
-    poly p=G->m[kkk];
+  rComplete(currRing);
+  for(j=0; j<IDELEMS(G); j++)
+  {
+    poly p=G->m[j];
     while(p!=NULL)
     {
@@ -2271 +2306 @@
 }
 
-/**************************************************************
+/********************************************************************
  * define and execute a new ring which order is (a(vb),a(va),lp,C)  *
- * ************************************************************/
+ * ******************************************************************/
 static void VMrHomogeneous(intvec* va, intvec* vb)
 {
@@ -2425 +2460 @@
   //rChangeCurrRing(r);
 }
-
+//unused
+#if 0
 static ring VMrDefault1(intvec* va)
 {
@@ -2496 +2532 @@
   return r;
 }
-
+#endif
 /****************************************************************
  * define and execute a new ring with ordering (a(va),Wp(vb),C) *
@@ -3126 +3162 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); //Aenderung
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     newRing = currRing;
@@ -3882 +3918 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); //Aenderung
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     newRing = currRing;
@@ -4143 +4179 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); // Aenderung
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     newRing = currRing;
@@ -4285 +4321 @@
 intvec* Xivlp;
 
-#if 0
-/********************************
- * compute a next weight vector *
- ********************************/
-static intvec* MWalkRandomNextWeight(ideal G, intvec* curr_weight, intvec* target_weight, int weight_rad, int pert_deg)
-{
-  int i, weight_norm;
-  int nV = currRing->N;
-  intvec* next_weight2;
-  intvec* next_weight22 = new intvec(nV);
-  intvec* next_weight = MwalkNextWeightCC(curr_weight,target_weight, G);
-  if(MivComp(next_weight, target_weight) == 1)
-  {
-    return(next_weight);
-  }
-  else
-  {
-    //compute a perturbed next weight vector "next_weight1"
-    intvec* next_weight1 = MkInterRedNextWeight(MPertVectors(G, MivMatrixOrder(curr_weight), pert_deg), target_weight, G);
-    //Print("\n // size of next_weight1 = %d", sizeof((*next_weight1)));
-
-    //compute a random next weight vector "next_weight2"
-    while(1)
-    {
-      weight_norm = 0;
-      while(weight_norm == 0)
-      {
-        for(i=0; i<nV; i++)
-        {
-          //Print("\n//  next_weight[%d]  = %d", i, (*next_weight)[i]);
-          (*next_weight22)[i] = rand() % 60000 - 30000;
-          weight_norm = weight_norm + (*next_weight22)[i]*(*next_weight22)[i];
-        }
-        weight_norm = 1 + floor(sqrt(weight_norm));
-      }
-
-      for(i=nV-1; i>=0; i--)
-      {
-        if((*next_weight22)[i] < 0)
-        {
-          (*next_weight22)[i] = 1 + (*curr_weight)[i] + floor(weight_rad*(*next_weight22)[i]/weight_norm);
-        }
-        else
-        {
-          (*next_weight22)[i] = (*curr_weight)[i] + floor(weight_rad*(*next_weight22)[i]/weight_norm);
-        }
-      //Print("\n//  next_weight22[%d]  = %d", i, (*next_weight22)[i]);
-      }
-
-      if(test_w_in_ConeCC(G, next_weight22) == 1)
-      {
-        //Print("\n//MWalkRandomNextWeight: next_weight2 im Kegel\n");
-        next_weight2 = MkInterRedNextWeight(next_weight22, target_weight, G);
-        delete next_weight22;
-        break;
-      }
-    }
-    intvec* result = new intvec(nV);
-    ideal G_test = MwalkInitialForm(G, next_weight);
-    ideal G_test1 = MwalkInitialForm(G, next_weight1);
-    ideal G_test2 = MwalkInitialForm(G, next_weight2);
-
-    // compare next_weights
-    if(IDELEMS(G_test1) < IDELEMS(G_test))
-    {
-      if(IDELEMS(G_test2) <= IDELEMS(G_test1)) // |G_test2| <= |G_test1| < |G_test|
-      {
-        for(i=0; i<nV; i++)
-        {
-          (*result)[i] = (*next_weight2)[i];
-        }
-      }
-      else // |G_test1| < |G_test|, |G_test1| < |G_test2|
-      {
-        for(i=0; i<nV; i++)
-        {
-          (*result)[i] = (*next_weight1)[i];
-        }
-      }
-    }
-    else
-    {
-      if(IDELEMS(G_test2) <= IDELEMS(G_test)) // |G_test2| <= |G_test| <= |G_test1|
-      {
-        for(i=0; i<nV; i++)
-        {
-          (*result)[i] = (*next_weight2)[i];
-        }
-      }
-      else // |G_test| <= |G_test1|, |G_test| < |G_test2|
-      {
-        for(i=0; i<nV; i++)
-        {
-          (*result)[i] = (*next_weight)[i];
-        }
-      }
-    }
-    delete next_weight;
-    delete next_weight1;
-    idDelete(&G_test);
-    idDelete(&G_test1);
-    idDelete(&G_test2);
-    if(test_w_in_ConeCC(G, result) == 1)
-    {
-      delete next_weight2;
-      return result;
-    }
-    else
-    {
-      delete result;
-      return next_weight2;
-    }
-  }
-}
-#endif
 
 /********************************
@@ -4414 +4335 @@
 
   //compute a perturbed next weight vector "next_weight1"
-  //intvec* next_weight1 = MkInterRedNextWeight(MPertVectors(G,MivMatrixOrderRefine(curr_weight,target_weight),pert_deg),target_weight,G);
   intvec* next_weight1 =MkInterRedNextWeight(curr_weight,target_weight,G);
   //compute a random next weight vector "next_weight2"
@@ -4443 +4363 @@
     {
       next_weight2 = MkInterRedNextWeight(next_weight22,target_weight,G);
+      if(MivAbsMax(next_weight2)>1147483647)
+      {
+        for(i=0; i<nV; i++)
+        {
+          (*next_weight22)[i] = (*next_weight2)[i];
+        }
+        i = 0;
+        while(test_w_in_ConeCC(G,next_weight22))
+        {
+          (*next_weight2)[i] = (*next_weight22)[i];
+          i = MivAbsMaxArg(next_weight22);
+          (*next_weight22)[i] = floor(0.1*(*next_weight22)[i] + 0.5);
+        }
+      }
       delete next_weight22;
       break;
@@ -4573 +4507 @@
     else
     {
-      rChangeCurrRing(VMrDefault(orig_target_weight)); // Aenderung
+      rChangeCurrRing(VMrDefault(orig_target_weight));
     }
     TargetRing = currRing;
@@ -4644 +4578 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); // Aenderung
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     newRing = currRing;
@@ -4753 +4687 @@
     else
     {
-      rChangeCurrRing(VMrDefault(orig_target_weight)); // Aenderung
+      rChangeCurrRing(VMrDefault(orig_target_weight));
     }
     F1 = idrMoveR(G, newRing,currRing);
@@ -4784 +4718 @@
       else
       {
-        rChangeCurrRing(VMrDefault(orig_target_weight)); // Aenderung
+        rChangeCurrRing(VMrDefault(orig_target_weight));
       }
     KSTD_Finish:
@@ -4882 +4816 @@
       tim = clock();
       /*
-        Print("\n// **** Grï¿œbnerwalk took %d steps and ", nwalk);
+        Print("\n// **** Groebnerwalk took %d steps and ", nwalk);
         PrintS("\n// **** call the rec. Pert. Walk to compute a red GB of:");
         idElements(Gomega, "G_omega");
@@ -4912 +4846 @@
       oldRing = currRing;
 
-      /* create a new ring newRing */
+      // create a new ring newRing
        if (rParameter(currRing) != NULL)
        {
@@ -4919 +4853 @@
        else
        {
-         rChangeCurrRing(VMrDefault(curr_weight)); // Aenderung
+         rChangeCurrRing(VMrDefault(curr_weight));
        }
       newRing = currRing;
@@ -4945 +4879 @@
       else
       {
-        rChangeCurrRing(VMrDefault(curr_weight));  //Aenderung
+        rChangeCurrRing(VMrDefault(curr_weight));
       }
       newRing = currRing;
@@ -4957 +4891 @@
       M=kStd(Gomega1,NULL,isHomog,NULL,hilb_func,0,NULL,curr_weight);
       delete hilb_func;
-#endif // BUCHBERGER_ALG
+#endif
       tstd = tstd + clock() - to;
 
@@ -4966 +4900 @@
 
       to = clock();
-      // compute a representation of the generators of submod (M) with respect to those of mod (Gomega). Gomega is a reduced Groebner basis w.r.t. the current ring.
+      // compute a representation of the generators of submod (M) with respect
+      // to those of mod (Gomega).
+      // Gomega is a reduced Groebner basis w.r.t. the current ring.
       F = MLifttwoIdeal(Gomega2, M1, G);
       tlift = tlift + clock() - to;
@@ -5016 +4952 @@
       else
       {
-        rChangeCurrRing(VMrDefault(target_weight)); // Aenderung
+        rChangeCurrRing(VMrDefault(target_weight));
       }
       F1 = idrMoveR(G, newRing,currRing);
@@ -5063 +4999 @@
  * THE GROEBNER WALK ALGORITHM *
  *******************************/
-ideal Mwalk(ideal Go, intvec* orig_M, intvec* target_M, ring baseRing)
+ideal Mwalk(ideal Go, intvec* orig_M, intvec* target_M,
+            ring baseRing, int reduction, int printout)
 {
-  BITSET save1 = si_opt_1; // save current options
-  //si_opt_1 &= (~Sy_bit(OPT_REDSB)); // no reduced Groebner basis
-  //si_opt_1 &= (~Sy_bit(OPT_REDTAIL)); // not tail reductions
-  //si_opt_1|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
+  // save current options
+  BITSET save1 = si_opt_1;
+  if(reduction == 0)
+  {
+    // no reduced Groebner basis
+    si_opt_1 &= (~Sy_bit(OPT_REDSB));
+    // not tail reductions
+    //si_opt_1 &= (~Sy_bit(OPT_REDTAIL));
+  }
   Set_Error(FALSE);
   Overflow_Error = FALSE;
@@ -5109 +5051 @@
 #endif
   rComplete(currRing);
-#ifdef CHECK_IDEAL_MWALK
-    idString(Go,"Go");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+  if(printout > 2)
+  {
+    idString(Go,"//** Mwalk: Go");
+  }
+//#endif
 #ifdef TIME_TEST
   to = clock();
 #endif
-     if(orig_M->length() == nV)
-      {
-        newRing = VMrDefault(curr_weight); // define a new ring with ordering "(a(curr_weight),lp)
-      }
-      else
-      {
-        newRing = VMatrDefault(orig_M);
-      }
+  if(orig_M->length() == nV)
+  {
+    // define a new ring with ordering "(a(curr_weight),lp)
+    newRing = VMrDefault(curr_weight);
+  }
+  else
+  {
+    newRing = VMatrDefault(orig_M);
+  }
   rChangeCurrRing(newRing);
   ideal G = MstdCC(idrMoveR(Go,baseRing,currRing));
@@ -5138 +5084 @@
     to = clock();
 #endif
-#ifdef CHECK_IDEAL_MWALK
-    idString(G,"G");
-#endif
-    Gomega = MwalkInitialForm(G, curr_weight); // compute an initial form ideal of <G> w.r.t. "curr_vector"
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(G,"//** Mwalk: G");
+    }
+//#endif
+    // compute an initial form ideal of <G> w.r.t. "curr_vector"
+    Gomega = MwalkInitialForm(G, curr_weight);
 #ifdef TIME_TEST
-    tif = tif + clock()-to; //time for computing initial form ideal
-#endif
-#ifdef CHECK_IDEAL_MWALK
-    idString(Gomega,"Gomega");
-#endif
+    //time for computing initial form ideal
+    tif = tif + clock()-to;
+#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 1)
+    {
+      idString(Gomega,"//** Mwalk: Gomega");
+    }
+//#endif
 #ifndef  BUCHBERGER_ALG
     if(isNolVector(curr_weight) == 0)
@@ -5162 +5116 @@
       if(orig_M->length() == nV)
       {
-        newRing = VMrDefault(curr_weight); // define a new ring with ordering "(a(curr_weight),lp)
+        // define a new ring with ordering "(a(curr_weight),lp)
+        newRing = VMrDefault(curr_weight);
       }
       else
@@ -5173 +5128 @@
      if(target_M->length() == nV)
      {
-       newRing = VMrRefine(curr_weight,target_weight); //define a new ring with ordering "(a(curr_weight),Wp(target_weight))"
+       //define a new ring with ordering "(a(curr_weight),Wp(target_weight))"
+       newRing = VMrRefine(curr_weight,target_weight);
      }
      else
      {
+       //define a new ring with matrix ordering
        newRing = VMatrRefine(target_M,curr_weight);
      }
@@ -5197 +5154 @@
 #endif
     idSkipZeroes(M);
-#ifdef CHECK_IDEAL_MWALK
-    PrintS("\n//** Mwalk: computed M.\n");
-    idString(M, "M");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(M, "//** Mwalk: M");
+    }
+//#endif
     //change the ring to baseRing
     rChangeCurrRing(baseRing);
@@ -5210 +5169 @@
     to = clock();
 #endif
-    // compute a representation of the generators of submod (M) with respect to those of mod (Gomega), where Gomega is a reduced Groebner basis w.r.t. the current ring
+    // compute a representation of the generators of submod (M) with respect to those of mod (Gomega),
+    // where Gomega is a reduced Groebner basis w.r.t. the current ring
     F = MLifttwoIdeal(Gomega2, M1, G);
 #ifdef TIME_TEST
     tlift = tlift + clock() - to;
 #endif
-#ifdef CHECK_IDEAL_MWALK
-    idString(F, "F");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(F, "//** Mwalk: F");
+    }
+//#endif
     idDelete(&Gomega2);
     idDelete(&M1);
@@ -5227 +5190 @@
     to = clock();
 #endif
-    //G = kStd(F1,NULL,testHomog,NULL,NULL,0,0,NULL);
+
 #ifdef TIME_TEST
     tstd = tstd + clock() - to;
 #endif
     idSkipZeroes(G);
-#ifdef CHECK_IDEAL_MWALK
-    idString(G, "G");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(G, "//** Mwalk: G");
+    }
+//#endif
 #ifdef TIME_TEST
     to = clock();
@@ -5242 +5208 @@
     tnw = tnw + clock() - to;
 #endif
-#ifdef PRINT_VECTORS
-    MivString(curr_weight, target_weight, next_weight);
-#endif
-    if(MivComp(next_weight, ivNull) == 1 || MivComp(target_weight,curr_weight) == 1)// || test_w_in_ConeCC(G, target_weight) == 1 || MivComp(next_weight,curr_weight) == 1)
-    {
-#ifdef CHECK_IDEAL_MWALK
-      PrintS("\n//** Mwalk: entering last cone.\n");
-#endif
+//#ifdef PRINT_VECTORS
+    if(printout > 0)
+    {
+      MivString(curr_weight, target_weight, next_weight);
+    }
+//#endif
+    if(MivComp(next_weight, ivNull) == 1 || MivComp(target_weight,curr_weight) == 1 || test_w_in_ConeCC(G, target_weight) == 1)
+    {
+//#ifdef CHECK_IDEAL_MWALK
+      if(printout > 0)
+      {
+        PrintS("\n//** Mwalk: entering last cone.\n");
+      }
+//#endif
       Gomega = MwalkInitialForm(G, curr_weight); // compute an initial form ideal of <G> w.r.t. "curr_vector"
       if(target_M->length() == nV)
@@ -5262 +5234 @@
       Gomega1 = idrMoveR(Gomega, baseRing,currRing);
       idDelete(&Gomega);
-#ifdef CHECK_IDEAL_MWALK
-      idString(Gomega1, "Gomega");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+      if(printout > 1)
+      {
+        idString(Gomega1, "//** Mwalk: Gomega");
+      }
+//#endif
       M = kStd(Gomega1,NULL,testHomog,NULL,NULL,0,0,NULL);
-#ifdef CHECK_IDEAL_MWALK
-      idString(M,"M");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+      if(printout > 1)
+      {
+        idString(M,"//** Mwalk: M");
+      }
+//#endif
       rChangeCurrRing(baseRing);
       M1 =  idrMoveR(M, newRing,currRing);
@@ -5275 +5253 @@
       idDelete(&Gomega1);
       F = MLifttwoIdeal(Gomega2, M1, G);
-#ifdef CHECK_IDEAL_MWALK
-      idString(F,"F");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(F,"//** Mwalk: F");
+    }
+//#endif
       idDelete(&Gomega2);
       idDelete(&M1);
@@ -5289 +5270 @@
       to = clock();
 #endif
- //     if(si_opt_1 == (Sy_bit(OPT_REDSB)))
-  //    {
-        G = kInterRedCC(G,NULL); //reduce the Groebner basis <G> w.r.t. currRing, if option(redSB) is set
-  //    }
+      //interreduce the Groebner basis <G> w.r.t. currRing
+      G = kInterRedCC(G,NULL);
 #ifdef TIME_TEST
       tred = tred + clock() - to;
@@ -5299 +5278 @@
       delete next_weight;
       break;
-#ifdef CHECK_IDEAL_MWALK
-      PrintS("\n//** Mwalk: last cone.\n");
-#endif
-    }
-#ifdef CHECK_IDEAL_MWALK
-    PrintS("\n//** Mwalk: update weight vectors.\n");
-#endif
+    }
     for(i=nV-1; i>=0; i--)
     {
@@ -5316 +5289 @@
   ideal result = idrMoveR(G,baseRing,currRing);
   idDelete(&G);
-/*#ifdef CHECK_IDEAL_MWALK
-  pDelete(&p);
-#endif*/
   delete tmp_weight;
   delete ivNull;
@@ -5326 +5296 @@
 #endif
 #ifdef TIME_TEST
-  Print("\n//** Mwalk: Groebner Walk took %d steps.\n", nstep);
   TimeString(tinput, tostd, tif, tstd, tlift, tred, tnw, nstep);
-  Print("\n//** Mwalk: Ergebnis.\n");
   //Print("\n// pSetm_Error = (%d)", ErrorCheck());
   //Print("\n// Overflow_Error? (%d)\n", Overflow_Error);
 #endif
+  Print("\n//** Mwalk: Groebner Walk took %d steps.\n", nstep);
   return(result);
 }
 
-// 07.11.2012
-// THE RANDOM WALK ALGORITHM  ideal Go, intvec* orig_M, intvec* target_M, ring baseRing
-ideal Mrwalk(ideal Go, intvec* orig_M, intvec* target_M, int weight_rad, int pert_deg, ring baseRing)
+// THE RANDOM WALK ALGORITHM
+ideal Mrwalk(ideal Go, intvec* orig_M, intvec* target_M, int weight_rad, int pert_deg,
+             int reduction, int printout)
 {
   BITSET save1 = si_opt_1; // save current options
-  //si_opt_1 &= (~Sy_bit(OPT_REDSB)); // no reduced Groebner basis
-  //si_opt_1 &= (~Sy_bit(OPT_REDTAIL)); // not tail reductions
-  //si_opt_1|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
+  if(reduction == 0)
+  {
+    si_opt_1 &= (~Sy_bit(OPT_REDSB)); // no reduced Groebner basis
+    //si_opt_1 &= (~Sy_bit(OPT_REDTAIL)); // not tail reductions
+    //si_opt_1|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
+  }
   Set_Error(FALSE);
   Overflow_Error = FALSE;
@@ -5352 +5324 @@
 #endif
   nstep=0;
-  int i,nwalk,endwalks = 0;
-  int nV = baseRing->N;
+  int i,polylength,nwalk,endwalks = 0;
+  int nV = currRing->N;
 
   ideal Gomega, M, F, Gomega1, Gomega2, M1; //, F1;
   ring newRing;
-  ring XXRing = baseRing;
+  ring baseRing = currRing;
+  ring XXRing = currRing;
   intvec* ivNull = new intvec(nV);
   intvec* curr_weight = new intvec(nV);
@@ -5363 +5336 @@
   intvec* exivlp = Mivlp(nV);
   intvec* tmp_weight = new intvec(nV);
+  intvec* next_weight= new intvec(nV);
   for(i=0; i<nV; i++)
   {
@@ -5383 +5357 @@
 #endif
   rComplete(currRing);
-#ifdef CHECK_IDEAL_MWALK
-    idString(Go,"Go");
-#endif
 #ifdef TIME_TEST
   to = clock();
 #endif
-     if(orig_M->length() == nV)
-      {
-        newRing = VMrDefault(curr_weight); // define a new ring with ordering "(a(curr_weight),lp)
-      }
-      else
-      {
-        newRing = VMatrDefault(orig_M);
-      }
+  if(orig_M->length() == nV)
+  {
+    newRing = VMrDefault(curr_weight); // define a new ring with ordering "(a(curr_weight),lp)
+  }
+  else
+  {
+    newRing = VMatrDefault(orig_M);
+  }
   rChangeCurrRing(newRing);
   ideal G = MstdCC(idrMoveR(Go,baseRing,currRing));
@@ -5412 +5383 @@
     to = clock();
 #endif
-#ifdef CHECK_IDEAL_MWALK
-    idString(G,"G");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(G,"//** Mrwalk: G");
+    }
+//#endif
     Gomega = MwalkInitialForm(G, curr_weight); // compute an initial form ideal of <G> w.r.t. "curr_vector"
+    //polylength = 1 if there is a polynomial in Gomega with at least 3 monomials and 0 otherwise
+    polylength = lengthpoly(Gomega);
 #ifdef TIME_TEST
     tif = tif + clock()-to; //time for computing initial form ideal
 #endif
-#ifdef CHECK_IDEAL_MWALK
-    idString(Gomega,"Gomega");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 1)
+    {
+      idString(Gomega,"//** Mrwalk: Gomega");
+    }
+//#endif
 #ifndef  BUCHBERGER_ALG
     if(isNolVector(curr_weight) == 0)
@@ -5471 +5450 @@
 #endif
     idSkipZeroes(M);
-#ifdef CHECK_IDEAL_MWALK
-    PrintS("\n//** Mwalk: computed M.\n");
-    idString(M, "M");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(M, "//** Mrwalk: M");
+    }
+//#endif
     //change the ring to baseRing
     rChangeCurrRing(baseRing);
@@ -5484 +5465 @@
     to = clock();
 #endif
-    // compute a representation of the generators of submod (M) with respect to those of mod (Gomega), where Gomega is a reduced Groebner basis w.r.t. the current ring
+    // compute a representation of the generators of submod (M) with respect to those of mod (Gomega),
+    // where Gomega is a reduced Groebner basis w.r.t. the current ring
     F = MLifttwoIdeal(Gomega2, M1, G);
 #ifdef TIME_TEST
     tlift = tlift + clock() - to;
 #endif
-#ifdef CHECK_IDEAL_MWALK
-    idString(F, "F");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(F, "//** Mrwalk: F");
+    }
+//#endif
     idDelete(&Gomega2);
     idDelete(&M1);
@@ -5500 +5485 @@
 #ifdef TIME_TEST
     to = clock();
-#endif
-    //G = kStd(F1,NULL,testHomog,NULL,NULL,0,0,NULL);
-#ifdef TIME_TEST
     tstd = tstd + clock() - to;
 #endif
     idSkipZeroes(G);
-#ifdef CHECK_IDEAL_MWALK
-    idString(G, "G");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(G, "//** Mrwalk: G");
+    }
+//#endif
 #ifdef TIME_TEST
     to = clock();
 #endif
-    intvec* next_weight = MWalkRandomNextWeight(G, curr_weight, target_weight, weight_rad, pert_deg);//next_weight = MwalkNextWeightCC(curr_weight,target_weight,G);
+    next_weight = MwalkNextWeightCC(curr_weight,target_weight,G);
+    if(polylength > 0)
+    {
+      //there is a polynomial in Gomega with at least 3 monomials,
+      //low-dimensional facet of the cone
+      delete next_weight;
+      next_weight = MWalkRandomNextWeight(G, curr_weight, target_weight, weight_rad, pert_deg);
+    }
 #ifdef TIME_TEST
     tnw = tnw + clock() - to;
 #endif
-#ifdef PRINT_VECTORS
-    MivString(curr_weight, target_weight, next_weight);
-#endif
+//#ifdef PRINT_VECTORS
+    if(printout > 0)
+    {
+      MivString(curr_weight, target_weight, next_weight);
+    }
+//#endif
     if(MivComp(next_weight, ivNull) == 1 || MivComp(target_weight,curr_weight) == 1)// || test_w_in_ConeCC(G, target_weight) == 1 || MivComp(next_weight,curr_weight) == 1)
     {
@@ -5525 +5520 @@
 #endif
       Gomega = MwalkInitialForm(G, curr_weight); // compute an initial form ideal of <G> w.r.t. "curr_vector"
+//#ifdef CHECK_IDEAL_MWALK
+      if(printout > 1)
+      {
+        idString(Gomega, "//** Mrwalk: Gomega");
+      }
+//#endif
       if(target_M->length() == nV)
       {
@@ -5536 +5537 @@
       Gomega1 = idrMoveR(Gomega, baseRing,currRing);
       idDelete(&Gomega);
-#ifdef CHECK_IDEAL_MWALK
-      idString(Gomega1, "Gomega");
-#endif
       M = kStd(Gomega1,NULL,testHomog,NULL,NULL,0,0,NULL);
-#ifdef CHECK_IDEAL_MWALK
-      idString(M,"M");
-#endif
+//#ifdef CHECK_IDEAL_MWALK
+      if(printout > 2)
+      {
+        idString(M,"//** Mrwalk: M");
+      }
+//#endif
       rChangeCurrRing(baseRing);
       M1 =  idrMoveR(M, newRing,currRing);
@@ -5549 +5550 @@
       idDelete(&Gomega1);
       F = MLifttwoIdeal(Gomega2, M1, G);
-#ifdef CHECK_IDEAL_MWALK
-      idString(F,"F");
-#endif
       idDelete(&Gomega2);
       idDelete(&M1);
@@ -5558 +5556 @@
       idDelete(&F);
       baseRing = currRing;
-      si_opt_1 = save1; //set original options, e. g. option(RedSB)
       idSkipZeroes(G);
 #ifdef TIME_TEST
       to = clock();
 #endif
- //     if(si_opt_1 == (Sy_bit(OPT_REDSB)))
-  //    {
-        //G = kInterRedCC(G,NULL); //reduce the Groebner basis <G> w.r.t. currRing, if option(redSB) is set
-  //    }
+//#ifdef CHECK_IDEAL_MWALK
+      if(printout > 2)
+      {
+        idString(G,"//** Mrwalk: G");
+      }
+/*#endif
+      if(si_opt_1 == (Sy_bit(OPT_REDSB)))
+      {*/
+        G = kInterRedCC(G,NULL); //interreduce the Groebner basis <G> w.r.t. currRing
+//      }
 #ifdef TIME_TEST
       tred = tred + clock() - to;
@@ -5573 +5576 @@
       delete next_weight;
       break;
-#ifdef CHECK_IDEAL_MWALK
-      PrintS("\n//** Mwalk: last cone.\n");
-#endif
-    }
-#ifdef CHECK_IDEAL_MWALK
-    PrintS("\n//** Mwalk: update weight vectors.\n");
-#endif
+    }
     for(i=nV-1; i>=0; i--)
     {
@@ -5587 +5584 @@
     delete next_weight;
   }
+  baseRing = currRing;
   rChangeCurrRing(XXRing);
   ideal result = idrMoveR(G,baseRing,currRing);
   idDelete(&G);
-/*#ifdef CHECK_IDEAL_MWALK
-  pDelete(&p);
-#endif*/
+  si_opt_1 = save1; //set original options, e. g. option(RedSB)
   delete tmp_weight;
   delete ivNull;
@@ -5599 +5595 @@
   delete last_omega;
 #endif
+  Print("\n//** Mrwalk: Groebner Walk took %d steps.\n", nstep);
 #ifdef TIME_TEST
-  Print("\n//** Mwalk: Groebner Walk took %d steps.\n", nstep);
   TimeString(tinput, tostd, tif, tstd, tlift, tred, tnw, nstep);
-  Print("\n//** Mwalk: Ergebnis.\n");
   //Print("\n// pSetm_Error = (%d)", ErrorCheck());
   //Print("\n// Overflow_Error? (%d)\n", Overflow_Error);
@@ -5749 +5744 @@
 // use kStd, if nP = 0, else call LastGB
 ideal Mpwalk(ideal Go, int op_deg, int tp_deg,intvec* curr_weight,
-             intvec* target_weight, int nP)
+             intvec* target_weight, int nP, int reduction, int printout)
 {
+  BITSET save1 = si_opt_1; // save current options
+  if(reduction == 0)
+  {
+    si_opt_1 &= (~Sy_bit(OPT_REDSB)); // no reduced Groebner basis
+    //si_opt_1 &= (~Sy_bit(OPT_REDTAIL)); // not tail reductions
+    //si_opt_1|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
+  }
   Set_Error(FALSE  );
   Overflow_Error = FALSE;
@@ -5788 +5790 @@
   ring XXRing = currRing;
 
-
   to = clock();
-  /* perturbs the original vector */
+  // perturbs the original vector
   if(MivComp(curr_weight, iv_dp) == 1) //rOrdStr(currRing) := "dp"
   {
@@ -5807 +5808 @@
       DefRingPar(curr_weight);
     else
-      rChangeCurrRing(VMrDefault(curr_weight)); //Aenderung 1
+      rChangeCurrRing(VMrDefault(curr_weight));
 
     G = idrMoveR(Go, XXRing,currRing);
@@ -5822 +5823 @@
   ring HelpRing = currRing;
 
-  /* perturbs the target weight vector */
+  // perturbs the target weight vector
   if(tp_deg > 1 && tp_deg <= nV)
   {
@@ -5828 +5829 @@
       DefRingPar(target_weight);
     else
-      rChangeCurrRing(VMrDefault(target_weight)); // Aenderung 2
+      rChangeCurrRing(VMrDefault(target_weight));
 
     TargetRing = currRing;
@@ -5850 +5851 @@
     G = idrMoveR(ssG, TargetRing,currRing);
   }
-  /*
-    Print("\n// Perturbationwalkalg. vom Gradpaar (%d,%d):",op_deg,tp_deg);
-    ivString(curr_weight, "new sigma");
-    ivString(target_weight, "new tau");
-  */
+    if(printout > 0)
+    {
+      Print("\n//** Mpwalk: Perturbation Walk of degree (%d,%d):",op_deg,tp_deg);
+      ivString(curr_weight, "//** Mpwalk: new current weight");
+      ivString(target_weight, "//** Mpwalk: new target weight");
+    }
   while(1)
   {
@@ -5862 +5864 @@
        "curr_weight" */
     Gomega = MwalkInitialForm(G, curr_weight);
-
+//#ifdef CHECK_IDEAL_MWALK
+      if(printout > 1)
+      {
+        idString(Gomega,"//** Mpwalk: Gomega");
+      }
+//#endif
 
 #ifdef ENDWALKS
-    if(endwalks == 1){
+    if(endwalks == 1)
+    {
       Print("\n// ring r%d = %s;\n", nstep, rString(currRing));
       idElements(G, "G");
-      // idElements(Gomega, "Gw");
       headidString(G, "G");
-      //headidString(Gomega, "Gw");
     }
 #endif
@@ -5889 +5895 @@
       DefRingPar(curr_weight);
     else
-      rChangeCurrRing(VMrDefault(curr_weight)); //Aenderung 3
+      rChangeCurrRing(VMrDefault(curr_weight));
 
     newRing = currRing;
@@ -5916 +5922 @@
     M=kStd(Gomega1,NULL,isHomog,NULL,hilb_func,0,NULL,curr_weight);
     delete hilb_func;
-#endif // BUCHBERGER_ALG
+#endif
+//#ifdef CHECK_IDEAL_MWALK
+      if(printout > 2)
+      {
+        idString(M,"//** Mpwalk: M");
+      }
+//#endif
 
     if(endwalks == 1){
@@ -5932 +5944 @@
     M1 =  idrMoveR(M, newRing,currRing);
     Gomega2 =  idrMoveR(Gomega1, newRing,currRing);
-
-    //if(endwalks==1)  PrintS("\n// Lifting is working:..");
 
     to=clock();
@@ -5945 +5955 @@
       xtlift=clock()-to;
 
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(F,"//** Mpwalk: F");
+    }
+//#endif
+
     idDelete(&M1);
     idDelete(&Gomega2);
@@ -5952 +5969 @@
     rChangeCurrRing(newRing);
     F1 = idrMoveR(F, oldRing,currRing);
-
-    //if(endwalks==1)PrintS("\n// InterRed is working now:");
 
     to=clock();
@@ -5969 +5984 @@
 
     to=clock();
-    /* compute a next weight vector */
+    // compute a next weight vector
     next_weight = MkInterRedNextWeight(curr_weight,target_weight, G);
     tnw=tnw+clock()-to;
-#ifdef PRINT_VECTORS
-    MivString(curr_weight, target_weight, next_weight);
-#endif
+//#ifdef PRINT_VECTORS
+    if(printout > 2)
+    {
+      MivString(curr_weight, target_weight, next_weight);
+    }
+//#endif
 
     if(Overflow_Error == TRUE)
@@ -6012 +6030 @@
         DefRingPar(orig_target);
       else
-        rChangeCurrRing(VMrDefault(orig_target)); //Aenderung
+        rChangeCurrRing(VMrDefault(orig_target));
 
     TargetRing=currRing;
@@ -6066 +6084 @@
     Eresult = idrMoveR(G, newRing,currRing);
   }
+  si_opt_1 = save1; //set original options, e. g. option(RedSB)
   delete ivNull;
   if(tp_deg != 1)
@@ -6080 +6099 @@
              tnw+xtnw);
 
-  Print("\n// pSetm_Error = (%d)", ErrorCheck());
-  Print("\n// It took %d steps and Overflow_Error? (%d)\n", nstep,  Overflow_Error);
-#endif
+  //Print("\n// pSetm_Error = (%d)", ErrorCheck());
+  //Print("\n// It took %d steps and Overflow_Error? (%d)\n", nstep,  Overflow_Error);
+#endif
+  Print("\n//** Mpwalk: Perturbation Walk took %d steps.\n", nstep);
+  return(Eresult);
+}
+
+/*******************************************************
+ * THE PERTURBATION WALK ALGORITHM WITH RANDOM ELEMENT *
+ *******************************************************/
+ideal Mprwalk(ideal Go, intvec* orig_M, intvec* target_M, int weight_rad,
+              int op_deg, int tp_deg, int nP, int reduction, int printout)
+{
+  BITSET save1 = si_opt_1; // save current options
+  if(reduction == 0)
+  {
+    si_opt_1 &= (~Sy_bit(OPT_REDSB)); // no reduced Groebner basis
+    //si_opt_1 &= (~Sy_bit(OPT_REDTAIL)); // not tail reductions
+    //si_opt_1|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
+  }
+  Set_Error(FALSE);
+  Overflow_Error = FALSE;
+  //Print("// pSetm_Error = (%d)", ErrorCheck());
+
+  clock_t  tinput, tostd, tif=0, tstd=0, tlift=0, tred=0, tnw=0;
+  xtextra=0;
+  xtif=0; xtstd=0; xtlift=0; xtred=0; xtnw=0;
+  tinput = clock();
+
+  clock_t tim;
+
+  nstep = 0;
+  int i, ntwC=1, ntestw=1, polylength, nV = currRing->N;
+  int endwalks=0;
+
+  ideal Gomega, M, F, G, Gomega1, Gomega2, M1,F1,Eresult,ssG;
+  ring newRing, oldRing, TargetRing;
+  intvec* iv_M_dp;
+  intvec* iv_M_lp;
+  intvec* exivlp = Mivlp(nV);
+  intvec* curr_weight = new intvec(nV);
+  intvec* target_weight = new intvec(nV);
+  for(i=0; i<nV; i++)
+  {
+    (*curr_weight)[i] = (*orig_M)[i];
+    (*target_weight)[i] = (*target_M)[i];
+  }
+  intvec* orig_target = target_weight;
+  intvec* pert_target_vector = target_weight;
+  intvec* ivNull = new intvec(nV);
+  intvec* iv_dp = MivUnit(nV);// define (1,1,...,1)
+#ifndef BUCHBERGER_ALG
+  intvec* hilb_func;
+#endif
+  intvec* next_weight;
+
+  // to avoid (1,0,...,0) as the target vector
+  intvec* last_omega = new intvec(nV);
+  for(i=nV-1; i>0; i--)
+    (*last_omega)[i] = 1;
+  (*last_omega)[0] = 10000;
+
+  ring XXRing = currRing;
+
+  to = clock();
+  // perturbs the original vector
+  if(orig_M->length() == nV)
+  {
+    if(MivComp(curr_weight, iv_dp) == 1) //rOrdStr(currRing) := "dp"
+    {
+      G = MstdCC(Go);
+      tostd = clock()-to;
+      if(op_deg != 1)
+      {
+        iv_M_dp = MivMatrixOrderdp(nV);
+        //ivString(iv_M_dp, "iv_M_dp");
+        curr_weight = MPertVectors(G, iv_M_dp, op_deg);
+      }
+    }
+    else
+    {
+      //define ring order := (a(curr_weight),lp);
+      if (rParameter(currRing) != NULL)
+        DefRingPar(curr_weight);
+      else
+        rChangeCurrRing(VMrDefault(curr_weight));
+
+      G = idrMoveR(Go, XXRing,currRing);
+      G = MstdCC(G);
+      tostd = clock()-to;
+      if(op_deg != 1)
+      {
+        iv_M_dp = MivMatrixOrder(curr_weight);
+        curr_weight = MPertVectors(G, iv_M_dp, op_deg);
+      }
+    }
+  }
+  else
+  {
+    rChangeCurrRing(VMatrDefault(orig_M));
+    G = idrMoveR(Go, XXRing,currRing);
+    G = MstdCC(G);
+    tostd = clock()-to;
+    if(op_deg != 1)
+    {
+      curr_weight = MPertVectors(G, orig_M, op_deg);
+    }
+  }
+
+  delete iv_dp;
+  if(op_deg != 1) delete iv_M_dp;
+
+  ring HelpRing = currRing;
+
+  // perturbs the target weight vector
+  if(target_M->length() == nV)
+  {
+    if(tp_deg > 1 && tp_deg <= nV)
+    {
+      if (rParameter(currRing) != NULL)
+        DefRingPar(target_weight);
+      else
+        rChangeCurrRing(VMrDefault(target_weight));
+
+      TargetRing = currRing;
+      ssG = idrMoveR(G,HelpRing,currRing);
+      if(MivSame(target_weight, exivlp) == 1)
+      {
+        iv_M_lp = MivMatrixOrderlp(nV);
+        //ivString(iv_M_lp, "iv_M_lp");
+        //target_weight = MPertVectorslp(ssG, iv_M_lp, tp_deg);
+        target_weight = MPertVectors(ssG, iv_M_lp, tp_deg);
+      }
+      else
+      {
+        iv_M_lp = MivMatrixOrder(target_weight);
+        //target_weight = MPertVectorslp(ssG, iv_M_lp, tp_deg);
+        target_weight = MPertVectors(ssG, iv_M_lp, tp_deg);
+      }
+      delete iv_M_lp;
+      pert_target_vector = target_weight;
+      rChangeCurrRing(HelpRing);
+      G = idrMoveR(ssG, TargetRing,currRing);
+    }
+  }
+  else
+  {
+    if(tp_deg > 1 && tp_deg <= nV)
+    {
+      rChangeCurrRing(VMatrDefault(target_M));
+      TargetRing = currRing;
+      ssG = idrMoveR(G,HelpRing,currRing);
+      target_weight = MPertVectors(ssG, target_M, tp_deg);
+    }
+  }
+  if(printout > 0)
+  {
+    Print("\n//** Mprwalk: Random Perturbation Walk of degree (%d,%d):",op_deg,tp_deg);
+    ivString(curr_weight, "//** Mprwalk: new current weight");
+    ivString(target_weight, "//** Mprwalk: new target weight");
+  }
+  while(1)
+  {
+    nstep ++;
+    to = clock();
+    /* compute an initial form ideal of <G> w.r.t. the weight vector
+       "curr_weight" */
+    Gomega = MwalkInitialForm(G, curr_weight);
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 1)
+    {
+      idString(Gomega,"//** Mprwalk: Gomega");
+    }
+//#endif
+    polylength = lengthpoly(Gomega);
+#ifdef ENDWALKS
+    if(endwalks == 1)
+    {
+      Print("\n// ring r%d = %s;\n", nstep, rString(currRing));
+      idElements(G, "G");
+      headidString(G, "G");
+    }
+#endif
+
+    tif = tif + clock()-to;
+
+#ifndef  BUCHBERGER_ALG
+    if(isNolVector(curr_weight) == 0)
+      hilb_func = hFirstSeries(Gomega,NULL,NULL,curr_weight,currRing);
+    else
+      hilb_func = hFirstSeries(Gomega,NULL,NULL,last_omega,currRing);
+#endif // BUCHBERGER_ALG
+
+    oldRing = currRing;
+
+    if(target_M->length() == nV)
+    {
+      // define a new ring with ordering "(a(curr_weight),lp)
+      if (rParameter(currRing) != NULL)
+        DefRingPar(curr_weight);
+      else
+        rChangeCurrRing(VMrDefault(curr_weight));
+    }
+    else
+    {
+      rChangeCurrRing(VMatrRefine(target_M,curr_weight));
+    }
+    newRing = currRing;
+    Gomega1 = idrMoveR(Gomega, oldRing,currRing);
+
+#ifdef ENDWALKS
+    if(endwalks==1)
+    {
+      Print("\n// ring r%d = %s;\n", nstep, rString(currRing));
+      idElements(Gomega1, "Gw");
+      headidString(Gomega1, "headGw");
+      PrintS("\n// compute a rGB of Gw:\n");
+
+#ifndef  BUCHBERGER_ALG
+      ivString(hilb_func, "w");
+#endif
+    }
+#endif
+
+    tim = clock();
+    to = clock();
+    /* compute a reduced Groebner basis of <Gomega> w.r.t. "newRing" */
+#ifdef  BUCHBERGER_ALG
+    M = MstdhomCC(Gomega1);
+#else
+    M=kStd(Gomega1,NULL,isHomog,NULL,hilb_func,0,NULL,curr_weight);
+    delete hilb_func;
+#endif
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(M,"//** Mprwalk: M");
+    }
+//#endif
+
+    if(endwalks == 1)
+    {
+      xtstd = xtstd+clock()-to;
+#ifdef ENDWALKS
+      Print("\n// time for the last std(Gw)  = %.2f sec\n",
+            ((double) clock())/1000000 -((double)tim) /1000000);
+#endif
+    }
+    else
+      tstd=tstd+clock()-to;
+
+    /* change the ring to oldRing */
+    rChangeCurrRing(oldRing);
+    M1 =  idrMoveR(M, newRing,currRing);
+    Gomega2 =  idrMoveR(Gomega1, newRing,currRing);
+
+    to=clock();
+    /* compute a representation of the generators of submod (M)
+       with respect to those of mod (Gomega).
+       Gomega is a reduced Groebner basis w.r.t. the current ring */
+    F = MLifttwoIdeal(Gomega2, M1, G);
+    if(endwalks != 1)
+      tlift = tlift+clock()-to;
+    else
+      xtlift=clock()-to;
+
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(F,"//** Mprwalk: F");
+    }
+//#endif
+
+    idDelete(&M1);
+    idDelete(&Gomega2);
+    idDelete(&G);
+
+    /* change the ring to newRing */
+    rChangeCurrRing(newRing);
+    F1 = idrMoveR(F, oldRing,currRing);
+
+    to=clock();
+    /* reduce the Groebner basis <G> w.r.t. new ring */
+    G = kInterRedCC(F1, NULL);
+    if(endwalks != 1)
+      tred = tred+clock()-to;
+    else
+      xtred=clock()-to;
+
+    idDelete(&F1);
+
+    if(endwalks == 1)
+      break;
+
+    to=clock();
+    // compute a next weight vector
+    next_weight = MkInterRedNextWeight(curr_weight,target_weight, G);
+    if(polylength > 0)
+    {
+      //there is a polynomial in Gomega with at least 3 monomials,
+      //low-dimensional facet of the cone
+      delete next_weight;
+      next_weight = MWalkRandomNextWeight(G, curr_weight, target_weight, weight_rad, op_deg);
+    }
+    tnw=tnw+clock()-to;
+//#ifdef PRINT_VECTORS
+    if(printout > 2)
+    {
+      MivString(curr_weight, target_weight, next_weight);
+    }
+//#endif
+
+    if(Overflow_Error == TRUE)
+    {
+      ntwC = 0;
+      //ntestomega = 1;
+      //Print("\n// ring r%d = %s;\n", nstep, rString(currRing));
+      //idElements(G, "G");
+      delete next_weight;
+      goto FINISH_160302;
+    }
+    if(MivComp(next_weight, ivNull) == 1){
+      newRing = currRing;
+      delete next_weight;
+      //Print("\n// ring r%d = %s;\n", nstep, rString(currRing));
+      break;
+    }
+    if(MivComp(next_weight, target_weight) == 1)
+      endwalks = 1;
+
+    for(i=nV-1; i>=0; i--)
+      (*curr_weight)[i] = (*next_weight)[i];
+
+    delete next_weight;
+  }//while
+
+  if(tp_deg != 1)
+  {
+    FINISH_160302:
+    if(target_M->length() == nV)
+    {
+      if(MivSame(orig_target, exivlp) == 1)
+        if (rParameter(currRing) != NULL)
+          DefRingParlp();
+        else
+          VMrDefaultlp();
+      else
+        if (rParameter(currRing) != NULL)
+          DefRingPar(orig_target);
+        else
+          rChangeCurrRing(VMrDefault(orig_target));
+    }
+    else
+    {
+      rChangeCurrRing(VMatrDefault(target_M));
+    }
+    TargetRing=currRing;
+    F1 = idrMoveR(G, newRing,currRing);
+#ifdef CHECK_IDEAL
+      headidString(G, "G");
+#endif
+
+    // check whether the pertubed target vector stays in the correct cone
+    if(ntwC != 0){
+      ntestw = test_w_in_ConeCC(F1, pert_target_vector);
+    }
+
+    if( ntestw != 1 || ntwC == 0)
+    {
+      /*
+      if(ntestw != 1){
+        ivString(pert_target_vector, "tau");
+        PrintS("\n// ** perturbed target vector doesn't stay in cone!!");
+        Print("\n// ring r%d = %s;\n", nstep, rString(currRing));
+        idElements(F1, "G");
+      }
+      */
+      // LastGB is "better" than the kStd subroutine
+      to=clock();
+      ideal eF1;
+      if(nP == 0 || tp_deg == 1 || MivSame(orig_target, exivlp) != 1 || target_M->length() != nV){
+        // PrintS("\n// ** calls \"std\" to compute a GB");
+        eF1 = MstdCC(F1);
+        idDelete(&F1);
+      }
+      else {
+        // PrintS("\n// ** calls \"LastGB\" to compute a GB");
+        rChangeCurrRing(newRing);
+        ideal F2 = idrMoveR(F1, TargetRing,currRing);
+        eF1 = LastGB(F2, curr_weight, tp_deg-1);
+        F2=NULL;
+      }
+      xtextra=clock()-to;
+      ring exTargetRing = currRing;
+
+      rChangeCurrRing(XXRing);
+      Eresult = idrMoveR(eF1, exTargetRing,currRing);
+    }
+    else{
+      rChangeCurrRing(XXRing);
+      Eresult = idrMoveR(F1, TargetRing,currRing);
+    }
+  }
+  else {
+    rChangeCurrRing(XXRing);
+    Eresult = idrMoveR(G, newRing,currRing);
+  }
+  si_opt_1 = save1; //set original options, e. g. option(RedSB)
+  delete ivNull;
+  if(tp_deg != 1)
+    delete target_weight;
+
+  if(op_deg != 1 )
+    delete curr_weight;
+
+  delete exivlp;
+  delete last_omega;
+
+#ifdef TIME_TEST
+  TimeStringFractal(tinput, tostd, tif+xtif, tstd+xtstd,0, tlift+xtlift, tred+xtred,
+             tnw+xtnw);
+
+  //Print("\n// pSetm_Error = (%d)", ErrorCheck());
+  //Print("\n// It took %d steps and Overflow_Error? (%d)\n", nstep,  Overflow_Error);
+#endif
+  Print("\n//** Mprwalk: Perturbation Walk took %d steps.\n", nstep);
   return(Eresult);
 }
@@ -6108 +6550 @@
  * Perturb the start weight vector at the top level, i.e. nlev = 1     *
  ***********************************************************************/
-static ideal rec_fractal_call(ideal G, int nlev, intvec* omtmp)
+static ideal rec_fractal_call(ideal G, int nlev, intvec* ivtarget, int printout)
 {
   Overflow_Error =  FALSE;
@@ -6125 +6567 @@
   intvec* next_vect;
   intvec* omega2 = new intvec(nV);
+  intvec* omtmp = new intvec(nV);
   intvec* altomega = new intvec(nV);
 
+  for(i = nV -1; i>0; i--)
+  {
+    (*omtmp)[i] = (*ivtarget)[i];
+  }
   //BOOLEAN isnewtarget = FALSE;
 
@@ -6167 +6614 @@
     NEXT_VECTOR_FRACTAL:
     to=clock();
-    /* determine the next border */
+    // determine the next border
     next_vect = MkInterRedNextWeight(omega,omega2,G);
     xtnw=xtnw+clock()-to;
-#ifdef PRINT_VECTORS
-    MivString(omega, omega2, next_vect);
-#endif
+
     oRing = currRing;
 
-    /* We only perturb the current target vector at the recursion  level 1 */
+    // We only perturb the current target vector at the recursion  level 1
     if(Xngleich == 0 && nlev == 1) //(ngleich == 0) important, e.g. ex2, ex3
       if (MivComp(next_vect, omega2) == 1)
       {
-        /* to dispense with taking initial (and lifting/interreducing
-           after the call of recursion */
-        //Print("\n\n// ** Perturb the both vectors with degree %d with",nlev);
-        //idElements(G, "G");
+        // to dispense with taking initial (and lifting/interreducing
+        // after the call of recursion
+        if(printout > 0)
+        {
+          Print("\n//** rec_fractal_call: Perturb the both vectors with degree %d.",nlev);
+          //idElements(G, "G");
+        }
 
         Xngleich = 1;
         nlev +=1;
 
-        if (rParameter(currRing) != NULL)
-          DefRingPar(omtmp);
+        if(ivtarget->length() == nV)
+        {
+          if (rParameter(currRing) != NULL)
+            DefRingPar(omtmp);
+          else
+            rChangeCurrRing(VMrDefault(omtmp));
+        }
         else
-          rChangeCurrRing(VMrDefault1(omtmp)); //Aenderung3
-
+        {
+          rChangeCurrRing(VMatrDefault(ivtarget));
+        }
         testring = currRing;
         Gt = idrMoveR(G, oRing,currRing);
 
-        /* perturb the original target vector w.r.t. the current GB */
-        delete Xtau;
-        Xtau = NewVectorlp(Gt);
+        // perturb the original target vector w.r.t. the current GB
+        if(ivtarget->length() == nV)
+        {
+          delete Xtau;
+          Xtau = NewVectorlp(Gt);
+        }
+        else
+        {
+          delete Xtau;
+          Xtau = Mfpertvector(Gt,ivtarget);
+        }
 
         rChangeCurrRing(oRing);
         G = idrMoveR(Gt, testring,currRing);
 
-        /* perturb the current vector w.r.t. the current GB */
+        // perturb the current vector w.r.t. the current GB
         Mwlp = MivWeightOrderlp(omega);
         Xsigma = Mfpertvector(G, Mwlp);
@@ -6220 +6682 @@
         next_vect = MkInterRedNextWeight(omega,omega2,G);
         xtnw=xtnw+clock()-to;
-
-#ifdef PRINT_VECTORS
+      }
+//#ifdef PRINT_VECTORS
+      if(printout > 0)
+      {
         MivString(omega, omega2, next_vect);
-#endif
-      }
-
+      }
+//#endif
 
     /* check whether the the computed vector is in the correct cone */
@@ -6234 +6697 @@
     {
       delete next_vect;
-      if (rParameter(currRing) != NULL)
-      {
-        DefRingPar(omtmp);
+      if(ivtarget->length() == nV)
+      {
+        if (rParameter(currRing) != NULL)
+          DefRingPar(omtmp);
+        else
+          rChangeCurrRing(VMrDefault(omtmp));
       }
       else
       {
-        rChangeCurrRing(VMrDefault1(omtmp)); // Aenderung4
+        rChangeCurrRing(VMatrDefault(ivtarget));
       }
 #ifdef TEST_OVERFLOW
@@ -6246 +6712 @@
       Gt = NULL; return(Gt);
 #endif
-
-      //Print("\n\n// apply BB's alg. in ring r = %s;", rString(currRing));
+      if(printout > 0)
+      {
+        Print("\n//** rec_fractal_call: applying Buchberger's algorithm in ring r = %s;",
+              rString(currRing));
+      }
       to=clock();
       Gt = idrMoveR(G, oRing,currRing);
@@ -6256 +6725 @@
       delete omega2;
       delete altomega;
-
-      //Print("\n// Leaving the %d-th recursion with %d steps", nlev, nwalks);
-      //Print("  ** Overflow_Error? (%d)", Overflow_Error);
+      if(printout > 0)
+      {
+        Print("\n//** rec_fractal_call: Leaving the %d-th recursion with %d steps.\n",
+              nlev, nwalks);
+        //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+      }
+
       nnflow ++;
 
@@ -6275 +6748 @@
     if (MivComp(next_vect, XivNull) == 1)
     {
-      if (rParameter(currRing) != NULL)
-        DefRingPar(omtmp);
+      if(ivtarget->length() == nV)
+      {
+        if (rParameter(currRing) != NULL)
+          DefRingPar(omtmp);
+        else
+          rChangeCurrRing(VMrDefault(omtmp));
+      }
       else
-        rChangeCurrRing(VMrDefault1(omtmp)); //Aenderung5
+      {
+        rChangeCurrRing(VMatrDefault(ivtarget));
+      }
 
       testring = currRing;
@@ -6287 +6767 @@
         delete next_vect;
         delete altomega;
-        //Print("\n// Leaving the %d-th recursion with %d steps ",nlev, nwalks);
-        //Print(" ** Overflow_Error? (%d)", Overflow_Error);
-
+        if(printout > 0)
+        {
+          Print("\n//** rec_fractal_call: Leaving the %d-th recursion with %d steps.\n",
+              nlev, nwalks);
+          //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+        }
         return (Gt);
       }
@@ -6300 +6783 @@
         //07.08.03
         //ivString(Xtau, "old Xtau");
-        intvec* Xtautmp = Mfpertvector(Gt, MivMatrixOrder(omtmp));
+        intvec* Xtautmp;
+        if(ivtarget->length() == nV)
+        {
+          Xtautmp = Mfpertvector(Gt, MivMatrixOrder(omtmp));
+        }
+        else
+        {
+          Xtautmp = Mfpertvector(Gt, ivtarget);
+        }
 #ifdef TEST_OVERFLOW
       if(Overflow_Error == TRUE)
@@ -6328 +6819 @@
 
       FRACTAL_MSTDCC:
-        //Print("\n//  apply BB-Alg in ring = %s;", rString(currRing));
+        if(printout > 0)
+        {
+          Print("\n//** rec_fractal_call: apply Buchberger's algorithm in ring = %s.\n",
+                rString(currRing));
+        }
         to=clock();
         G = MstdCC(Gt);
@@ -6336 +6831 @@
 
         // update the original target vector w.r.t. the current GB
-        if(MivSame(Xivinput, Xivlp) == 1)
-          if (rParameter(currRing) != NULL)
-            DefRingParlp();
+        if(ivtarget->length() == nV)
+        {
+          if(MivSame(Xivinput, Xivlp) == 1)
+            if (rParameter(currRing) != NULL)
+              DefRingParlp();
+            else
+              VMrDefaultlp();
           else
-            VMrDefaultlp();
+            if (rParameter(currRing) != NULL)
+              DefRingPar(Xivinput);
+            else
+              rChangeCurrRing(VMrDefault(Xivinput));
+        }
         else
-          if (rParameter(currRing) != NULL)
-            DefRingPar(Xivinput);
-          else
-            rChangeCurrRing(VMrDefault1(Xivinput)); //Aenderung6
-
+        {
+          rChangeCurrRing(VMatrRefine(ivtarget,Xivinput));
+        }
         testring = currRing;
         Gt = idrMoveR(G, oRing,currRing);
@@ -6359 +6860 @@
         delete next_vect;
         delete altomega;
-        /*
-          Print("\n// Leaving the %d-th recursion with %d steps,", nlev,nwalks);
-          Print(" ** Overflow_Error? (%d)", Overflow_Error);
-        */
+        if(printout > 0)
+        {
+          Print("\n//** rec_fractal_call: Leaving the %d-th recursion with %d steps.\n",
+              nlev, nwalks);
+          //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+        }
         if(Overflow_Error == TRUE)
           nnflow ++;
@@ -6381 +6884 @@
     Gomega = MwalkInitialForm(G, omega);
     xtif=xtif+clock()-to;
-
+    if(printout > 1)
+    {
+      idString(Gomega,"//** rec_fractal_call: Gomega");
+    }
 #ifndef  BUCHBERGER_ALG
     if(isNolVector(omega) == 0)
@@ -6388 +6894 @@
       hilb_func = hFirstSeries(Gomega,NULL,NULL,last_omega,currRing);
 #endif // BUCHBERGER_ALG
-
-    if (rParameter(currRing) != NULL)
-      DefRingPar(omega);
+    if(ivtarget->length() == nV)
+    {
+      if (rParameter(currRing) != NULL)
+        DefRingPar(omega);
+      else
+        rChangeCurrRing(VMrDefault(omega));
+    }
     else
-      rChangeCurrRing(VMrDefault1(omega)); //Aenderung7
-
+    {
+      rChangeCurrRing(VMatrRefine(ivtarget,omega));
+    }
     Gomega1 = idrMoveR(Gomega, oRing,currRing);
 
-    /* Maximal recursion depth, to compute a red. GB */
-    /* Fractal walk with the alternative recursion */
-    /* alternative recursion */
+    // Maximal recursion depth, to compute a red. GB
+    // Fractal walk with the alternative recursion
+    // alternative recursion
     // if(nlev == nV || lengthpoly(Gomega1) == 0)
     if(nlev == Xnlev || lengthpoly(Gomega1) == 0)
       //if(nlev == nV) // blind recursion
     {
-      /*
-      if(Xnlev != nV)
-      {
-        Print("\n// ** Xnlev = %d", Xnlev);
-        ivString(Xtau, "Xtau");
-      }
-      */
       to=clock();
 #ifdef  BUCHBERGER_ALG
@@ -6419 +6923 @@
       xtstd=xtstd+clock()-to;
     }
-    else {
+    else
+    {
       rChangeCurrRing(oRing);
       Gomega1 = idrMoveR(Gomega1, oRing,currRing);
-      Gresult = rec_fractal_call(idCopy(Gomega1),nlev+1,omega);
-    }
-
-    //convert a Groebner basis from a ring to another ring,
+      Gresult = rec_fractal_call(idCopy(Gomega1),nlev+1,omega,printout);
+    }
+    if(printout > 2)
+    {
+      idString(Gresult,"//** rec_fractal_call: M");
+    }
+    //convert a Groebner basis from a ring to another ring
     new_ring = currRing;
 
@@ -6433 +6941 @@
 
     to=clock();
-    /* Lifting process */
+    // Lifting process
     F = MLifttwoIdeal(Gomega2, Gresult1, G);
     xtlift=xtlift+clock()-to;
+    if(printout > 2)
+    {
+      idString(F,"//** rec_fractal_call: F");
+    }
     idDelete(&Gresult1);
     idDelete(&Gomega2);
@@ -6454 +6966 @@
  * Perturb the start weight vector at the top level with random element *
  ************************************************************************/
-static ideal rec_r_fractal_call(ideal G, int nlev, intvec* omtmp, int weight_rad)
+static ideal rec_r_fractal_call(ideal G, int nlev, intvec* ivtarget,
+                int weight_rad, int printout)
 {
   Overflow_Error =  FALSE;
   //Print("\n\n// Entering the %d-th recursion:", nlev);
 
-  int i, nV = currRing->N;
+  int i, polylength, nV = currRing->N;
   ring new_ring, testring;
   //ring extoRing;
@@ -6471 +6984 @@
   intvec* next_vect;
   intvec* omega2 = new intvec(nV);
+  intvec* omtmp = new intvec(nV);
   intvec* altomega = new intvec(nV);
 
   //BOOLEAN isnewtarget = FALSE;
 
+  for(i = nV -1; i>0; i--)
+  {
+    (*omtmp)[i] = (*ivtarget)[i];
+  }
   // to avoid (1,0,...,0) as the target vector (Hans)
   intvec* last_omega = new intvec(nV);
@@ -6514 +7032 @@
     to=clock();
     /* determine the next border */
-    next_vect = MWalkRandomNextWeight(G, omega,omega2, weight_rad, 1+nlev);
-    //next_vect = MkInterRedNextWeight(omega,omega2,G);
+    next_vect = MkInterRedNextWeight(omega,omega2,G);
+    if(polylength > 0)
+    {
+      //there is a polynomial in Gomega with at least 3 monomials,
+      //low-dimensional facet of the cone
+      delete next_vect;
+      next_vect = MWalkRandomNextWeight(G,omega,omega2,weight_rad,1+nlev);
+      if(isNolVector(next_vect))
+      {
+        delete next_vect;
+        next_vect = MkInterRedNextWeight(omega,omega2,G);
+      }
+    }
     xtnw=xtnw+clock()-to;
-#ifdef PRINT_VECTORS
-    MivString(omega, omega2, next_vect);
-#endif
+
     oRing = currRing;
 
-    /* We only perturb the current target vector at the recursion  level 1 */
+    // We only perturb the current target vector at the recursion  level 1
     if(Xngleich == 0 && nlev == 1) //(ngleich == 0) important, e.g. ex2, ex3
       if (MivComp(next_vect, omega2) == 1)
       {
-        /* to dispense with taking initial (and lifting/interreducing
-           after the call of recursion */
-        //Print("\n\n// ** Perturb the both vectors with degree %d with",nlev);
-        //idElements(G, "G");
-
+        // to dispense with taking initials and lifting/interreducing
+        // after the call of recursion.
+        if(printout > 0)
+        {
+          Print("\n//** rec_r_fractal_call: Perturb the both vectors with degree %d.",nlev);
+          //idElements(G, "G");
+        }
         Xngleich = 1;
         nlev +=1;
-
-        if (rParameter(currRing) != NULL)
-          DefRingPar(omtmp);
+        if(ivtarget->length() == nV)
+        {
+          if (rParameter(currRing) != NULL)
+            DefRingPar(omtmp);
+          else
+            rChangeCurrRing(VMrDefault(omtmp));
+        }
         else
-          rChangeCurrRing(VMrDefault1(omtmp)); //Aenderung3
-
+        {
+          rChangeCurrRing(VMatrDefault(ivtarget));
+        }
         testring = currRing;
         Gt = idrMoveR(G, oRing,currRing);
 
-        /* perturb the original target vector w.r.t. the current GB */
-        delete Xtau;
-        Xtau = NewVectorlp(Gt);
+        // perturb the original target vector w.r.t. the current GB
+        if(ivtarget->length() == nV)
+        {
+          delete Xtau;
+          Xtau = NewVectorlp(Gt);
+        }
+        else
+        {
+          delete Xtau;
+          Xtau = Mfpertvector(Gt,ivtarget);
+        }
 
         rChangeCurrRing(oRing);
-        G = idrMoveR(Gt, testring,currRing);
-
-        /* perturb the current vector w.r.t. the current GB */
+        G = idrMoveR(Gt,testring,currRing);
+
+        // perturb the current vector w.r.t. the current GB
         Mwlp = MivWeightOrderlp(omega);
+        if(ivtarget->length() > nV)
+        {
+          delete Mwlp;
+          Mwlp = MivMatrixOrderRefine(omega,ivtarget);
+        }
         Xsigma = Mfpertvector(G, Mwlp);
         delete Mwlp;
@@ -6566 +7113 @@
 
         next_vect = MkInterRedNextWeight(omega,omega2,G);
+        if(polylength > 0)
+        {
+          //there is a polynomial in Gomega with at least 3 monomials,
+          //low-dimensional facet of the cone
+          delete next_vect;
+          next_vect = MWalkRandomNextWeight(G,omega,omega2,weight_rad,1+nlev);
+          if(isNolVector(next_vect))
+          {
+            delete next_vect;
+            next_vect = MkInterRedNextWeight(omega,omega2,G);
+          }
+        }
         xtnw=xtnw+clock()-to;
-
-#ifdef PRINT_VECTORS
+      }
+//#ifdef PRINT_VECTORS
+      if(printout > 0)
+      {
         MivString(omega, omega2, next_vect);
-#endif
-      }
-
-
-    /* check whether the the computed vector is in the correct cone */
-    /* If no, the reduced GB of an omega-homogeneous ideal will be
+      }
+//#endif
+
+    /* check whether the the computed vector is in the correct cone
+       If no, the reduced GB of an omega-homogeneous ideal will be
        computed by Buchberger algorithm and stop this recursion step*/
     //if(test_w_in_ConeCC(G, next_vect) != 1) //e.g. Example s7, cyc6
@@ -6581 +7141 @@
     {
       delete next_vect;
-      if (rParameter(currRing) != NULL)
-      {
-        DefRingPar(omtmp);
+      if(ivtarget->length() == nV)
+      {
+        if (rParameter(currRing) != NULL)
+        {
+          DefRingPar(omtmp);
+        }
+        else
+        {
+          rChangeCurrRing(VMrDefault(omtmp));
+        }
       }
       else
       {
-        rChangeCurrRing(VMrDefault1(omtmp)); // Aenderung4
+        rChangeCurrRing(VMatrDefault(ivtarget));
       }
 #ifdef TEST_OVERFLOW
       Gt = idrMoveR(G, oRing,currRing);
-      Gt = NULL; return(Gt);
-#endif
-
-      //Print("\n\n// apply BB's alg. in ring r = %s;", rString(currRing));
+      Gt = NULL;
+      return(Gt);
+#endif
+      if(printout > 0)
+      {
+        Print("\n//** rec_r_fractal_call: applying Buchberger's algorithm in ring r = %s;",
+              rString(currRing));
+      }
       to=clock();
       Gt = idrMoveR(G, oRing,currRing);
@@ -6603 +7174 @@
       delete omega2;
       delete altomega;
-
-      //Print("\n// Leaving the %d-th recursion with %d steps", nlev, nwalks);
-      //Print("  ** Overflow_Error? (%d)", Overflow_Error);
+      if(printout > 0)
+      {
+        Print("\n//** rec_r_fractal_call: Leaving the %d-th recursion with %d steps.\n",
+              nlev, nwalks);
+        //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+      }
       nnflow ++;
-
       Overflow_Error = FALSE;
       return (G1);
     }
-
-
-    /* If the perturbed target vector stays in the correct cone,
-       return the current GB,
-       otherwise, return the computed  GB by the Buchberger-algorithm.
-       Then we update the perturbed target vectors w.r.t. this GB. */
-
-    /* the computed vector is equal to the origin vector, since
-       t is not defined */
+    /*
+       If the perturbed target vector stays in the correct cone,
+       return the current Groebner basis.
+       Otherwise, return the Groebner basis computed with Buchberger's
+       algorithm.
+       Then we update the perturbed target vectors w.r.t. this GB.
+    */
     if (MivComp(next_vect, XivNull) == 1)
     {
-      if (rParameter(currRing) != NULL)
-        DefRingPar(omtmp);
+      // The computed vector is equal to the origin vector,
+      // because t is not defined
+      if(ivtarget->length() == nV)
+      {
+        if (rParameter(currRing) != NULL)
+          DefRingPar(omtmp);
+        else
+          rChangeCurrRing(VMrDefault(omtmp));
+      }
       else
-        rChangeCurrRing(VMrDefault1(omtmp)); //Aenderung5
-
+      {
+        rChangeCurrRing(VMatrDefault(ivtarget));
+      }
       testring = currRing;
       Gt = idrMoveR(G, oRing,currRing);
 
-      if(test_w_in_ConeCC(Gt, omega2) == 1) {
+      if(test_w_in_ConeCC(Gt, omega2) == 1)
+      {
         delete omega2;
         delete next_vect;
         delete altomega;
-        //Print("\n// Leaving the %d-th recursion with %d steps ",nlev, nwalks);
-        //Print(" ** Overflow_Error? (%d)", Overflow_Error);
-
+        if(printout > 0)
+        {
+          Print("\n//** rec_r_fractal_call: Leaving the %d-th recursion with %d steps.\n",
+                nlev, nwalks);
+          //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+        }
         return (Gt);
       }
       else
-      {
-        //ivString(omega2, "tau'");
-        //Print("\n//  tau' doesn't stay in the correct cone!!");
-
+      { 
+        if(printout > 0)
+        {
+          Print("\n//** rec_r_fractal_call: target weight doesn't stay in the correct cone.\n");
+        }
 #ifndef  MSTDCC_FRACTAL
-        //07.08.03
         //ivString(Xtau, "old Xtau");
-        intvec* Xtautmp = Mfpertvector(Gt, MivMatrixOrder(omtmp));
+        intvec* Xtautmp;
+        if(ivtarget->length() == nV)
+        {
+          Xtautmp = Mfpertvector(Gt, MivMatrixOrder(omtmp));
+        }
+        else
+        {
+          Xtautmp = Mfpertvector(Gt, ivtarget);
+        }
 #ifdef TEST_OVERFLOW
       if(Overflow_Error == TRUE)
@@ -6675 +7266 @@
 
       FRACTAL_MSTDCC:
-        //Print("\n//  apply BB-Alg in ring = %s;", rString(currRing));
+        if(printout > 0)
+        {
+          Print("\n//** rec_r_fractal_call: apply Buchberge's algorithm in ring = %s.\n",
+                rString(currRing));
+        }
         to=clock();
         G = MstdCC(Gt);
@@ -6683 +7278 @@
 
         // update the original target vector w.r.t. the current GB
-        if(MivSame(Xivinput, Xivlp) == 1)
-          if (rParameter(currRing) != NULL)
-            DefRingParlp();
+        if(ivtarget->length() == nV)
+        {
+          if(MivSame(Xivinput, Xivlp) == 1)
+            if (rParameter(currRing) != NULL)
+              DefRingParlp();
+            else
+              VMrDefaultlp();
           else
-            VMrDefaultlp();
+            if (rParameter(currRing) != NULL)
+              DefRingPar(Xivinput);
+            else
+              rChangeCurrRing(VMrDefault(Xivinput));
+        }
         else
-          if (rParameter(currRing) != NULL)
-            DefRingPar(Xivinput);
-          else
-            rChangeCurrRing(VMrDefault1(Xivinput)); //Aenderung6
-
+        {
+          rChangeCurrRing(VMatrRefine(ivtarget,Xivinput));
+        }
         testring = currRing;
         Gt = idrMoveR(G, oRing,currRing);
@@ -6706 +7307 @@
         delete next_vect;
         delete altomega;
-        /*
-          Print("\n// Leaving the %d-th recursion with %d steps,", nlev,nwalks);
-          Print(" ** Overflow_Error? (%d)", Overflow_Error);
-        */
+        if(printout > 0)
+        {
+          Print("\n//** rec_r_fractal_call: Leaving the %d-th recursion with %d steps.\n",
+                nlev,nwalks);
+          //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+        }
         if(Overflow_Error == TRUE)
           nnflow ++;
@@ -6725 +7328 @@
 
     to=clock();
-    /* Take the initial form of <G> w.r.t. omega */
+    // Take the initial form of <G> w.r.t. omega
     Gomega = MwalkInitialForm(G, omega);
     xtif=xtif+clock()-to;
-
+    //polylength = 1 if there is a polynomial in Gomega with at least 3 monomials and 0 otherwise
+    polylength = lengthpoly(Gomega);
+    if(printout > 1)
+    {
+      idString(Gomega,"//** rec_r_fractal_call: Gomega");
+    }
 #ifndef  BUCHBERGER_ALG
     if(isNolVector(omega) == 0)
@@ -6734 +7342 @@
     else
       hilb_func = hFirstSeries(Gomega,NULL,NULL,last_omega,currRing);
-#endif // BUCHBERGER_ALG
-
-    if (rParameter(currRing) != NULL)
-      DefRingPar(omega);
+#endif
+    if(ivtarget->length() == nV)
+    {
+      if (rParameter(currRing) != NULL)
+        DefRingPar(omega);
+      else
+        rChangeCurrRing(VMrDefault(omega));
+    }
     else
-      rChangeCurrRing(VMrDefault1(omega)); //Aenderung7
-
+    {
+      rChangeCurrRing(VMatrRefine(ivtarget,omega));
+    }
     Gomega1 = idrMoveR(Gomega, oRing,currRing);
 
-    /* Maximal recursion depth, to compute a red. GB */
-    /* Fractal walk with the alternative recursion */
-    /* alternative recursion */
-    // if(nlev == nV || lengthpoly(Gomega1) == 0)
+    // Maximal recursion depth, to compute a red. GB
+    // Fractal walk with the alternative recursion
+    // alternative recursion
     if(nlev == Xnlev || lengthpoly(Gomega1) == 0)
-      //if(nlev == nV) // blind recursion
-    {
-      /*
-      if(Xnlev != nV)
-      {
-        Print("\n// ** Xnlev = %d", Xnlev);
-        ivString(Xtau, "Xtau");
-      }
-      */
+    {
       to=clock();
 #ifdef  BUCHBERGER_ALG
@@ -6763 +7367 @@
       Gresult =kStd(Gomega1,NULL,isHomog,NULL,hilb_func,0,NULL,omega);
       delete hilb_func;
-#endif // BUCHBERGER_ALG
+#endif
       xtstd=xtstd+clock()-to;
     }
-    else {
+    else
+    {
       rChangeCurrRing(oRing);
       Gomega1 = idrMoveR(Gomega1, oRing,currRing);
-      Gresult = rec_fractal_call(idCopy(Gomega1),nlev+1,omega);
-    }
-
-    //convert a Groebner basis from a ring to another ring,
+      Gresult = rec_fractal_call(idCopy(Gomega1),nlev+1,omega,printout);
+    }
+    if(printout > 2)
+    {
+      idString(Gresult,"//** rec_r_fractal_call: M");
+    }
+    //convert a Groebner basis from a ring to another ring
     new_ring = currRing;
 
@@ -6780 +7388 @@
 
     to=clock();
-    /* Lifting process */
+    // Lifting process
     F = MLifttwoIdeal(Gomega2, Gresult1, G);
     xtlift=xtlift+clock()-to;
+
+    if(printout > 2)
+    {
+      idString(F,"//** rec_r_fractal_call: F");
+    }
+
     idDelete(&Gresult1);
     idDelete(&Gomega2);
@@ -6791 +7405 @@
 
     to=clock();
-    /* Interreduce G */
+    // Interreduce G
     G = kInterRedCC(F1, NULL);
     xtred=xtred+clock()-to;
@@ -6797 +7411 @@
   }
 }
-
-
 
 
@@ -6805 +7417 @@
  *                                                                             *
  * The main procedur Mfwalk calls the recursive Subroutine                     *
- * rec_fractal_call to compute the wanted Grï¿œbner basis.                       *
- * At the main procedur we compute the reduced Grï¿œbner basis w.r.t. a "fast"   *
+ * rec_fractal_call to compute the wanted Groebner basis.                      *
+ * At the main procedur we compute the reduced Groebner basis w.r.t. a "fast"  *
  * order, e.g. "dp" and a sequence of weight vectors which are row vectors     *
  * of a matrix. This matrix defines the given monomial order, e.g. "lp"        *
  *******************************************************************************/
-ideal Mfwalk(ideal G, intvec* ivstart, intvec* ivtarget)
+ideal Mfwalk(ideal G, intvec* ivstart, intvec* ivtarget,
+             int reduction, int printout)
 {
+  BITSET save1 = si_opt_1; // save current options
+  if(reduction == 0)
+  {
+    si_opt_1 &= (~Sy_bit(OPT_REDSB)); // no reduced Groebner basis
+    //si_opt_1 &= (~Sy_bit(OPT_REDTAIL)); // not tail reductions
+  }
   Set_Error(FALSE);
   Overflow_Error = FALSE;
@@ -6846 +7465 @@
       intvec* iv_dp = MivUnit(nV); // define (1,1,...,1)
       intvec* Mdp;
-
-      if(MivSame(ivstart, iv_dp) != 1)
-        Mdp = MivWeightOrderdp(ivstart);
+      if(ivstart->length() == nV)
+      {
+        if(MivSame(ivstart, iv_dp) != 1)
+          Mdp = MivWeightOrderdp(ivstart);
+        else
+          Mdp = MivMatrixOrderdp(nV);
+      }
       else
-        Mdp = MivMatrixOrderdp(nV);
+      {
+        Mdp = ivstart;
+      }
 
       Xsigma = Mfpertvector(I, Mdp);
@@ -6867 +7492 @@
   Xivlp = Mivlp(nV);
 
-  if(MivComp(ivtarget, Xivlp)  != 1)
-  {
-    if (rParameter(currRing) != NULL)
-      DefRingPar(ivtarget);
+  if(ivtarget->length() == nV)
+  {
+    if(MivComp(ivtarget, Xivlp)  != 1)
+    {
+      if (rParameter(currRing) != NULL)
+        DefRingPar(ivtarget);
+      else
+        rChangeCurrRing(VMrDefault(ivtarget));
+
+      I1 = idrMoveR(I, oldRing,currRing);
+      Mlp = MivWeightOrderlp(ivtarget);
+      Xtau = Mfpertvector(I1, Mlp);
+    }
     else
-      rChangeCurrRing(VMrDefault1(ivtarget)); //Aenderung1
-
-    I1 = idrMoveR(I, oldRing,currRing);
-    Mlp = MivWeightOrderlp(ivtarget);
-    Xtau = Mfpertvector(I1, Mlp);
+    {
+      if (rParameter(currRing) != NULL)
+        DefRingParlp();
+      else
+        VMrDefaultlp();
+
+      I1 = idrMoveR(I, oldRing,currRing);
+      Mlp =  MivMatrixOrderlp(nV);
+      Xtau = Mfpertvector(I1, Mlp);
+    }
   }
   else
   {
-    if (rParameter(currRing) != NULL)
-      DefRingParlp();
-    else
-      VMrDefaultlp();
-
-    I1 = idrMoveR(I, oldRing,currRing);
-    Mlp =  MivMatrixOrderlp(nV);
+    rChangeCurrRing(VMatrDefault(ivtarget));
+    I1 = idrMoveR(I,oldRing,currRing);
+    Mlp =  ivtarget;
     Xtau = Mfpertvector(I1, Mlp);
   }
@@ -6897 +7532 @@
   id_Delete(&I, oldRing);
   ring tRing = currRing;
-
-  if (rParameter(currRing) != NULL)
-    DefRingPar(ivstart);
+  if(ivtarget->length() == nV)
+  {
+    if (rParameter(currRing) != NULL)
+      DefRingPar(ivstart);
+    else
+      rChangeCurrRing(VMrDefault(ivstart));
+  }
   else
-    rChangeCurrRing(VMrDefault1(ivstart)); //Aenderung2
+  {
+    rChangeCurrRing(VMatrDefault(ivstart));
+  }
 
   I = idrMoveR(I1,tRing,currRing);
@@ -6912 +7553 @@
   ring helpRing = currRing;
 
-  J = rec_fractal_call(J, 1, ivtarget);
+  J = rec_fractal_call(J,1,ivtarget,printout);
 
   rChangeCurrRing(oldRing);
@@ -6918 +7559 @@
   idSkipZeroes(resF);
 
+  si_opt_1 = save1; //set original options, e. g. option(RedSB)
   delete Xivlp;
   delete Xsigma;
@@ -6936 +7578 @@
 }
 
-ideal Mfrwalk(ideal G, intvec* ivstart, intvec* ivtarget,int weight_rad)
+/*******************************************************************************
+ * The implementation of the fractal walk algorithm with random element        *
+ *                                                                             *
+ * The main procedur Mfwalk calls the recursive Subroutine                     *
+ * rec_r_fractal_call to compute the wanted Groebner basis.                    *
+ * At the main procedure we compute the reduced Groebner basis w.r.t. a "fast" *
+ * order, e.g. "dp" and a sequence of weight vectors which are row vectors     *
+ * of a matrix. This matrix defines the given monomial order, e.g. "lp"        *
+ *******************************************************************************/
+ideal Mfrwalk(ideal G, intvec* ivstart, intvec* ivtarget,
+              int weight_rad, int reduction, int printout)
 {
+  BITSET save1 = si_opt_1; // save current options
+  if(reduction == 0)
+  {
+    si_opt_1 &= (~Sy_bit(OPT_REDSB)); // no reduced Groebner basis
+    //si_opt_1 &= (~Sy_bit(OPT_REDTAIL)); // not tail reductions
+  }
   Set_Error(FALSE);
   Overflow_Error = FALSE;
@@ -6972 +7630 @@
       intvec* iv_dp = MivUnit(nV); // define (1,1,...,1)
       intvec* Mdp;
-
-      if(MivSame(ivstart, iv_dp) != 1)
-        Mdp = MivWeightOrderdp(ivstart);
+      if(ivstart->length() == nV)
+      {
+        if(MivSame(ivstart, iv_dp) != 1)
+          Mdp = MivWeightOrderdp(ivstart);
+        else
+          Mdp = MivMatrixOrderdp(nV);
+      }
       else
-        Mdp = MivMatrixOrderdp(nV);
+      {
+        Mdp = ivstart;
+      }
 
       Xsigma = Mfpertvector(I, Mdp);
@@ -6993 +7657 @@
   Xivlp = Mivlp(nV);
 
-  if(MivComp(ivtarget, Xivlp)  != 1)
-  {
-    if (rParameter(currRing) != NULL)
-      DefRingPar(ivtarget);
+  if(ivtarget->length() == nV)
+  {
+    if(MivComp(ivtarget, Xivlp)  != 1)
+    {
+      if (rParameter(currRing) != NULL)
+        DefRingPar(ivtarget);
+      else
+        rChangeCurrRing(VMrDefault(ivtarget));
+
+      I1 = idrMoveR(I, oldRing,currRing);
+      Mlp = MivWeightOrderlp(ivtarget);
+      Xtau = Mfpertvector(I1, Mlp);
+    }
     else
-      rChangeCurrRing(VMrDefault1(ivtarget)); //Aenderung1
-
-    I1 = idrMoveR(I, oldRing,currRing);
-    Mlp = MivWeightOrderlp(ivtarget);
-    Xtau = Mfpertvector(I1, Mlp);
+    {
+      if (rParameter(currRing) != NULL)
+        DefRingParlp();
+      else
+        VMrDefaultlp();
+
+      I1 = idrMoveR(I, oldRing,currRing);
+      Mlp =  MivMatrixOrderlp(nV);
+      Xtau = Mfpertvector(I1, Mlp);
+    }
   }
   else
   {
-    if (rParameter(currRing) != NULL)
-      DefRingParlp();
-    else
-      VMrDefaultlp();
-
-    I1 = idrMoveR(I, oldRing,currRing);
-    Mlp =  MivMatrixOrderlp(nV);
+    rChangeCurrRing(VMatrDefault(ivtarget));
+    I1 = idrMoveR(I,oldRing,currRing);
+    Mlp =  ivtarget;
     Xtau = Mfpertvector(I1, Mlp);
   }
@@ -7023 +7697 @@
   id_Delete(&I, oldRing);
   ring tRing = currRing;
-
-  if (rParameter(currRing) != NULL)
-    DefRingPar(ivstart);
+  if(ivtarget->length() == nV)
+  {
+    if (rParameter(currRing) != NULL)
+      DefRingPar(ivstart);
+    else
+      rChangeCurrRing(VMrDefault(ivstart));
+  }
   else
-    rChangeCurrRing(VMrDefault1(ivstart)); //Aenderung2
+  {
+    rChangeCurrRing(VMatrDefault(ivstart));
+  }
 
   I = idrMoveR(I1,tRing,currRing);
@@ -7037 +7717 @@
   ideal resF;
   ring helpRing = currRing;
-//ideal G, int nlev, intvec* omtmp, int weight_rad)
-  J = rec_r_fractal_call(J, 1, ivtarget,weight_rad);
+
+  J = rec_r_fractal_call(J,1,ivtarget,weight_rad,printout);
 
   rChangeCurrRing(oldRing);
@@ -7044 +7724 @@
   idSkipZeroes(resF);
 
+  si_opt_1 = save1; //set original options, e. g. option(RedSB)
   delete Xivlp;
   delete Xsigma;
@@ -7099 +7780 @@
   intvec* hilb_func;
 #endif
-  /* to avoid (1,0,...,0) as the target vector */
+  // to avoid (1,0,...,0) as the target vector
   intvec* last_omega = new intvec(nV);
   for(i=nV-1; i>0; i--)
@@ -7114 +7795 @@
 
   to=clock();
-  /* compute a red. GB w.r.t. the help ring */
+  // compute a red. GB w.r.t. the help ring
   if(MivComp(curr_weight, iv_dp) == 1) //rOrdStr(currRing) = "dp"
     G = MstdCC(G);
@@ -7123 +7804 @@
       DefRingPar(curr_weight);
     else
-      rChangeCurrRing(VMrDefault(curr_weight)); // Aenderung 4
+      rChangeCurrRing(VMrDefault(curr_weight));
     G = idrMoveR(G, XXRing,currRing);
     G = MstdCC(G);
@@ -7149 +7830 @@
       DefRingPar(curr_weight);
     else
-      rChangeCurrRing(VMrDefault(curr_weight)); //Aenderung 5
+      rChangeCurrRing(VMrDefault(curr_weight));
     to=clock();
     Gw = idrMoveR(G, exring,currRing);
@@ -7184 +7865 @@
       DefRingPar(curr_weight);
     else
-      rChangeCurrRing(VMrDefault(curr_weight)); //Aenderung 6
+      rChangeCurrRing(VMrDefault(curr_weight));
 
     newRing = currRing;
@@ -7269 +7950 @@
           DefRingPar(target_tmp);
         else
-          rChangeCurrRing(VMrDefault(target_tmp)); // Aenderung 8
+          rChangeCurrRing(VMrDefault(target_tmp));
 
       lpRing = currRing;
@@ -7329 +8010 @@
           DefRingPar(target_tmp);
         else
-          rChangeCurrRing(VMrDefault(target_tmp)); //Aenderung 9
+          rChangeCurrRing(VMrDefault(target_tmp));
 
       lpRing = currRing;
@@ -7532 +8213 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); // Aenderung 10
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     G = idrMoveR(G, XXRing,currRing);
@@ -7565 +8246 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); //Aenderung 11
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     to=clock();
@@ -7608 +8289 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); // Aenderung 12
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     newRing = currRing;
@@ -7777 +8458 @@
         else
         {
-          rChangeCurrRing(VMrDefault(target_tmp)); // Aenderung 13
+          rChangeCurrRing(VMrDefault(target_tmp));
         }
       }
@@ -7850 +8531 @@
         else
         {
-          rChangeCurrRing(VMrDefault(target_tmp)); // Aenderung 14
+          rChangeCurrRing(VMrDefault(target_tmp));
         }
       }
@@ -8093 +8774 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); // Aenderung 15
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     newRing = currRing;
@@ -8235 +8916 @@
 
   //Print("\n// \"Mpwalk\" (1,%d) took %d steps and %.2f sec. Overflow_Error (%d)", tp_deg, nwalk, ((double) clock()-tinput)/1000000, nOverflow_Error);
+<<<<<<< HEAD
+=======
 
   return(result);
@@ -8421 +9104 @@
     delete next_weight;
   } //end of while-loop
+>>>>>>> f533f6f7667328bccb271b19b2f603aaebe41596
   Print("\n// Mprwalk took %d steps. Ring= %s;\n", nwalk, rString(currRing));
-  idSkipZeroes(G);
-  si_opt_1 = save1; //set original options, e. g. option(RedSB)
-  baseRing = currRing;
-  rChangeCurrRing(XXRing);
-  ideal Res = idrMoveR(G,baseRing,currRing);
-  delete tmp_weight;
-  delete ivNull;
-  delete exivlp;
-#ifndef BUCHBERGER_ALG
-  delete last_omega;
-#endif
-#ifdef TIME_TEST
-  TimeString(tinput, tostd, tif, tstd, tlift, tred, tnw, nstep);
-#endif
-  return(Res);
+  return(result);
 }
 
@@ -8515 +9185 @@
         else
         {
-          rChangeCurrRing(VMrDefault(cw_tmp)); // Aenderung 16
+          rChangeCurrRing(VMrDefault(cw_tmp));
         }
         G = idrMoveR(Go, XXRing,currRing);
@@ -8589 +9259 @@
     else
     {
-      rChangeCurrRing(VMrDefault(curr_weight)); // Aenderung 17
+      rChangeCurrRing(VMrDefault(curr_weight));
     }
     newRing = currRing;
@@ -8651 +9321 @@
       else
       {
-        rChangeCurrRing(VMrDefault(target_weight)); // Aenderung 18
+        rChangeCurrRing(VMrDefault(target_weight));
       }
       F1 = idrMoveR(G, newRing,currRing);

Singular/walk.h

@@ -54 +54 @@
 // compute a Groebner basis of an ideal G w.r.t. lexicographic order
 //ideal Mwalk(ideal Go, intvec* orig_M, intvec* target_M);
-ideal Mwalk(ideal Go, intvec* orig_M, intvec* target_M, ring baseRing);
+ideal Mwalk(ideal Go, intvec* orig_M, intvec* target_M, ring baseRing, int reduction, int printout);
 
 // random walk algorithm to compute a Groebner basis
-ideal Mrwalk(ideal Go, intvec* curr_weight, intvec* target_weight, int weight_rad, int pert_deg, ring baseRing);
+
+ideal Mrwalk(ideal Go, intvec* orig_M, intvec* target_M, int weight_rad, int pert_deg, int reduction, int printout);
 
 /* the perturbation walk algorithm */
 
-ideal Mpwalk(ideal Go, int op_deg, int tp_deg,intvec* curr_weight,intvec* target_weight, int nP);
+ideal Mpwalk(ideal Go, int op_deg, int tp_deg,intvec* curr_weight,intvec* target_weight, int nP, int reduction, int printout);
 
 /* the perturbation walk algorithm with random element */
-
-ideal Mprwalk(ideal Go, intvec* curr_weight, intvec* target_weight, int weight_rad, int op_deg, int tp_deg, ring baseRing);
+ideal Mprwalk(ideal Go, intvec* orig_M, intvec* target_M, int weight_rad, int op_deg, int tp_deg, int nP, int reduction, int printout);
 
 /* The fractal walk algorithm */
-ideal Mfwalk(ideal G, intvec* ivstart, intvec* ivtarget);
+ideal Mfwalk(ideal G, intvec* ivstart, intvec* ivtarget, int reduction, int printout);
 
 /* The fractal walk algorithm with random element */
-ideal Mfrwalk(ideal G, intvec* ivstart, intvec* ivtarget,int weight_rad);
+ideal Mfrwalk(ideal G, intvec* ivstart, intvec* ivtarget, int weight_rad, int reduction, int printout);
 
 /* Implement Tran's idea */

Tst/Old/m139si.res.gz.uu

@@ -1 +1 @@
 begin 640 m139si.res.gz
-M'XL("'**>U0``VTQ,SES:2YR97,`[5SY?]LVLO]=?P7BM%TJ@FQ1OBO3NU';
-M-$[3U+738RNK64J";$HD19.4'">;_=O??''PD&A;;;K7>\_]=$3BF`%F!H.9
-M`9CSUU^>O&*,V<<$O#!EGK/=J9WKTC9*7YYTV<:E"$7L^IN^-]C(Z[=1/_5\
-MW_5]:R.*9\.->EZ[8VI-D[QJ%U6C>1!9&^B1I+$77K(T2=\DJ9O.DS=CSQ?,
-M81N!O7V8>)NAN-E$#=&6@Z0J&F;D#J?NI6!?J\%1`8V`/7WS"WI&;NP&(A4Q
-MT]B3#LO+@"7L,%:C68^9Q<)CI]G>8VXX8N&18YX>.2U6IR;OZ7]F\+A^=.4R
-M1Q9=;+A\P(=\Q`4?\TM^Q3T^X5/N\X"'?,8C?LUCGO"4S_F"W_"W_):_XQ<;
-MC3^D]U/>Y5_P+_E7_!G_FC_G)_P%_X:_Y-_R5_P[?LJ_YV?\G+_F/_`?^4_\
-M9_Y7_LO'];X@_C.C*%Y'_KJN*AO/8LOS')M*O2-G5_XZGM=HUV6U8B'ZCBW%
-MPI[G]1TG877VGI`XP/=!-E)0BH7*G589@:'3VE64[-W=)5(%8FM08TM40=3(
-M/<>D93^;IYV:P<RLD!VS%C!2.>F<(N2ZO/W$"NM-NT\*%HMT'H?,HA;UG*3J
-M?,1:JR/6E`8B-4JFQ/6.A/^6E&!!RI"24L2D'!$I24C*XI/23$AYKDB)QJ1,
-M(U*J`7<S8?]1&'XA)?B9E.%'4HK7I!QGI"2GI"RO2&E>DO*\("5Z3LKTC)3J
-M2U*N+G_Z\1B,TA64@CBWVS:BW&TW20<SUN:-CIG=VC&MVGNMI69*9N"S%EE3
-MRZPDLA4=^5"K=50+BVIK9<.H#-#Y%R<G91/D>TG*'BM[8\R1#?%>;$CTCR1W
-M+M3;8X!/`#X%^`S@3P`60!W@"4`#@`,T`39KVVWZV=X&V`'8!=@#V`<X`#@D
+M'XL("'Q2TE0``VTQ,SES:2YR97,`[5SY?]LVLO]=?P5LMUTJ@FQ1OBO3NU';
+M-$[3U+738RNK65J";$HD19.4'">;_=O??''PD&A;;;K7>\_]=$3BF`%F!H.9
+M`9CSUU^>O&*,V<<$O#!EGK/=J9WKTC9*7YYTV?J5"$7L^IN^=[F>UV^C?N+Y
+MONO[UGH43P?K];QVQ]2:)GG5+JJ&LR"RUM$C26,OO&)IDKY)4C>=)6]&GB^8
+MP]8#>_LP\39#<;N)&J(M!TE5-,S('4S<*\&^5H.C`AH!>_KF%_2,W-@-1"IB
+MIK$G'9:7`4O88:Q&LQXQBX7'3K.]Q]QPR,(CQSRM.2U6IR;OZ7]F\+A^=.TR
+M1Q9=K+O\D@_XD`L^XE?\FGM\S"?<YP$/^91'_(;'/.$IG_$YO^5O^1U_QR_6
+M&W]([Z>\R[_@7_*O^#/^-7_.3_@+_@U_R;_EK_AW_)1_S\_X.7_-?^`_\I_X
+MS_RO_)>/ZWU!_&=&4;R._'5=53::QI;G.3:5>D?.KOQU/*_1KLMJQ4+T'5F*
+MA3W/ZSM.PNKL/2%Q@.^#;*2@%`N5.ZTR`D.GM:LHV;N["Z0*Q%:@QA:H@JB1
+M>XY)RWXZ2SLU@YE9(3MF+6"D<M(Y1<AU>?N)%=:;=I\4+!;I+`Z912WJ.4G5
+M^8BUED>L*5V*U"B9$M<[$OY;4H(Y*4-*2A&3<D2D)"$IBT]*,R;EN28E&I$R
+M#4FI+KF;"?N/PO`+*<'/I`P_DE*\)N4X(R4Y)65Y14KSDI3G!2G1<U*F9Z14
+M7Y)R=?G3C\=@E*Z@%,2YW;81Y6Z[23J8L39O=,SLUHYIU=YK+313,@.?M<B:
+M6F8ED2WIR(=:K:-:6%1;*QM&98#.OS@Y*9L@WTM2MJ'LC3%'-L1[L2[1KTGN
+M7*BW#8!/`#X%^`S@3P`60!W@"4`#@`,T`39KVVWZV=X&V`'8!=@#V`<X`#@D
 ML-,"L`'08P<]=M!C!SUV]FI;P(=&#(T8&C$T8FC$T(@!+0-:!K0,:-GG`!V`
 M(P"GMH,&.VBP@P:[0+D+E+M`N0N4NT"Y"Y2[0+F+'KOHL8L>>^BQ9]>P7;`_
@@ -21 +21 @@
 M@>X>Z.Z#[CY&NH\>^^BQCQ[[Z+&_5_L6^+"3L>\`3@&^!S@#.`=X#?`#P(\`
 M/P'\#/!7@%\`>K5]T-T'W7W0/0#=`]`]`-T#T#T`W0/0/<!(#]#C`#T.T.,0
-M/0[M&BG/!5#V`7X%>`/P-P`78``P!!@!"(`QP"7`%8`',*D=@O0A2!^"]"%(
-M'X+T(4@?@O0AD;9;+0`;H`VPS>2"([`+4)L"G0\0`(0`,X`(X!H@!D@`4H`Y
-MP`+@!N`MP&W-;NT#WP$`Z-J@:X.N#;HVZ-J@:X.NO0>`'C9ZV.C11H^V77L'
-MA.\!_@[P`>`?-;L--&V@:0--&VC(!8#AP;(W"[:M%^PC+-3'GWSZV9^L^I,&
-M;VYNM:CWSN[>_L'AYYTCY_C/?WG:_>++KYY]_?SDQ3<OOWWUW>GW9^>O?_CQ
-MIY__^DL/@NK_^N9O[F`X$N/+*V\R]8-P%EW'23I?W+R]???^[Q_^86A+6Y9X
-M[X3UN,X<A^E]R6P7VA`EMC)4'ZJZV)5=:#J]QSV[W]RV^^R>WNV'>O/'O7:_
-MB9=&`=-#-M(=)#^Z_ER4S20QA`USKVQX[,C=5:,:Z@U4^(G(2YNJ^"&"`R^<
-M!9[KEPEJ-[!<,%4CH"Z7>/4[A9>8')S"ZW3J3(OO8>B$G8R-4]J"PN94<Y!>
-M';QV"HR>'I&G,8O9]#A4AKWPM[5%>K?`D(=N(A*%(R8<UA1.T9-8(R*'B%D^
-M'"__R)D2>M_Q&\M"=V)R2<*&W?3K6WXN;<VS&$Q[@(%C=YC.XKLXR)9YM+75
-MO/>/#6=!-">7WIN%[/ZFS68V32D/IRVG2E3]1F-EFK]S=MY@%KK#H7?G[/3D
-MI)_NV)S^^V=.TD,<)OW;$#]+\[RB48X;EQTRX`ZCGTOZN5J9]]4:\YX&(IC%
-MMW=[*YH%YFDAXD&FX,9,/'*T(ZO'%SHP!]IU*C8\MK6_^UXB<F`ZM!9_J)E0
-M##49RO=Y+!#FH0`;#2*RR:DEH2\6PF\N9MY0-+:Y9M'%QM86TY.;)V+$F9NR
-M]$JP8!:(,.5L<,M(H[V%8`N7U'K@BX16EN?/!K>IJ']^L9&YZX:ZS7XC^726
-MTG+1@Z#X=S9TT^J1G)^\^OJ'ET_/*D>`_XU/:BEL%%XT:-?=KK.1M\#^N[.&
-MK,-Y,!#Q&W'W`I::1]$`A9Q&X@LQ9',NY.N\%S;:?:?588*>;/7DB(:M-<*"
-M`?=",;(&9+&P:=;+9@A-AE=NG-<[B+2(HVILM(!I;:>P91\R;=;;;RR2N0^/
-M_6*CO:EC`L2"3,6<M%`:^'6\9=N'^8HG=LNX\K)3H)H'Q^@<.$'3"+<8BBG/
-MA'KW@GYCW@L:F5(SR8V@3Y6)%(%%E?5"I="5GY8J3/"1S44]--04K3FMFJPM
-M>)5*I=-F/VXH)JEF6_K%;M5_]8KLROO5[M?5-I=*2O&9&D7/YA"J&4#!>"[;
-MTZ7F:^I==+=MS10OI=#SFK\J*E],,6J7G\;"]X+.BC[P**]XA;W1;CT)U:K8
-MI@"I+2NBWBNMK9$3-4C#8B=:U9]7!?TAOG5[7M]I/_&:=B=G[,?J=T2B,H^Q
-MMZ+J>CPMI<^5VAQ!$PK:#.U6\UO2[U=:O]OWZ'>LM%1\VJ6'@O9>:[V7?%RJ
-M$ZKN^HE%2.N-J!<T<]J9@I.*2L3Y0$LX\V*P[/J10SX],F[T=%@YT*4%4Y"Z
-M^E/Z@7$5"B-3J-?7]<I"E-2=:IH92O7`#ZLPJX?&Q<9AGJ980FZW[L5NJ2>R
-M$DTK?]9<JA<DG8M6;J>J:1TR;FD1U_.6!4K9<+5)4KPX-45%J_7A-W"\9)\B
-MSXF\AE3I#Q5S;%6Q[F*C5<VS):S:T%W?;?*6QJIM@G%!"AO']F9N[=H\-(K[
-MNTWFDJV,O+N,Y1I6DH@%Y((\')X$,L.")S(UX:7(XXWP.)!\4^4P(*$3,"B'
-M;FEJ,I-&2*YY)/68J%M!G:N'L-XQ]G<A%Q4M7_IIJIW^Y@K9>5+N8R>2!*\S
-M#+3$5`^^R/L4`AX]`"U@M%STI#HOZIN;MG$&-:<6:[%M-IH/T]4XTAL5&9>[
-MM-4^.\W62RFX\=XI9QW&*(G$$/'.6+@T`E'MP&<N,I_P-"UN4.EMASWPM[5U
-M@^.1@:`X05"'2+`91@XL<L04S-"`V4^"W7C)%3F4THV\80FU3Z]`Q?>FPC#!
-M>FO9Q,56O0YFTTN=;VYN\K=8,<R-!5!ESNXF,ZV9ES!7T2/JT<R_3>3\R3D5
-M<2)=5;!:C,"$&R^]`AYOY("`;/C8=$<E.U0H.$,0X!"5MAK&X]ZA?"6*F^RY
-M"(>"$^>`BV:2R""7,-%32"LN9B*(TMM-=C(F$LP=C3S(A:21J26UO"3W/>1R
-M.*F<Q6@D1N#28TXL8C>"7;GDX%-!(J`+J4##L1?36#'PP)T*-0`!,Y%F\[CR
-MAE?4-T'7`7GJM(2]R/?$:+-F!(ZEJN.:S(@DV<'!>ZWOD.EL;#WN)7WR!2XV
-MU.@O-A#T5]21S[^Z5106(MH6;&F:ZG2$^DN<I&F73#1R.<?*`WDLNY/$D_[2
-MT4<A[W.\E%]"L`^.6-ZHWGAL4,LS/5I?IA%8YHW0]$&-5UH/67^NNU!GC2>]
-ME48:)?G&$!HVTPARXXH44'&<LJOFIVFH98*J'&V^%9<Q&TX\&-''M`R&4J6V
-M55[FOK@^VUQN(5\L"R-Y*>^1</UB`4DYG<47&T:"645`R]L7Q::!2T;FK9E/
-MYG\"HSP=E4^6:H4)UN^0G>X!27CK"*\D.]FY(*=P./.3LJ#RV4OM+DR^M!!T
-M"8UW94IJ%2D9*AS09M68G3,'=MZHL\X,YI7ZL2!BEJTGL.D<"R*,9S>)=5[G
-M>)93.*_W[^*7[KLNP\K\DIWO5NP5Y6/#69@0E^/<!DC##-.8[7QW*6#&_C2W
-M2GF(P*P)W(#)D:.W7WK66296MCXR)].;]-D1TL_44[X<L]6,)::[P+D:QLQB
-M[/3Y?K:"F&7[/`7(#_.Q/&DR]O:JWYI)6&EG;]%?RR!!2H;1M$VD^:`_K-5]
-M!5=,FTDT"T?2#9BQQ5UF)7,QE)+,0J'3K)C?.Q'/[A!N9K!SDZ<7B#(I*T&I
-M431VE"_2JJA$;MUL;,Y`K7$Y8KK?/M+&2ANT?\O-?GG+9H,)V;3D7AU=60CP
-MWL;P+:0,M8\N0Y\)HMF)#(TGSD0'ZJKYI.X0H!CH"?69+#F28W)HU_`EDUF\
-MOB-I;D'PR80G')-H\1:W>:N8O%CDSGE%ZD`/_A3'T+JTZ"MK[P(I!*QZ*Q?V
-MRNY1K#";16FE%?]6>^C-I+ZTF4C!!.3WC&^I*6]GRB#M!\MN>^1V7Z:JJQ1+
-M3H@DXWG]1X[\E:=%Q(%!+-QI9V4%R_8>\L`%A=4A`^1$W"U;=6G[=8.L"_FW
-MG14G1['UF&*0?Q%;*W<T[?O9RO=3,4/1/RED7-Z*X3P5UL6&2GS9S*'G!A)-
-MU,TZK3>(!D?18J5$GLLADXS_<Y12K[&^`C>R3GG!96*LS.)B12)49'-:*`N=
-M]I*)8"NVZ0['5]<4';.,1[2TNB'O>KP[X=W!TNX;>8M96M!%J^LYF07I>L<M
-M`LVFRB!0RU[7ZSO=0FI"QJ]6=Y(=*!39W24-SN?7G10];$DKI))N>)11;!+J
-M;ICOG66#ZF&>/3V.L-\_+KS1$N@7<C9+FV-WX&3=.J6:K-@I8*IN@KQGSK]L
-M3L6$3"%CL[P*H2;=V,G=GWN9W8TEI_,)>OU"J*%-KXPFNC&73>IW'#P_TB8O
-M-.E3%?MD^8%L2X-U;%<L+QPLR3.D>],,ZGC!;#^+0AR7;Y?JQEBR&BN`-X'<
-MHCKEX0=U37G%XV(3Y7/!Z<+/O?[6I']D)H\79S(IY=8"%&HO!X_].U;A0M\:
-MT&PPYE!N8R^=@"\ZA7WRY3J;Y#SX[TRVP#5C?TR^A7CP_[F6?U*N1>+]UZ59
-M_B^G5]9.I?S7YD76X=?=S"OF-SXJM9)[T7"B[Z(\$CZ93S+69`QB3]WX^<@D
-MRD?.OYBO^(].Q-RCI/?F4+"9_;OR)YF3D:=1?E_ZI/5@^L1D3S!=,MVM/RQS
-M\@<F3BKS)FOF&VC/>##58$2ZDFZ0=_&/;7V#*;OAZ&.3#^4Y;)MK(PTE-67U
-M/FW]#=VL:1H:<]XSS1HV>9PAVE:EKZ7S=#X/`N'DJ8[B73=W/J8`"S_(>N`W
-M4[+WNJ.$#>J.6H-!RU-/1C99]VKFC9L.KT:SR]6C2*_HY&G':QB,\@N;*SF.
-ME8]GXI"Z.P"TO63-U*#!BS@A)\+)LB$U-9,B;C.\-W$HY@4"TCZ4*HN]R<@<
-M,_,Q#WDAQ.$I9Y="W<2*2.U)=?$XI-API#Q20<!3#<A?#*A,$O*]<,K\-\"`
-MP#WQ/L>C.;&818*"'%FKIY6'[S>Q1[^JDE_/9[*0=(AX2!#YESQ,UPZZ:JR*
-M((*)<^-ZJ?2JK)?<>V*W6K3\,:/AE1C2E&ZNR%$E\1A_S#6'XG).^AJ9IWP"
-M,(:"8+O\J8L40WZB[H[*TRE+0\JK7O7=#2VJ)2D_<J3TJ^-D4"U)KZ0$YL]D
-M("398@7H/<H&I<[<[PZM\RDZ8T$TRTK%RX?[Q?7$*BSF>%4U/7CS\3Q**SA3
-MUM.L9?DBA(+&3"Q_A:2'?K'Q#>$2H_RPC,;RZ#<-!BJUVK#H]8JW$;*BZPUX
-MZ,\245:7Y6L0++O"G:W<K\[.OCNCE?!,Q0KQY1SW(K$@,U-4"`\HXDD\>6\3
-M0[D4\:9>,P];-N5@G<\'<G$MFS>5KUT.8WUEW>2S7(?JJMJ$)U-/7B+3"2*\
-MJK2*047A`G&./`-MUW72U+%9AZR1\1N2.EZ545?LT+<KK$D#.)&#6"0]KU]>
-MI-.>C/[]GFJ5>4D3D[Q2`D&=*E&&D.CU#-W^D7SRBS;4F3;D!N;W2BWE)J9;
-M]S,A:F9/U[W<,IR)\3A931Z\J,X=,',_Q?/PB9I+9C#;KXM?1)0\LVMGN]UJ
-M;=\9WBA7.L^](E53#@FSQ6'4LDUV,Q]?,*?Q#:1C)O,'LFLC%#>T+0AC,K1M
-MN%Z^!WU-FY`<G[DTHP9;N`%=O8VNS!/<R%:IL@GR`.(M'T7YW,'<D^6(Y84.
-M6.1)C[KZHRZ/!.Y;U=#6+50']@6)S8'LK!.:#8^TUZ2C&\XF]#\"^M*Y!]E0
-M^2[%J7<@/SO(\3P<Y,C;[=+-/ZFO7G+79,,A10UXYGH(GH<Q%!.'<%G1HM?.
-M`P>\Z]AAY1QCKVX&P@I?K.;IO>61^.9VDSJ;2RQ]#TT=9]1Y=JU03G8R\AT_
-M%_L$U(E%5"RS`Z!"SUE<([<#*C"R)$8Z`.1)]K;[^2PGI5E,[IW%I&H6"_D%
-M+*ZU3=2X<]PFX9_;*I6A*1"40]JK%QB*]L2N7G:'CEG0RB+)JK$!47%TA047
-M"XQ+Q8JR73[,@D.K'9-,PRJ3&*5F6C5_UZV\E,3^3'WY\F[IXKQ<0-Y=MDL>
-M[)5\F-*'$,M?-U@EHY3'V/7//E-E9?.O]FTO-6GQ0O$$6=Z6^GJ,Y9\3P^Y6
-MN]TECU:FB)9]VBJOEO:IHC?+E#M;8I<E%F1-O'I=GKVJ3N2H)KX0$0V5)8'K
-MRQRCB*FAGTA]<:,HWI0GX0EM&*&)?<$C.>'CJF^FU8'.A+9*^,-PB2M]3"D!
-M^>\+9,.^V("'>[%AGF[Q.*%H[7WY7%(N9:QD<M0GN7>4.X,5\RO,C':+?$IL
-M',\"%LYNJ*R6H\Z<+NT`8#J8<K5SO<X\##,J9F/FDA'-9K`>\@I?\L&X0>$F
-M37RTJHIW!P6GI>/Q0F75:61Y$.IT\Y2S"H=>VMW3TU515GJQ>77FDQ='6MCE
-M"I/56Z$C/Q4SI>;CB;XC'2V;%T]8S=7DOK/HK#<<\UU0:8;ECX8LM6T]QTI<
-MS^"=IZ,E[UAM]O\1MDZ&O/\F\Y:DHY)1*TB_'*I7!>MR+1=C:'G^#(L!GL_F
-MZ8I:*;;K:,];2Q/_ERQ"\UNI^^OH/"2UEK[KQ5&QM4<Z",%LSLK9"!T#9L^A
-M]L7Q/')4&EM%.U;$%VX,ESISURPX1'!]<5O#.JMWEK_NG%1A\`H*AY3#\:0B
-MUQSF6H*!.Y.2SFAO&3H5N$[!W9>IWJVMD2<8!<CO4L%^U">7#*J-\N<NA?SF
-M/!-X`K=G)D#6B@88FJ"A%^H"76W*(Q9=><X917)Y9$#<=\:9OT#UEG'MM4EU
-M4$8MZIV2]W:_8&<1SB\MTDVNK;#5PF[8WMT#]K.O7O]P]LHJ_$M%>\?J7SE*
-5DU2AR/\E(K#GD]K_`#;QH?8G20``
+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
+7SY0FJ4*1_QM*8,\GM?\!V-0IB>%)````
 `
 end

Tst/Old/m24si.res.gz.uu

@@ -1 +1 @@
 begin 640 m24si.res.gz
-M'XL(")F*>U0``VTR-'-I+G)E<P#L7&M[VS:R_JY?@<C;+AE!MBC?(].[4=JT
-M;M,TC7O;RFJ6DB`;$DG))"7;R69_^\X+@#>)<MRFN^?L<X[S9$SB,C,8#`8S
-M`]#GWW]V]I(QYIP2B&1XR2)WM]UJ[7+KEM_QMS8?S3NU<].JC5:^#*?,=^M/
-M;IBX]8*Y+[:3VZ3>8?C9V6')W5PP&;.G\5!*SH+92+W.EB*ZB60B,FR["ENG
-MEO9YPIZ>/SL[P[OJ](3=X#GT`CP7:*%T-A<AE88SO$3"&ZF71#W>H4S1*I:E
-M9/=`-DZ\9!%;/F=UX*_;FGV6#D(1):Z+5(O/*;+]%61@JTZ_[T1L<!(R)3%"
-M!E[N1*)X%Z-:*\-R`"QR)#R?23?P;M6CU;9SR1^BA1H2(SH.KW?JO*U@/>U7
-MYQ(%A4Y'#V$NG-UD#*)!S<GZ'Z_TQZRL26H\BQ1CT)W:3=K7:64,6_6BFA"_
-M8<(F[CXXI>XC+_%`VIL3[9$8L63&QM+/M,31FDDS6,938*.`)1+)(B+9,B\F
-MQJ'/-)Q.K4W_4S'5WK;YW5M^U^:W;_GM';]5E8:G6D96J?K0G\7"\DM#+I)-
-MY:;:C;*^2K'%K1@N:/2*==]>P9$JK692:YIJ/R*&V]#?QX^IQ4B,9:@:T'N&
-M?U6#?^.\.JM*6SFO,M0<HK(697T//D(N2HDQ6XM@SI9>E!L%#'$>B:6<+6(U
-M_6PX"Q,1)D^RSD?;U!D]K57+DVN\HS1V*GV?15EA6ZGBI4ATYRHE(IZH7O,U
-MCF:!UL"U23A/O'#D12/,Q5IEG(S&EWZPJ>Y*^H/*NNO%+)$TTA<R3BH;S+VH
-M3<)ZC>>J>F#>6'D=^S*XK*9\&<W$(!11964DXHWLWCL.Y][:]KVUN_?6[M];
-MNU<M^3FMKV1<+=C-5>-[ZFZ$O+Q*ONY65I(A$HFDO:.JDBQ[=3FMM:KR)$[>
-MZ&7Z1JV)JC:3@F%H*UOYXJS+ZI>TPT2>O^W+03U?">UT>7B^;]7GT6Q86#SM
-MW6SQF"9YE;(X>OW4-ZYZM7S(?).VSQ9)S9BVU4&X9&_:>['<#L7--BJ(/^UX
-M4)6E?`\[<SZLT=RBUV=V9K^ID=X=U\RX;<PXM2!#/O>&4^]2L"^T(*B`1LN>
-MOOD%#-"2HOT](=4W3,8=EI<!2TB#K-&>/&86"T_=9ON`T=IGX8F;/CUR6\RF
-M)N]J3%E3A<?SYU<><U711=WC`S[D(R[XF%_R*]J?)WS*?1[PD,_XG%_SB,<\
-MX0N^Y#=<#9E?U!M_2.^GO,N?\<_XY_PY_X)_R<_X5_QK_H)_PU_R;_DK_AU_
-MS<_Y]_P'_B/_B?_,_\9_^;C>%S2/Z`SI2=E1OSU/EY&/8$GI.E0J3]Q]]=N5
-MLM&V5;46(?J.+2W"GI1]UXV9S=X1$A?XWJM&&JIIH7*W54:0TFGM:TK._OX*
-MJ0*Q!U!C*U1!-)WW').9>]+Y3BW%S*R0G;(6,%(YZ9PFY'F\_=@*[:;3[S#C
-MK3"+6M@Y2=WYA+76.3:4!B))E4Q/%ZT#4H`;4H0%*41,BG%-"C(C10E(8::D
-M.)(4Z)(429!"#4FQO&RR_R@,OY`2_$S*\",IQ?>D'*])25Z1LKPDI7E!RO,5
-M*=&7I$S/2:D^(^7J\J<?CR%5NH)2D.3VV^E4[K>;I(.9:/-&I^2A[J6MV@>M
-ME69ZSB!G,V5-,V>E*5O3D?>U6D>WL*BV5C;"V@`APBF;(!\;_Y:V-ZDY<C"]
-M%W6%_I&2SH5^VP+X$\`G`)\"_!G``K`!'@,T`#A`$V"[MMNF7[N[`'L`^P`'
-M`(<`1P#'!/9:``X`>NRAQQYZ[*''WD%M!_C0B*$10R.&1@R-&!HQH&5`RX"6
-M`2U%9_2C=HX3`+>VAP9[:+"'!OM`N0^4^T"Y#Y3[0+D/E/M`N8\>^^BQCQX'
-MZ''@U+`UL;\`_!7@*4`7X!G`9P"?`SP'^`+@2X`S@*\`O@9X43L`W0/0/0#=
-M`]`]`-T#T#T`W0/0/03=0W!ZB!Z'Z'&('H?H<7A0^P;X$#^Q;P%>`7P'\!K@
-M'.![@!\`?@3X">!G@+\!_`+0JQV"[B'H'H+N$>@>@>X1Z!Z![A'H'H'N$3@]
-M0H\C]#A"CV/T.'9JI#P70-D'^!7@#<#?`3R``<`08`0@`,8`EP!7`!)@4CL&
-MZ6.0/@;I8Y`^!NECD#X&Z>-CA'\M``>@#;#+U((CL`]0FP*=#Q``A``S@#G`
-M-4`$$`,D``N`)<`-P"W`7<UI'0+?$0#H.J#K@*X#N@[H.J#K@*YS`(`>#GHX
-MZ-%&C[93>PN$[P#^`?`>X)\UIPTT;:!I`TT;:,@%@.'!LD\7;-LLV$=8J%M_
-M^N33/UOVXP9O;N^TJ/?>_L'AT?&3SHE[^I>_/NT^^^SSYU]\>?;5UR^^>?GM
-MJ^]>GW__PX\__?RW7WJ8J/ZO;_[N#8;DX%U>R<G4#\+9_#J*D\7RYO;N[;M_
-MO/]G2EO9LEB^%=:6S5R7F7TIW2Z,(8H=;:C>5W5Q*KO0<'I;/:??W'7Z[)[>
-M[0_UYEN]=K^)ET8!TX=LI#>(?_3\A2B;21((&^9>V?#45;NK034T&ZCP8Y&7
-M-G7QAP@.9#@+)'F7)8+&#2P73#4'U.42KWZG\!*1@U-XG4[=:?$]#-VPDXEQ
-M2EM0V)P:"=*KB]=.0=#3$_(T9A&;GH;:L!=^=G9([Y9@>>C%(M8XE`,]A5/T
-M.#*(D)RQ?#A>_HD[)?2^ZS=6)]V-R"4)&T[3MW?\?+:-S"(([0,"''O#9!9M
-MDB!;E='.3O/>'PK^@_F"0@,Y"]G]39O-;)AJ/MRV&BI1]1N-M6'^SM')P2ST
-MAD.Y<71F<,I/=QU.__Z=@R2'=E?[MR%^K8SSBK@<-RX[9,!=1K\NZ=?5VKBO
-M'C#N:2""672WV5LQ(DB?EB(:9`J>FHE'KG%D#7^A"W-@7*=BPU/'^+OO%"(7
-MIL-H\?M:&HJA)D/Y+H\%PCP48*.!"MXM!7VQ%'YS.9-#T=CE1D07=:28]>`6
-ML1AQYB4LN1(LF`4B3#@;W#'2:+D4R%));^"+F%:6]&>#NT383R[JF;N>4G?8
-M;R2?S!):+H8)BK5G0R^IYN3\[.47/[QX^KJ2`_Q/?5)+8Z/PHD&[[J[-1G*)
-M_7?O`7,=+H*!B-Z(S0M8:1Y%`Q1RIC.^%$.VX$*]+GIAH]UW6QTFZ,G13ZYH
-M.$8C+*92%F)D#<AB8=.TRV8(38977I37NXBT2**:-UK`M+83V++WF3:;[3<2
-M\<*'QWY1;V^;F`"Q(-,Q)RV4!GZ[<M7V8;SBL=-*77G5*=#-@U-T#MR@F4YN
-M,133G@GU[@7]QJ(7-#*E9DH:09\J8S4%%E7:A4IA*C\I5:3!1S86_=#00[06
-MM&JRMI!5HI3.F/VHH86DF^V8%Z=E_RJ+XLK[U>[7U3972DKQF>:BYW!,:LI`
-MP7BNVM.5Y@_4N_EFVYHI7D*AYS5_652^B&+4+G\5"5\&G35]X/.\XB7V1J?U
-M.-2K8I<"I+:JF/=>&FV=N_,&:5CDSM?UYV5!?TANW9[LN^W'LNET<L%^K'[/
-M::K2QTBNJ;KAIZ7UN5*;Y]"$@C9#N_7X5O3[I='O]CWZ'6DM%9]TZ:&@O==&
-M[Y4<5^J$KKM^;!%2NS'O!<V<=J;@I*(*<<YH"6=>#)%=/W+)IT?&C9Z.*QE=
-M63"%6=<_6C_`5Z%PGA::]76]MA`5=;>:9H92/_#C*LSZH7%1/\[3%"O(G=:]
-MV"W]1%:B:>7/1DIV8:;SJ57;J6YJ8XY;9HKMO&6!4L:N,4E:%J_2HJ+5>O\;
-M)%ZR3W/ISF5#J?3[BC&VJD1W46]5RVP%JS%TUYM-W@JOQB:D+DAAX]C=SJU=
-MFX>IXOYND[EB*^=RD[%\@)4D8@&Y(!\.3P*58<$3F9KP4N3Q1G@:*+GI<AB0
-MT`T8E,.T3&LRDT9(KOE<Z3%1MP*;ZX?0[J3V=ZD6%2U?^M74._W-%9+\I-RG
-M[EP1O,XPT!+3/?@R[U,(>`P#9H+1<ME3ZKRTM[>=U!DTDEH^2&RST6*8K,>1
-M<E047.[25OOL-%J94'`CWVIG'<8HGHLAXIVQ\(@#4>W`9RXRG_`D*6Y0R5WE
-M(4KQ9V?G!D<Q`T%Q@M`7)&;@'%@4QQ3,X#CH)\%N9'R%@Q>XD3<LIO;)%:CX
-M<BI2(5BWED-2;-DVA$TO-M_>WN:W6#',B]1I9^;L;K.TM3J:U_2(^GSFW\5J
-M_.2<BBA6KBI$+480PHU,KH!'CEP04`VWTNZH9,<:!6<(`ERBTM9L;/6.U2M1
-MW&9?BG`H.$E.W0RYPCDR;9F$"5<H:,5%3`3SY&Z;G8V)!/-&(XEYP>E0JI;4
-M\I+<]Y`K=A(UBI&Y7;#%243L1K`KCQQ\G%<)Z$(BT'`L(^(5C`?>5&@&!,Q$
-MDHWC2@ZOJ&^,K@/RU&D)R[DOQ6B[EDXXEJJ):S(C$F<'!^^,OF-.9V-KJQ?W
-MR1>XJ&ON+^H(^BOJR.=?WRH*"Q%M"[8T24PZ0O_$;MQT2B8:N9Q3[8%LJ>XT
-MXW%_Y>BCD/<Y7<DO(=B'1"PYLAM;*6IU?DCK*VT$D<D1FGY0X[768ZZ?F"[4
-MV>!)[I211DF^,82IF(F#W+@B!53D4W4U\DP;FCE!58XVWXK+F%-)?#"BCV@9
-M#)5*[>J\S'UQ?;:YW&%^L2S2F5?SC3/.8@'-<C*++NKI#&85`2UO7Q2;!AX9
-MF=MT/)G_N7)^JEMA@/:&N3,],!/R(9-7FCO5N3!/X7#FQ^6)RD>OM+LP^-)"
-M,"7$[]J0]"K2<ZAQ0)MU8W;.7-CY5)U-9C"O-(^%*6;9>H*8SK$@PFAV$UOG
-M-L>S&L*YW=\D+]/WH0(KRTMUWJS8:\J'&S(Q23G*;8`RS#"-V<ZW20$S\2>Y
-M5<I#!&9-X`9,3ERS_=*SR3*QLO51.9G>I,].D'ZFGNKEE*UG+#'<)<[5P#.+
-ML-/G^]D:8I;M\T[U=8,RXO*@R=@[ZWYK-L-:.WO+_H,,$F8I%31M$TG.]/L'
-M=5_#%=%F,I^%(^4&S-ARDUG)7`RM)+-0F#0KQO=61+,-DYL9[-SDF06B3<I:
-M4)HJ&CO)%VE55**V;C9.ST"M<3EBNM\^TL9*&[1_Q]/]\H[-!A.R:?&].KJV
-M$."]C>%;J#DT/KH*?2:(9B<J-)ZX$Q.HZ^83VR5`,=!CZC-9<23'Y-`^P)>,
-M9]'#'<GT%@2?3'C,,8@6;W&'MXK)BV7NG%>D#@SSKW`,;4J+OK+Q+I!"P*JW
-M\LE>VSV*%>EF45IIQ9_U'F8SL5<V$S4Q`?D]XSMJRMN9,BC[P;+;'KG=5ZGJ
-M*L52`Z*9D;+_R%6_U6D126`0"6_:65O!JKU$'KB@L"9DP#R1=,M67=E^TR#K
-M0OYM9\W)T6(]I1CD/R36RAW-^'Z.]OUTS%#T3PH9%W/+]**N$U\.<^FY@403
-M=;->V0VBP5&T7"M1YW+().-_CE+I-=97X,VM5[S@,C%6%G&Q(A8ZLGE5*`O=
-M]HJ)8&NV:8/C:VJ*CEDF(UI:W9!W)>].>'>PLOO.Y7*6%'31ZDHWLR!=>=HB
-MT&SJ#`*U['5EW^T64A,J?K6ZD^Q`H2CN+FEP/K[NI.AA*UHAE73#DXQBDU!W
-MPWSO+!M4B7'V#!]AOW]:>*,ET"_D;%8VQ^[`S;IU2C59L5O`5-T$><]<?MF8
-MB@F90L9F=15"3;J1F[L_]PJ[&RE)YP.4_4*H84ROBB:Z$5=-[`T'SX^,R0O3
-M]*F.?;+\0+:EP3JV*Y87#I;4&=*]:09]O)!N/\M"')=OE_K&6+P>*T`V@=JB
-M.F7V`]M07O.XV$3[7'"Z\.M>?VO2/TD'CQ=W,BGEU@(4&B\'C_T-JW!I;@T8
-M,:3F4&UC+]R`+SN%??+%0S;)1?#?F6Q1]U?_F'P+R>#_<RW_IER+PON?2[/\
-M7TZO/#B5\E^;%WF(O#8+KYC?^*C42NY%PXG>1'DD?#*?9*S)&$12W_CYR"3*
-M1XZ_F*_X7YV(N4=)[\VA8#/[G\J?9$Y&GD;Y?>F3U@?3)VGV!,,ET]WZPS(G
-M?V#BI#)O\L!\`^T9'TPUI%.ZEFY0=_%/'7.#*;OAZ&.3#]4Y;)L;(PTE3<OL
-M/FW]#=.LF39,S7DO;=9PR.,,T;8J?:V<I_-%$`@W3W44[[IYBS$%6/B%K`=^
-M9TKVSG14L$'=49MB,/-I!J.://1JYHV7#*]&L\OUHTA9=/*,XS4,1OF%S;4<
-MQ]K',Q$^NG4!:'O)FFFF(8LH)B?"S;(A-3V2(NZ4O3=1*!8%`LH^E"J+O<G(
-MG++T8Q[]1>N4JP\"E<M%:D^JB\<AQ88C[9$*`E(W('\QH#)%2'\;_088$+C'
-M\@D>TQ,+?(9IZ5HSK#Q\UY_*ZDJ.;]I02#I$,B2(_$L>IAL'73?61?H#UAM/
-M)LJKLEYP^=AIM6CY8T3#*S&D(=U<D:-*TY/Z8UYZ**[&9*Z12>T30#`4!#OE
-M3UW4-.0GZOBRM3B<\FRH^;*KOKNA1;4RRX]<-?O5<3*HEF:OI`3I3YJ!4&2+
-M%:#W*&-*G[EO#JWS(;IC033+2L7+A_O%]<0J+.9X734EO/EH,4\J)%/6TZQE
-M^2*$AJF96/T*R;!^4?^:<(E1?EA&O#SZ3<Q`I=8;%KU><3M'5O1A#)MOAHOJ
-MLGH-@F57N+.5^_GKU]^^II7P7,<*T>4"]R*Q(#-35`@/*.*)I;JW"58N1;1M
-MULR'+9MVL,X7`[6X5LV;SM>NAK&^MF[J6:U#?55MPN.I5)?(3(((KSJMDJ*B
-M<($D1YZ!L>LF:>HZK$/6*/4;8ANOVJAK<9C;%=:D`9S(02SCGNR7%^FTIZ)_
-MOZ=;95[2)$U>Z0E!G2[1AI#H]5*Z_1/UY!=MJ#MMJ`W,[Y5:JDW,M.YGDVB$
-M/7WHY9;A3(S'\7KRX*OJW`%+[Z=(B4_4/#*#V7Y=_"*BY)E=Z[]LL3&\T:YT
-MGGM%JJ8<$F:+(U7+-MG-G+]@0?P-E&.F_P@&NC9"<4/;@DA-AK$-UZOWH*]I
-M$])?OYI+,YK9P@WHZFUT;9R01K9*LR]K6_Q6_2F/E`,(]VPU8OG*!"SJI$=?
-M_=&71[*_2>&8%KH#>T;3YF+NK#,:#9\;K\E$-YQ-Z#\"^M*Y!]E0]:ZFT^Q`
-M?G:0(R4.<M3M=N7FG]GKE]P-V7!(40.>N6%!2O!03!S"946+7CL/'/!N8H>U
-M<XP#.V6$%;Y8S=-[JYSXZ>TF?3876^8>FC[.L'EVK5`-=C+R73^?]@FHDXBH
-M6&4'0(6>L[A&;0=4D,XE"=(%($^RM]O/1SDIC6)R[R@F5:-8JB]@<:UMHOG.
-M<:<)_]Q6Z0Q-@:!BZ<`N"!3M25R][`X=LZ"519)5O`%1D;O"@HL$^-*QHFJ7
-MLUEP:(UCDFE891*CU,RHYN^ZE8?O_)_K+U_>KER<5PM(;K)=ZF"OY,.4/H18
-M_;K!*AFE/,:V/_U4EY7-O]ZW99*FQ0O%^#8>ET;++L,`=K?:[2YYM"I%M.K3
-M5GFUZ1]^,=XLT^YL25R66)(UD;:MSEYU)W)48U^(.?[T2!QXOLHQBH@:^K'2
-M%V\^C[;527A,&T:8QKZ0D1KP:=4WT_I`9T);)?QAN,25/J::`?,G40S;%W5X
-MN!?U].D.CQ.*UMZ5SR754L9*)D=]DGM'N3-8,;["R&BWR(>D__P(_G;++*SE
-MJ#.GRS@`&`Z&7.U</V0<J3`J1I..)2.:C>!AR"M\R0_&#1HW:>*C=57<'!2\
-M*AV/%RJK3B/+3/RKFZMG;1@&HGM_A3`9%-#0)+47HVR%3,6X'TO(8+!+;+!K
-M8A%H?WUUTDF67%&TM62RD8RMCZ>[]W36Z>AFP4B`T"N[6Q0_IS+(8N=JR\G=
-MECI>SNDLND*NCHJ94G-XXL05T=HP-\)J?DT^\6L>UQQS+LCKH7]HB&JW=8"5
-M&&?PGD6]8,?:V?\+6Z<D[Q^9MTG4GE%S9M^7ZB&QKM:RJZ%5_%EE4Y-C#ME4
-MEK#2PXYJKXU"XHTL0G,-8C\&\S!347C'Q1%P[2.*$.A-Z>]&H`:T]P-R<;BO
-MN=[&UFJ'CNQ:78!26[I&@1`!]86_-6BYSI>G.[O0&UH'<+#EL.\">\W#C!)H
-M..\\S"!;!DSU%7?H/J83J]N&2('\)1KRAI%+`M"&\D,E);^)9\)[^NIH.B"M
-ME6S@8$3#<<`"K#;E(QG/+2^EDIN5@1Q]_F[Y@JRGAMJC2>50)I]8YQY[^WUB
-M/T:(7U*)3896F.YV:?J09O?@%+=I!A\I'U]>RR?J)$?2.=,^)]'T-)G."4LN
-@_3(+F4WHM\WV.@V3F(3^[IP%"<9T=?<-^G938GA1````
+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
+?>?XTDXEPE6UU`BDQ"OW>*7\3C.GUXA.6;?MZ,5(`````
 `
 end

Tst/Short/countedref_s.res.gz.uu

@@ -1 @@
-begin 644 countedref_s.res.gz
-M'XL(""2\@U(``V-O=6YT961R969?<RYR97,`S7UM<QLYDN9W_8I:Q46,U.9H
-M"D`!5;"&O)C9EXB^V-C=V)EO';TV)94LMBE2)BE;\L3^]\L$JI`/BD5*[AWW
-MG:-;)`N)1&8BD<A,O-1?_OI//_Y;411J5OSA#\6_+);MV^)Z_;C:M3>;]O;=
-M]F*WW9W\I0/2%PSTUW:[VQ:WZTU!$.VF75VWQ7QU4VSOYIOVIKB9[^;%[OFA
-MW:9ZYJ+XUQ__7)P2KHOEXNKT,I54LX(>OENL%KNS\\L3_BQFLYR"5?OE8KN;
-M"QEV5J3O[J+8/F]W[?W9::+F]%P:J&>I/-*'A0T@\A?INRKANX+OD7_A^N[Q
-M[G&JZH10$:.+U:[XN/ZXSIY7TI"R%T,,#"ZP+O3$=K=9K#Z<<;D0K&HF8+RH
-M"4WW3U6="OSL4!T-?&K@4Q.?#!G0I(=&>-#5Q8!`:4]3[P!_B[M%,>VP]1`.
-M,!%'#),W!?VB_0B`*6>I?2K+VC=**AMBA*&*S;2</$UN'A(-!K@QQ,WJ\?ZJ
-MW8Q@(VZ"6/<*@`G3,?$FLFFJ5$",C!?X6/!#9$TWOB^I2L%;J8CW!Z4)IDRU
-M*ST+$GVC2GJ>2*I,U]K@,2A?9:67*P??ZZBXZZM?BJGR24Q5@YWY$(H92`""
-M=LUWU!E79UP^*4Z9M-/)Z:<O[:<O,-HL:)M5K,C/N[OUZMWF<75V>M/>%O?/
-M#QN6]0_SS8?M^=LB_"KX!V()8[!KL*L!I6:_E"BZ?5Q=OUO-[]$RV`K((;%\
-M7"R716#@`1FTT,^V?@$[_;AZ_M/J^=]W=^WFWP;M-:\G#6R1*[G:<K&-0WL2
-M_T1M[$%@Z#H2#TO^RR?^C^1_>0*_$A1HOZM&!KNSL_U1YT@4IS=S0GDS3\_J
-MJ(I3;C2V1[;T?Q?OB;OW9VS8SDECWL?!^KY8;(O5>E=L'Q\>UALR\!&X?7IH
-MK^E7K,7P_'FD['Z>BC<;FH?6U]>/&YY[%JN"?EZU-#FU121QN5BU1.;;XGU.
-MY_O$`NGXZ=VBW1#M_)&>^]F^8.IR1#`UF)R:.H`GO_5M;QK3^$D@(/VZB@-O
-MU3ZNOK9W*V(0AE^=V5+ZIHII#RE`;@"D"0G#"@1U$@\P>FBF>0E8VIJT[HQ+
-M)XR#_QBV>/ZDZ/[O`9N2QSQ#3I5+J!K0PD:_%A6)@G6[6/(_HCLHNJHGRHA^
-M-]6^%&*%RQ.:*7_X@9X1>^0[L*7GXA]^2'6C!$4DH)V])(.&<L/_[_2SL:2?
-M2&?2SB;V;M]O_Y^2[R+Y'95"?#WKI@,:6O21GH/:-6#L?'D1V6=1\!]S>?*3
-M^ODM$T/C[2?=?34GK$PGH$@>AJ`/4P2CH+I3&4W>_&KL40/?M4^[S?QZQZJM
-MS_O.@(+4`T$=D_Q?)T1?O<V0=:TD87J[1X3Z^Q-A]XE02`1,A[Z&GJ/9K1_(
-M:1A/M`QB[W$0+^EK',0]@"K%\5$EV1(&@?Y)W:-/$A2Y0:<,QD6GE\5)_ST!
-M&$#9&=IVN>.&(Z0T3K*E$G*;TA-BM(.:&H&K`6-SF$@C1`8'Z1]3///V[;;=
-M+3@>X;H3/1%#ISCN>!FC"J':D`..34ZW'Q</Q9<-H3^]_$."F3:7)U*2*IA1
-M-"2FD1&KE)V]AC07IM*[19A*[Q;I>9W,_)35(F.:;,%R&6A(PN>8)3R;IAA*
-MZ9*?C;5/0]?TE/3`8@X41S/INX'O%09B#_--4(PE2H-C&2ZX/$F3O>+HA9]!
-M?*=T?8@V-49<`\3YY"XPTA%W01D8&$8F627!34'1S=G3Y'GR]7RR?!B;%&5&
-M5!#Y*(Y\'M;+Y^*!6']Z\_SF:V+)6`!SF:3BV'T04!@4A@;%0]"3@"Y)C0.>
-M_GM5=H1_(C21\DAW7PZ=5^D>7[!B_]E301;LIEWM%K?DL`5C=[M9WQ?!N-$@
-M9^PGWV3WJ"$R?*&E]ZEMD%0ET8+B((H&<0@_-Z+(%2O&".L5B2<*^8'%+%HS
-M"*X>>L$^@"A`;!P_]<U^DF:M2NBG2IYJJ&BR[DO-"'`%P!(A*NNB\(LWL=:O
-MZ(1OZ@/KNCY(#::^L*!CM@&R?A.Z&J1K0!CTD"M'%<.IV9#>H"%OZ@1!O17B
-MS[Z\?TX:F/(7_0B_>6F$NZK3B-OIDW[SK-]\U6_RP>U@<#O7V8"GA^F30/1*
-M^_PP?9:G3??TZ\,4L&53^VU4+V&"0R8I?J*OTR?1/8Z=I/292Y^A5&/I5R[]
-M"J4DGNWC%;D:MY.G"?75QS-&<,YR>B#Y&V+<?$W058+FF9>D^7``T(X",N8]
-M4'&'5%U?_(K.JGN1=B98F/.#J*>>"N=-E&D=-"E9FD9UZO)IVIO5T?8_0?N-
-M[C%]9P/;Z.A9UC)V./H;Y;V+^`+'WW=H-YW3S4T)7?:WDHG=EPEH5$,:M6J_
-M;'>;1_+$3^^?XS=.,[$KNY@$C_87R1PI"*P4!U9]%<Z6I@2L\C%]^GC!J5EP
-M8R"(4C&("E!92E!Q%!4K0SI4<804P0409A+ONI"L4^=M-!(Y?`WP(5FV15OH
-M??_H8B%!G2[+(:0NU<6`%EV*#ZC+;#K<=HY?SU(/%/F)SE__S%[L/W,CSXB1
-M#BTG;ONGU#4=G$HQC.;P(%+ZR[0\65"%OD2)VZ=A$4(K8(77&Z)?37_6M_QW
-MVT=??0A&OG;2#PT+$3I?B%BN^YA,4$DU!]6(NPA,WNYX@#;T>+5JH+Z'^IG;
-MKX.+#T70S>S09Y3U[?:?@03^K=-O'WZ;]#N1H\GFI9%Q+VS"$H?FZ.!^2ZHF
-M/<C1`#WZ1>)!S<$`=$`<K'T/W&]%\+H&U(WTH);LAS9EWB$K^I(Z)*).^&"5
-M0W,@$*%#CQ!]I$A)J,;,,A0$0WI.<\+-NMVN?D<&Y,MZ\U$ZP8"*F$Q%^%N,
-MGG-T0E27B5SN@F6II0"XYP@A4BN=&$E.,9;F:"%G>PC9`<)JB>;5DB&QNIB*
-M9`12]W3J@0G4E3G>LI*F04ZPK**K@:G;;-M/PZ!75S54"+:.P:08M`*6330O
-MFW`B]WK]\!Q':\=&J@E^OV:_OX/LM4*2UIJ=_B[R[(!&@D]M+>!S*<>CZFFR
-M+Y6PQ5YZMPJ\O5,U)((R*+`&O-3!H,<-296H=CQU$3QG]J37'(P&7@'),=;'
-M,<*@=]5`A0(/$5L/`@)Q,2XF:LA6R12I73T[2(+R8S2`1%R02)`AR=F'C*HT
-M7X<LB/*$`ZPC+$#H^@C_T'A*;FI8CM"UA+FZ)J7N-23XUHR5YQ+NTP0$,P,[
-MP-+[ON_]>M),O/0^+#GH.O:^'Z.U&2&U@>'.ZPU<EV5O$W9V9P]AM&,8@?D&
-MF&]LTG4MYK[96VHQ9&`RB#JN-]"3]OYA]QR02&O`.^2]->>]0_R7X?(JX7K!
-M#YU_GB^6\ZMERZYF[X]>KU>[]FGW;2XI-=JM1)CDDVH/1L4;$4R%`QRL&SN#
-MN!ED&H`AL:8YEPT0?R(0_I1R$G1\(*Z2KY/!XB)J+F)(Y<VL:P[&"Z>=CU0R
-MD'4V[#?&1L5,&DXR!Q+SIP:JB=H8=A%QR(0VP[Z670)Q4#4L*!<O"=2$5#,5
-MO\[=,J7D)`SGE$'2NNN,A)JSR4.*]6"4&]4)0;]$0*I@N@J=@Y>>5_(<HPK#
-M^66I($LO1KDC38,]@[9KX%Y<+:-\)@F#WKEAUS,\1>_<L-?9PQJ!U0(KS8+S
-M:#2HA+;PW64!W8XW4G4A71?1#0(Z`WZC8;]1JA3BGQN=Y0IV,;J"<D@A&TXA
-M[[HP2@:*,7H6,'9A2)V>`UL&V&+7L)/F;KN]RUH##>>M,5S.060AW6T:`.$4
-M^$C+[-MQ52[QF>]B($-L.$,<9/=YOD2&V)/K"%P$>3"`E%99*0V+!820IK+0
-M`'5:!P-K\Z:"GF$7+M8'S>7<;:B7/;7$5:1$.+7`CI7PSMAD:YFW8!BL@[G4
-M6.%B^9_,XQ)YM&)DEY%^!I)BZ";>V=+!1`-$*CPA!Q*:@AYCIRVBZH<D@8L]
-ML#(HV%U;1AF\",H17B"_A[0N`?H$)5.1<6&S3[%=W[?D%5\]?OC`R:WK]?W]
-M?'6S35"@M,Y&7;FYNNP^Q0*X;&Z_N8K^-4$F@'H/0`<(5!S7[`&9`1HPSG69
-M=B\&T$G<^'@N,;%AURX'V<[OVTE$S9LJ$J`^`J@S2',$DKN\3)#5(4B=@<%H
-MJ=V0I>7B8_MEL1VEN1[B'P#G=#<O0)L,VH]!CQ#!3N5!P(R`9J\O`#)KO-GK
-MC!XR@]KKB!XJ$V\CD:9AOS2O<AIG[]/<RV!/=01N"`4VK&F&F'E7&L'?7"60
-M@4CU"(R'J<:K(<IV]7C?;N:[]KR83H>XI!!DY/<D>1C'(11[8@84_Y"C,(=P
-M0!]`8M-P8K.SL??M?99+,%ZB82IC6T$?4MI@J0F&E_PO^BY&UXNMJ$JQ%02S
-M;RFJ4K0S`,2A&O&I!*0/`.D,RAR`0NM0E=485*Z\56F!!9>S(,-W2&4].PR8
-M4]H<@309I-^'W&M8E0>`LD:5.@"5-:CT&%2P`$DZRHS#9"*$I&VE;"["T=%?
-M*3?;AQK"U("UR;&&40VCBP60QKHP"-JI!]HY.D@CFK'Q5>F!2`_5/U1='ZS^
-M#UC]P/"NP'FO\GTA5"EZ`C!V*\X$CXZ/.+6DGM/NB';FTU`%GGZEF^C9/%ZU
-M3P^;=KM=K%?;5.@AS<*[K<0IK=C1[X))=IS[I^Q:T0-.EH=\EFR[JH+?W\5_
-M!$(0PQBY"AGD@"]%8,F?K2!=7$%,P&UHC+`JB`HJC@JZUCIZ`*X!.'\Q;#D%
-M9Q7D?JLJ)(.8+030`&`RTD+:)K2?VHT102A2E3P%\P4;YJNJWJ.LDH:!A<HG
-MR@3``NDV2ULSSFX=9D`?9W:E5,+1RNYWCTEE'5-YZ\`3YW3WNA^L!.R[J*P$
-MTY5%);22@*L<L,8;TSMMM#%\(=AS`87^85^>H#B9QP@%IIKUSVMY:,-#B!1.
-M8#-8#\1CCS'9Q+@#9APPPRE73JO3_\1/3@`G7/L$$A?OC0YVT$,)!)]5#:S5
-M0?4LYH^J&D9-+:,F])6+HA(Y08ZURG*LRV4]#34$M(G][3@_CO2`J6[*J)%U
-MMOLUE2J`E%BT:LS^6O3V+BU%2\JB`G>U8G>U`XV?%.`U`@F,-<(8P[#!W8<G
-M[N*#Q;04BH$W7R(6/RVR^IQ0Y0=9YJ."[&;%V4VN>)GE&RKP_BKV_O8%H5D2
-MK$,D$Q$%[):M>'F[!TZ\\4F=OAR,AO?(1EB$$((MYRP%P06)=AK!!$+-1MI2
-M(%1IV);"O^6U<039WDE"QK*_)\B&A1:PB%/,JQ<E`>8$2]LQI@X@2%(#R/S%
-M7JO]!&O17TLPU$#GK$RGP\)2"F7NM<&A$WFSH(H,7Z*,G;KP4%9?+#MQ`PI]
-M*D.9E8,R$)F2N<6J-!1RIGBCOU+2+`A)R6*"A5-]ED_U#?LS<8U.TS<+#Z0'
-MSI,-)P.[J.:99Q3,F5GVF\*$P&60JK+L*'7/V')U=:6XAA8:D$Y?XSP?(9P/
-M34WL&SEKREEJ`A^+[;-&'VHFV1-KS%@SC>"KH!EX#/UN'-ASPO/O_](A?!='
-M:]^RM!F"RCU((P"--&JD35D'`78&<YD%E\I6LN?$5AJ^&]Y]N;ZF<?NPG%^W
-M/"T6R[OM)!XQNMN>%W_CW[PX?;>]+/X[5:P`>=A8$.L+/1-RHI+QM)4#^&`\
-MAY).+HVM@&E\+%.#M>5XAZHTUUNK7B,D6&*WUHS1E3P.:U$#X#%H`'M@TEH!
-M1ZHL.%^6G:\QVL17LW94ZUU?[,I16F#MW/+:><Q"!+CS`-B7P2CGG.J+_Q*P
-MQ<E,]BA;]M"85JFAA"HX,1#<(0(\']G*2/%/VLMH73A*<#FD0]:-$F#87T)\
-M+H,4I\UE1C'[?!EA0^IJ-=SOGTJTS"2?.<C`L<N)U\^?:>88$U-=C1"?6O#2
-M@F4D0S@H[Z2*C[+,]6<B84`7^U6!L/3$]\0`!5U94T+$N*>$31`-&W&T[\VH
-M6/9ZD\JD-V%IWL+2O&TL?(=ILZGA>]/OQ=6#D]\6W$7+[B)L0!75A)V0UJ>9
-MH'AXQ\Z6X/)`H@<2V4>,S9MA\^`26G8)&>7WWF=*#?$&=F[I?6H;O(?@;O;[
-MUN7,EH/%<<>+XY%6DM-)>JH!0L[6.%@3=V5_N#JD0&(.B%,QTHS#3*@<`@5"
-MCF527?ER)M7!DKA3+V12W3"_-Y9)=</TWF@FU0T3?*.95*=>D4EURKZ<P'3#
-MS-]H`M.ID?SJ"%4CN=5]JD"PX'DZK6`;TV9\7X/3H#XZ9``VK]QAX'0U&U[M
-M<&R?O=,6FG*A*392,.@=>)E.-P-J6.N/T@-R,.F`$]'V_.(>?`=^IPN;.;GA
-M[VL2J!TR"=S0^]2R`2JJL9,L#CQ79]PW2@@V@3HCV1=G,)7$'V2,TT$45Y7]
-MX"8I/B5DO`.@([#X),`:@+^S`,.!L;ZQ),2PZV!?<++=(.?"CG*1["&<O7%5
-M#2B>!878<5?YT5ZSY6\G%5N.2<6.]I;5HQQ9T$,[KH?L/W=GEN@O:(L=;M!C
-M76(8@8B^4-8-O+=AA#S?0WYOF?FXY0X$%K:Y[O/MU#[QG$7=)SZ<'"-(5J!O
-M)O^;J'>FHYZ:$OJKWTAVKMJ7'1@IWJ$[)L<1)7"C2N!^*R5P^TI0@_M52S3N
-M:@W?3=HY.BDV$Z`<4LP.4LR\8#0V%7/8,'Y7DJOKSJ5'N\PQPV".ZTMB[/"]
-M!5;[,(&)N)JR(_-[:WQ3AI:Y)6E<_29,-VK(-(S^=#K$A6M5(#Y].CHQ<\)^
-M7_,;VP=RW]V$A&-P?5O"FOMM1.J&(JU'1=I\DTA]TD6Q,+X<D[-7OY':>K6O
-MMK#VX7CMXS1<%,671O%G*@%3PJ%MN$/IRZ=XMQ1]264.X&HP.=N[]6:7S(X8
-M'0A"G>_6>M=\0N[(M1]U6<YZ0#X%(6G?NA0_NB[U"^CZ3I/\;PV[NFN.8/]`
-M7OM_;.:[Q?5\6;1/\_N'9;M]6US/K^_:!$?R:*_OUI+7JCF>A16B[:=0@1>(
-M^@VSO%5?EHEJN%6D+ILNO1HJW;S;?GJD.F<=DO@TGON<;SZ<2S62WM_Z'QS@
-M%L7BMC@C&-X_47).=M/N'C>KXJP\EZ1LS:<)"TC//;84JH5&+@*5/Q&&E"BJ
-M5=4C[N+"4&-2/*XHKCGG1GH45.V_-+63".0%CB+1P->\!5`YFUCS)A2A2\*I
-M&O:6G"Y6V]U\N0S"%+F>T9],7I-"$LEUV%O2R2\62Y&&9F2+0+B&L@M9`0_;
-MR5`_RH8@&%#*+2!S<:?I;KI;W+<;@:EG17=V]Y?)Q\E*"F@HA-N_RE*>\0YB
-M:F%Z5KY="1V\>E'P_9MG!9]>*R_IXX\K^OOFS;DH`>_SIG\?>3T[ZM`"4!@N
-M3-+FA8I78+3',-8YQN95&/T1C)7*,')L]S+&RAS#:'.,[E48ZV,8?8;1OJIG
-M[+&>L7G/V%?UC#W6,S;O&?NJGK''>L;E/>->U3/N6,^XO&?<JWK&'>L9E_<,
-M^-(U^-(U^-)UW=W>RB.6U]3"R"U^+P.<7>KA@*[[)<UKOMN(QND;)434.1\J
-M\#'=8Z2.C!"&GQ:\(>IL\5\:D.2<-.6K<#:B9!%OPM?D&M94K\-G#^++]:MI
-M7H?/'\+G<^WR^E7XO#F(+]<M_[H^\?407](3GW5(4[ZJ0YKR4(<TI<GQO:I#
-MFO)0AS1EG>-[58<TY:$.:536(8UZ58<TZE"'-,KF^,1K;)2LX31P=JN!_0T-
-M9)D;SC+W0U:/#-D&)O@&+O]JX(16`R>T&AU.;P<+(#CJ_IF69T`<G.%O./4+
-MOM_5S4W:(G7S-.G<B[O%A[O^^W(-=^0VG`FF.L7-8OY!'LKBV==VLYZ64L+'
-M[`CT@C%.N5"*JJZ(&AB4V*Z$*`K&-15`1YC`,]_Q?;:8EED7)Q`2P6JJH;Z?
-M=:[KW7RQ.NM(9C>UA^";OY*"\/R^QRO/WT`<5>9ODJ1O>`X7EJE<2NH+X3@K
-M\!?)\60`$3?/Q$D/85V_L:`JG(,<6/V&$Y`@G%XV1>*45_43IW$&YJ9Y,`3A
-M#.CP0(<+UZN&]D"1X9+?QLF*Y&+7;J:9!%VXU^_+W6+9!C>;(5B&YS`V717/
-MG?9E4ME*`;NW7,Z"%H`P/H16&*^NCUS"U<;OJ&O/@$AL/5B:;1=AM[Q3A#SX
-M-]V%WHG>-SQRDM5M:@61RF*GIOO$U28#*2,(J8-`P%`/LR[',KF44C%3F6B.
-MTRD1.V6"WQ3`)-%R3D].B[=%NMB^B9,LP_.?-QEX>4[0YP#+]C")-$RGO;I2
-MW7.^JP.K1Y9$>1I4'I]R_4'J.M<-6-9NX@4_.6+Q.AH/(X"7MG.C5J)5XWT_
-MP:2%G4"9/>-SW@P>E%\L13C>S4]8Y&#/^,1,?!Y&-Q0T?0$/;G@N8:(O95[P
-M8;4ZF:+R+-``ELAS>N!OZ8>Y$"HOTU-[W!3YLCY@BCS/I6.FR"MUP!1YGB[_
-M._V0A(M7-B8B_JF=7^\6G^>[MCB]7LZW6\Y*G!9?YL^38C?_V!:[]9HO5OE0
-MG-W/5\]\\\>"M">AX:/'(CG/2\`#J^9YP9?[,.S<V-^<,8>]-IX#]&,6T&NP
-M]5Z'X<,8IEV/A-X4]G7T%L)3W#GB>7).<M%NQ#1Z+4;(ZSTC5(8-:KD)\OI;
-M3%!?*4;4$=N(^?$QJ([E^[;'&[$]WARU/=Z@[?'50=M3CAH?7QTR/N6^]?$5
-M6A]??:/U\158'P_G&KR5"<O;W-;L]3Y,M]Z&N2D;B7`GI>>)-2QX\&TDY$3Q
-M=LR0!GW/W\/=QR$;Q3<?<RZ48;\I3^K#+92#)MZGYNOHH%V58@?@:+3GF?R,
-M"D-_PG!S8I<9*V0MO5-8U$QE@ZGGR)J1L9H-+J+Q/,]S&?5&$<N@'M@/!\+C
-MV;O'ASM?/2^(=<APJZJ'BVE\=TKBK$=PGIV']QQA]\6L(4R4.(<>KJCQ''0#
-M&6FCFJ\-D*%+>0[\Q+4L%@16#$OF+`&L5<_ZM3$A`QBJLYMVIA3(I%]:KOWR
-M33G8BDC`$X81_6W4WI:X;,^H;\2W]`TH.^]K8Z$M^]W%1G#:?,'!G.SGPGU<
-M(U&PT]<W]4NT@`C@$AHO9R>$G+0WUOO!ED<[1H[7'3E6'ID7R('%!0\G:SV<
-MK%TN#?2'KZ%"V*;#RP`$(Q!P)VO);H$08/8(((BCK/7K!'#O..QZHQ\F=2$A
-MGZ:C8U12(1A?*$0TAI:JDQ<:JZ`Q-WN)?KR4/%X5\U/U,UP&7)8HD'#+.$.$
-M0V9PM[EZE1R8]FJ/RG!#3)1"15*`2R5+95Z#EHU1CU<,$]5&(2JX4K)DCR::
-M8@V-H2PX@T"EG9UY_^X]H/6]M8K%YX-R70[*97,L%<(]F:76V(@'%*+YT,J@
-M[S2RI^W%T&#10X<0=3I1!Q!-6I^/HR\5^-G>B#;T3R#,X%)U+A4.#/)IX!KU
-MTAC\48V0C?>'EP;'\N!X&Y7*[L[E<ON\NIYFB)H9F,A8V<!U<@3A<R;@2D@3
-M?LN5D*"Q<-:!?L2+]<ZDH3"8XY4K$P>-5?H;&BNR^R<!-`R#[JG&IPX(S-Y>
-MD$T4P>`Q;0U29O].E#5``RH?7%I(/Z*=43\G6C(I?4N7'*,%Y&'CNB_IQ]\9
-M+VHY>ZJ=[R=^Y=_!JV3,XE;*=;\E[W;#V/KJJ3])"&<J"8SL!)455^LG>(AC
-MS.))HFD.%P88GVD$KL.F:;[^<F]9G@I]7^&/7#J3:@Y'C0M[?"\6^?6']!SG
-M1Q>654=Q59&$`S=["1RRZ>0."3Z,=GK7+A]84-VS/V[:V]FDN+BX.'];M$^[
-MEGKMIN"7;.T6Z]5\N=@]YV\N_`->5!=J4_,YLK@_/*G.[[N7Q17K6T&S+1[6
-M%-UP.+E;'\`#EQ)$/(^KQ:?'MD?'9'4[/IX9SSB2I(8]DNN[]OKCMOARU_)+
-MQV*MXFY.\V+;K@K.$WR(+X')\72"$Z9"=+8M=G>DZXL5$7,_9Y$5]^UV.__0
-M[B/H;Y[H$<RO=X\4X/-CD0N1\3S&B9KUN]SYEYZ=$X)=>J]D%,,U;.5<7_W2
-M7N^VH@8XS\-9;OKANQ',UV/#U4RJY`@EY*P*G,QK";_B/6'%XE*P\7D>/DU0
-M+'E%\)2D^98(_'AZ6:P?VM794L&HX>@EO&+EC`.$3X]K_L:#:Q$NG>&_Y^<(
-MCW,_AS5?YHO=[6+37]Y,R"=\VA=V[A.<BSF:^>;#(MS_.K\94$&2X<)+/#LD
-M]V@)7)/<$P8?<<T)QN<P>@2F08L`+P&C'R'JQ\L%&0E*@$.AZ^5ZV^8L-"B8
-M!GV^QN6=.T%WIZG'^K?);N1*72SE_O4]S-G580_SK+S7M7B3>LF9UM=T+8=*
-MHUV[EXH+$'*'?\DQ5.QSZ&#.O4+G[?><=_G5CWWOR&DN@B&9CO00;-RB'S3B
-M%G!\6X5W.0WI4;`[BW[($L;5_/HC#_UI_^XWN>!.9:]P"N]PZJ%'7]V%K5FL
-MZ/9:"Z=F^Q]P&$YE[W@*+WF2*I@S40JCJO#N)@&<.L''8=4^U6Z,:-6_!T3@
-M4Q$*0E4Y5<$3^3,]^+UH^M5F_;%=?>,+"0@S>2F`^KVTB0(-L=?W(<`=)`#[
-MA4.[WA!`M!#>'-79`'RS07A[5'8P(#,"V?NBP@NCXF6.T-DZ;J@OWH2B@E?)
-M_O2X6],D2>S\[J;MD=/P_)V\Z)7J57V]ZO)$*WE.XJPZ;-ESAY2`QZVTO&*M
-MNT]\4DTLC)7N%E!X79F*\=U/]/1GSA&EQ\BNZ5W>#=0[].*9!%#-#KTY*KPZ
-MJAMM3^%R"E@TH5(7:YX]A0/&?&HH%=6'BYK#13@,JQ(D!D?857B3%'7:/[*[
-MQ)QMR<DHVMM;="M4U=^X>7TW7WUH[UNAFX_PR%.XW#D!X`"I7+<.L6T[NX]W
-M_$QZ.Q_.RG>A.Z\3I52Z4A6J.T=;"5-/Q:2`,Y(JO"M*"`3KV`-`=IY^J%P<
-M-XO;2-^N^#S?+.;L"Y*#&X6Q7GUN-WP)E52';$!XP91<2L,U1H_[J?"BJ5!.
-MKFH'%RL`",]:L70_S#MZP(SJ=F]C.(M(S[\=0=V="]]#<.R^9:K7H&1]7+!+
-MHMW=S7?1Q;AIVX=EOS1'=HI^I^DXO#TJCL,)CYO<KKG^U3Z\+%].BGY,%C@H
-M.>Z204G&Y9G^AX'IS'!@0AGX7"H<V0]O0'J(M)"W\TQ]67SE[NQC!N+Q=KY8
-M;J.%C_#ON?WWD^X(&'WAUXJ>![B]UY'F-?#C_'\*269YLW@2V$#%-\Y$CD\E
-MO%X*,E&%FZ?Z>LEH#6M3O0_K]<V)DWHUU`MJ>*`>QW]8K_F5]?ROJU>C':GE
-MCJ]^U`?E[?_`Z`^Q5&?LGB^3]+I[0&Z*]8K?6<8FCD+EW>99*@XRR,]I,#Y)
-M`OE)AG%=8=Y3A[SGU\N\.8YT*:SDF%G,?VT/-?15&OH*#;F4FXRM/%V*5GQH
-M5^V&@MCY<M=N5A1,?Y9W;];U-W*$!J8.!J;X_:_\E_`T8'!"A!HO:D[%R>1<
-MTE1)D?V/?.Y^_A1^G%$T$)_^'WKZ(]32^XX6%J,;RZM?W0O1XQ6U\<WQ5`):
-MT^"TRO'??@V.HL0?X#"P@_GQ``1*DY?`QHE`*CSJ/.]0/4"%-,)K8:-D``@*
-M`^Z/4.'=69D4=29%CMR$`'T(/7H0O%*6T\RO:24V-7()KE1XL]9+7&H.ZHYS
-MJ4L]&VGY/%S5F&!,CF8$HD+2[,7+_.MR7THC>&O$*T)B,A;;O_SY%$/T\+JN
-M'.4^#+RX2X4W=XU4F!2R^X&`--8PHS24`H"2P!4QK=QH8WEMY!>VV"H->VPI
-M!"KWJ2!E`:)UWO/[<M#(E3:'2(,*R)BV^<58J/\Z[@,J_GFU?=SP\%BNYS?!
-MB5VWW:NOY_?S#VVX&GYWQR?E4LU:SA*E`49D0,-RZT5W7NL4N1Z^E?&O7];Q
-M-4QB.;7!S1Y$NPY^+NQJ4N']7;'VY<F/X2(*^M`_3Y_IP_P\E3E&Q]V_C"7,
-MG!VFD+$0T7&\%DUYP#GI:D![<L/(`;Z-/<:W&1ZL'^6[?IGOYM5\^U?PS8MX
-G1_G&=PGK+@3\GTZ<FJ/$W7;W;KN;[QZW/!7^KY/_"RAA(I9(B0``
+begin 640 countedref_s.res.gz
+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
+L;)>O8;MZB6V(<W4;`/YOITW_MJ[];O]VMY_O'W<\$?[CR?\`/I]YE(N(````
 `
 end

Tst/Short/countedref_s.tst

@@ -567 +567 @@
 list ll=list(val);
 ll;
-link(ll[1])=8;
-val;
-ll;
+
 shared vv =ll[1];
 vv=9;

doc/NEWS.texi

@@ -31 +31 @@
 @item brillnoether.lib (@nref{brillnoether_lib})
 @item hess.lib (@nref{hess_lib})
+@item gradedModules.lib (@nref{gradedModules_lib})
 @end itemize
 
 Changed libraries:
 @itemize
-@item Presolve::findvars (@nref{findvars},@nref{variables})
+@item Presolve::findvars (@nref{findvars}, @nref{variables})
 @item Ring::addvarsTo (@nref{addvarsTo})
 @item Ring::addNvarsTo (@nref{addNvarsTo})
-@item grobcov.lib (grobcovK) (@nref{grobcov_lib})
+@item Schreyer::s_res (@nref{s_res})
+@item grobcov.lib (grobcovK) (@nref{grobcov_lib}) with new routines
+   AddCons (@nref{AddCons}), AddConsP (@nref{AddConsP}).
 @item normaliz.lib (for normaliz >=2.8) (@nref{normaliz_lib})
 @end itemize