Changeset ce70e6 in git for Singular

Timestamp:

Dec 17, 2013, 1:23:10 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

a1e807a999ad81c88502c684ee93531e7840ea82

Parents:

81f4bd5c5a8887cb6c7de707703727b6435fcbd84c13414601e276ca17f4e13f1d191e558fb2ef91

Message:

Merge pull request #443 from surface-smoothers/fixOptionModificationByAccident.primdec.lib

Fix option modification by accident in primdec.lib

Location:

Singular

Files:

• LIB/COPYING (modified) (1 diff)
• LIB/grobcov.lib (modified) (99 diffs)
• LIB/modnormal.lib (modified) (2 diffs)
• LIB/modstd.lib (modified) (6 diffs)
• LIB/normal.lib (modified) (7 diffs)
• LIB/parallel.lib (modified) (1 diff)
• LIB/polymake.lib (moved) (moved from Singular/LIB/oldpolymake.lib) (42 diffs)
• LIB/primdec.lib (modified) (11 diffs)
• LIB/primdecint.lib (modified) (2 diffs)
• LIB/resources.lib (added)
• LIB/symodstd.lib (modified) (3 diffs)
• LIB/tasks.lib (added)
• LIB/tropical.lib (modified) (19 diffs)
• Makefile.am (modified) (1 diff)
• checklibs.c (modified) (2 diffs)
• grammar.cc (modified) (153 diffs)
• grammar.h (modified) (1 diff)
• grammar.y (modified) (3 diffs)
• ipid.cc (modified) (1 diff)
• iplib.cc (modified) (6 diffs)
• ipshell.cc (modified) (3 diffs)
• ipshell.h (modified) (1 diff)
• singular-libs (modified) (4 diffs)
• subexpr.cc (modified) (2 diffs)
• table.h (modified) (1 diff)
• tesths.cc (modified) (3 diffs)

Singular/LIB/COPYING

@@ -134 +134 @@
 paramet.lib     Thomas Keilen                   keilen@mathematik.uni-kl.de
 perron.lib      Oleksandr Motsak                motsak at mathematik dot uni minus kl dot de
-phindex.lib 
+phindex.lib
 pointid.lib     Stefan Steidel                  steidel@mathematik.uni-kl.de
 poly.lib        Olaf Bachmann                   obachman@mathematik.uni-kl.de
                 Gert-Martin Greuel              greuel@mathematik.uni-kl.de
                 Anne Fruehbis-Krueger           anne@mathematik.uni-kl.de
-oldpolymake.lib Thomas Markwig                  keilen@mathematik.uni-kl.de
+polymake.lib    Thomas Markwig                  keilen@mathematik.uni-kl.de
 presolve.lib    Gert-Martin Greuel              greuel@mathematik.uni-kl.de
 primdec.lib     Gerhard Pfister                 pfister@mathematik.uni-kl.de

Singular/LIB/grobcov.lib

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
-version="version grobcov.lib 4.0.0.0 Jun_2013 "; // $Id$
+version="version grobcov.lib 4-0-0-0 Dec_2013 ";
 category="General purpose";
 info="
@@ -15 +15 @@
           The locus algorithm and definitions will be
           published in a forthcoming paper by Abanades, Botana, Montes, Recio:
-          \''Geometrical locus of points using the Groebner cover\''.
-
+          \''An Algebraic Taxonomy for Locus Computation in Dynamic Geometry\''.
 
           The central routine is grobcov. Given a parametric
@@ -69 +68 @@
 PROCEDURES:
 
-grobcov(F);        Is the basic routine giving the canonical
+grobcov(F);  Is the basic routine giving the canonical
                    Groebner cover of the parametric ideal F.
                    This routine accepts many options, that
@@ -75 +74 @@
                    computation does not finish in reasonable time.
 
-cgsdr(F);          Is the procedure for obtaining a first disjoint,
+cgsdr(F);      Is the procedure for obtaining a first disjoint,
                    reduced Comprehensive Groebner System that
-                   is used in grobcov, but that can be used
+                   is used in grobcov, that can also be used
                    independently if only the CGS is required.
                    It is a more efficient routine than buildtree
@@ -86 +85 @@
                    respectively the rings Q[a][x], Q[a], Q[x,a].
                    It is called inside each of the fundamental routines
-                   of the library: grobcov, cgsdr and killed before
+                   of the library: grobcov, cgsdr, locus, locusdg and killed before
                    the output.
-                   If the user want to use some other internal routine,
-                   then setglobalrings() is to be called before, as
-                   the rings @R, @P and @RP are needed in most of them.
-                   globally, and more internal routines can be used, but
-                   these rings are killed by the call to any of the
-                   basic routines.
+                   So, if the user want to use some other internal routine,
+                   then setglobalrings() is to be called before, as most of them use
+                   these rings.
 
 pdivi(f,F);     Performs a pseudodivision of a parametric polynomial
                    by a parametric ideal.
+                   Can be used without calling presiouly setglobalrings(),
 
 pnormalf(f,E,N);   Reduces a parametric polynomial f over V(E) \ V(N)
                    E is the null ideal and N the non-null ideal
                    over the parameters.
+                   Can be used without calling presiouly setglobalrings(),
+
+Prep(N,M);   Computes the P-representation of V(N) \ V(M).
+                   Can be used without calling previously setglobalrings().
 
 extend(GC); When the grobcov of an ideal has been computed
@@ -110 +111 @@
                    the bases are computed, and one can obtain the full
                    representation using extend.
-
-locus(G):   Special routine for determining the locus of points
+                   Can be used without calling presiouly setglobalrings(),
+
+locus(G);     Special routine for determining the locus of points
                    of  objects. Given a parametric ideal J with
                    parameters (a_1,..a_m) and variables (x_1,..,xn),
@@ -126 +128 @@
                    The description of the algorithm and definitions will be
                    given in a forthcoming paper by Abanades, Botana, Montes, Recio:
-                   ''Geometrical locus of points using the Groebner cover''
-
-locusdg(G):  Is a special routine for computing the locus in dinamical geometry.
+                   ''An Algebraic Taxonomy for Locus Computation in Dynamic Geometry''.
+                   Can be used without calling presiouly setglobalrings(),
+
+locusdg(G);  Is a special routine for computing the locus in dinamical geometry.
                     It detects automatically a possible point that is to be avoided by the mover,
                     whose coordinates must be the last two coordinates in the definition of the ring.
@@ -134 +137 @@
                     depending on the point that is to be avoided.
                     Then it calls locus.
-
-locusto(L):  Transforms the output of locus to a string that
+                    Can be used without calling presiouly setglobalrings(),
+
+locusto(L);  Transforms the output of locus to a string that
                   can be reed from different computational systems.
+                  Can be used without calling presiouly setglobalrings(),
+
+addcons(L); Given a disjoint set of locally closed subsets in P-representation,
+                  it returns the canonical P-representation of the constructible set
+                  formed by the union of them.
+                  Can be used without calling presiouly setglobalrings(),
 
 SEE ALSO: compregb_lib
@@ -154 +164 @@
 // Initial data: 6-9-2009
 // Final data: 25-10-2011
-// Release 3: (this release, public)
+// Release 3:
 // Initial data: 1-7-2012
 // Final data: 4-9-2012
+// Release 4: (this release, public)
+// Initial data: 4-9-2012
+// Final data: 21-11-2013
 // basering Q[a][x];
 
@@ -166 +179 @@
 RETURN:   After its call the rings @R=Q[a][x], @P=Q[a], @RP=Q[x,a] are
           defined as global variables.
-NOTE:     It is called internally by the fundamental routines of the
-          library grobcov, cgsdr, extend, pdivi, pnormalf, locus, locusto,
+NOTE: It is called internally by the fundamental routines of the
+          library grobcov, cgsdr, extend, pdivi, pnormalf, locus, locusdg, locusto,
           and killed before the output.
           The user does not need to call it, except when it is interested
@@ -210 +223 @@
 }
 
-//*************Auxilliary routines**************
+//*************Auxiliary routines**************
 
 // cld : clears denominators of an ideal and normalizes to content 1
-//       can be used in @R or @P or @RP
+//        can be used in @R or @P or @RP
 // input:
-//    ideal J (J can be also poly), but the output is an ideal;
+//        ideal J (J can be also poly), but the output is an ideal;
 // output:
-//    ideal Jc (the new form of ideal J without denominators and
-//       normalized to content 1)
+//        ideal Jc (the new form of ideal J without denominators and
+//        normalized to content 1)
 proc cld(ideal J)
 {
@@ -369 +382 @@
 //"USAGE:   subset(J,K);
 //          (J,K)  expected (ideal,ideal)
-//                   or     (list, list)
+//                  or     (list, list)
 //RETURN:   1 if all the elements of J are in K, 0 if not.
 //EXAMPLE:  subset; shows an example;"
@@ -419 +432 @@
 }
 
-// pdivi : pseudodivision of a poly f by a parametric ideal F in Q[a][x].
+// pdivi : pseudodivision of a parametric polynomial f by a parametric ideal F in Q[a][x].
 // input:
-//   poly  f (in the parametric ring @R)
-//   ideal F (in the parametric ring @R)
+//   poly  f
+//   ideal F
 // output:
 //   list (poly r, ideal q, poly mu)
@@ -438 +451 @@
 EXAMPLE:  pdivi; shows an example"
 {
+  int i;
+  int j;
+//  string("T_f=",f);
+  poly v=1;
+  for(i=1;i<=nvars(basering);i++){v=v*var(i);}
   int te=0;
+  def R=basering;
   if (defined(@P)==1){te=1;}
   else{setglobalrings();}
-  def R=basering;
-  int i;
-  int j;
   poly r=0;
   poly mu=1;
@@ -476 +492 @@
         rho=qlc[1]*qlm;
         p=nu*p-rho*F[i];
+//        string("i=",i,"  coef(p,v)=",coef(p,v));
         r=nu*r;
         for (j=1;j<=size(F);j++){q[j]=nu*q[j];}
@@ -487 +504 @@
       r=r+lcp*lpp;
       p=p-lcp*lpp;
+//      string("pasa al rem p=",p);
     }
   }
@@ -845 +863 @@
 {
   int i;
+  int nt;
+  if (typeof(F)=="ideal"){nt=ncols(F);}
+  else{nt=size(F);}
+
   def FF=F;
   FF=F[1];
-  for (i=2;i<=ncols(F);i++)
+  for (i=2;i<=nt;i++)
   {
     if (not(memberpos(F[i],FF)[1]))
@@ -979 +1001 @@
   poly g; int i;
   ideal Nb; ideal Na=N;
-
-  // begins incquotient
   if (size(Na)==1)
   {
@@ -1055 +1075 @@
 }
 
+// Auxiliary routine to define an order for ideals
+// Returns 1 if the ideal a is shoud precede ideal b by sorting them in idbefid order
+//             2 if the the contrary happen
+//             0 if the order is not relevant
 proc idbefid(ideal a, ideal b)
 {
@@ -1086 +1110 @@
 }
 
+// sort a list of ideals using idbefid
 proc sortlistideals(list L)
 {
@@ -1139 +1164 @@
 //    the Prep of V(N)\V(M)
 // Assumed to work in the ring @P of the parameters
+// Can be used without calling previously setglobalrings().
 proc Prep(ideal N, ideal M)
 {
+  int te;
   if (N[1]==1)
   {
@@ -1146 +1173 @@
   }
   def RR=basering;
+  if(defined(@P)){te=1;}
+  else{te=0; setglobalrings();}
   setring(@P);
   ideal Np=imap(RR,N);
@@ -1175 +1204 @@
   if (size(prep)==0){prep=list(list(ideal(1),list(ideal(1))));}
   setring(RR);
-  return(imap(@P,prep));
+  def pprep=imap(@P,prep);
+  if(te==0){kill @P; kill @R; kill @RP;}
+  return(pprep);
 }
 
@@ -1187 +1218 @@
 //    the C-representaion of V(N)\V(M) = V(ida)\V(idb)
 // Assumed to work in the ring @P of the parameters
+// If the routine is to be called from the top, a previous call to
+// setglobalrings() is needed.
 proc PtoCrep(list L)
 {
@@ -1293 +1326 @@
 EXAMPLE:  cgsdr; shows an example"
 {
+  int te;
   def RR=basering;
-  setglobalrings();
+  if(defined(@P)){te=1;}
+  else{te=0; setglobalrings();}
   // INITIALIZING OPTIONS
   int i; int j;
@@ -1452 +1487 @@
     }
   }
-  if(defined(@P)){kill @P; kill @R; kill @RP;}
+  if(te==0){kill @P; kill @R; kill @RP;}
   return(GS);
 }
@@ -1469 +1504 @@
 
 // input:  internal routine called by cgsdr at the end to group the
-//         lpp segments and improve the output
+//            lpp segments and improve the output
 // output: grouped segments by lpp obtained in cgsdr
 proc grsegments(list T)
@@ -1505 +1540 @@
 // input: ideal p, ideal q
 // output: 1 if p contains q,  0 otherwise
+// If the routine is to be called from the top, a previous call to
+// setglobalrings() is needed.
 proc idcontains(ideal p, ideal q)
 {
@@ -1530 +1567 @@
 // input: L (list of ideals)
 // output: the list of integers corresponding to the minimal ideals in L
+// If the routine is to be called from the top, a previous call to
+// setglobalrings() is needed.
 proc selectminideals(list L)
 {
@@ -1568 +1607 @@
 
 // LCUnion
-// Given a list of the P-representations of locally closed segments
+// Given a list of the P-representations of disjoint locally closed segments
 // for which we know that the union is also locally closed
 // it returns the P-representation of its union
@@ -1576 +1615 @@
 // output: P-representation of the union
 //       ((P_j,(P_j1,...,P_jk_j | j=1..t)))
+// If the routine is to be called from the top, a previous call to
+// setglobalrings() is needed.
+// Auxiliary routine called by grobcov and addcons
+// A previous call to setglobarings() is needed if it is to be used at the top.
 proc LCUnion(list LL)
 {
   def RR=basering;
   setring(@P);
+  int care;
   def L=imap(RR,LL);
   int i; int j; int k; list H; list C; list T;
-  list L0; list P0; list P; list Q0; list Q;
+  list L0; list P0; list P; list Q0; list Q;  intvec Qi;
+  if(not(defined(@Q2))){list @Q2;}
+  else{kill @Q2; list @Q2;}
+  exportto(Top,@Q2);
   for (i=1;i<=size(L);i++)
   {
@@ -1592 +1639 @@
   }
   Q0=selectminideals(P0);
+  //"T_3Q0="; Q0;
+  kill P; list P;
   for (i=1;i<=size(Q0);i++)
   {
-    Q[i]=L0[Q0[i]];
-    P[i]=L[Q[i][1]][Q[i][2]];
+    Qi=L0[Q0[i]];
+    Q[size(Q)+1]=Qi;
+      P[size(P)+1]=L[Qi[1]][Qi[2]];
+  }
+  @Q2=Q;
+  if(size(P)==0)
+  {
+    setring(RR);
+    list TT;
+    return(TT);
   }
   // P is the list of the maximal components of the union
@@ -1611 +1668 @@
         {
           C[size(C)+1]=L[i][j];
+          C[size(C)][3]=intvec(i,j);
         }
       }
     }
-    T[size(T)+1]=list(Q[k],P[k][1],addpart(H,C));
-  }
+    if(size(P[k])>=3){T[size(T)+1]=list(Q[k],P[k][1],addpart(H,C),P[k][3]);}
+    else{T[size(T)+1]=list(Q[k],P[k][1],addpart(H,C));}
+  }
+  @Q2=sortpairs(@Q2);
   setring(RR);
   def TT=imap(@P,T);
@@ -1621 +1681 @@
 }
 
-// Called by LCUnion to modify the holes of a primepart of the union
+// Auxiliary routine
+// called by LCUnion to modify the holes of a primepart of the union
 // by the addition of the segments that do not correspond to that part
 // Works on @P ring.
@@ -1627 +1688 @@
 //   H=(p_i1,..,p_is) the holes of a component to be transformed by the addition of
 //        the segments C that do not correspond to that component
-//   C=((q_1,(q_11,..,q_1l_1)),..,(q_k,(q_k1,..,q_kl_k)))
+//   C=((q_1,(q_11,..,q_1l_1),pos1),..,(q_k,(q_k1,..,q_kl_k),posk))
+// posi=(i,j) position of the component
 //        the list of segments to be added to the holes
 proc addpart(list H, list C)
@@ -1633 +1695 @@
   list Q; int i; int j; int k; int l; int t; int t1;
   Q=H; intvec notQ; list QQ; list addq;
+  // @Q2=list of (i,j) positions of the components that have been aded to some hole of the maximal ideals
+  //          plus those of the components added to the holes.
   ideal q;
   i=1;
@@ -1645 +1709 @@
         if (equalideals(q,C[j][1]))
         {
+          @Q2[size(@Q2)+1]=C[j][3];
           t=0;
           for (k=1;k<=size(C[j][2]);k++)
@@ -1666 +1731 @@
             {
               addq[size(addq)+1]=C[j][2][k];
+              @Q2[size(@Q2)+1]=C[j][3];
             }
           }
@@ -1697 +1763 @@
 }
 
-// Called by addpart to finish the modification of the holes of a primepart
+// Auxiliary routine called by addpart to finish the modification of the holes of a primepart
 // of the union by the addition of the segments that do not correspond to
 // that part.
@@ -1787 +1853 @@
 }
 
-// specswellCrep
-// input:
-//   given two corresponding polynomials g1 and g2 with the same lpp
-//   g1 belonging to the basis in the segment ida1,idb1
-//   g2 belonging to the basis in the segment ida2,idb2
-// output:
-//   1 if g1 spezializes well to g2 on the whole (ida2,idb2) segment
-//   0 if not
-proc specswellCrep(poly g1, poly g2, ideal ida2)
-{
-  poly S;
-  S=leadcoef(g2)*g1-leadcoef(g1)*g2;
-  def RR=basering;
-  setring(@RPt);
-  def SR=imap(RR,S);
-  def ida2R=imap(RR,ida2);
-  attrib(ida2R,"isSB",1);
-  poly S2R=reduce(SR,ida2R);
-  setring(RR);
-  def S2=imap(@RPt,S2R);
-  if (S2==0){return(1);}   // and (nonnullCrep(leadcoef(g1),ida2,idb2))
-  else {return(0);}
-}
-
+// Auxiliary routine for grobcov: ideal F is assumed to be homogeneous
 // gcover
 // input: ideal F: a generating set of a homogeneous ideal in Q[a][x]
@@ -1881 +1924 @@
     LCU=LCUnion(pairspP);
     kill prep; list prep;
+    kill crep; list crep;
     for(k=1;k<=size(LCU);k++)
     {
@@ -1945 +1989 @@
     for(j=1;j<=size(B);j++)
     {
-      B[j]=pnormalf(B[j],crep[1],N);
+      B[j]=pnormalf(B[j],crep[1],crep[2]);
     }
     S[i]=list(lpp,B,prep,crep,lpph);
@@ -2015 +2059 @@
                 each point of the segment. With option (\"ext\",1) the
                 full representation of the bases is computed (possible
-                shaves) and sometimes a simpler result is obtained.
+                sheaves) and sometimes a simpler result is obtained.
             \"rep\",0-1-2: The default is (\"rep\",0) and then the segments
                 are given in canonical P-representation. Option (\"rep\",1)
@@ -2204 +2248 @@
 }
 
-// input. GC the grobcov of an ideal in generic representation of the
+// Input. GC the grobcov of an ideal in generic representation of the
 //        bases computed with option option ("rep",2).
-// output The grobcov in full representation.
-// option ("comment",1) shows the time.
+// Output The grobcov in full representation.
+// Option ("comment",1) shows the time.
+// Can be called from the top
 proc extend(list GC, list #);
 "USAGE:   extend(GC); When the grobcov of an ideal has been computed
@@ -2394 +2439 @@
 }
 
-
+// Auxiliary routine
 // nonzerodivisor
 // input:
@@ -2435 +2480 @@
 }
 
+// Auxiliary routine
 // deltai
 // input:
@@ -2475 +2521 @@
 }
 
+// Auxiliary routine
 // combine
 // input: a list of pairs ((p1,P1),..,(pr,Pr)) where
@@ -2498 +2545 @@
 }
 
+// Auxiliary routine
 // elimconstfac: eliminate the factors in the polynom f that are in K[a]
 // input:
@@ -2523 +2571 @@
 };
 
+//Auxiliary routine
 // nullin
 // input:
@@ -2544 +2593 @@
 }
 
+// Auxiliary routine
 // monoms
+// Input: A polynomial f
+// Output: The list of leading terms
 proc monoms(poly f)
 {
@@ -2563 +2615 @@
 }
 
+// Auxiliary routine called by extend
 // extend0
 // input:
@@ -2622 +2675 @@
 }
 
+// Auxiliary routine
 // findindexpolys
 // input:
@@ -2670 +2724 @@
 }
 
+// Auxiliary routine
 // extendcoef: given Q,P in K[a] where P/Q specializes on an open and dense subset
 //      of the whole V(p1 int...int pr), it returns a basis of the module
@@ -2698 +2753 @@
 }
 
+// Auxiliary routine
 // selectregularfun
 // input:
@@ -2755 +2811 @@
 }
 
+// Auxiliary routine
 // searchinlist
 // input:
@@ -2776 +2833 @@
 }
 
+// Auxiliary routine
 // comb: the list of combinations of elements (1,..n) of order p
 proc comb(int n, int p)
@@ -2812 +2870 @@
 }
 
+// Auxiliary routine
 // selectminsheaves
 // Input: L=((v_11,..,v_1k_1),..,(v_s1,..,v_sk_s))
@@ -2834 +2893 @@
 }
 
+// Auxiliary routine
 // smsheaves
 // Input:
@@ -2868 +2928 @@
 }
 
+// Auxiliary routine
 // allsheaves
 // Input: L=((v_11,..,v_1k_1),..,(v_s1,..,v_sk_s))
@@ -2910 +2971 @@
 }
 
+// Auxiliary routine
 // numones
 // Input:
@@ -2926 +2988 @@
 }
 
+// Auxiliary routine
 // pos
 // Input:  intvec p of zeros and ones
@@ -2940 +3003 @@
 }
 
+// Auxiliary routine
 // actualize: actualizes zeroes of p
 // Input:
@@ -2957 +3021 @@
 }
 
+// Auxiliary routine
 // combrep
 // Input: V=(n_1,..,n_i)
@@ -2990 +3055 @@
 }
 
+// Auxiliary routine
 proc reducemodN(poly f,ideal E)
 {
@@ -3005 +3071 @@
 }
 
+// Auxiliary routine
 // intersp: computes the intersection of the ideals in S in @P
 proc intersp(list S)
@@ -3017 +3084 @@
 }
 
+// Auxiliary routine
 // radicalmember
 proc radicalmember(poly f,ideal ida)
@@ -3039 +3107 @@
 }
 
+// Auxiliary routine
 // NonNull: returns 1 if the poly f is nonnull on V(E)\V(N), 0 otherwise.
 proc NonNull(poly f, ideal E, ideal N)
@@ -3059 +3128 @@
 }
 
+// Auxiliary routine
 // selectextendcoef
 // input:
@@ -3117 +3187 @@
 }
 
+// Auxiliary routine
 // input:
 //   ideal E1: in some basering (depends only on the parameters)
@@ -3133 +3204 @@
 }
 
+// Auxiliary routine
 // reform
 // input:
@@ -3216 +3288 @@
 }
 
+// Auxiliary routine
 // nonnullCrep
 proc nonnullCrep(poly f0,ideal ida0,ideal idb0)
@@ -3238 +3311 @@
 }
 
+// Auxiliary routine
 // precombint
 // input:  L: list of ideals (works in @P)
@@ -3284 +3358 @@
 }
 
-// precombinediscussion
-// not used, can be deleted
-// input:  list L: the LCU segment with bases for each pi component
-// output: intvec vv:  vv[1]=(1 if the generic polynomial of the vv[2]
-//                     component already specializes well,
-//                     0 if combine is to be used)
-//                     vv[2]=selind, the index for which the generic basis
-//                     already specializes well if combine is not to be used (vv[1]=1).
-proc precombinediscussion(L,crep)
-{
-  int tes=1; int selind; int i1; int j1; poly p; poly lcp; intvec vv;
-  if (size(L)==1){vv=1,1; return(vv);}
-  for (i1=1;i1<=size(L);i1++)
-  {
-    tes=1;
-    p=L[i1][2];
-    lcp=leadcoef(p);
-
-
-    if(nonnullCrep(lcp,crep[1],crep[2]))
-    {
-      for(j1=1;j1<=size(L);j1++)
-      {
-        if(i1!=j1)
-        {
-          if(specswellCrep(p,L[j1][2],L[j1][1])==0){tes=0; break;}
-        }
-      }
-    }
-    else{tes=0;}
-    if(tes){selind=i1; break;}
-  }
-  vv=tes,selind;
-  return(vv);
-}
-
+
+// Auxiliary routine
 // minAssGTZ eliminating denominators
 proc minGTZ(ideal N);
@@ -3337 +3377 @@
 //********************* Begin KapurSunWang *************************
 
+// Auxiliary routine
 // inconsistent
 // Input:
@@ -3372 +3413 @@
 }
 
+// Auxiliary routine
 // MDBasis: Minimal Dickson Basis
 proc MDBasis(ideal G)
@@ -3397 +3439 @@
 }
 
+// Auxiliary routine
 // primepartZ
 proc primepartZ(poly f);
@@ -3497 +3540 @@
 }
 
+// Auxiliary routine
 // sqf
 // This is for releases of Singular before 3-5-1
@@ -3516 +3560 @@
 // }
 
+// Auxiliary routine
 // sqf
 proc sqf(poly f)
@@ -3529 +3574 @@
 
 
+// Auxiliary routine
 // KSW0: Kapur-Sun-Wang algorithm for computing a CGS, called by KSW
 // Input:
@@ -3575 +3621 @@
   {
     if(comment>1){"Basis 1 is found"; E; N;}
-    return(E0,N0,ideal(1));
-  }
+    list KK; KK[1]=list(E0,N0,ideal(1));
+    return(KK);
+   }
   ideal Gr; ideal Gm; ideal GM;
   for (i=1;i<=size(G);i++)
@@ -3654 +3701 @@
 }
 
+// Auxiliary routine
 // KSWtocgsdr
 proc KSWtocgsdr(list L)
@@ -3672 +3720 @@
 }
 
+// Auxiliary routine
 // KtoPrep
 // Computes the P-representaion of a K-representation (N,W) of a set
@@ -3720 +3769 @@
 }
 
+// Auxiliary routine
 // groupKSWsegments
 // input:  the list of vertices of KSW
@@ -3754 +3804 @@
 
 //******************** Begin locus ******************************
-
 
 // indepparameters
@@ -3777 +3826 @@
 }
 
-
-// dimP0: Auxiliar routine
+// dimP0: Auxiliary routine
 // if the dimension in @P of an ideal in the parameters has dimension 0 then it returns 0
 // else it retuns 1
@@ -3794 +3842 @@
 }
 
-// Auxiliar routine.
+// Auxiliary routine.
 // input:    ideals E and F (assumed in ring @P
 // returns: 1 if ideal E is contained in ideal F (assumed F is std basis)
@@ -3817 +3865 @@
 }
 
-// AddCons: given a set of locally closed components of a selection of
-//       segments of the Grobner cover, it builds the canonical P-representation
-//       of the corresponding constructible set, including levels it they are
-// input: a list L of a selection of segments of the Groebner cover
-//       given a a set of components of the form
-//       ( (p_1,(p_11,..,p_1k_1).. (p_s,(p_s1,..,p_sk_s))
-// output: The canonical P-representation of adding the given components.
-proc AddCons(list L)
-{
-  // First step: Selecting the top varieties
-  list L1; list L2; list LL; int i; int j; int t;
-  list Lend;
+// addcons: given a set of locally closed sets given in P-representation,
+//       (particularly a subset of components of a selection of segments
+//       of the Grobner cover), it builds the canonical P-representation
+//       of the corresponding constructible set, of its union, including levels it they are.
+// input: a list L of disjoint segments (for exmple a selection of segments of the Groebner cover)
+//       of the form
+//       ( ( (p1_1,(p1_11,..,p1_1k_1).. (p1_s,(p1_s1,..,p1_sk_s)),..,
+//         ( (pn_1,(pn_11,..,pn_1j_1).. (pn_s,(pn_s1,..,pn_sj_s))   )
+// output: The canonical P-representation of the  constructible set resulting by
+//       adding the given components.
+//       The first element of each component can be ignored. It is only for internal use.
+//       The fifth element of each component is the level of the constructible set
+//       of the component.
+//       It is no need a previous call to setglobalrings()
+proc addcons(list L)
+"USAGE:   addcons(  ( ( (p1_1,(p1_11,..,p1_1k_1).. (p1_s,(p1_s1,..,p1_sk_s)),..,
+  ( (pn_1,(pn_11,..,pn_1j_1).. (pn_s,(pn_s1,..,pn_sj_s))   )   )
+  a list L of locally closed sets in P-representation
+RETURN: the canonical P-representation of the constructible set of the union.
+NOTE:   It is called internally by the routines locus, locusdg,
+
+KEYWORDS: P-representation, constructible set
+EXAMPLE:  adccons; shows an example"
+{
+  int te;
+  if(defined(@P)){te=1;}
+  else{setglobalrings();}
+  list notadded; list P0;
+  int i; int j; int k; int l;
+  intvec v; intvec v1; intvec v0;
+  ideal J; list K;
   for(i=1;i<=size(L);i++)
   {
-    t=1;
-    for(j=1;j<=size(L);j++)
-    {
-      if(i!=j)
-      {
-        if(containedideal(L[j][1],L[i][1])==1)
-        {t=0;
-         // "the ideal "; L[j][1]; "is contained in ideal "; L[i][1];
-          j=size(L);
-        }
-      }
-    }
-    if(t==1){L1[size(L1)+1]=L[i];}
-    else{L2[size(L2)+1]=L[i];}
-  }
-  // Second step: Adding segments to obtain a locally closed sets for each level
-  int lev=1;
-  if(size(L2)==0)
-  {
-     for(i=1;i<=size(L1);i++)
+    for(j=1;j<=size(L[i]);j++)
+    {
+        v=i,j;
+        notadded[size(notadded)+1]=v;
+    }
+  }
+  //"T_notadded="; notadded;
+  int level=1;
+  list P=L;
+  list LL;
+  list Ln;
+  //int cont=0;
+  while(size(notadded)>0)
+  {
+    kill notadded; list notadded;
+    for(i=1;i<=size(P);i++)
+    {
+      for(j=1;j<=size(P[i]);j++)
+      {
+          v=i,j;
+          notadded[size(notadded)+1]=v;
+      }
+    }
+    //"T_notadded="; notadded;
+     //cont++;
+     P0=P;
+     Ln=LCUnion(P);
+     //"T_Ln="; Ln;
+     notadded=minuselements(notadded,@Q2);
+     //"T_@Q2="; @Q2;
+     //"T_notadded="; notadded;
+     for(i=1;i<=size(Ln);i++)
      {
-       if(size(L1[i])>=3)
-       {L1[i][3]=string(string(L1[i][3]),",",lev);}
-       else{L1[i][3]=string(lev);}
+       //Ln[i][4]=  ; JA HAURIA DE VENIR DE LCUnion
+       Ln[i][5]=level;
+       LL[size(LL)+1]=Ln[i];
      }
-   return(L1);
-  }
-   while(size(L2)>0)
-   {
-     LL=addtolocalclosed(L1,L2);
-     for(i=1;i<=size(LL[1]);i++)
+     i=0;j=0;
+     v=0,0;
+     v0=0,0;
+     kill P; list P;
+     for(l=1;l<=size(notadded);l++)
      {
-       if(size(LL[1][i])>=3)
-       {LL[1][i][3]=string(string(LL[1][i][3]),",",lev);}
-       else{LL[1][i][3]=string(lev);}
-       Lend[size(Lend)+1]=LL[1][i];
+       v1=notadded[l];
+       if(v1[1]<>v0[1]){i++;j=1; P[i]=K;} // list P[i];
+       else
+       {
+         if(v1[2]<>v0[2])
+         {
+           j=j+1;
+         }
+       }
+       v=i,j;
+       //"T_v1="; v1;
+       P[i][j]=K; P[i][j][1]=J; P[i][j][2]=K;
+       P[i][j][1]=P0[v1[1]][v1[2]][1];
+       //"T_P0[v1[1]][v1[2]][2]="; P0[v1[1]][v1[2]][2];
+       //"T_size(P0[v1[1]][v1[2]][2])="; size(P0[v1[1]][v1[2]][2]);
+       for(k=1;k<=size(P0[v1[1]][v1[2]][2]);k++)
+       {
+         P[i][j][2][k]=P0[v1[1]][v1[2]][2][k];
+         //string("T_P[",i,"][",j,"][2][",k,"]="); P[i][j][2][k];
+       }
+       v0=v1;
+       //"T_P_1="; P;
      }
-     L2=LL[2];
-     lev++;
-   }
-   return(Lend);
-}
-
-// input: Two lists of P-components to be added.
-//           L1 contains the top components, and L2 the remaining components
-//           each of the form ( (p_1,(p_11,..,p_1k_1).. (p_s,(p_s1,..,p_sk_s))
-// output: A list of two lists:
-//           The first one contains the P-representation of the top components added
-//           The second contains the components that have not yet been added when
-//           the total subset is not locally closed. If so addtolocalclosed is to be called
-//           at new after separating the new top and remaining components in order
-//           to compute the next level of the constructible set.
-//           The input and the output must be in the ring @P of parameters.
-proc  addtolocalclosed(list L1,list L2)
-{
-   // Second step: Adding segments to obtain a locally closed set
-   // L1 contains the top components (ideals and descendants)
-   // L2 contains the nontop components (ideals and descendants)
-   list LL; int i; int j; int t; intvec Added; int mesvoltes=1; intvec alreadyadded; list LN;
-   int k; int l; int m; ideal top; ideal hole; ideal nhole; intvec nottoadd; int t0; list h;
-   LL=L1;
-   LN=L2;
-   while(mesvoltes)
-   {
-     //"volta";
-     for(i=1;i<=size(L1);i++)
-     {
-        Added=Added,alreadyadded;
-        Added=sort(elimrepeatedvl(Added))[1];
-        kill alreadyadded; intvec alreadyadded;
-        top=LL[i][1][1];
-        j=1;
-        while(j<=size(LL[i][2]))
-        {
-           kill nottoadd; intvec nottoadd;
-           hole=LL[i][2][j];
-           t0=1;
-           k=1;
-           while(t0 and k<=size(LN))
-           {
-              if (equalideals(hole,LN[k][1])==1)
-              {
-                 t0=0;
-                  if(alreadyadded==intvec(0)){alreadyadded[1]=k;}
-                 else{alreadyadded[size(alreadyadded)+1]=k;}
-                 LL[i][2]=elimfromlist(LL[i][2],j);
-                 j=j-1;
-                 for(l=1;l<=size(LN[k][2]);l++)
-                 {
-                   nhole=LN[k][2][l],LL[i][1];
-                   nhole=std(nhole);
-                   t=1; m=1;
-                    while(t and m<=size(LL[i][2]))
-                    {
-                       if(containedideal(LL[i][2][m],nhole)==1)
-                       {
-                         t=0;
-                       }
-                       m++;
-                    }
-                    if(t==0){nottoadd[size(nottoadd)+1]=l;}
-                  }
-                 for(m=1;m<=size(LN[k][2]);m++)
-                 {
-                     if(memberpos(m,nottoadd)[1]==0)
-                    {
-                       LL[i][2][size(LL[i][2])+1]=LN[k][2][m];
-                    }
-                 }
-              }
-              k++;
-
-           }
-           j++;
-        }
-        if(size(LL[i][2])==0 and size(LL[i][1])>0){LL[i][2][1]=ideal(1);}
-     }
-     h=1,1;
-     while((h[1]==1) and (alreadyadded!=intvec(0)))
-     {
-       h=memberpos(0,alreadyadded);
-       if(h[1]==1){alreadyadded=elimfromlist(alreadyadded,h[2]);}
-     }
-     if(alreadyadded!=intvec(0))
-     {alreadyadded=sort(elimrepeatedvl(alreadyadded))[1];}
-     if(Added==intvec(0)){Added=alreadyadded;}
-     else{
-       Added=Added,alreadyadded;
-       Added=sort(elimrepeatedvl(Added))[1];
-     }
-     h=1,1;
-     while((h[1]==1) and (Added!=intvec(0)))
-     {
-       h=memberpos(0,Added);
-       if(h[1]==1){Added=elimfromlist(Added,h[2]);}
-     }
-     if (alreadyadded==intvec(0))
-     {
-       mesvoltes=0;
-     }
-  }
-  if(Added!=intvec(0)){Added=sort(elimrepeatedvl(Added))[1]; }
-  if(Added!=intvec(0))
-  {
-    for(i=1;i<=size(Added);i++)
-    {
-      if(size(LN)>0){LN=elimfromlist(LN,Added[size(Added)+1-i]);}
-    }
-  }
-  for (i=1;i<=size(LL);i++)
-  {
-    for(j=1;j<=size(LL[i][2]);j++)
-    {
-      hole=LL[i][2][j];
-      for (k=1;k<=size(LL);k++)
-      {
-        if(k!=i)
-        {
-          if(containedideal(LL[k][1],hole))
-          {
-            LL[i][2]=elimfromlist(LL[i][2],j);
-            for(l=1;l<=size(LL[k][2]);l++)
-            {
-              nhole=hole,LL[k][2][l];
-              nhole=std(nhole);
-              if(equalideals(nhole,ideal(1))==0)
-              {
-                m=1; t=1;
-                while(t and m<size(LL[i][2]))
-                {
-                  if(containedideal(LL[i][2][m],nhole)){t=0;}
-                  m++;
-                }
-                if(t==1){LL[i][2][size(LL[i][2])+1]=nhole;}
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  LL[1]=LL; LL[2]=LN;
+     //"T_P="; P;
+     level++;
+     //if(cont>3){break;}
+     //kill notadded; list notadded;
+  }
+  if(defined(@Q2)){kill @Q2;}
+  if(te==0){kill @P; kill @R; kill @RP;}
+  //"T_LL_sortida addcons="; LL; "Fi sortida";
   return(LL);
 }
-
-// locus(G):  Special routine for determining the locus of points
-//                of  objects. Given a parametric ideal J with
-//                parameters (a_1,..a_m) and variables (x_1,..,xn),
-//                representing the system determining
-//                the locus of points (a_1,..,a_m)) who verify certain
-//                properties, computing the grobcov G of
-//                J and applying to it locus, determines the different
-//                classes of locus components. They can be
-//                Normal, Special, Accumulation point, Degenerate.
-//                The output are the components given in P-canonical form
-//                of at most 4 constructible sets: Normal, Special, Accumulation,
-//                Degenerate.
-//                The description of the algorithm and definitions will be
-//                given in a forthcoming paper by Abanades, Botana, Montes Recio.
-
-// input:      The output G of the grobcov (in generic representation, which is the default)
+example
+{
+  "EXAMPLE:"; echo = 2;
+   ring R=(0,a,b),(x1,y1,x2,y2,p,r),dp;
+   ideal S93=(a+1)^2+b^2-(p+1)^2,
+                    (a-1)^2+b^2-(1-r)^2,
+                    a*y1-b*x1-y1+b,
+                    a*y2-b*x2+y2-b,
+                    -2*y1+b*x1-(a+p)*y1+b,
+                    2*y2+b*x2-(a+r)*y2-b,
+                    (x1+1)^2+y1^2-(x2-1)^2-y2^2;
+  short=0;
+  "System S93="; S93; " ";
+  def GC93=grobcov(S93);
+  "grobcov(S93)="; GC93; " ";
+  int i;
+  list H;
+  for(i=1;i<=size(GC93);i++){H[i]=GC93[i][3];}
+  "H="; H;
+  "addcons(H)="; addcons(H);
+}
+
+// Takes a list of intvec and sorts it and eliminates repeated elements.
+// Auxiliary routine used in addcons
+proc sortpairs(L)
+{
+  def L1=sort(L);
+  def L2=elimrepeated(L1[1]);
+  return(L2);
+}
+
+// Eliminates the pairs of L1 that are also in L2.
+// Auxiliary routine used in addcons
+proc minuselements(list L1,list L2)
+{
+  int i;
+  list L3;
+  for (i=1;i<=size(L1);i++)
+  {
+    if(not(memberpos(L1[i],L2)[1])){L3[size(L3)+1]=L1[i];}
+  }
+  return(L3);
+}
+
+// locus0(G): Private routine used by locus (the public routine), that
+//                builds the diferent components.
+// input:      The output G of the grobcov (in generic representation, which is the default option)
 // output:
 //         list, the canonical P-representation of the Normal and Non-Normal locus:
 //              The Normal locus has two kind of components: Normal and Special.
 //              The Non-normal locus has two kind of components: Accumulation and Degenerate.
-//              Normal components: for each point in the component,
-//              the number of solutions in the variables is finite, and
-//              the solutions depend on the point in the component if the component is not 0-dimensional.
-//              Special components:  for each point in the component,
-//              the number of solutions in the variables is finite,
-//              the component is not 0-dimensional, but the solutions do not depend on the
-//              values of the parameters in the component.
-//              Accumlation points: are 0-dimensional components for which it exist
-//              an infinite number of solutions.
-//              Degenerate components: are components of dimension greater than 0 for which
-//              for every point in the component there exist infinite solutions.
+//              This routine is compemented by locus that calls it in order to eliminate problems
+//              with degenerate points of the mover.
 //         The output components are given as
 //              ((p1,(p11,..p1s_1),type_1,level_1),..,(pk,(pk1,..pks_k),type_k,level_k)
@@ -4052 +4032 @@
 //              If all levels of a class of locus are 1, then the set is locally closed. Otherwise the level
 //              gives the depth of the component.
-proc locus(list GG, list #)
-"USAGE:   locus(G);
-               The input must be the grobcov  of a parametrical ideal
-RETURN:  The  locus.
-               The output are the components of two constructible subsets of the locus
-               of the parametrical system.: Normal and Non-normal.
-               These components are
-               given as a list of  (pi,(pi1,..pis_i),type_i,level_i) varying i,
-               where the p's are prime ideals, the type can be: Normal, Special,
-               Accumulation, Degenerate.
-NOTE:      It can only be called after computing the grobcov of the
-               parametrical ideal in generic representation ('ext',0),
-               which is the default.
-               The basering R, must be of the form Q[a_1,..,a_m][x_1,..,x_n].
-KEYWORDS: geometrical locus, locus, loci.
-EXAMPLE:  locus; shows an example"
+proc locus0(list GG, list #)
 {
   int t1=1; int t2=1;
   def R=basering;
   int moverdim=nvars(R);
+  list HHH;
+  if (GG[1][1][1]==1 and GG[1][2][1]==1 and GG[1][3][1][1][1]==0 and GG[1][3][1][2][1]==1){return(HHH);}
   list Lop=#;
   if(size(Lop)>0){moverdim=Lop[1];}
@@ -4077 +4044 @@
   list G1; list G2;
   def G=GG;
+  list Q1; list Q2;
   int i; int d; int j; int k;
   t1=1;
@@ -4082 +4050 @@
   {
     attrib(G[i][1],"IsSB",1);
-    //d=dim(std(G[i][1]));
-    // ULL
     d=locusdim(G[i][2],moverdim);
     if(d==0){G1[size(G1)+1]=G[i];}
@@ -4131 +4097 @@
           P1[i][3][j]=P1[i][3][j]*h[k];
         }
-        //P1[i][3][j]=normalize(P1[i][3][j]);
       }
     }
   }
   else{list P1;}
+  ideal BB;
   for(i=1;i<=size(P1);i++)
   {
@@ -4149 +4115 @@
     }
   }
+  list l;
+  for(i=1;i<=size(P1);i++){Q1[i]=l; Q1[i][1]=P1[i];} P1=Q1;
+  for(i=1;i<=size(P2);i++){Q2[i]=l; Q2[i][1]=P2[i];} P2=Q2;
+
   setring @P;
-  // CANVIAR
+  ideal J;
   if(t1==1)
   {
     def C1=imap(R,P1);
-    def L1=AddCons(C1);
+    def L1=addcons(C1);
    }
   else{list C1; list L1; kill P1; list P1;}
@@ -4160 +4130 @@
   {
     def C2=imap(R,P2);
-    def L2=AddCons(C2);
+    def L2=addcons(C2);
   }
   else{list L2; list C2; kill P2; list P2;}
     for(i=1;i<=size(L2);i++)
     {
-      d=dim(std(L2[i][1]));
+      J=std(L2[i][2]);
+      d=dim(J); // AQUI
       if(d==0)
       {
-        L2[i][3]=string("Accumulation,",L2[i][3]);
-      }
-      else{L2[i][3]=string("Degenerate,",L2[i][3]);}
+        L2[i][4]=string("Accumulation",L2[i][4]);
+      }
+      else{L2[i][4]=string("Degenerate",L2[i][4]);}
     }
   list LN;
@@ -4185 +4156 @@
   for(i=1;i<=size(L);i++){if(size(L[i][2])==0){L[i][2]=ideal(1);}}
   kill @R; kill @RP; kill @P;
-  return(L);
-}
-example
-{"EXAMPLE:"; echo = 2;
-  ring R=(0,a,b),(x,y),dp;
-  short=0;
-  "Concoid";
-  ideal S96=x^2+y^2-4,(b-2)*x-a*y+2*a,(a-x)^2+(b-y)^2-1;
-  "System="; S96; " ";
-  locus(grobcov(S96));
-}
-
-
-// locusto: Transforms the output of locus to a string that
-//      can be read by different computational systems.
-// input:
-//     list L: The output of locus
+  list LL;
+  for(i=1;i<=size(L);i++)
+  {
+    LL[i]=l;
+    LL[i]=elimfromlist(L[i],1);
+  }
+  return(LL);
+}
+
+// locus0dg(G): Private routine used by locusdg (the public routine), that
+//                builds the diferent components used in Dynamical Geometry
+// input:      The output G of the grobcov (in generic representation, which is the default option)
 // output:
-//     string s: The output of locus converted to a string readable by other programs
-proc locusto(list L)
-"USAGE:   locusto(G);
-          The argument must be the output of locus of a parametrical ideal
-          It transforms the output into a string in standard form
-          readable in many languages (Geogebra).
-
-RETURN: The locus in string standard form
-NOTE:     It can only be called after computing the locus(grobcov(F)) of the
-              parametrical ideal.
-              The basering R, must be of the form Q[a,b,..][x,y,..].
-KEYWORDS: geometrical locus, locus, loci.
-EXAMPLE:  locusto; shows an example"
-{
-  int i; int j; int k;
-  string s;
-  s="[";
-  ideal p;
-  ideal q;
+//         list, the canonical P-representation of the Relevant components of the locus in Dynamical Geometry,
+//              i.e. the Normal and Accumulation components.
+//              This routine is compemented by locusdg that calls it in order to eliminate problems
+//              with degenerate points of the mover.
+//         The output components are given as
+//              ((p1,(p11,..p1s_1),type_1,level_1),..,(pk,(pk1,..pks_k),type_k,level_k)
+//              whwre type_i is always "Relevant".
+//         The components are given in canonical P-representation of the subset.
+//              If all levels of a class of locus are 1, then the set is locally closed. Otherwise the level
+//              gives the depth of the component.
+proc locus0dg(list GG, list #)
+{
+  int t1=1; int t2=1; int ojo;
+  def R=basering;
+  int moverdim=nvars(R);
+  list HHH;
+  if (GG[1][1][1]==1 and GG[1][2][1]==1 and GG[1][3][1][1][1]==0 and GG[1][3][1][2][1]==1){return(HHH);}
+  list Lop=#;
+  if(size(Lop)>0){moverdim=Lop[1];}
+  setglobalrings();
+  list G1; list G2;
+  def G=GG;
+  list Q1; list Q2;
+  int i; int d; int j; int k;
+  t1=1;
+  for(i=1;i<=size(G);i++)
+  {
+    attrib(G[i][1],"IsSB",1);
+    d=locusdim(G[i][2],moverdim);
+    if(d==0){G1[size(G1)+1]=G[i];}
+    else
+    {
+      if(d>0){G2[size(G2)+1]=G[i];}
+    }
+  }
+  if(size(G1)==0){t1=0;}
+  if(size(G2)==0){t2=0;}
+  setring(@RP);
+  if(t1)
+  {
+    list G1RP=imap(R,G1);
+  }
+  else {list G1RP;}
+  list P1RP;
+  ideal B;
+  for(i=1;i<=size(G1RP);i++)
+  {
+     kill B;
+     ideal B;
+     for(k=1;k<=size(G1RP[i][3]);k++)
+     {
+       attrib(G1RP[i][3][k][1],"IsSB",1);
+       G1RP[i][3][k][1]=std(G1RP[i][3][k][1]);
+       for(j=1;j<=size(G1RP[i][2]);j++)
+       {
+         B[j]=reduce(G1RP[i][2][j],G1RP[i][3][k][1]);
+       }
+       P1RP[size(P1RP)+1]=list(G1RP[i][3][k][1],G1RP[i][3][k][2],B);
+     }
+  }
+  setring(R);
+  ideal h;
+  if(t1)
+  {
+    def P1=imap(@RP,P1RP);
+    for(i=1;i<=size(P1);i++)
+    {
+      for(j=1;j<=size(P1[i][3]);j++)
+      {
+        h=factorize(P1[i][3][j],1);
+        P1[i][3][j]=h[1];
+        for(k=2;k<=size(h);k++)
+        {
+          P1[i][3][j]=P1[i][3][j]*h[k];
+        }
+      }
+    }
+  }
+  else{list P1;}
+  ideal BB;
+  for(i=1;i<=size(P1);i++)
+  {
+    if (indepparameters(P1[i][3])==1){P1[i][3]="Special";}
+    else{P1[i][3]="Relevant";}
+  }
+  list P2;
+  for(i=1;i<=size(G2);i++)
+  {
+    for(k=1;k<=size(G2[i][3]);k++)
+    {
+      P2[size(P2)+1]=list(G2[i][3][k][1],G2[i][3][k][2]);
+    }
+  }
+  list l;
+  for(i=1;i<=size(P1);i++){Q1[i]=l; Q1[i][1]=P1[i];} P1=Q1;
+  for(i=1;i<=size(P2);i++){Q2[i]=l; Q2[i][1]=P2[i];} P2=Q2;
+
+  setring @P;
+  ideal J;
+  if(t1==1)
+  {
+    def C1=imap(R,P1);
+    def L1=addcons(C1);
+   }
+  else{list C1; list L1; kill P1; list P1;}
+  if(t2==1)
+  {
+    def C2=imap(R,P2);
+    def L2=addcons(C2);
+  }
+  else{list L2; list C2; kill P2; list P2;}
+    for(i=1;i<=size(L2);i++)
+    {
+      J=std(L2[i][2]);
+      d=dim(J); // AQUI
+      if(d==0)
+      {
+        L2[i][4]=string("Relevant",L2[i][4]);
+      }
+      else{L2[i][4]=string("Degenerate",L2[i][4]);}
+    }
+  list LN;
+  list ll; list l0;
+  if(t1==1)
+  {
+    for(i=1;i<=size(L1);i++)
+    {
+      if(L1[i][4]=="Relevant")
+      {
+       LN[size(LN)+1]=l0;
+       LN[size(LN)][1]=L1[i];
+     }
+    }
+  }
+  if(t2==1)
+  {
+    for(i=1;i<=size(L2);i++)
+    {
+      if(L2[i][4]=="Relevant")
+      {
+        LN[size(LN)+1]=l0;
+        LN[size(LN)][1]=L2[i];
+      }
+    }
+  }
+  list LNN;
+  kill ll; list ll; list lll; list llll;
+  for(i=1;i<=size(LN);i++)
+  {
+      LNN[size(LNN)+1]=l0;
+      ll=LN[i][1]; lll[1]=ll[2]; lll[2]=ll[3]; lll[3]=ll[4]; LNN[size(LNN)][1]=lll;
+  }
+  kill LN; list LN;
+  LN=addcons(LNN);
+  if(size(LN)==0){ojo=1;}
+  setring(R);
+  if(ojo==1){list L;}
+  else
+  {
+    def L=imap(@P,LN);
+    for(i=1;i<=size(L);i++){if(size(L[i][2])==0){L[i][2]=ideal(1);}}
+  }
+  kill @R; kill @RP; kill @P;
+  list LL;
   for(i=1;i<=size(L);i++)
   {
-    s=string(s,"[[");
-    for (j=1;j<=size(L[i][1]);j++)
-    {
-      s=string(s,L[i][1][j],",");
-    }
-    s[size(s)]="]";
-    s=string(s,",[");
-    for(j=1;j<=size(L[i][2]);j++)
-    {
-      s=string(s,"[");
-      for(k=1;k<=size(L[i][2][j]);k++)
-      {
-        s=string(s,L[i][2][j][k],",");
-      }
-      s[size(s)]="]";
-      s=string(s,",");
-    }
-    s[size(s)]="]";
-    s=string(s,"]");
-    if(size(L[i])>=3)
-    {
-      s[size(s)]=",";
-      s=string(s,string(L[i][3]),"]");
-    }
-    if(size(L[i])>=4)
-    {
-      s[size(s)]=",";
-      s=string(s,string(L[i][4]),"],");
-    }
-    s[size(s)]="]";
-    s=string(s,",");
-  }
-  s[size(s)]="]";
-  return(s);
-}
-example
-{"EXAMPLE:"; echo = 2;
-  ring R=(0,a,b),(x,y),dp;
-  short=0;
-  ideal S96=x^2+y^2-4,(b-2)*x-a*y+2*a,(a-x)^2+(b-y)^2-1;
-  "System="; S96; " ";
-  locusto(locus(grobcov(S96)));
-}
-
-// locusdg is the routine for computing the locus in dinamical geometry.
-//    It detects automatically a possible point that is to be avoided by the mover,
-//    whose coordinates must be the last coordinates in the definition of the ring (2 last by default,
-//    or the dd last if the option locusdg(G,dd) is specified).
-//    If such a point is detected, then it eliminates the segments of the grobcov that
-//    have this point as solution.
-//    Then it calls locus.
-proc locusdg(list GG,list #)
-"USAGE:  locusdg(GG) ;
-          The argument must be the output of grobcov
-RETURN:  The  components of the locus of points in dinamical geometry
-NOTE:  The basering R, must be of the form Q[a][x], a=parameters,
-          x=variables, and the mover coordinates must be the two last variables in the
-          definition of the ring.
-KEYWORDS: ring, locus, grobcov
-EXAMPLE:  locusdg(GG); shows an example"
+    LL[i]=l;
+    LL[i]=elimfromlist(L[i],1);
+  }
+  return(LL);
+}
+
+
+//  locus(G):  Special routine for determining the locus of points
+//                 of  geometrical constructions. Given a parametric ideal J with
+//                 parameters (a_1,..a_m) and variables (x_1,..,xn),
+//                 representing the system determining
+//                 the locus of points (a_1,..,a_m) who verify certain
+//                 properties, computing the grobcov G of
+//                 J and applying to it locus, determines the different
+//                 classes of locus components. The components can be
+//                 Normal, Special, Accumulation, Degenerate.
+//                 The output are the components given in P-canonical form
+//                 of at most 4 constructible sets: Normal, Special, Accumulation,
+//                 Degenerate.
+//                 The description of the algorithm and definitions is
+//                 given in a forthcoming paper by Abanades, Botana, Montes, Recio.
+//                 Usually locus problems have mover coordinates, variables and tracer coordinates.
+//                 The mover coordinates are to be placed as the last variables, and by default,
+//                 its number is 2. If one consider locus problems in higer dimensions, the number of
+//                 mover coordinates (placed as the last variables) is to be given as an option.
+//
+//  input:      The output G of the grobcov (in generic representation, which is the default option for grobcov)
+//  output:
+//          list, the canonical P-representation of the Normal and Non-Normal locus:
+//               The Normal locus has two kind of components: Normal and Special.
+//               The Non-normal locus has two kind of components: Accumulation and Degenerate.
+//               Normal components: for each point in the component,
+//               the number of solutions in the variables is finite, and
+//               the solutions depend on the point in the component if the component is not 0-dimensional.
+//               Special components:  for each point in the component,
+//               the number of solutions in the variables is finite,
+//               the component is not 0-dimensional, but the solutions do not depend on the
+//               values of the parameters in the component.
+//               Accumlation points: are 0-dimensional components for which it exist
+//               an infinite number of solutions.
+//               Degenerate components: are components of dimension greater than 0 for which
+//               for every point in the component there exist infinite solutions.
+//          The output components are given as
+//               ((p1,(p11,..p1s_1),type_1,level_1),..,(pk,(pk1,..pks_k),type_k,level_k)
+//          The components are given in canonical P-representation of the subset.
+//               If all levels of a class of locus are 1, then the set is locally closed. Otherwise the level
+//               gives the depth of the component of the constructible set.
+proc locus(list GG, list #)
+  "USAGE:   locus(G);
+                 The input must be the grobcov  of a parametrical ideal
+  RETURN:  The  locus.
+                 The output are the components of four constructible subsets of the locus
+                 of the parametrical system: Normal , Special, Accumulation and Degenerate.
+                 These components are
+                 given as a list of  (pi,(pi1,..pis_i),type_i,level_i) varying i,
+                 where the p's are prime ideals, the type can be: Normal, Special,
+                 Accumulation, Degenerate.
+  NOTE:      It can only be called after computing the grobcov of the
+                 parametrical ideal in generic representation ('ext',0),
+                 which is the default.
+                 The basering R, must be of the form Q[a_1,..,a_m][x_1,..,x_n].
+  KEYWORDS: geometrical locus, locus, loci.
+  EXAMPLE:  locus; shows an example"
 {
   def R=basering;
@@ -4294 +4408 @@
   if (equalideals(B0,ideal(1)))
   {
-    return(locus(GG));
+    return(locus0(GG));
   }
   else
@@ -4325 +4439 @@
     if(te)
     {
-      string("locusdg detected that the mover must avoid point (",N,") in order to obtain the locus");
-      // eliminate segments of GG where N is contained in the basis
+      string("locus detected that the mover must avoid point (",N,") in order to obtain the correct locus");
+      // eliminates segments of GG where N is contained in the basis
       list nGP;
       def GP=GG;
@@ -4343 +4457 @@
    }
   }
-  //"T_nGP="; nGP;
   kill @RP; kill @P; kill @R;
-  return(locus(nGP,dd));
-}
-//      // Now eliminate components for which the basis has dim>0, and all elements non reducing to 0
-//      // modulo N do not contain the mover coordinates
-//      list nnGP; poly r;
-//      for(j=1; j<=size(nGP);j++)
-//      {
-//        if(not(indepparameters(nGP[j][2])))
-//        {
-//          if(dim(std(nGP[j][1]))==0){nnGP[size(nnGP)+1]=nGP[j];}
-//          else
-//          {
-//            te=1; k=1;
-//            while(te and k<=size(nGP[2]))
-//            {
-//              r=pdivi(nGP[j][2][k],N)[1];
-//              if(r==0){k++;}
-//              else
-//              {
-//                if(not(subset(variables(nGP[j][2][k]),vmov )))
-//                {
-//                  te=0;
-//                }
-//                else{k++;}
-//              }
-//            }
-//            if(te==1){nnGP[size(nnGP)+1]=nGP[j];}
-//          }
-//        }
-//      }
-//
-//    }
-//    kill @RP; kill @P; kill @R;
-//    return(locus(nnGP));
-//  }
-//}
+  return(locus0(nGP,dd));
+}
 example
 {"EXAMPLE:"; echo = 2;
@@ -4390 +4469 @@
              (a-x1)^2+(b-x2)^2-(x1-x3)^2-(x2-x4)^2;
   short=0;
-  locusdg(grobcov(S));
-}
-
+  locus(grobcov(S)); " ";
+  kill R;
+  ring R=(0,a,b),(x,y),dp;
+  short=0;
+  "Concoid";
+  ideal S96=x^2+y^2-4,(b-2)*x-a*y+2*a,(a-x)^2+(b-y)^2-1;
+  "System="; S96; " ";
+  locus(grobcov(S96));
+  kill R; ring R=(0,x,y),(x1,x2),dp;
+  ideal S=-(x - 5)*(x1 - 1) - (x2 - 2)*(y - 2),
+              (x1 - 5)^2 + (x2 - 2)^2 - 4,
+              -2*(x - 5)*(x2 - 2) + 2*(x1 - 5)*(y - 2);
+ "System="; S;
+  locus(grobcov(S)); " ";
+  ideal S1=-(x - x1)*(x1 - 4) + (x2 - y)*(x2 - 4),
+                (x1 - 4)^2 + (x2 - 2)^2 - 4,
+                -2*(x1 - 4)*(2*x2 - y - 4) - 2*(x - 2*x1 + 4)*(x2 - 2);
+ "System="; S1;
+  locus(grobcov(S1));
+}
+
+//  locusdg(G):  Special routine for determining the locus of points
+//                 of  geometrical constructions. Given a parametric ideal J with
+//                 parameters (a_1,..a_m) and variables (x_1,..,xn),
+//                 representing the system determining
+//                 the locus of points (a_1,..,a_m) who verify certain
+//                 properties, computing the grobcov G of
+//                 J and applying to it locus, determines the different
+//                 classes of locus components. The components can be
+//                 Normal, Special, Accumulation point, Degenerate.
+//                 The output are the components given in P-canonical form
+//                 of at most 4 constructible sets: Normal, Special, Accumulation,
+//                 Degenerate.
+//                 The description of the algorithm and definitions is
+//                 given in a forthcoming paper by Abanades, Botana, Montes, Recio.
+//                 Usually locus problems have mover coordinates, variables and tracer coordinates.
+//                 The mover coordinates are to be placed as the last variables, and by default,
+//                 its number is 2. If onw consider locus problems in higer dimensions, the number of
+//                 mover coordinates (placed as the last variables) is to be given as an option.
+//
+//  input:      The output G of the grobcov (in generic representation, which is the default option for grobcov)
+//  output:
+//          list, the canonical P-representation of the Normal and Non-Normal locus:
+//               The Normal locus has two kind of components: Normal and Special.
+//               The Non-normal locus has two kind of components: Accumulation and Degenerate.
+//               Normal components: for each point in the component,
+//               the number of solutions in the variables is finite, and
+//               the solutions depend on the point in the component if the component is not 0-dimensional.
+//               Special components:  for each point in the component,
+//               the number of solutions in the variables is finite,
+//               the component is not 0-dimensional, but the solutions do not depend on the
+//               values of the parameters in the component.
+//               Accumlation points: are 0-dimensional components for which it exist
+//               an infinite number of solutions.
+//               Degenerate components: are components of dimension greater than 0 for which
+//               for every point in the component there exist infinite solutions.
+//          The output components are given as
+//               ((p1,(p11,..p1s_1),type_1,level_1),..,(pk,(pk1,..pks_k),type_k,level_k)
+//          The components are given in canonical P-representation of the subset.
+//               If all levels of a class of locus are 1, then the set is locally closed. Otherwise the level
+//               gives the depth of the component of the constructible set.
+proc locusdg(list GG, list #)
+  "USAGE:   locus(G);
+                 The input must be the grobcov  of a parametrical ideal
+  RETURN:  The  locus.
+                 The output are the components of two constructible subsets of the locus
+                 of the parametrical system.: Normal and Non-normal.
+                 These components are
+                 given as a list of  (pi,(pi1,..pis_i),type_i,level_i) varying i,
+                 where the p's are prime ideals, the type can be: Normal, Special,
+                 Accumulation, Degenerate.
+  NOTE:      It can only be called after computing the grobcov of the
+                 parametrical ideal in generic representation ('ext',0),
+                 which is the default.
+                 The basering R, must be of the form Q[a_1,..,a_m][x_1,..,x_n].
+  KEYWORDS: geometrical locus, locus, loci.
+  EXAMPLE:  locusdg; shows an example"
+{
+  def R=basering;
+  int dd=2; int comment=0;
+  list DD=#;
+  if (size(DD)>1){comment=1;}
+  if(size(DD)>0){dd=DD[1];}
+  int i; int j; int k;
+  def B0=GG[1][2];
+  if (equalideals(B0,ideal(1)))
+  {
+    return(locus0dg(GG));
+  }
+  else
+  {
+    int n=nvars(R);
+    ideal vmov=var(n-1),var(n);
+    ideal N;
+    intvec xw; intvec yw;
+    for(i=1;i<=n-1;i++){xw[i]=0;}
+    xw[n]=1;
+    for(i=1;i<=n;i++){yw[i]=0;}
+    yw[n-1]=1;
+    poly px; poly py;
+    int te=1;
+    i=1;
+    while( te and i<=size(B0))
+    {
+      if((deg(B0[i],xw)==1) and (deg(B0[i])==1)){px=B0[i]; te=0;}
+      i++;
+    }
+    i=1; te=1;
+    while( te and i<=size(B0))
+    {
+      if((deg(B0[i],yw)==1) and (deg(B0[i])==1)){py=B0[i]; te=0;}
+      i++;
+    }
+    N=px,py;
+    setglobalrings();
+    te=indepparameters(N);
+    if(te)
+    {
+      string("locus detected that the mover must avoid point (",N,") in order to obtain the correct locus");
+      // eliminates segments of GG where N is contained in the basis
+      list nGP;
+      def GP=GG;
+      ideal BP;
+      for(j=1;j<=size(GP);j++)
+      {
+        te=1; k=1;
+        BP=GP[j][2];
+        while((te==1) and (k<=size(N)))
+        {
+          if(pdivi(N[k],BP)[1]!=0){te=0;}
+          k++;
+        }
+        if(te==0){nGP[size(nGP)+1]=GP[j];}
+      }
+   }
+  }
+  //"T_nGP="; nGP;
+  kill @RP; kill @P; kill @R;
+  return(locus0dg(nGP,dd));
+}
+example
+{"EXAMPLE:"; echo = 2;
+  ring R=(0,a,b),(x4,x3,x2,x1),dp;
+  ideal S=(x1-3)^2+(x2-1)^2-9,
+             (4-x2)*(x3-3)+(x1-3)*(x4-1),
+             (3-x1)*(x3-x1)+(4-x2)*(x4-x2),
+             (4-x4)*a+(x3-3)*b+3*x4-4*x3,
+             (a-x1)^2+(b-x2)^2-(x1-x3)^2-(x2-x4)^2;
+  short=0;
+  locus(grobcov(S)); " ";
+  kill R;
+  ring R=(0,a,b),(x,y),dp;
+  short=0;
+  "Concoid";
+  ideal S96=x^2+y^2-4,(b-2)*x-a*y+2*a,(a-x)^2+(b-y)^2-1;
+  "System="; S96; " ";
+  locusdg(grobcov(S96));
+  kill R; ring R=(0,x,y),(x1,x2),dp;
+  ideal S=-(x - 5)*(x1 - 1) - (x2 - 2)*(y - 2),
+              (x1 - 5)^2 + (x2 - 2)^2 - 4,
+              -2*(x - 5)*(x2 - 2) + 2*(x1 - 5)*(y - 2);
+ "System="; S;
+  locusdg(grobcov(S)); " ";
+  ideal S1=-(x - x1)*(x1 - 4) + (x2 - y)*(x2 - 4),
+                (x1 - 4)^2 + (x2 - 2)^2 - 4,
+                -2*(x1 - 4)*(2*x2 - y - 4) - 2*(x - 2*x1 + 4)*(x2 - 2);
+ "System="; S1;
+  locusdg(grobcov(S1));
+}
+
+// locusto: Transforms the output of locus to a string that
+//      can be read by different computational systems.
+// input:
+//     list L: The output of locus
+// output:
+//     string s: The output of locus converted to a string readable by other programs
+proc locusto(list L)
+"USAGE:   locusto(L);
+          The argument must be the output of locus of a parametrical ideal
+          It transforms the output into a string in standard form
+          readable in many languages (Geogebra).
+RETURN: The locus in string standard form
+NOTE:     It can only be called after computing the locus(grobcov(F)) of the
+              parametrical ideal.
+              The basering R, must be of the form Q[a,b,..][x,y,..].
+KEYWORDS: geometrical locus, locus, loci.
+EXAMPLE:  locusto; shows an example"
+{
+  int i; int j; int k;
+  string s="["; string sf="]"; string st=s+sf;
+  if(size(L)==0){return(st);}
+  ideal p;
+  ideal q;
+  for(i=1;i<=size(L);i++)
+  {
+    s=string(s,"[[");
+    for (j=1;j<=size(L[i][1]);j++)
+    {
+      s=string(s,L[i][1][j],",");
+    }
+    s[size(s)]="]";
+    s=string(s,",[");
+    for(j=1;j<=size(L[i][2]);j++)
+    {
+      s=string(s,"[");
+      for(k=1;k<=size(L[i][2][j]);k++)
+      {
+        s=string(s,L[i][2][j][k],",");
+      }
+      s[size(s)]="]";
+      s=string(s,",");
+    }
+    s[size(s)]="]";
+    s=string(s,"]");
+    if(size(L[i])>=3)
+    {
+      s[size(s)]=",";
+      s=string(s,string(L[i][3]),"]");
+    }
+    if(size(L[i])>=4)
+    {
+      s[size(s)]=",";
+      s=string(s,string(L[i][4]),"],");
+    }
+    s[size(s)]="]";
+    s=string(s,",");
+  }
+  s[size(s)]="]";
+  return(s);
+}
+example
+{"EXAMPLE:"; echo = 2;
+  ring R=(0,a,b),(x,y),dp;
+  short=0;
+  ideal S96=x^2+y^2-4,(b-2)*x-a*y+2*a,(a-x)^2+(b-y)^2-1;
+  "System="; S96; " ";
+  locusto(locus(grobcov(S96)));
+}
+
+// Auxiliary routione
 // locusdim
 // input:
@@ -4437 +4753 @@
 }
 
+// locusdgto: Transforms the output of locus to a string that
+//      can be read by different computational systems.
+// input:
+//     list L: The output of locus
+// output:
+//     string s: The output of locus converted to a string readable by other programs
+//                   Outputs only the relevant dynamical geometry components.
+//                   Without unnecessary parenthesis
+proc locusdgto(list LL)
+{
+  def RR=basering;
+  int i; int j; int k; int short0=short; int ojo;
+  int te=0;
+  if(defined(@P)){te=1;}
+  else{setglobalrings();}
+  setring @P;
+  short=0;
+  if(size(LL)==0){ojo=1; list L;}
+  else
+  {
+    def L=imap(RR,LL);
+  }
+  string s="["; string sf="]"; string st=s+sf;
+  if(size(L)==0){return(st);}
+  ideal p;
+  ideal q;
+  for(i=1;i<=size(L);i++)
+  {
+    if(L[i][3]=="Relevant")
+    {
+      s=string(s,"[[");
+      for (j=1;j<=size(L[i][1]);j++)
+      {
+        s=string(s,L[i][1][j],",");
+      }
+      s[size(s)]="]";
+      s=string(s,",[");
+      for(j=1;j<=size(L[i][2]);j++)
+      {
+        s=string(s,"[");
+        for(k=1;k<=size(L[i][2][j]);k++)
+        {
+          s=string(s,L[i][2][j][k],",");
+        }
+        s[size(s)]="]";
+        s=string(s,",");
+      }
+      s[size(s)]="]";
+      s=string(s,"]");
+      s[size(s)]="]";
+      s=string(s,",");
+    }
+  }
+  if(s=="["){s="[]";}
+  else{s[size(s)]="]";}
+  setring(RR);
+  short=short0;
+  if(te==0){kill @P; kill @R; kill @RP;}
+  return(s);
+}
 
 //********************* End locus ****************************

Singular/LIB/modnormal.lib

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
-version="version modnormal.lib 4.0.0.0 Jun_2013 "; // $Id$
+version="version modnormal.lib 4.0.0.0 Dec_2013 "; // $Id$
 category = "Commutative Algebra";
 info="
@@ -314 +314 @@
         modarguments[j-(k-1)*n2-sh] = list(I, L[j], condu, printTimings, #);
       }
-      modresults = parallelWaitAll("modpNormal", modarguments,
-        list(list(list(ncores))));
+      modresults = parallelWaitAll("modpNormal", modarguments, 0, ncores);
       for(j = (k-1)*n2+1+sh; j <= k*n2+1; j++)
       {

Singular/LIB/modstd.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="version modstd.lib 4.0.0.0 Jun_2013 "; // $Id$
+version="version modstd.lib 4.0.0.0 Dec_2013 "; // $Id$
 category = "Commutative Algebra";
 info="
@@ -33 +33 @@
 static proc mod_init()
 {
-   newstruct("ideal_primeTest", "ideal Ideal");
+   newstruct("idealPrimeTest", "ideal Ideal");
 }
 
@@ -487 +487 @@
       list arguments;
       int neededPrimes = neededSize-size(L);
-      ideal_primeTest Id;
+      idealPrimeTest Id;
       Id.Ideal = I;
       export(Id);
@@ -500 +500 @@
             arguments[i] = list("Id", p);
          }
-         parallelResults = parallelWaitAll("primeTest", arguments,
-            list(list(list(ncores))));
+         parallelResults = parallelWaitAll("primeTest", arguments, 0, ncores);
          for(i = size(arguments); i > 0; i--)
          {
@@ -511 +510 @@
          neededPrimes = neededSize-size(L);
       }
+      kill Id;
       if(size(L) > neededSize)
       {
@@ -1239 +1239 @@
             arguments_farey[i] = list(ideal(H[i]), N);
          }
-         results_farey = parallelWaitAll("farey", arguments_farey,
-                                         list(list(list(n1))));
+         results_farey = parallelWaitAll("farey", arguments_farey, 0, n1);
          for(i = ncols(H); i > 0; i--)
          {

Singular/LIB/normal.lib

@@ -2156 +2156 @@
 
 proc genus(ideal I,list #)
-"USAGE:   genus(i) or genus(i,1); I a 1-dimensional ideal
+"USAGE:   genus(I) or genus(I,<option>); I a 1-dimensional ideal
 RETURN:  an integer, the geometric genus p_g = p_a - delta of the projective
          curve defined by i, where p_a is the arithmetic genus.
@@ -2162 +2162 @@
          i.e. dim(R'/R), R' the normalization of the local ring R of the
          singularity. @*
-         genus(i,1) uses the normalization to compute delta. Usually genus(i,1)
-         is slower than genus(i) but sometimes not.
+         genus(I,"nor") uses the normalization to compute delta. Usually genus(I,"nor")
+         is slower than genus(I) but sometimes not. @*
+         genus(I,"pri") starts with a primary decompsition.
 EXAMPLE: example genus; shows an example
 "
@@ -2169 +2170 @@
    int w = printlevel-voice+2;  // w=printlevel (default: w=0)
 
+   int ono,rpr,ll;
+   if(size(#)>0)
+   {
+     if(typeof(#[1])=="string")
+     {
+        if(#[1]=="nor"){ono=1;}
+        if(#[1]=="pri"){rpr=1;}
+     }
+     else { ERROR("invalid option for genus");}
+   }
    def R0=basering;
-   if(char(basering)>0)
+   if((char(basering)>0)||(ono))
    {
      def R1=changeord(list(list("dp",1:nvars(basering))));
@@ -2198 +2209 @@
        J=std(J);
      }
-     int pa=1-hilbPoly(J)[1];
-     pa=pa-deltaP(J);
+
+     list LL=normal(J,"prim");
+     int pa,i;
+     for(i=1;i<=size(LL[1]);i++)
+     {
+        def T=LL[1][i];
+        setring T;
+        pa=pa-hilbPoly(std(norid))[1];
+        setring S;
+        kill T;
+     }
+     pa=pa+1;
      setring R0;
      return(pa);
+   }
+   if(!rpr)
+   {
+      list LZ=minAssGTZ(I);
+      if(size(LZ)>1)
+      {
+         int p_g;
+         for(ll=1;ll<=size(LZ);ll++)
+         {
+            p_g=p_g+genus(LZ[ll],"pri")-1;
+         }
+         return(p_g+1);
+      }
+      else
+      {
+         I=LZ[1];
+      }
    }
    I=std(I);
@@ -2432 +2470 @@
    map sigma=S,var(1),var(2),1;
    ideal I=sigma(F);
-
-   if(size(#)!=0)
-   {                              //uses the normalization to compute delta
-      list nor=normal(I);
-      delt=nor[size(nor)][2];
-      genus=genus-delt-deltainf;
-      setring R0;
-      return(genus);
-   }
 
    ideal I1=jacob(I);
@@ -4416 +4445 @@
         printlevel = printlevel + 1;
         ideal JDefault = 0; // Now it uses the default J;
-        list nor1 = normalM(Id1, decomp, withDelta, denomOption, JDefault, JDefault)[1];
-        list nor2 = normalM(Id2, decomp, withDelta, denomOption, JDefault, JDefault)[1];
+        list nor1 = normalM(Id1, decomp, withDelta, denomOption, JDefault, JDefault);
+        list nor2 = normalM(Id2, decomp, withDelta, denomOption, JDefault, JDefault);
         printlevel = printlevel - 1;
         option(set,save_opt);
-        return(list(nor1, nor2));
+        list res = nor1 + nor2;
+        return(res);
       }
     }
@@ -4539 +4569 @@
 
       ideal JDefault = 0;  // Now it uses the default J;
-      list nor1 = normalM(Id1, decomp, withDelta, denomOption, JDefault, JDefault)[1];
-      list nor2 = normalM(Id2, decomp, withDelta, denomOption, JDefault, JDefault)[1];
+      list nor1 = normalM(Id1, decomp, withDelta, denomOption, JDefault, JDefault);
+      list nor2 = normalM(Id2, decomp, withDelta, denomOption, JDefault, JDefault);
       printlevel = printlevel - 1;
       option(set,save_opt);
-      return(list(nor1, nor2));
+      list res = nor1 + nor2;
+      return(res);
     }
   }

Singular/LIB/parallel.lib

@@ -1 @@
-///////////////////////////////////////////////////////////////////
-version="version parallel.lib 4.0.0.0 Jun_2013 "; // $Id$
+////////////////////////////////////////////////////////////////////
+version="version parallel.lib 4.0.0.0 Dec_2013 "; // $Id$
 category="General purpose";
 info="
-LIBRARY:   parallel.lib  Tools for Parallelization
+LIBRARY:   parallel.lib  An abstraction layer for parallel skeletons
+
 AUTHOR:    Andreas Steenpass, e-mail: steenpass@mathematik.uni-kl.de
 
 OVERVIEW:
-This library provides tools to do several computations in parallel. They
-are aimed at ordinary Singular users as well as authors of Singular
-libraries.
-@* Even without this library, it is possible to do execute self-defined
-Singular commands in parallel using @ref{link}, but the handling of
-such links can be quite tedious. With the pocedures described below,
-this can be done by one-line commands.
-@* There are many parallel 'skeletons' (i.e. ways in which parallel
-tasks rely upon and interact with each other). A few of them are already
-implemented. Future plans include an abstraction layer for modular
-techniques, 'worker farms', and parallel tests.
-
-SEE ALSO:  link, modstd_lib, assprimeszerodim_lib
-
-KEYWORDS:  parallel.lib; Parallelization; Links, user interface;
-           Skeletons for parallelization; Distributed computing
+This library provides implementations of several parallel 'skeletons' (i.e.
+ways in which parallel tasks rely upon and interact with each other). It is
+based on the library tasks.lib and aims at both ordinary Singular users as well
+as authors of Singular libraries.
+
+KEYWORDS:  parallelization; parallel skeletons; distributed computing
+
+SEE ALSO:  resources_lib, tasks_lib, modstd_lib, modnormal_lib
 
 PROCEDURES:
-  parallelWaitN(...)     execute several jobs in parallel,
-                         wait for N of them to finish
-  parallelWaitFirst(...) execute several jobs in parallel,
-                         wait for the first to finish
-  parallelWaitAll(...)   execute several jobs in parallel,
-                         wait for all of them to finish
+  parallelWaitN();      execute several jobs in parallel
+                        and wait for N of them to finish
+  parallelWaitFirst();  execute several jobs in parallel
+                        and wait for the first to finish
+  parallelWaitAll();    execute several jobs in parallel
+                        and wait for all of them to finish
+  parallelTestAND();    run several tests in parallel
+                        and determine if they all succeed
+  parallelTestOR();     run several tests in parallel
+                        and determine if any of them succeeds
 ";
 
-proc parallelWaitN(list commands, list args, int N, list #)
-"USAGE:  parallelWaitN(commands, args, N[, timeout, linktype, servers,
-         maxmemory]); commands list, args list, N int, timeout int,
-         linktype string, servers list, maxmemory intvec
-RETURN:  a list, containing the results of commands[i] applied to arg[i],
-         i = 1, ..., size(commands).
-         @* The procedure waits for N jobs to finish.
-
-         @* OPTIONAL PARAMETERS:
-
-            An optional timeout in ms can be provided. Default is 0 which
-            disables the timeout.
-
-            Supported linktypes are up to now \"ssi\" and \"mp\", see
-            @ref{Ssi links}.
-
-            Servers:
-         @* Each server is given by a list containing the address of the server,
-            the number of cores to use on this server and the command to start
-            Singular.
-         @* If the address is \"localhost\", the processes will be generated on
-            the same machine using forks. If the command to start Singular is
-            \"\" (the empty string), \"Singular\" will be used.
-         @* Default is @code{list(\"localhost\", system(\"cpu\"), \"\")}.
-         @* There are some obvious shortcuts for servers, e.g. \"myserver\" is
-            a shortcut for
-            @code{list(\"myserver\", [nb. of cores on myserver], \"\")}, or 3
-            for @code{list(\"localhost\", 3, \"\")}.
-
-            Memory limits:
-         @* If an intvec maxmemory of size @code{size(commands)} is given, the
-            i-th job will be killed if it uses more than maxmemory[i] MB of
-            memory. If maxmemory[i] is 0, there will be no restraint for the
-            i-th job. Default is @code{0:size(commands)}.
-NOTE:       The entries of the list commands must be strings.
-         @* The entries of the list args must be lists.
-         @* The returned list may contain more than N results if several jobs
-            finished \"at the same time\". It may contain less than N results in
-            the case of timeout or errors occurring.
-         @* The check whether the jobs exceed the memory sizes given by
-            maxmemory is only done from time to time. This feature is
-            experimental and should be used with care.
-SEE ALSO: Ssi links, waitfirst, waitall
-KEYWORDS: parallelWaitN; Parallelization; Links, user interface;
-          Skeletons for parallelization; Distributed computing
-EXAMPLE:  @code{example parallelWaitN;} shows an example."
-{
-  // initialize the timer
-  int oldtimerresolution = system("--ticks-per-sec");
-  system("--ticks-per-sec", 1000);
-  int t = rtimer;
-
-  // auxiliary variables
-  int i, j, m, tt;
-
-  // read optional parameters
-  list defaultserver = list("localhost", system("cpu"), "");
-  list defaults = list(0, "ssi", list(defaultserver), 0:size(commands));
-  for(i = 1; i <= size(defaults); i++)
-  {
-    if(typeof(#[i]) != typeof(defaults[i]))
-    {
-      # = insert(#, defaults[i], i-1);
-    }
-  }
-  if(size(#) != size(defaults))
-  {
-    ERROR("wrong optional parameters");
-  }
-  for(j = size(#[3]); j > 0; j--)
-  {
-    if(typeof(#[3][j][1]) != typeof(defaultserver[1]))
-    {
-      #[3][j] = insert(#[3][j], defaultserver[1], 0);
-    }
-    defaultserver[3] = "";
-    // only for ssi:tcp links, the default program is system("Singular")
-    if(#[2] == "ssi" && #[3][j][1] != "localhost")
-    {
-      defaultserver[3] = system("Singular");
-    }
-    for(i = 2; i <= size(defaultserver); i++)
-    {
-      if(typeof(#[3][j][i]) != typeof(defaultserver[i]))
-      {
-        #[3][j] = insert(#[3][j], defaultserver[i], i-1);
-      }
-    }
-    if(size(#[3][j]) != size(defaultserver))
-    {
-      ERROR("wrong declaration for server no. "+string(j));
-    }
-  }
-  int timeout = #[1];
-  string linktype = #[2];
-  list servers = #[3];
-  intvec maxmems = #[4];
-
-  // error checking
-  int njobs = size(commands);
-  if(njobs != size(args))
-  {
-    ERROR("The number of commands does not match the number of lists"
-         +newline+"of arguments.");
-  }
-  if(njobs == 0)
-  {
-    ERROR("no commands specified");
-  }
-  for(i = 1; i <= njobs; i++)
-  {
-    if(typeof(commands[i]) != "string")
-    {
-      ERROR("The first argument is not a list of strings.");
-    }
-    if(typeof(args[i]) != "list")
-    {
-      ERROR("The second argument is not a list of lists.");
-    }
-  }
-  if(N < 0)
-  {
-    ERROR("The number of jobs which you want to wait for is negative.");
-  }
-  if(N > njobs)
-  {
-    ERROR("The number of jobs which you wnat to wait for is greater"
-         +newline+"than the number of jobs itself.");
-  }
-  if(timeout < 0)
-  {
-    ERROR("The given timeout is negative.");
-  }
-  if(linktype != "ssi" && linktype != "mp")
-  {
-    ERROR("The given linktype is not recognized.");
-  }
-  int nservers = size(servers);
-  if(nservers <= 0)
-  {
-    ERROR("no server specified");
-  }
-  for(i = 1; i <= nservers; i++)
-  {
-    if(servers[i][1] != "localhost")
-    {
-      if(system("sh", "ssh "+servers[i][1]+" exit"))
-      {
-        ERROR("Could not connect to server \""+servers[i][1]+"\"");
-      }
-    }
-    if(servers[i][2] < 0)
-    {
-      ERROR("The number of cores to be used on server \""+servers[i][1]+"\""
-           +newline+" is negative.");
-    }
-    if(servers[i][1] == "localhost")
-    {
-      int ncpus(i) = system("cpu");
-    }
-    else
-    {
-      //if(linktype == "ssi")
-      //{
-        link lcpu(i) = "ssi:tcp "+servers[i][1]+":"+servers[i][3];
-      //}
-      open(lcpu(i));
-      write(lcpu(i), quote(system("cpu")));
-      int ncpus(i) = read(lcpu(i));
-      close(lcpu(i));
-      kill lcpu(i);
-    }
-    if(servers[i][2] == 0)
-    {
-      servers[i][2] = ncpus(i);
-    }
-    else
-    {
-      if(servers[i][2] > ncpus(i))
-      {
-        ERROR("The number of cores to use on server \""+servers[i][1]+"\""
-             +newline+"is greater than the number of available cores");
-      }
-    }
-    if(servers[i][1] != "localhost")
-    {
-      if(system("sh", "ssh "+servers[i][1]+
-                      " 'test -e `which "+servers[i][3]+"`'"))
-      {
-        ERROR("\""+servers[i][3]+"\" was not found on"
-             +"\""+servers[i][1]+"\".");
-      }
-    }
-  }
-  if(size(maxmems) != njobs)
-  {
-    ERROR("The size of the intvec which specifies the maximal amount of memory"
-         +newline+"to be used for each job does not match the number of jobs.");
-  }
-  int havemaxmem;
-  for(i = 1; i <= njobs; i++)
-  {
-    if(maxmems[i] < 0)
-    {
-      ERROR("The maximal amount of memory to be used for job no. "+string(i)
-           +"is negative.");
-    }
-    havemaxmem = havemaxmem+maxmems[i];
-  }
-
-  // skip those cores which won't be needed
-  int nlinks;
-  for(i = 1; i <= nservers; i++)
-  {
-    if(nlinks+servers[i][2] <= njobs)
-    {
-      nlinks = nlinks+servers[i][2];
-    }
-    else
-    {
-      if(nlinks == njobs)
-      {
-        servers = list(servers[1..(i-1)]);
-      }
-      else
-      {
-        servers = list(servers[1..i]);
-        servers[i][2] = njobs-nlinks;
-        nlinks = njobs;
-      }
-      nservers = size(servers);
-    }
-  }
-
-  // open the links
-  string server;
-  int ncores;
-  string program;
-  int k = 1;   // the index of the link
-  for(i = 1; i <= nservers; i++)
-  {
-    server = servers[i][1];
-    ncores = servers[i][2];
-    program = servers[i][3];
-    for(j = 1; j <= ncores; j++)
-    {
-      if(server == "localhost")
-      {
-        //if(linktype == "ssi")
-        //{
-          link l(k) = "ssi:fork";
-        //}
-      }
-      else
-      {
-        //if(linktype == "ssi")
-        //{
-          link l(k) = "ssi:tcp "+server+":"+program;
-        //}
-      }
-      open(l(k));
-      k++;
-    }
-  }
-  list links = list(l(1..nlinks));
-
-  // start a memory watchdog if needed
-  if(havemaxmem)
-  {
-    //if(linktype == "ssi")
-    //{
-      link mempatrol = "ssi:fork";
-    //}
-    open(mempatrol);
-    write(mempatrol, quote(watchlinks()));
-    links = insert(links, mempatrol, nlinks);
-  }
-  int nkilled;   // the number of jobs killed by the mempatrol
-
-  // distribute work to the links
-  k = 1; // from here on, k is the index of the next job which must be
-         // distributed to some link
-  intvec assignment = 0:nlinks;  // link number i is currently doing
-                                 // job number assignment[i]
-  int pid;
-  for(i = 1; i <= nlinks; i++)
-  {
-    write(l(i), quote(execute("option(noredefine);")));
-    read(l(i));
-    write(l(i), quote(execute("def result;")));
-    read(l(i));
-    write(l(i), quote(execute("list currentargs;")));
-    read(l(i));
-    if(status(l(i), "mode", "fork"))
-    {
-      write(l(i), quote(currentargs = args[eval(k)]));
-    }
-    else
-    {
-      write(l(i), quote(currentargs = eval(args[k])));
-    }
-    read(l(i));
-    if(maxmems[k] > 0)
-    {
-      m = i;
-      for(j = 1; j <= nservers; j++)
-      {
-        if(servers[j][2] > m)
-        {
-          server = servers[j][1];
-          break;
-        }
-        else
-        {
-          m = m-servers[j][2];
-        }
-      }
-      write(l(i), quote(system("pid")));
-      pid = read(l(i));
-      write(mempatrol, list(server, pid, i, maxmems[k]));
-    }
-    write(l(i), quote(execute("result = "+eval(commands[k])
-      +"("+argsToString("currentargs", size(currentargs))+");")));
-    assignment[i] = k;
-    k++;
-  }
-
-  // distribute the rest of the work
-  list results;
-  for(i = njobs; i > 0; i--)
-  {
-    results[i] = list();  // TODO: What if the result of one of the commands is
-                          // list()?
-  }
-  int nfinished;  // the number of finished jobs
-  int wait;   // the index of the link which is finished, or 0 for timeout
-  while(k <= njobs && nfinished < N-1)
-  {
-    if(timeout == 0)
-    {
-      wait = waitfirst(links);
-    }
-    else
-    {
-      tt = timeout-(rtimer-t);
-      if(tt < 0)
-      {
-        wait = waitfirst(links, 0);
-        wait = 0;
-      }
-      else
-      {
-        wait = waitfirst(links, tt);
-      }
-    }
-    if(wait == -1)
-    {
-      ERROR("All links crashed.");
-    }
-    if(wait)
-    {
-      if(wait == nlinks+1)
-      {
-        wait = read(mempatrol);
-        close(l(wait));
-        open(l(wait));
-        results[assignment[wait]] = "out of memory";
-        nkilled++;
-      }
-      else
-      {
-        read(l(wait));
-        write(l(wait), quote(result));
-        results[assignment[wait]] = read(l(wait));
-        if(maxmems[assignment[wait]] > 0)
-        {
-          write(mempatrol, assignment[wait]);
-        }
-        nfinished++;
-      }
-      if(status(l(wait), "mode", "fork"))
-      {
-        write(l(wait), quote(currentargs = args[eval(k)]));
-      }
-      else
-      {
-        write(l(wait), quote(currentargs = eval(args[k])));
-      }
-      read(l(wait));
-      if(maxmems[k] > 0)
-      {
-        m = wait;
-        for(j = 1; j <= nservers; j++)
-        {
-          if(servers[j][2] > m)
-          {
-            server = servers[j][1];
-            break;
-          }
-          else
-          {
-            m = m-servers[j][2];
-          }
-        }
-        write(l(wait), quote(system("pid")));
-        pid = read(l(wait));
-        write(mempatrol, list(server, pid, wait, maxmems[k]));
-      }
-      write(l(wait), quote(execute("def result = "+eval(commands[k])
-        +"("+argsToString("currentargs", size(currentargs))+");")));
-      assignment[wait] = k;
-      k++;
-    }
-    else
-    {
-      break;
-    }
-  }
-
-  // collect the rest of the results
-  while(nfinished < N && nfinished+nkilled < njobs)
-  {
-    if(timeout == 0)
-    {
-      wait = waitfirst(links);
-    }
-    else
-    {
-      tt = timeout-(rtimer-t);
-      if(tt < 0)
-      {
-        wait = waitfirst(links, 0);
-        wait = 0;
-      }
-      else
-      {
-        wait = waitfirst(links, tt);
-      }
-    }
-    if(wait == -1)
-    {
-      ERROR("All links crashed.");
-    }
-    if(wait)
-    {
-      if(wait == nlinks+1)
-      {
-        wait = read(mempatrol);
-        close(l(wait));
-        results[assignment[wait]] = "out of memory";
-        nkilled++;
-      }
-      else
-      {
-        read(l(wait));
-        write(l(wait), quote(result));
-        results[assignment[wait]] = read(l(wait));
-        if(maxmems[assignment[wait]] > 0)
-        {
-          write(mempatrol, assignment[wait]);
-        }
-        nfinished++;
-      }
-    }
-    else
-    {
-      break;
-    }
-  }
-
-  //close all links
-  for(i = 1; i <= nlinks; i++)
-  {
-    if(status(l(i), "read", "ready"))
-    {
-      read(l(i));
-      write(l(i), quote(result));
-      results[assignment[i]] = read(l(i));
-    }
-    close(l(i));
-  }
-  if(havemaxmem)
-  {
-    close(mempatrol);
-  }
-
-  system("--ticks-per-sec", oldtimerresolution);
-  return(results);
-}
-example
-{
-  "EXAMPLE:"; echo = 2;
-  LIB "primdec.lib";
-  ring r = 0, (x,y,z), lp;
-  ideal i = z8+z6+4z5+4z3+4z2+4, y-z2;
-  ideal j = 3x3y+x3+xy3+y2z2, 2x3z-xy-xz3-y4-z2, 2x2yz-2xy2+xz2-y4;
-  list commands = list("std", "primdecGTZ", "primdecSY",
-                       "std", "primdecGTZ", "primdecSY");
-  list args = list(list(i), list(i), list(i), list(j), list(j), list(j));
-  parallelWaitN(commands, args, 3);
-}
-
-proc parallelWaitFirst(list commands, list args, list #)
-"USAGE:  parallelWaitFirst(commands, args[, timeout, linktype, servers,
-         maxmemory]); commands list, args list, timeout int, linktype string,
-         servers list, maxmemory intvec
-RETURN:  a list, containing at least one (if no timeout occurs) of the results
-         of commands[i] applied to arg[i], i = 1, ..., size(commands).
-         @* The command
-         @code{parallelWaitFirst(list commands, list args, list #)} is
-         synonymous to
-         @code{parallelWaitN(list commands, list args, 1, list #)}. See
-         @ref{parallelWaitN} for details on optional arguments and other
-         remarks.
-SEE ALSO: Ssi links, waitfirst
-KEYWORDS: parallelWaitFirst; Parallelization; Links, user interface;
-          Skeletons for parallelization; Distributed computing
-EXAMPLE:  @code{example parallelWaitFirst;} shows an example."
-{
-  return(parallelWaitN(commands, args, 1, #));
-}
-example
-{
-  "EXAMPLE:"; echo = 2;
-  LIB "primdec.lib";
-  ring r = 0, (x,y,z), lp;
-  ideal i = z8+z6+4z5+4z3+4z2+4, y-z2;
-  list commands = list("primdecGTZ", "primdecSY");
-  list args = list(list(i), list(i));
-  parallelWaitFirst(commands, args);
-}
-
-proc parallelWaitAll(def commands, list args, list #)
-"USAGE:  parallelWaitAll(commands, args[, timeout, linktype, servers,
-         maxmemory]); commands list or string, args list, timeout int,
-         linktype string, servers list, maxmemory intvec
-RETURN:  a list, containing the results of commands[i] applied to arg[i],
-         i = 1, ..., size(commands).
-         @* The command
-         @code{parallelWaitAll(list commands, list args, list #)} is
-         synonymous to
-         @code{parallelWaitN(list commands, list args, size(args), list #)}. See
-         @ref{parallelWaitN} for details on optional arguments and other
-         remarks.
-         If commands is of type string, this is a shortcut for a list of size
-         @code{size(args)} whose entries are just this string.
-SEE ALSO: Ssi links, waitall
-KEYWORDS: parallelWaitAll; Parallelization; Links, user interface;
-          Skeletons for parallelization; Distributed computing
-EXAMPLE:  @code{example parallelWaitAll;} shows an example."
-{
-  if(typeof(commands) != "list" && typeof(commands) != "string")
-  {
-    ERROR("invalid type of first argument");
-  }
-  if(typeof(commands) == "list")
-  {
-    return(parallelWaitN(commands, args, size(args), #));
-  }
-  else
-  {
-    list cmds;
-    for(int i = size(args); i > 0; i--)
-    {
-      cmds[i] = commands;
-    }
-    return(parallelWaitN(cmds, args, size(args), #));
-  }
-}
-example
-{
-  "EXAMPLE:"; echo = 2;
-  ring r = 0, (x,y,z), dp;
-  ideal i1 = z8+z6+4z5+4z3+4z2+4, y-z2;
-  ideal i2 = x10+x9y2, y8-x2y7;
-  ideal i3 = x3-2xy, x2y-2y2+x;
-  string command = "std";
-  list args = list(list(i1), list(i2), list(i3));
-  parallelWaitAll(command, args);
-}
-
-// TODO
-/// http://arxiv.org/abs/1005.5663v2
-static proc doModular(command, args, proc deleteUnlucksPrimes, proc testInChar0)
-{
-}
-
-// TODO
-/* worker farm */
-static proc Create() {}
-
-/* auxiliary procedures */
-static proc watchlinks()
-{
-  list parent = list(mempatrol);
-  list watchedlinks;
-  int wait;
-  int i, sys;
-  while(1)
-  {
-    if(size(watchedlinks) == 0)
-    {
-      wait = waitall(parent);
-    }
-    else
-    {
-      wait = waitall(parent, 10000);
-    }
-    if(wait == -1)
-    {
-      ERROR("The main process crashed.");
-    }
-    if(wait)
-    {
-      def query = read(mempatrol);
-      if(typeof(query) == "list")
-      {
-        watchedlinks = insert(watchedlinks, query);
-      }
-      else // in this case, typeof(query) is assumed to be "int", the
-           // index of the link
-      {
-        for(i = size(watchedlinks); i > 0; i--)
-        {
-          if(watchedlinks[i][3] == query)
-          {
-            watchedlinks = delete(watchedlinks, i);
-            break;
-          }
-        }
-      }
-    }
-    for(i = size(watchedlinks); i > 0; i--)
-    {
-      if(getusedmemory(watchedlinks[i][1], watchedlinks[i][2])
-           > watchedlinks[i][4])
-      {
-        if(watchedlinks[i][1] == "localhost")
-        {
-          sys = system("sh", "kill "+string(watchedlinks[i][2]));
-        }
-        else
-        {
-          sys = system("sh", "ssh "+watchedlinks[i][1]+" kill "
-                             +string(watchedlinks[i][2]));
-        }
-        write(mempatrol, watchedlinks[i][3]);
-        watchedlinks = delete(watchedlinks, i);
-      }
-    }
-  }
-}
-
-static proc getusedmemory(string server, int pid)
-{
-  string s;
-  if(server == "localhost")
-  {
-    s = read("|: grep VmSize /proc/"+string(pid)+"/status "+
-             "| awk '{ print $2; }'");
-  }
-  else
-  {
-    s = read("|: ssh "+server+" grep VmSize /proc/"+string(pid)+"/status "+
-             "| awk '{ print $2; }'");
-  }
-  bigint b;
-  execute("b = "+s+";");
-  int i = int(b/1000);
-  return(i);
-}
-
-static proc argsToString(string name, int length)
-{
-  string arglist;
-  if(length > 0) {
-    arglist = name+"[1]";
-  }
-  int i;
-  for(i = 2; i <= length; i++) {
-    arglist = arglist+", "+name+"["+string(i)+"]";
-  }
-  return(arglist);
-}
+LIB "tasks.lib";
+
+proc parallelWaitN(alias list commands, alias list args, int N, list #)
+"USAGE:   parallelWaitN(commands, arguments, N[, timeout]); commands list,
+          arguments list, N int, timeout int
+RETURN:   a list, containing the results of commands[i] applied to
+          arguments[i], i = 1, ..., size(arguments).
+       @* The procedure waits for N jobs to finish.
+       @* An optional timeout in ms can be provided. Default is 0 which
+          disables the timeout.
+NOTE:     The entries of the list commands must be strings. The entries of the
+          list arguments must be lists.
+       @* The type of any entry of the returned list whose corresponding task
+          did not finish (due to timeout or error) is \"none\".
+       @* The returned list may contain more than N results if several jobs
+          finished \"at the same time\". It may contain less than N results in
+          the case of timeout or errors occurring.
+SEE ALSO: parallelWaitAll, parallelWaitFirst, tasks_lib
+EXAMPLE:  example parallelWaitN; shows an example"
+{
+    // auxiliary variables
+    int i;
+
+    // read optional parameters
+    int timeout;
+    int ncores;   // obsolete, but kept for compatibility with old libraries
+    if (size(#) > 0) {
+        if (typeof(#[1]) != "int") {
+            ERROR("wrong optional parameters");
+        }
+        timeout = #[1];
+        if (size(#) > 1) {
+            if (size(#) > 2 || typeof(#[2]) != "int") {
+                ERROR("wrong optional parameters");
+            }
+            ncores = #[2];
+        }
+    }
+
+    // apply wrapper for obsolete optional parameter ncores
+    if (ncores) {
+        list semaphore_save = Resources::setcores_subtree(ncores);
+    }
+
+    // error checking
+    int njobs = size(commands);
+    if (njobs != size(args)) {
+        ERROR("The number of commands does not match the number of lists"
+            +newline+"of arguments.");
+    }
+    if (njobs == 0) {
+        ERROR("no commands specified");
+    }
+    for (i = 1; i <= njobs; i++) {
+        if (typeof(commands[i]) != "string") {
+            ERROR("The first argument is not a list of strings.");
+        }
+        if (typeof(args[i]) != "list") {
+            ERROR("The second argument is not a list of lists.");
+        }
+    }
+
+    // compute the tasks
+    for (i = 1; i <= njobs; i++) {
+        task t(i) = commands[i], args[i];
+    }
+    startTasks(t(1..njobs));
+    list indices = waitTasks(list(t(1..njobs)), N, timeout);
+
+    // wrap back to saved semaphore
+    if (ncores) {
+        Resources::resetcores_subtree(semaphore_save);
+    }
+
+    // return results
+    list results;
+    for (i = size(indices); i > 0; i--) {
+        results[indices[i]] = getResult(t(indices[i]));
+    }
+    for (i = 1; i <= njobs; i++) {
+        killTask(t(i));
+    }
+    return(results);
+}
+example
+{
+    "EXAMPLE:";
+    echo = 2;
+    ring R = 0, (x,y,z), lp;
+    ideal I = 3x3y+x3+xy3+y2z2, 2x3z-xy-xz3-y4-z2, 2x2yz-2xy2+xz2-y4;
+    ideal J = x10+x9y2, x2y7-y8;
+    list commands = list("std", "std");
+    list arguments = list(list(I), list(J));
+    parallelWaitN(commands, arguments, 1);
+}
+
+proc parallelWaitFirst(alias list commands, alias list args, list #)
+"USAGE:   parallelWaitFirst(commands, args[, timeout]); commands list,
+          arguments list, timeout int
+RETURN:   a list, containing at least one (if no timeout occurs) of the results
+          of commands[i] applied to arguments[i], i = 1, ..., size(arguments).
+       @* The command @code{parallelWaitFirst(commands, arguments[, timeout])}
+          is synonymous to
+          @code{parallelWaitN(commands, arguments, 1[, timeout])}. See
+          @ref{parallelWaitN} for details on optional arguments and other
+          remarks.
+SEE ALSO: parallelWaitN, parallelWaitAll, tasks_lib
+EXAMPLE:  example parallelWaitFirst; shows an example"
+{
+    return(parallelWaitN(commands, args, 1, #));
+}
+example
+{
+    "EXAMPLE:";
+    echo = 2;
+    ring R = 0, (x,y,z), lp;
+    ideal I = 3x3y+x3+xy3+y2z2, 2x3z-xy-xz3-y4-z2, 2x2yz-2xy2+xz2-y4;
+    ideal J = x10+x9y2, x2y7-y8;
+    list commands = list("std", "std");
+    list arguments = list(list(I), list(J));
+    parallelWaitFirst(commands, arguments);
+}
+
+proc parallelWaitAll(def commands, alias list args, list #)
+"USAGE:   parallelWaitAll(commands, arguments[, timeout]); commands list or
+          string, arguments list, timeout int
+RETURN:   a list, containing the results of commands[i] applied to
+          arguments[i], i = 1, ..., size(arguments).
+       @* The command @code{parallelWaitAll(commands, arguments[, timeout])} is
+          synonymous to @code{parallelWaitN(commands, arguments,
+          size(arguments)[, timeout])}. See @ref{parallelWaitN} for details on
+          optional arguments and other remarks.
+NOTE:     As a shortcut, @code{commands} can be a string. This is synonymous to
+          providing a list of @code{size(arguments)} copies of this string.
+SEE ALSO: parallelWaitFirst, parallelWaitN, tasks_lib
+EXAMPLE:  example parallelWaitAll; shows an example"
+{
+    if (typeof(commands) != "list" && typeof(commands) != "string") {
+        ERROR("invalid type of first argument");
+    }
+    if (typeof(commands) == "list") {
+        return(parallelWaitN(commands, args, size(args), #));
+    }
+    else {
+        list cmds;
+        for (int i = size(args); i > 0; i--) {
+            cmds[i] = commands;
+        }
+        return(parallelWaitN(cmds, args, size(args), #));
+    }
+}
+example
+{
+    "EXAMPLE:";
+    echo = 2;
+    ring R = 0, (x,y,z), dp;
+    ideal I1 = z8+z6+4z5+4z3+4z2+4, -z2+y;
+    ideal I2 = x9y2+x10, x2y7-y8;
+    ideal I3 = x3-2xy, x2y-2y2+x;
+    string command = "std";
+    list arguments = list(list(I1), list(I2), list(I3));
+    parallelWaitAll(command, arguments);
+}
+
+proc parallelTestAND(def commands, alias list args, list #)
+"USAGE:   parallelTestAND(commands, arguments[, timeout]); commands list or
+          string, arguments list, timeout int
+RETURN:   1, if commands[i] applied to arguments[i] is not equal to zero for
+          all i = 1, ..., size(arguments);
+          0, otherwise.
+       @* An optional timeout in ms can be provided. Default is 0 which
+          disables the timeout. In case of timeout, -1 is returned.
+NOTE:     The entries of the list commands must be strings. The entries of the
+          list arguments must be lists.
+       @* commands[i] applied to arguments[i] must evaluate to an integer for
+          i = 1, ..., size(arguments).
+       @* As a shortcut, @code{commands} can be a string. This is synonymous to
+          providing a list of @code{size(arguments)} copies of this string.
+SEE ALSO: parallelTestOR, tasks_lib
+EXAMPLE:  example parallelTestAND; shows an example"
+{
+    // note: this can be improved
+    list results = parallelWaitAll(commands, args, #);
+    int i;
+    for (i = size(args); i > 0; i--) {
+        if (typeof(results[i]) != "int" && typeof(results[i]) != "none") {
+            ERROR("result no. "+string(i)+" not of type int");
+        }
+    }
+    for (i = size(args); i > 0; i--) {
+        if (typeof(results[i]) == "none") {   // timeout
+            return(-1);
+        }
+    }
+    for (i = size(results); i > 0; i--) {
+        if (!results[i]) {
+            return(0);
+        }
+    }
+    return(1);
+}
+example
+{
+    "EXAMPLE:";
+    echo = 2;
+    ring R = 0, (x,y,z), dp;
+    ideal I = x, y, z;
+    intvec v = 0:3;
+    list l = list(I, v);
+    module m1 = x*gen(1);
+    module m2;
+    string command = "size";
+    list arguments1 = list(list(I), list(v), list(l), list(m1));
+    list arguments2 = list(list(I), list(v), list(l), list(m2));
+    // test if all the arguments have non-zero size
+    parallelTestAND(command, arguments1);
+    parallelTestAND(command, arguments2);
+}
+
+proc parallelTestOR(def commands, alias list args, list #)
+"USAGE:   parallelTestOR(commands, arguments[, timeout]); commands list or
+          string, arguments list, timeout int
+RETURN:   1, if commands[i] applied to arguments[i] is not equal to zero for
+          any i = 1, ..., size(arguments);
+          0, otherwise.
+       @* An optional timeout in ms can be provided. Default is 0 which
+          disables the timeout. In case of timeout, -1 is returned.
+NOTE:     The entries of the list commands must be strings. The entries of the
+          list arguments must be lists.
+       @* commands[i] applied to arguments[i] must evaluate to an integer for
+          i = 1, ..., size(arguments).
+       @* As a shortcut, @code{commands} can be a string. This is synonymous to
+          providing a list of @code{size(arguments)} copies of this string.
+SEE ALSO: parallelTestAND, tasks_lib
+EXAMPLE:  example parallelTestAND; shows an example"
+{
+    // note: this can be improved
+    list results = parallelWaitAll(commands, args, #);
+    int i;
+    for (i = size(args); i > 0; i--) {
+        if (typeof(results[i]) != "int" && typeof(results[i]) != "none") {
+            ERROR("result no. "+string(i)+" not of type int");
+        }
+    }
+    for (i = size(args); i > 0; i--) {
+        if (typeof(results[i]) == "none") {   // timeout
+            return(-1);
+        }
+    }
+    for (i = size(results); i > 0; i--) {
+        if (results[i]) {
+            return(1);
+        }
+    }
+    return(0);
+}
+example
+{
+    "EXAMPLE:";
+    echo = 2;
+    ring R = 0, (x,y,z), dp;
+    ideal I;
+    string s;
+    list l;
+    module m1 = x*gen(1);
+    module m2;
+    string command = "size";
+    list arguments1 = list(list(I), list(s), list(l), list(m1));
+    list arguments2 = list(list(I), list(s), list(l), list(m2));
+    // test if any of the arguments has non-zero size
+    parallelTestOR(command, arguments1);
+    parallelTestOR(command, arguments2);
+}
+

Singular/LIB/polymake.lib

@@ -1 @@
-////
-version="version oldpolymake.lib 4.0.0.0 Jun_2013 "; // $Id$
+version="version polymake.lib 4.0.0.0 Jun_2013 ";
 category="Tropical Geometry";
 info="
-LIBRARY:   oldpolymake.lib  Computations with polytopes and fans,
-                            interface to polymake and TOPCOM
+LIBRARY:   polymake.lib    Computations with polytopes and fans,
+                           interface to polymake and TOPCOM
 AUTHOR:    Thomas Markwig,  email: keilen@mathematik.uni-kl.de
 
@@ -10 +9 @@
    Most procedures will not work unless polymake or topcom is installed and
    if so, they will only work with the operating system LINUX!
-   For more detailed information see the following note or consult the
+   For more detailed information see IMPORTANT NOTE respectively consult the
    help string of the procedures.
 
-NOTE:
+   The conventions used in this library for polytopes and fans, e.g. the
+   length and labeling of their vertices resp. rays, differs from the conventions
+   used in polymake and thus from the conventions used in the polymake
+   extension polymake.so of Singular. We recommend to use the newer polymake.so
+   whenever possible.
+
+IMPORTANT NOTE:
    Even though this is a Singular library for computing polytopes and fans
    such as the Newton polytope or the Groebner fan of a polynomial, most of
@@ -19 +24 @@
 @* - polymake by Ewgenij Gawrilow, TU Berlin and Michael Joswig, TU Darmstadt
 @*   (see http://www.math.tu-berlin.de/polymake/),
-@* respectively (only in the procedure triangularions) by the program
-@* - topcom by Joerg Rambau, Universitaet Bayreuth (see http://www.uni-bayreuth.de/
-     departments/wirtschaftsmathematik/rambau/TOPCOM);
-@*   This library should rather be seen as an interface which allows to use a
+@* respectively (only in the procedure triangulations) by the program
+@* - topcom by Joerg Rambau, Universitaet Bayreuth (see
+@*   http://www.uni-bayreuth.de/departments/wirtschaftsmathematik/rambau/TOPCOM);
+@*   this library should rather be seen as an interface which allows to use a
      (very limited) number of options which polymake respectively topcom offers
      to compute with polytopes and fans and to make the results available in
@@ -32 +37 @@
      independent of both, polymake and topcom.
 
-PROCEDURES:
-  polymakePolytope()   computes the vertices of a polytope using polymake
-  newtonPolytopeP()     computes the Newton polytope of a polynomial
-  newtonPolytopeLP()   computes the lattice points of the Newton polytope
-  normalFan()          computes the normal fan of a polytope
-  groebnerFan()        computes the Groebner fan of a polynomial
-  intmatToPolymake()   transforms an integer matrix into polymake format
-  polymakeToIntmat()   transforms polymake output into an integer matrix
-
-  triangulations()     computes all triangulations of a marked polytope
-  secondaryPolytope()  computes the secondary polytope of a marked polytope
-
-  secondaryFan()       computes the secondary fan of a marked polytope
-
-  cycleLength()      computes the cycleLength of cycle
-  splitPolygon()     splits a marked polygon into vertices, facets, interior points
-  eta()              computes the eta-vector of a triangulation
-  findOrientedBoundary()    computes the boundary of a convex hull
-  cyclePoints()      computes lattice points connected to some lattice point
-  latticeArea()      computes the lattice area of a polygon
-  picksFormula()     computes the ingrediants of Pick's formula for a polygon
-  ellipticNF()       computes the normal form of an elliptic polygon
-  ellipticNFDB()     displays the 16 normal forms of elliptic polygons
-
-  polymakeKeepTmpFiles()  determines if the files created in /tmp should be kept
+PROCEDURES USING POLYMAKE:
+  polymakePolytope()  computes the vertices of a polytope using polymake
+  newtonPolytopeP()    computes the Newton polytope of a polynomial
+  newtonPolytopeLP()  computes the lattice points of the Newton polytope
+  normalFanL()         computes the normal fan of a polytope
+  groebnerFan()       computes the Groebner fan of a polynomial
+
+PROCEDURES USING TOPCOM:
+  triangulations()    computes all triangulations of a marked polytope
+  secondaryPolytope() computes the secondary polytope of a marked polytope
+
+PROCEDURES USING POLYMAKE AND TOPCOM:
+  secondaryFan()      computes the secondary fan of a marked polytope
+
+PROCEDURES CONERNED WITH PLANAR POLYGONS:
+  cycleLength()    computes the cycleLength of cycle
+  splitPolygon()   splits a marked polygon into vertices, facets, interior points
+  eta()            computes the eta-vector of a triangulation
+  findOrientedBoundary()  computes the boundary of a convex hull
+  cyclePoints()    computes lattice points connected to some lattice point
+  latticeArea()    computes the lattice area of a polygon
+  picksFormula()   computes the ingrediants of Pick's formula for a polygon
+  ellipticNF()     computes the normal form of an elliptic polygon
+  ellipticNFDB()   displays the 16 normal forms of elliptic polygons
 
 KEYWORDS:    polytope; fan; secondary fan; secondary polytope; polymake;
@@ -85 +89 @@
 ////////////////////////////////////////////////////////////////////////////////
 
+static proc mod_init ()
+{
+  LIB "gfanlib.so";
+  LIB "polymake.so";
+}
 
 /////////////////////////////////////////////////////////////////////////////
@@ -90 +99 @@
 /////////////////////////////////////////////////////////////////////////////
 
-proc polymakePolytope (intmat polytop,list #)
-"USAGE:  polymakePolytope(polytope[,#]);   polytope list, # string
-ASSUME:  each row of polytope gives the coordinates of a lattice point of a
+proc polymakePolytope (intmat points)
+"USAGE:  polymakePolytope(points);   polytope intmat
+ASSUME:  each row of points gives the coordinates of a lattice point of a
          polytope with their affine coordinates as given by the output of
          secondaryPolytope
 PURPOSE: the procedure calls polymake to compute the vertices of the polytope
          as well as its dimension and information on its facets
-RETURN:  list L with four entries
+RETURN:  list, L with four entries
 @*            L[1] : an integer matrix whose rows are the coordinates of vertices
                      of the polytope
 @*            L[2] : the dimension of the polytope
-@*            L[3] : a list whose i-th entry explains to which vertices the
+@*            L[3] : a list whose ith entry explains to which vertices the
                      ith vertex of the Newton polytope is connected
                      -- i.e. L[3][i] is an integer vector and an entry k in
                         there means that the vertex L[1][i] is connected to the
                         vertex L[1][k]
-@*            L[4] : an integer matrix whose rows mulitplied by
+@*            L[4] : an matrix of type bigintmat whose rows mulitplied by
                      (1,var(1),...,var(nvar)) give a linear system of equations
                      describing the affine hull of the polytope,
@@ -118 +127 @@
          convention which starts indexing its vertices by zero while we start
          with one !
-@*    -  the procedure creates the file  /tmp/polytope.polymake which contains
-         the polytope in polymake format; if you wish to use this for further
-         computations with polymake, you have to use the procedure
-         polymakeKeepTmpFiles in before
-@*    -  moreover, the procedure creates the file /tmp/polytope.output which
-         it deletes again before ending
-@*    -  it is possible to provide an optional second argument a string
-         which then will be used instead of 'polytope' in the name of the
-         polymake output file
 EXAMPLE: example polymakePolytope;   shows an example"
 {
-  // the header for the file secendarypolytope.polymake
-  string sp="_application polytope
-_version 2.2
-_type RationalPolytope
-
-POINTS
-";
+  // add a first column to polytope as homogenising coordinate
+  points=intmatAddFirstColumn(points,"points");
+  polytope polytop=polytopeViaPoints(points);
+  list graph=vertexAdjacencyGraph(polytop)[2];
   int i,j;
-  // set the name for the polymake output file
-  if (size(#)>0)
-  {
-    if (typeof(#[1])=="string")
-    {
-      string dateiname=#[1];
-    }
-    else
-    {
-      string dateiname="polytope";
-    }
-  }
-  else
-  {
-    string dateiname="polytope";
-  }
-  // create the lattice point list for polymake
-  sp=sp+intmatToPolymake(polytop,"points");
-  // initialise dateiname.polymake and compute the vertices
-  write(":w /tmp/"+dateiname+".polymake",sp);
-  system("sh","cd /tmp; polymake "+dateiname+".polymake VERTICES > "+dateiname+".output");
-  string vertices=read("/tmp/"+dateiname+".output");
-  system("sh","/bin/rm /tmp/"+dateiname+".output");
-  intmat np=polymakeToIntmat(vertices,"affine");
-  // compute the dimension
-  system("sh","cd /tmp; polymake "+dateiname+".polymake DIM > "+dateiname+".output");
-  string pdim=read("/tmp/"+dateiname+".output");
-  system("sh","/bin/rm /tmp/"+dateiname+".output");
-  pdim=pdim[5,size(pdim)-6];
-  execute("int nd="+pdim+";");
-  // compute the vertex-edge graph
-  system("sh","cd /tmp; polymake "+dateiname+".polymake GRAPH > "+dateiname+".output");
-  string vertexedgegraph=read("/tmp/"+dateiname+".output");
-  system("sh","/bin/rm /tmp/"+dateiname+".output");
-  vertexedgegraph=vertexedgegraph[7,size(vertexedgegraph)-8];
-  string newveg;
-  for (i=1;i<=size(vertexedgegraph);i++)
-  {
-    if (vertexedgegraph[i]=="{")
-    {
-      newveg=newveg+"intvec(";
-    }
-    else
-    {
-      if (vertexedgegraph[i]=="}")
-      {
-        newveg=newveg+"),";
-      }
-      else
-      {
-        if (vertexedgegraph[i]==" ")
-        {
-          newveg=newveg+",";
-        }
-        else
-        {
-          newveg=newveg+vertexedgegraph[i];
-        }
-      }
-    }
-  }
-  newveg=newveg[1,size(newveg)-1];
-  execute("list nveg="+newveg+";");
-  // raise each entry in nveg by one
-  for (i=1;i<=size(nveg);i++)
-  {
-    for (j=1;j<=size(nveg[i]);j++)
-    {
-      nveg[i][j]=nveg[i][j]+1;
-    }
-  }
-  // compute the affine hull
-  system("sh","cd /tmp; polymake "+dateiname+".polymake AFFINE_HULL > "+dateiname+".output");
-  string equations=read("/tmp/"+dateiname+".output");
-  system("sh","/bin/rm /tmp/"+dateiname+".output");
-  if (size(equations)>14)
-  {
-    intmat neq=polymakeToIntmat(equations,"cleardenom");
-  }
-  else
-  {
-    intmat neq[1][ncols(polytop)+1];
-  }
-  // delete the tmp-files, if polymakekeeptmpfiles is not set
-  if (defined(polymakekeeptmpfiles)==0)
-  {
-    system("sh","/bin/rm /tmp/"+dateiname+".polymake");
-  }
-  // return the files
-  return(list(np,nd,nveg,neq));
+  for (i=1;i<=size(graph);i++)
+  {
+    for (j=1;j<=size(graph[i]);j++)
+    {
+      graph[i][j]=graph[i][j]+1;
+    }
+  }
+  return(list(intmatcoldelete(vertices(polytop),1),dimension(polytop),graph,equations(polytop)));
 }
 example
@@ -247 +162 @@
    ring r=0,x(1..4),dp;
    matrix M[5][1]=1,x(1),x(2),x(3),x(4);
-   np[4]*M;
+   intmat(np[4])*M;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
-proc newtonPolytopeP (poly f,list #)
-"USAGE: newtonPolytopeP(f[,#]);  f poly, # string
-RETURN: list L with four entries
+proc newtonPolytopeP (poly f)
+"USAGE: newtonPolytopeP(f);  f poly
+RETURN: list, L with four entries
 @*            L[1] : an integer matrix whose rows are the coordinates of vertices
                      of the Newton polytope of f
@@ -263 +178 @@
                         there means that the vertex L[1][i] is
                         connected to the vertex L[1][k]
-@*            L[4] : an integer matrix whose rows mulitplied by
+@*            L[4] : an matrix of type bigintmat whose rows mulitplied by
                      (1,var(1),...,var(nvar)) give a linear system of equations
                      describing the affine hull of the Newton polytope, i.e. the
@@ -269 +184 @@
 NOTE: -  if we replace the first column of L[4] by zeros, i.e. if we move
          the affine hull to the origin, then we get the equations for the
-         orthogonal comploment of the linearity space of the normal fan dual
+         orthogonal complement of the linearity space of the normal fan dual
          to the Newton polytope, i.e. we get the EQUATIONS that
          we need as input for polymake when computing the normal fan
@@ -275 +190 @@
          TU Berlin and Michael Joswig, so it only works if polymake is installed;
          see http://www.math.tu-berlin.de/polymake/
-@*    -  the procedure creates the file  /tmp/newtonPolytope.polymake which
-         contains the polytope in polymake format and which can be used for
-         further computations with polymake
-@*    -  moreover, the procedure creates the file /tmp/newtonPolytope.output
-         and deletes it again before ending
-@*    -  it is possible to give as an optional second argument a string
-         which then will be used instead of 'newtonPolytope' in the name of
-         the polymake output file
 EXAMPLE: example newtonPolytopeP;   shows an example"
 {
@@ -296 +203 @@
     f=f-lead(f);
   }
-  if (size(#)==0)
-  {
-    #[1]="newtonPolytope";
-  }
   // call polymakePolytope with exponents
-  return(polymakePolytope(exponents,#));
+  return(polymakePolytope(exponents));
 }
 example
@@ -330 +233 @@
    // the Newton polytope is contained in the affine space given
    //     by the equations
-   np[4]*M;
+   intmat(np[4])*M;
 }
 
@@ -339 +242 @@
 RETURN: list, the exponent vectors of the monomials occuring in f,
               i.e. the lattice points of the Newton polytope of f
-EXAMPLE: example normalFan;   shows an example"
+EXAMPLE: example newtonPolytopeLP;   shows an example"
 {
   list np;
@@ -363 +266 @@
 /////////////////////////////////////////////////////////////////////////////
 
-proc normalFan (intmat vertices,intmat affinehull,list graph,int er,list #)
-"USAGE:  normalFan (vert,aff,graph,rays,[,#]);   vert,aff intmat,  graph list, rays int, # string
+proc normalFanL (def vertices, def affinehull,list graph,int er,list #)
+"USAGE:  normalFanL (vert,aff,graph,rays,[,#]);   vert,aff intmat,  graph list, rays int, # string
 ASSUME:  - vert is an integer matrix whose rows are the coordinate of
            the vertices of a convex lattice polytope;
@@ -396 +299 @@
 @*       - in the optional argument # it is possible to hand over other names
            for the variables to be used -- be careful, the format must be correct
-           which is not tested, e.g. if you want the variable names to be
-           u00,u10,u01,u11 then you must hand over the string 'u11,u10,u01,u11'
-EXAMPLE: example normalFan;   shows an example"
-{
+           and that is not tested, e.g. if you want the variable names to be
+           u00,u10,u01,u11 then you must hand over the string u11,u10,u01,u11
+EXAMPLE: example normalFanL;   shows an example"
+{
+  if (typeof(affinehull) != "intmat" && typeof (affinehull) != "bigintmat")
+  {
+    ERROR("normalFanL: input affinehull has to be either intmat or bigintmat");
+    list L;
+    return (L);
+  }
   list ineq; // stores the inequalities of the cones
   int i,j,k;
@@ -431 +340 @@
     list pp;  // contain strings representing the inequalities
               // describing the normal cone
-    intmat ie[size(graph[i])][ncols(vertices)]; // contains the inequalities
-                                                // as rows
+    if (typeof (vertices) == "intmat")
+    {
+      intmat ie[size(graph[i])][ncols(vertices)]; // contains the inequalities
+    }                                             // as rows
+    if (typeof (vertices) == "bigintmat")
+    {
+      bigintmat ie[size(graph[i])][ncols(vertices)]; // contains the inequalities
+    }                                                // as rows
     // consider all the vertices to which the ith vertex in the
     // polytope is connected by an edge
@@ -469 +384 @@
   }
   // remove the first column of affine hull to compute the linearity space
-  intmat linearity=intmatcoldelete(affinehull,1);
+  bigintmat linearity[1][ncols(vertices)];
+  if (nrows(affinehull)>0)
+  {
+    linearity=intmatcoldelete(affinehull,1);
+  }
   //////////////////////////////////////////////////////////////////
   // Compute next the extreme rays of the cones
@@ -476 +395 @@
   {
     list extremerays; // keeps the result
-    string polymake; // keeps polymake output
-    // the header for ineq.polymake
-    string head="_application polytope
-_version 2.2
-_type RationalPolytope
-
-INEQUALITIES
-";
-    // the tail for both polymake files
-    string tail="
-EQUATIONS
-";
-    tail=tail+intmatToPolymake(linearity,"rays");
-    string ungleichungen; // keeps the inequalities for the polymake code
+    cone kegel;
+    bigintmat linearspan=intmatAddFirstColumn(linearity,"rays");
     intmat M; // the matrix keeping the inequalities
-    // create the file ineq.output
-    write(":w /tmp/ineq.output","");
-    int dimension; // keeps the dimension of the intersection the
-                   // bad cones with the u11tobeseencone
     for (i=1;i<=size(ineq);i++)
     {
-      i,". Cone of ",nrows(vertices); // indicate how many
-                                      // vertices have been dealt with
-      ungleichungen=intmatToPolymake(ineq[i][1],"rays");
-      // write the inequalities to ineq.polymake and call polymake
-      write(":w /tmp/ineq.polymake",head+ungleichungen+tail);
-      ungleichungen=""; // clear ungleichungen
-      system("sh","cd /tmp; /bin/rm ineq.output; polymake ineq.polymake VERTICES > ineq.output");
-      // read the result of polymake
-      polymake=read("/tmp/ineq.output");
-      intmat VERT=polymakeToIntmat(polymake,"affine");
-      extremerays[i]=VERT;
-      kill VERT;
+      kegel=coneViaInequalities(intmatAddFirstColumn(ineq[i][1],"rays"),linearspan);
+      extremerays[i]=intmatcoldelete(rays(kegel),1);
     }
     for (i=1;i<=size(ineq);i++)
@@ -514 +407 @@
       ineq[i]=ineq[i]+list(extremerays[i]);
     }
-  }
-  // delete the tmp-files, if polymakekeeptmpfiles is not set
-  if (defined(polymakekeeptmpfiles)==0)
-  {
-    system("sh","/bin/rm /tmp/ineq.polymake");
-    system("sh","/bin/rm /tmp/ineq.output");
   }
   // get the linearity space
@@ -534 +421 @@
    list np=newtonPolytopeP(f);
    // the Groebner fan of f, i.e. the normal fan of the Newton polytope
-   list gf=normalFan(np[1],np[4],np[3],1,"x,y,z");
+   list gf=normalFanL(np[1],np[4],np[3],1,"x,y,z");
    // the number of cones in the Groebner fan of f is:
    size(gf[1]);
@@ -549 +436 @@
 /////////////////////////////////////////////////////////////////////////////
 
-proc groebnerFan (poly f,list #)
-"USAGE:  groebnerFan(f[,#]);  f poly, # string
+proc groebnerFan (poly f)
+"USAGE:  groebnerFan(f);  f poly
 RETURN:  list, the ith entry of L[1] contains information about the ith cone
                in the Groebner fan dual to the ith vertex in the Newton
@@ -564 +451 @@
                       in each cone
 @*             L[3] = the Newton polytope of f in the format of the procedure
-                      newtonPolytope
-@*             L[4] = integer matrix where each row represents the exponet
+                      newtonPolytopeP
+@*             L[4] = integer matrix where each row represents the exponent
                       vector of one monomial occuring in the input polynomial
 NOTE: - if you have already computed the Newton polytope of f then you might want
-        to use the procedure normalFan instead in order to avoid doing costly
+        to use the procedure normalFanL instead in order to avoid doing costly
         computation twice
 @*    - the procedure calls for its computation polymake by Ewgenij Gawrilow,
         TU Berlin and Michael Joswig, so it only works if polymake is installed;
         see http://www.math.tu-berlin.de/polymake/
-@*    - the procedure creates the file  /tmp/newtonPolytope.polymake which
-        contains the Newton polytope of f in polymake format and which can
-        be used for further computations with polymake
-@*    - it is possible to give as an optional second argument as string which
-        then will be used instead of 'newtonPolytope' in the name of the
-        polymake output file
 EXAMPLE: example groebnerFan;   shows an example"
 {
@@ -591 +472 @@
     f=f-lead(f);
   }
-  if (size(#)==0)
-  {
-    #[1]="newtonPolytope";
-  }
   // call polymakePolytope with exponents
-  list newtonp=polymakePolytope(exponents,"newtonPolytope");
+  list newtonp=polymakePolytope(exponents);
   // get the variables as string
   string variablen;
@@ -604 +481 @@
   }
   variablen=variablen[1,size(variablen)-1];
-  // call normalFan in order to compute the Groebner fan
-  list gf=normalFan(newtonp[1],newtonp[4],newtonp[3],1,variablen);
+  // call normalFanL in order to compute the Groebner fan
+  list gf=normalFanL(newtonp[1],newtonp[4],newtonp[3],1,variablen);
   // append newtonp to gf
   gf[3]=newtonp;
@@ -642 +519 @@
 
 
-/////////////////////////////////////////////////////////////////////////////
-
-proc intmatToPolymake (intmat M,string art)
-"USAGE:  intmatToPolymake(M,art);  M intmat, art string
-ASSUME:  - M is an integer matrix which should be transformed into polymake
-           format;
-@*       - art is one of the following strings:
-@*           + 'rays'   : indicating that a first column of 0's should be added
-@*           + 'points' : indicating that a first column of 1's should be added
-RETURN:  string, the matrix is transformed in a string and a first column has
-                 been added
-EXAMPLE: example intmatToPolymake;   shows an example"
-{
-  if (art=="rays")
-  {
-    string anf="0 ";
-  }
-  else
-  {
-    string anf="1 ";
-  }
-  string sp;
-  int i,j;
-  // create the lattice point list for polymake
-  for (i=1;i<=nrows(M);i++)
-  {
-    sp=sp+anf;
-    for (j=1;j<=ncols(M);j++)
-    {
-      sp=sp+string(M[i,j])+" ";
-      if (j==ncols(M))
-      {
-        sp=sp+"
-";
-      }
-    }
-  }
-  return(sp);
-}
-example
-{
-   "EXAMPLE:";
-   echo=2;
-   intmat M[3][4]=1,2,3,4,5,6,7,8,9,10,11,12;
-   intmatToPolymake(M,"rays");
-   intmatToPolymake(M,"points");
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-proc polymakeToIntmat (string pm,string art)
-"USAGE:  polymakeToIntmat(pm,art);  pm, art string
-ASSUME:  pm is the result of calling polymake with one 'argument' like
-         VERTICES, AFFINE_HULL, etc., so that the first row of the string is
-         the name of the corresponding 'argument' and the further rows contain
-         the result which consists of vectors either over the integers
-         or over the rationals
-RETURN:  intmat, the rows of the matrix are basically the vectors in pm, starting
-                 from the second row, where each row has been multiplied with the
-                 lowest common multiple of the denominators of its entries as if
-                 it is an integer matrix; moreover, if art=='affine', then
-                 the first column is omitted since we only want affine
-                 coordinates
-EXAMPLE: example polymakeToIntmat;   shows an example"
-{
-  // we need a line break
-  string zeilenumbruch="
-";
-  // remove the 'argment' name, i.e. the first row of pm
-  while (pm[1]!=zeilenumbruch)
-  {
-    pm=stringdelete(pm,1);
-  }
-  pm=stringdelete(pm,1);
-  // find out how many entries each vector has, namely one more
-  // than 'spaces' in a row
-  int i=1;
-  int s=1;
-  int z=1;
-  while (pm[i]!=zeilenumbruch)
-  {
-    if (pm[i]==" ")
-    {
-      s++;
-    }
-    i++;
-  }
-  // if we want to have affine coordinates
-  if (art=="affine")
-  {
-    s--; // then there is one column less
-    // and the entry of the first column (in the first row) has to be removed
-    while (pm[1]!=" ")
-    {
-      pm=stringdelete(pm,1);
-    }
-    pm=stringdelete(pm,1);
-  }
-  // we add two line breaks at the end in order to have this as
-  // a stopping criterion
-  pm=pm+zeilenumbruch+zeilenumbruch;
-  // we now have to work through each row
-  for (i=1;i<=size(pm);i++)
-  {
-    // if there are two consecutive line breaks we are done
-    if ((pm[i]==zeilenumbruch) and (pm[i+1]==zeilenumbruch))
-    {
-      i=size(pm)+1;
-    }
-    else
-    {
-      // a line break has to be replaced by a comma
-      if (pm[i]==zeilenumbruch)
-      {
-        z++;
-        pm[i]=",";
-        // if we want to have affine coordinates,
-        // then we have to delete the first entry in each row
-        if (art=="affine")
-        {
-         while (pm[i+1]!=" ")
-         {
-           pm=stringdelete(pm,i+1);
-         }
-         pm=stringdelete(pm,i+1);
-        }
-      }
-      // a space has to be replaced by a comma
-      if (pm[i]==" ")
-      {
-        pm[i]=",";
-      }
-    }
-  }
-  // if we have introduced superflous commata at the end, they should be removed
-  while (pm[size(pm)]==",")
-  {
-    pm=stringdelete(pm,size(pm));
-  }
-  // since the matrix could be over the rationals,
-  // we need a ring with rational coefficients
-  ring zwischering=0,x,lp;
-  // create the matrix with the elements of pm as entries
-  execute("matrix mm["+string(z)+"]["+string(s)+"]="+pm+";");
-  // transform this into an integer matrix
-  matrix M[1][ncols(mm)]; // takes a row of mm
-  int cm;  // takes a lowest common multiple
-  // multiply each row by an integer such that its entries are integers
-  for (int j=1;j<=nrows(mm);j++)
-  {
-    M=mm[j,1..ncols(mm)];
-    cm=commondenominator(M);
-    for (i=1;i<=ncols(mm);i++)
-    {
-      mm[j,i]=cm*mm[j,i];
-    }
-  }
-  // transform the matrix mm into an integer matrix
-  execute("intmat im["+string(z)+"]["+string(s)+"]="+string(mm)+";");
-  return(im);
-}
-example
-{
-   "EXAMPLE:";
-   echo=2;
-   // this is the usual output of some polymake computation
-   string pm="VERTICES
-0 1 3 5/3 1/3 -1 -23/3 -1/3 5/3 1/3 1
-0 1 3 -23/3 5/3 1 5/3 1/3 1/3 -1/3 -1
-0 1 1 1/3 -1/3 -1 5/3 1/3 -23/3 5/3 3
-0 1 1 5/3 -23/3 3 1/3 5/3 -1/3 1/3 -1
-0 1 -1 1/3 5/3 3 -1/3 -23/3 1/3 5/3 1
-0 1 -1 -1/3 1/3 1 1/3 5/3 5/3 -23/3 3
-0 1 -1 1 3 -5 -1 3 -1 1 -1
-0 1 -1 -1 -1 -1 1 1 3 3 -5
-0 1 -5 3 1 -1 3 -1 1 -1 -1
-
-";
-   intmat PM=polymakeToIntmat(pm,"affine");
-   // note that the first column has been removed, since we asked for
-   // affine coordinates, and the denominators have been cleared
-   print(PM);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 /// PROCEDURES USING TOPCOM
 ///////////////////////////////////////////////////////////////////////////////
 
-proc triangulations (list polygon)
-"USAGE:  triangulations(polygon); list polygon
+proc triangulations (list polygon,list #)
+"USAGE:  triangulations(polygon[,#]); list polygon, list #
 ASSUME:  polygon is a list of integer vectors of the same size representing
          the affine coordinates of the lattice points
@@ -846 +539 @@
        this  procedure; see
 @*     http://www.uni-bayreuth.de/departments/wirtschaftsmathematik/rambau/TOPCOM
+@*   - if you only want to have the regular triangulations the procedure should
+       be called with the string 'regular' as optional argument
 @*   - the procedure creates the files /tmp/triangulationsinput and
        /tmp/triangulationsoutput;
@@ -851 +546 @@
        output containing the triangulations of corresponding to points in the
        format of points2triangs; if you wish to use this for further
-       computations with topcom, you have to use the procedure
-       polymakeKeepTmpFiles in before
+       computations with topcom, you have to call the procedure with the
+       string 'keepfiles' as optional argument
 @*   - note that an integer i in an integer vector representing a triangle
        refers to the ith lattice point, i.e. polygon[i]; this convention is
@@ -860 +555 @@
 {
   int i,j;
+  // check for optional arguments
+  int regular,keepfiles;
+  if (size(#)>0)
+  {
+    for (i=1;i<=size(#);i++)
+    {
+      if (typeof(#[i])=="string")
+      {
+        if (#[i]=="keepfiles")
+        {
+          keepfiles=1;
+        }
+        if (#[i]=="regular")
+        {
+          regular=1;
+        }
+      }
+    }
+  }
   // prepare the input for points2triangs by writing the input polygon in the
   // necessary format
@@ -875 +589 @@
   write(":w /tmp/triangulationsinput",spi);
   // call points2triangs
-  system("sh","cd /tmp; points2triangs < triangulationsinput > triangulationsoutput");
+  if (regular==1) // compute only regular triangulations
+  {
+    system("sh","cd /tmp; points2triangs --regular < triangulationsinput > triangulationsoutput");
+  }
+  else // compute all triangulations
+  {
+    system("sh","cd /tmp; points2triangs < triangulationsinput > triangulationsoutput");
+  }
   string p2t=read("/tmp/triangulationsoutput"); // takes result of points2triangs
-  // delete the tmp-files, if polymakekeeptmpfiles is not set
-  if (defined(polymakekeeptmpfiles)==0)
+  // delete the tmp-files, if no second argument is given
+  if (keepfiles==0)
   {
     system("sh","cd /tmp; rm -f triangulationsinput; rm -f triangulationsoutput");
@@ -953 +674 @@
             else
             {
-              np2t=np2t+p2t[i];
+              if (p2t[i]=="[")
+              {
+                // in Topcom version 17.4 (and maybe also in earlier versions) the list
+                // of triangulations is indexed starting with index 0, in Singular
+                // we have to start with index 1
+                np2t=np2t+p2t[i]+"1+";
+              }
+              else
+              {
+                np2t=np2t+p2t[i];
+              }
             }
           }
@@ -962 +693 @@
   list T;
   execute(np2t);
+  // depending on the version of Topcom, the list T has or has not an entry T[1]
+  // if it has none, the entry should be removed
+  while (typeof(T[1])=="none")
+  {
+    T=delete(T,1);
+  }
   // raise each index by one
   for (i=1;i<=size(T);i++)
@@ -1000 +737 @@
 RETURN:  list, say L, such that:
 @*             L[1] = intmat, each row gives the affine coordinates of a lattice
-                      point in the secondary polytope given by the marked polytope
-                      corresponding to polygon
+                      point in the secondary polytope given by the marked
+                      polytope corresponding to polygon
 @*             L[2] = the list of corresponding triangulations
 NOTE: if the triangluations are not handed over as optional argument the
@@ -1114 +851 @@
        see http://www.math.tu-berlin.de/polymake/
 @*   - in the optional argument # it is possible to hand over other names for
-       the variables to be used -- be careful, the format must be correct
-       which is not tested, e.g. if you want the variable names to be
+       the variables to be used -- be careful, the format must be correct and
+       that is not tested, e.g. if you want the variable names to be
        u00,u10,u01,u11 then you must hand over the string 'u11,u10,u01,u11'
 @*   - if the triangluations are not handed over as optional argument the
@@ -1135 +872 @@
   list sp=secondaryPolytope(polygon,triang);
   list spp=polymakePolytope(sp[1]);
-  list sf=normalFan(spp[1],spp[4],spp[3],1);
+  list sf=normalFanL(spp[1],spp[4],spp[3],1);
   return(list(sf[1],sf[2],spp,triang));
 }
@@ -1378 +1115 @@
 @*       triang is a list of integer vectors all of size three describing a
          triangulation of the polygon described by polygon; if an entry of
-         triang is the vector (i,j,k) then the triangle is built from the vertices
+         triang is the vector (i,j,k) then the triangle is built by the vertices
          with indices i, j and k
 RETURN:  intvec, the integer vector eta describing that vertex of the Newton
@@ -1948 +1685 @@
   // points and
   // the number b of boundary points are connected by the formula: A=b+2g-2
-  return(list(area,bdpts,(area-bdpts+2)/2));
+  return(list(area,bdpts,(area-bdpts+2) div 2));
 }
 example
@@ -1973 +1710 @@
 "USAGE:  ellipticNF(polygon);   polygon list
 ASSUME:  polygon is a list of integer vectors in the plane such that their
-         convex hull C has precisely one interior lattice point, i.e. C is the
+         convex hull C has precisely one interior lattice point; i.e. C is the
          Newton polygon of an elliptic curve
 PURPOSE: compute the normal form of the polygon with respect to the unimodular
@@ -1991 +1728 @@
   int i;            // index
   intvec edge;      // stores the vector of an edge
-  intvec boundary;  // stores lattice lengths of the edges of the Newton cylce
+  intvec boundary;  // stores lattice lengths of the edges of the Newton cycle
   // find the vertices of the Newton cycle and order it clockwise
   list pg=findOrientedBoundary(polygon)[2];
@@ -2302 +2039 @@
 
 /////////////////////////////////////////////////////////////////////////////////
-/// AUXILARY PROCEDURES
-/////////////////////////////////////////////////////////////////////////////////
-
-proc polymakeKeepTmpFiles (int i)
-"USAGE:  polymakeKeepTmpFiles(int i);   i int
-PURPOSE: some procedures create files in the directory /tmp which are used for
-         computations with polymake respectively topcom; these will be removed
-         when the corresponding procedure is left; however, it might be
-         desireable to keep them for further computations with either polymake or
-         topcom; this can be achieved by this procedure; call the procedure as:
-@*       - polymakeKeepTmpFiles(1); - then the files will be kept
-@*       - polymakeKeepTmpFiles(0); - then files will be removed in the future
-RETURN:  none"
-{
-  if ((i==1) and (defined(polymakekeeptmpfiles)==0))
-  {
-    int polymakekeeptmpfiles;
-    export(polymakekeeptmpfiles);
-  }
-  if (i!=1)
-  {
-    if (defined(polymakekeeptmpfiles))
-    {
-      kill polymakekeeptmpfiles;
-    }
-  }
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////
 /// AUXILARY PROCEDURES, WHICH ARE DECLARED STATIC
@@ -2364 +2071 @@
 }
 
-static proc intmatcoldelete (intmat w,int i)
+static proc intmatcoldelete (def w,int i)
 "USAGE:      intmatcoldelete(w,i); w intmat, i int
 RETURN:      intmat, the integer matrix w with the ith comlumn deleted
-NOTE:        the procedure is called by intmatsort and normalFan"
-{
-  if ((i<1) or (i>ncols(w)) or (ncols(w)==1))
-  {
-    return(w);
-  }
-  if (i==1)
-  {
-    intmat M[nrows(w)][ncols(w)-1]=w[1..nrows(w),2..ncols(w)];
-    return(M);
-  }
-  if (i==ncols(w))
-  {
-    intmat M[nrows(w)][ncols(w)-1]=w[1..nrows(w),1..ncols(w)-1];
-    return(M);
-  }
-  else
-  {
-    intmat M[nrows(w)][i-1]=w[1..nrows(w),1..i-1];
-    intmat N[nrows(w)][ncols(w)-i]=w[1..nrows(w),i+1..ncols(w)];
-    return(intmatconcat(M,N));
+NOTE:        the procedure is called by intmatsort and normalFanL"
+{
+  if (typeof(w)=="intmat")
+  {
+    if ((i<1) or (i>ncols(w)) or (ncols(w)==1))
+    {
+      return(w);
+    }
+    if (i==1)
+    {
+      intmat M[nrows(w)][ncols(w)-1]=w[1..nrows(w),2..ncols(w)];
+      return(M);
+    }
+    if (i==ncols(w))
+    {
+      intmat M[nrows(w)][ncols(w)-1]=w[1..nrows(w),1..ncols(w)-1];
+      return(M);
+    }
+    else
+    {
+      intmat M[nrows(w)][i-1]=w[1..nrows(w),1..i-1];
+      intmat N[nrows(w)][ncols(w)-i]=w[1..nrows(w),i+1..ncols(w)];
+      return(intmatconcat(M,N));
+    }
+  }
+  if (typeof(w)=="bigintmat")
+  {
+    if ((i<1) or (i>ncols(w)) or (ncols(w)==1))
+    {
+      return(w);
+    }
+    if (i==1)
+    {
+      bigintmat M[nrows(w)][ncols(w)-1]=w[1..nrows(w),2..ncols(w)];
+      return(M);
+    }
+    if (i==ncols(w))
+    {
+      bigintmat M[nrows(w)][ncols(w)-1]=w[1..nrows(w),1..ncols(w)-1];
+      return(M);
+    }
+    else
+    {
+      bigintmat MN[nrows(w)][ncols(w)-1];
+      MN[1..nrows(w),1..i-1]=w[1..nrows(w),1..i-1];
+      MN[1..nrows(w),i..ncols(w)-1]=w[1..nrows(w),i+1..ncols(w)];
+      return(MN);
+    }
+  } else
+  {
+    ERROR("intmatcoldelete: input matrix has to be of type intmat or bigintmat");
+    intmat M; return(M);
   }
 }
@@ -2683 +2421 @@
   return(list(coord,coords,latex));
 }
+
+static proc intmatAddFirstColumn (def M,string art)
+"USAGE:  intmatAddFirstColumn(M,art);  M intmat, art string
+ASSUME:  - M is an integer matrix where a first column of 0's or 1's should be added
+@*       - art is one of the following strings:
+@*         + 'rays'   : indicating that a first column of 0's should be added
+@*         + 'points' : indicating that a first column of 1's should be added
+RETURN:  intmat, a first column has been added to the matrix"
+{
+  if (typeof (M) == "intmat")
+  {
+    intmat N[nrows(M)][ncols(M)+1];
+    int i,j;
+    for (i=1;i<=nrows(M);i++)
+    {
+      if (art=="rays")
+      {
+        N[i,1]=0;
+      }
+      else
+      {
+        N[i,1]=1;
+      }
+      for (j=1;j<=ncols(M);j++)
+      {
+        N[i,j+1]=M[i,j];
+      }
+    }
+    return(N);
+  }
+  if (typeof (M) == "bigintmat")
+  {
+    bigintmat N[nrows(M)][ncols(M)+1];
+    int i,j;
+    for (i=1;i<=nrows(M);i++)
+    {
+      if (art=="rays")
+      {
+        N[i,1]=0;
+      }
+      else
+      {
+        N[i,1]=1;
+      }
+      for (j=1;j<=ncols(M);j++)
+      {
+        N[i,j+1]=M[i,j];
+      }
+    }
+    return(N);
+  }
+  else
+  {
+    ERROR ("intmatAddFirstColumn: input matrix has to be either intmat or bigintmat");
+    intmat N;
+    return (N);
+  }
+}
+
+
+

Singular/LIB/primdec.lib

@@ -709 +709 @@
     return(l);
   }
+  def op = option(get);
   def P=basering;
   int i,j,k,m,q,d,o;
-  int n=nvars(basering);
+  int n = nvars(basering);
   ideal s,t,u,sact;
   poly ni;
@@ -769 +770 @@
         {
           setring RL;
+
           option(redSB);
           t=std(t);
@@ -785 +787 @@
           rp=delete(rp,1);
           keep1=keep1+rp;
+
           option(noredSB);
         }
@@ -803 +806 @@
   }
   l=l+keep1;
+  option(set,op);
   return(l);
 }
@@ -1898 +1902 @@
    list @res,empty;
    ideal ser;
-   option(redSB);
+   def op = option( get );
+   option( redSB );
    list @pr=facstd(i);
    //if(size(@pr)==1)
@@ -1923 +1928 @@
 //      }
 //   }
-    option(noredSB);
+   // option( noredSB );
+   option( set, op );
    int j,k,odim,ndim,count;
    attrib(@pr[1],"isSB",1);
@@ -2096 +2102 @@
   }
 
-  if(dim(i) == -1){setring P0;return(ideal(1));}
-  if((dim(i) == 0) && (npars(P) == 0))
+  if( dim(i) == -1 ) 
+  {  
+    option( set,op );
+    setring P0; 
+    return( ideal(1) ); 
+  }
+  if( (dim(i) == 0 ) && ( npars(P) == 0) )
   {
     int di = vdim(i);
@@ -2546 +2557 @@
    int n=nvars(R);
 
+   def op = option(get); 
+
 //---Anfang Provisorium
    if((size(i)==2) && (w==2))
    {
-      option(redSB);
-      ideal J=std(i);
-      option(noredSB);
-      if((size(J)==2)&&(deg(J[1])==1))
+      option( redSB );
+      ideal J = std(i);
+      option( noredSB );
+      if ((size(J)==2)&&(deg(J[1])==1))
       {
          ideal keep;
@@ -2577 +2590 @@
             resu[j]=L;
          }
+         option( set, op );
          return(resu);
       }
@@ -2652 +2666 @@
       re=convList(pr);
    }
-   return(re);
+   option( set, op );
+   return( re );
 }
 ///////////////////////////////////////////////////////////////////////////////
@@ -7009 +7024 @@
       primary=resu;
     }
+    option(set,op);
     if (intersectOption == "intersect")
     {

Singular/LIB/primdecint.lib

@@ -1203 +1203 @@
 //=== this is needed because quotient(I,f) does not work properly, should be
 //=== replaced by quotient later
+   if ( f==0 ) { return( ideal(1) ); }   
    def R=basering;
    int i;
@@ -1227 +1228 @@
 //=== this is needed because quotient(I,J) does not work properly, should be
 //=== replaced by quotient later
+   if ( size(J)==0 ) { return( ideal(1) ); }
    int i;
    ideal K=quotientOneZ(I,J[1]);

Singular/LIB/symodstd.lib

@@ -1 +1 @@
 ////////////////////////////////////////////////////////////////////////////
+version="version symodstd.lib 4.0.0.0 Dec_2013 "; // $Id$
 category = "Commutative Algebra";
 info="
@@ -723 +724 @@
             arguments[i] = list("I", p, k);
          }
-         parallelResults = parallelWaitAll("divPrimeTest", arguments,
-            list(list(list(ncores))));
+         parallelResults = parallelWaitAll("divPrimeTest", arguments, 0,
+            ncores);
          for(i = size(arguments); i > 0; i--)
          {
@@ -1436 +1437 @@
             arguments_farey[i] = list(ideal(H[i]), N);
          }
-         results_farey = parallelWaitAll("farey", arguments_farey,
-                                         list(list(list(n1))));
+         results_farey = parallelWaitAll("farey", arguments_farey, 0, n1);
          for(i = ncols(H); i > 0; i--)
          {

Singular/LIB/tropical.lib

@@ -1 @@
-///////////////////////////////////////////////////////////
-version="version tropical.lib 4.0.0.0 Jun_2013 "; // $Id$
+//
+version="version tropical.lib 4.0.0.0 Dec_2013 ";
 category="Tropical Geometry";
 info="
@@ -204 +204 @@
 LIB "elim.lib";
 LIB "linalg.lib";
-LIB "oldpolymake.lib";
+LIB "polymake.lib";
 LIB "primdec.lib";
 LIB "absfact.lib";
@@ -650 +650 @@
           // pass first to a ring where a and @a
           // are variables in order to use maps
-          string @mp= string(minpoly);
+          poly mp=minpoly;
           ring INTERRING=char(LIFTRING),(t,@a,a),dp;
-          execute("poly mp=" + @mp + ";");
+          poly mp=imap(LIFTRING,mp);
           ideal LIFT=imap(LIFTRING,LIFT);
           kill LIFTRING;
@@ -1012 +1012 @@
   {
     def GLOBALRING=basering;
-    string @mp= string(minpoly);
+    number mp=minpoly;
     execute("ring LOCALRING=("+charstr(basering)+"),("+varstr(basering)+"),ds;");
-    execute("minpoly= " + @mp + ";");
     poly f=imap(GLOBALRING,f);
+    minpoly=imap(GLOBALRING,mp);
   }
   // check if a substitution is necessary
@@ -1049 +1049 @@
     if (minpoly!=0)
     {
-      string @mp= string(minpoly);
+      poly mp=minpoly;
       def OLDRING=basering;
       execute("ring NEWRING=0,("+varstr(basering)+","+parstr(basering)+"),ds;");
-      execute("ideal I = " + @mp + ";");
-      I = I,imap(OLDRING,f);
+      ideal I=imap(OLDRING,mp),imap(OLDRING,f);
     }
     else
@@ -1065 +1064 @@
       w=NewtP[jj]-NewtP[jj+1];
       ggteiler=gcd(w[1],w[2]);
-      zw=w[1]/ggteiler;
-      w[1]=w[2]/ggteiler;
+      zw=w[1] div ggteiler;
+      w[1]=w[2] div ggteiler;
       w[2]=zw;
       // if we have introduced a third variable for the parameter, then w needs a third component
@@ -1134 +1133 @@
     else
     {
-      string @mp= string(minpoly);
+      poly mp=minpoly;
       ring degreering=0,a,dp;
-      execute("poly mp=" + @mp + ";");
+      poly mp=imap(countring,mp);
       numberofbranchesfound=numberofbranchesfound+deg(mp);
       setring countring;
@@ -1158 +1157 @@
    ring r=0,(x,y),ds;
    poly f=x2-y4+x5y7;
-   puiseuxExpansion(puiseuxExpansion(f,3));
+   puiseuxExpansion(f,3,"subst");
+   displayPuiseuxExpansion(puiseuxExpansion(f,3));
 }
 
@@ -1540 +1540 @@
       ggt=gcd(normalvector[1],normalvector[2]);   // the gcd of the entries
       zw=normalvector[2];    // create the outward pointing normal vector
-      normalvector[2]=-normalvector[1]/ggt;
-      normalvector[1]=zw/ggt;
+      normalvector[2]=-normalvector[1] div ggt;
+      normalvector[1]=zw div ggt;
       if (size(#)==0) // we are computing w.r.t. minimum
       {
@@ -2718 +2718 @@
         if(k<>j)  // except the unit vector of the non-zero component
         {
-          intvec u; u[size(w)]=0; u[k]=1;
-          O[r,1..size(w)]=u; r=r+1;
+          intvec u;
+          u[size(w)]=0;
+          u[k]=1;
+          O[r,1..size(w)]=u;
+          r=r+1;
+          kill u;
         }
       }
@@ -4708 +4712 @@
         wneu=NewtP[1]-NewtP[2];
         int ggteiler=gcd(wneu[1],wneu[2]);
-        wneu[1]=-wneu[1]/ggteiler;
-        wneu[2]=wneu[2]/ggteiler;
+        wneu[1]=-wneu[1] div ggteiler;
+        wneu[2]=wneu[2] div ggteiler;
         if (wneu[1]>0)
         {
@@ -4807 +4811 @@
   for (jj=1;jj<=anzahlvariablen+numberdeletedvariables-1;jj++)
   {
-    PARA[jj]=(PARA[jj]+a[jj+1])*t^(tw[jj+1]*tweight/ww[1]);
+    PARA[jj]=(PARA[jj]+a[jj+1])*t^(tw[jj+1]*tweight div ww[1]);
   }
   // if we have reached the stop-level, i.e. either
@@ -5353 +5357 @@
     if (koeffizienten[j-ord(p)+1]!=0)
     {
-      if ((j-(N*wj)/w1)==0)
+      if ((j-(N*wj) div w1)==0)
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1]);
       }
-      if (((j-(N*wj)/w1)==1) and (N!=1))
+      if (((j-(N*wj) div w1)==1) and (N!=1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^(1/"+string(N)+")";
       }
-      if (((j-(N*wj)/w1)==1) and (N==1))
+      if (((j-(N*wj) div w1)==1) and (N==1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t";
       }
-      if (((j-(N*wj)/w1)==-1) and (N==1))
+      if (((j-(N*wj) div w1)==-1) and (N==1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t";
       }
-      if (((j-(N*wj)/w1)==-1) and (N!=1))
+      if (((j-(N*wj) div w1)==-1) and (N!=1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t^(1/"+string(N)+")";
       }
-      if (((j-(N*wj)/w1)>1) and (N==1))
-      {
-        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^"+string(j-(N*wj)/w1);
-      }
-      if (((j-(N*wj)/w1)>1) and (N!=1))
-      {
-        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^("+string(j-(N*wj)/w1)+"/"+string(N)+")";
-      }
-      if (((j-(N*wj)/w1)<-1) and (N==1))
+      if (((j-(N*wj) div w1)>1) and (N==1))
+      {
+        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^"+string(j-(N*wj) div w1);
+      }
+      if (((j-(N*wj) div w1)>1) and (N!=1))
+      {
+        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^("+string(j-(N*wj) div w1)+"/"+string(N)+")";
+      }
+      if (((j-(N*wj) div w1)<-1) and (N==1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t^"+string(wj-j);
       }
-      if (((j-(N*wj)/w1)<-1) and (N!=1))
-      {
-        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t^("+string((N*wj)/w1-j)+"/"+string(N)+")";
+      if (((j-(N*wj) div w1)<-1) and (N!=1))
+      {
+        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t^("+string((N*wj) div w1-j)+"/"+string(N)+")";
       }
       if (j<deg(p))
@@ -5495 +5499 @@
     {
       setring LIFTRing;
-      string @mp= string(minpoly);
+      poly mp=minpoly;
       execute("ring TESTRing=("+charstr(LIFTRing)+"),("+varstr(BASERING)+"),dp;");
-      execute("minpoly= " + @mp + ";");
+      minpoly=number(imap(LIFTRing,mp));
       ideal i=imap(BASERING,i);
     }
@@ -5769 +5773 @@
               wneu=NewtP[jjj]-NewtP[jjj+1];
               int ggteiler=gcd(wneu[1],wneu[2]);
-              wneu[1]=-wneu[1]/ggteiler;
-              wneu[2]=wneu[2]/ggteiler;
+              wneu[1]=-wneu[1] div ggteiler;
+              wneu[2]=wneu[2] div ggteiler;
               if (wneu[1]>0)
               {
@@ -5869 +5873 @@
         {
           execute("ring PARARing=("+string(char(basering))+",@a),t,ls;");
-          minpoly=number(imap(PREGFANRING,m)); // ?
+          minpoly=number(imap(PREGFANRING,m));
         }
         else
@@ -5908 +5912 @@
         for (jjj=1;jjj<=anzahlvariablen+numberdeletedvariables-1;jjj++)
         {
-          PARA[jjj]=(PARA[jjj]+zeros[size(zeros)][jjj+1])*t^(ww[jjj+1]*tweight/ww[1]);
+          PARA[jjj]=(PARA[jjj]+zeros[size(zeros)][jjj+1])*t^(ww[jjj+1]*tweight div ww[1]);
         }
         // delete the last entry in zero, since that one has
@@ -6033 +6037 @@
     {
       I=subst(i,var(lastvar),0);
-      while (subst(I[1],t,0)==0)
+      while ((I[1]!=0) and (subst(I[1],t,0)==0))
       {
         I[1]=I[1]/t;
@@ -7814 +7818 @@
     poly denom=delta*hn^5;
     poly ggt=gcd(num,denom);
-    num=num/ggt;
-    denom=denom/ggt;
+    num=num div ggt;
+    denom=denom div ggt;
     setring BASERING;
     poly num=imap(TRING,num);

Singular/Makefile.am

@@ -248 +248 @@
 Singulard_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT}
 
+dist_bin_SCRIPTS = singularsurf
 
 #### ESingular

Singular/checklibs.c

@@ -219 +219 @@
     {
       p=buf;
-      while(*p==' ') p++;
-      if (*p=='@') { p++; texinfo+=(isalpha(*p)); }
+      if (strchr(buf,'@')!=NULL)
+      { texinfo++; printf("%s",buf); }
     }
     get_next(); (*l)++;
@@ -253 +253 @@
     if (texinfo>0)
     {
-      printf("warning: %d texinfo commands %d header lines: should be used very rarely!\n",texinfo,header);
+      printf("warning: %d texinfo commands in %d header lines: should be used very rarely!\n",texinfo,header);
     }
 }

Singular/grammar.cc

@@ -245 +245 @@
 
 /* Line 189 of yacc.c  */
-#line 252 "grammar.cc"
+#line 248 "grammar.cc"
 
 /* Enabling traces.  */
@@ -387 +387 @@
      PROC_DEF = 371,
      APPLY = 372,
-     BREAK_CMD = 373,
-     CONTINUE_CMD = 374,
-     ELSE_CMD = 375,
-     EVAL = 376,
-     QUOTE = 377,
-     FOR_CMD = 378,
-     IF_CMD = 379,
-     SYS_BREAK = 380,
-     WHILE_CMD = 381,
-     RETURN = 382,
-     PARAMETER = 383,
-     SYSVAR = 384,
-     UMINUS = 385
+     ASSUME_CMD = 373,
+     BREAK_CMD = 374,
+     CONTINUE_CMD = 375,
+     ELSE_CMD = 376,
+     EVAL = 377,
+     QUOTE = 378,
+     FOR_CMD = 379,
+     IF_CMD = 380,
+     SYS_BREAK = 381,
+     WHILE_CMD = 382,
+     RETURN = 383,
+     PARAMETER = 384,
+     SYSVAR = 385,
+     UMINUS = 386
    };
 #endif
@@ -416 +417 @@
 
 /* Line 264 of yacc.c  */
-#line 423 "grammar.cc"
+#line 420 "grammar.cc"
 
 #ifdef short
@@ -631 +632 @@
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2454
+#define YYLAST   2536
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  149
+#define YYNTOKENS  150
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  44
+#define YYNNTS  45
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  170
+#define YYNRULES  172
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  386
+#define YYNSTATES  393
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   385
+#define YYMAXUTOK   386
 
 #define YYTRANSLATE(YYX)                                                \
@@ -655 +656 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   141,     2,
-     145,   146,   143,   133,   139,   134,   147,   135,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   142,   140,
-     131,   130,   132,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   142,     2,
+     146,   147,   144,   134,   140,   135,   148,   136,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   143,   141,
+     132,   131,   133,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   136,     2,   137,   138,     2,   148,     2,     2,     2,
+       2,   137,     2,   138,   139,     2,   149,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -690 +691 @@
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   144
+     125,   126,   127,   128,   129,   130,   145
 };
 
@@ -706 +707 @@
      216,   221,   230,   235,   244,   249,   253,   255,   257,   259,
      263,   270,   275,   282,   289,   296,   303,   310,   317,   321,
-     327,   328,   334,   337,   339,   342,   345,   349,   353,   357,
-     361,   365,   369,   373,   377,   381,   385,   388,   391,   394,
-     397,   399,   403,   406,   409,   412,   415,   424,   427,   431,
-     434,   436,   438,   444,   446,   448,   453,   455,   459,   461,
-     465,   467,   469,   471,   473,   474,   479,   483,   486,   490,
-     493,   496,   500,   505,   510,   515,   520,   525,   530,   535,
-     540,   547,   554,   561,   568,   575,   582,   589,   593,   595,
-     604,   607,   610,   612,   614,   617,   620,   622,   628,   631,
-     637,   639,   641,   645,   651,   655,   659,   664,   667,   670,
-     675
+     327,   333,   334,   340,   343,   346,   348,   351,   354,   358,
+     362,   366,   370,   374,   378,   382,   386,   390,   394,   397,
+     400,   403,   406,   408,   412,   415,   418,   421,   424,   433,
+     436,   440,   443,   445,   447,   453,   455,   457,   462,   464,
+     468,   470,   474,   476,   478,   480,   482,   483,   488,   492,
+     495,   499,   502,   505,   509,   514,   519,   524,   529,   534,
+     539,   544,   549,   556,   563,   570,   577,   584,   591,   598,
+     602,   604,   613,   616,   619,   621,   623,   626,   629,   631,
+     637,   640,   646,   648,   650,   654,   660,   664,   668,   673,
+     676,   679,   684
 };
 
@@ -721 +722 @@
 static const yytype_int16 yyrhs[] =
 {
-     150,     0,    -1,    -1,   150,   151,    -1,   152,    -1,   154,
-     140,    -1,   165,   140,    -1,   192,    -1,   125,    -1,   140,
-      -1,     1,   140,    -1,   187,    -1,   188,    -1,   153,    -1,
-     189,    -1,   190,    -1,   174,    -1,   176,    -1,   177,    -1,
-     103,   112,    -1,   155,    -1,   178,    -1,   179,    -1,   180,
-      -1,   191,    -1,   182,    -1,   183,    -1,   185,    -1,   186,
-      -1,   163,   157,    -1,   115,    -1,   164,    -1,   156,    11,
-     156,    -1,   158,   147,   156,    -1,   156,   145,   146,    -1,
-     156,   145,   157,   146,    -1,   136,   157,   137,    -1,   113,
-      -1,   129,    -1,   166,    -1,    15,   145,   158,   146,    -1,
-      99,   145,   158,   146,    -1,   100,   145,   157,   146,    -1,
-     100,   145,   146,    -1,   101,   145,   158,   146,    -1,   102,
-     145,   157,   146,    -1,   102,   145,   146,    -1,    91,   145,
-     158,   146,    -1,    94,   145,   158,   146,    -1,    95,   145,
-     158,   146,    -1,    97,   145,   158,   146,    -1,    92,   145,
-     158,   139,   158,   146,    -1,    94,   145,   158,   139,   158,
-     146,    -1,    96,   145,   158,   139,   158,   146,    -1,    97,
-     145,   158,   139,   158,   146,    -1,    93,   145,   158,   139,
-     158,   139,   158,   146,    -1,    95,   145,   158,   139,   158,
-     139,   158,   146,    -1,    96,   145,   158,   139,   158,   139,
-     158,   146,    -1,    97,   145,   158,   139,   158,   139,   158,
-     146,    -1,    98,   145,   146,    -1,    98,   145,   157,   146,
-      -1,   173,   145,   158,   139,   158,   139,   158,   146,    -1,
-     173,   145,   158,   146,    -1,    16,   145,   167,   139,   167,
-     139,   171,   146,    -1,    16,   145,   158,   146,    -1,   157,
-     139,   158,    -1,   158,    -1,   162,    -1,   156,    -1,   145,
-     157,   146,    -1,   158,   136,   158,   139,   158,   137,    -1,
-     158,   136,   158,   137,    -1,   117,   145,   158,   139,    91,
-     146,    -1,   117,   145,   158,   139,    94,   146,    -1,   117,
-     145,   158,   139,    95,   146,    -1,   117,   145,   158,   139,
-      97,   146,    -1,   117,   145,   158,   139,    98,   146,    -1,
-     117,   145,   158,   139,   158,   146,    -1,   160,   158,   161,
-      -1,   160,   158,   130,   158,   161,    -1,    -1,   121,   145,
-     159,   158,   146,    -1,   122,   145,    -1,   146,    -1,   158,
-      10,    -1,   158,     7,    -1,   158,   133,   158,    -1,   158,
-     134,   158,    -1,   158,   135,   158,    -1,   158,   138,   158,
-      -1,   158,   131,   158,    -1,   158,   141,   158,    -1,   158,
-       9,   158,    -1,   158,     4,   158,    -1,   158,     3,   158,
-      -1,   158,   142,   158,    -1,     8,   158,    -1,   134,   158,
-      -1,   165,   172,    -1,   157,   130,    -1,   114,    -1,   148,
-     158,   148,    -1,    99,   156,    -1,   100,   156,    -1,   101,
-     156,    -1,   102,   156,    -1,   173,   156,   136,   158,   137,
-     136,   158,   137,    -1,   173,   156,    -1,   165,   139,   156,
-      -1,    15,   156,    -1,   111,    -1,   158,    -1,   145,   158,
-     139,   157,   146,    -1,   114,    -1,   168,    -1,   168,   145,
-     157,   146,    -1,   169,    -1,   169,   139,   170,    -1,   169,
-      -1,   145,   170,   146,    -1,   130,    -1,    20,    -1,    14,
-      -1,    13,    -1,    -1,   131,   166,   175,   140,    -1,   105,
-     111,   140,    -1,   105,   140,    -1,   103,   111,   140,    -1,
-     104,   157,    -1,   106,   156,    -1,   179,   139,   156,    -1,
-     108,   145,    99,   146,    -1,   108,   145,   100,   146,    -1,
-     108,   145,   101,   146,    -1,   108,   145,   102,   146,    -1,
-     108,   145,    16,   146,    -1,   108,   145,   173,   146,    -1,
-     108,   145,    15,   146,    -1,   108,   145,   156,   146,    -1,
-     108,   145,   156,   139,    99,   146,    -1,   108,   145,   156,
-     139,   100,   146,    -1,   108,   145,   156,   139,   101,   146,
-      -1,   108,   145,   156,   139,   102,   146,    -1,   108,   145,
-     156,   139,    16,   146,    -1,   108,   145,   156,   139,   173,
-     146,    -1,   108,   145,   156,   139,    15,   146,    -1,   108,
-     145,   146,    -1,    16,    -1,   181,   156,   172,   167,   139,
-     167,   139,   171,    -1,   181,   156,    -1,   129,   166,    -1,
-     109,    -1,    40,    -1,   184,   158,    -1,   110,   158,    -1,
-     157,    -1,   124,   145,   158,   146,   112,    -1,   120,   112,
-      -1,   124,   145,   158,   146,   118,    -1,   118,    -1,   119,
-      -1,   126,   111,   112,    -1,   123,   111,   111,   111,   112,
-      -1,    15,   164,   112,    -1,   116,   111,   112,    -1,   116,
-     111,   111,   112,    -1,   128,   165,    -1,   128,   158,    -1,
-     127,   145,   157,   146,    -1,   127,   145,   146,    -1
+     151,     0,    -1,    -1,   151,   152,    -1,   153,    -1,   155,
+     141,    -1,   167,   141,    -1,   194,    -1,   126,    -1,   141,
+      -1,     1,   141,    -1,   189,    -1,   190,    -1,   154,    -1,
+     191,    -1,   192,    -1,   176,    -1,   178,    -1,   179,    -1,
+     103,   112,    -1,   156,    -1,   180,    -1,   181,    -1,   182,
+      -1,   193,    -1,   184,    -1,   185,    -1,   187,    -1,   188,
+      -1,   165,   158,    -1,   115,    -1,   166,    -1,   157,    11,
+     157,    -1,   159,   148,   157,    -1,   157,   146,   147,    -1,
+     157,   146,   158,   147,    -1,   137,   158,   138,    -1,   113,
+      -1,   130,    -1,   168,    -1,    15,   146,   159,   147,    -1,
+      99,   146,   159,   147,    -1,   100,   146,   158,   147,    -1,
+     100,   146,   147,    -1,   101,   146,   159,   147,    -1,   102,
+     146,   158,   147,    -1,   102,   146,   147,    -1,    91,   146,
+     159,   147,    -1,    94,   146,   159,   147,    -1,    95,   146,
+     159,   147,    -1,    97,   146,   159,   147,    -1,    92,   146,
+     159,   140,   159,   147,    -1,    94,   146,   159,   140,   159,
+     147,    -1,    96,   146,   159,   140,   159,   147,    -1,    97,
+     146,   159,   140,   159,   147,    -1,    93,   146,   159,   140,
+     159,   140,   159,   147,    -1,    95,   146,   159,   140,   159,
+     140,   159,   147,    -1,    96,   146,   159,   140,   159,   140,
+     159,   147,    -1,    97,   146,   159,   140,   159,   140,   159,
+     147,    -1,    98,   146,   147,    -1,    98,   146,   158,   147,
+      -1,   175,   146,   159,   140,   159,   140,   159,   147,    -1,
+     175,   146,   159,   147,    -1,    16,   146,   169,   140,   169,
+     140,   173,   147,    -1,    16,   146,   159,   147,    -1,   158,
+     140,   159,    -1,   159,    -1,   164,    -1,   157,    -1,   146,
+     158,   147,    -1,   159,   137,   159,   140,   159,   138,    -1,
+     159,   137,   159,   138,    -1,   117,   146,   159,   140,    91,
+     147,    -1,   117,   146,   159,   140,    94,   147,    -1,   117,
+     146,   159,   140,    95,   147,    -1,   117,   146,   159,   140,
+      97,   147,    -1,   117,   146,   159,   140,    98,   147,    -1,
+     117,   146,   159,   140,   159,   147,    -1,   161,   159,   163,
+      -1,   161,   159,   131,   159,   163,    -1,   162,   159,   140,
+     159,   163,    -1,    -1,   122,   146,   160,   159,   147,    -1,
+     123,   146,    -1,   118,   146,    -1,   147,    -1,   159,    10,
+      -1,   159,     7,    -1,   159,   134,   159,    -1,   159,   135,
+     159,    -1,   159,   136,   159,    -1,   159,   139,   159,    -1,
+     159,   132,   159,    -1,   159,   142,   159,    -1,   159,     9,
+     159,    -1,   159,     4,   159,    -1,   159,     3,   159,    -1,
+     159,   143,   159,    -1,     8,   159,    -1,   135,   159,    -1,
+     167,   174,    -1,   158,   131,    -1,   114,    -1,   149,   159,
+     149,    -1,    99,   157,    -1,   100,   157,    -1,   101,   157,
+      -1,   102,   157,    -1,   175,   157,   137,   159,   138,   137,
+     159,   138,    -1,   175,   157,    -1,   167,   140,   157,    -1,
+      15,   157,    -1,   111,    -1,   159,    -1,   146,   159,   140,
+     158,   147,    -1,   114,    -1,   170,    -1,   170,   146,   158,
+     147,    -1,   171,    -1,   171,   140,   172,    -1,   171,    -1,
+     146,   172,   147,    -1,   131,    -1,    20,    -1,    14,    -1,
+      13,    -1,    -1,   132,   168,   177,   141,    -1,   105,   111,
+     141,    -1,   105,   141,    -1,   103,   111,   141,    -1,   104,
+     158,    -1,   106,   157,    -1,   181,   140,   157,    -1,   108,
+     146,    99,   147,    -1,   108,   146,   100,   147,    -1,   108,
+     146,   101,   147,    -1,   108,   146,   102,   147,    -1,   108,
+     146,    16,   147,    -1,   108,   146,   175,   147,    -1,   108,
+     146,    15,   147,    -1,   108,   146,   157,   147,    -1,   108,
+     146,   157,   140,    99,   147,    -1,   108,   146,   157,   140,
+     100,   147,    -1,   108,   146,   157,   140,   101,   147,    -1,
+     108,   146,   157,   140,   102,   147,    -1,   108,   146,   157,
+     140,    16,   147,    -1,   108,   146,   157,   140,   175,   147,
+      -1,   108,   146,   157,   140,    15,   147,    -1,   108,   146,
+     147,    -1,    16,    -1,   183,   157,   174,   169,   140,   169,
+     140,   173,    -1,   183,   157,    -1,   130,   168,    -1,   109,
+      -1,    40,    -1,   186,   159,    -1,   110,   159,    -1,   158,
+      -1,   125,   146,   159,   147,   112,    -1,   121,   112,    -1,
+     125,   146,   159,   147,   119,    -1,   119,    -1,   120,    -1,
+     127,   111,   112,    -1,   124,   111,   111,   111,   112,    -1,
+      15,   166,   112,    -1,   116,   111,   112,    -1,   116,   111,
+     111,   112,    -1,   129,   167,    -1,   129,   159,    -1,   128,
+     146,   158,   147,    -1,   128,   146,   147,    -1
 };
 
@@ -794 +796 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   370,   370,   372,   406,   407,   409,   411,   415,   420,
-     422,   473,   474,   475,   476,   477,   478,   479,   480,   484,
-     487,   488,   489,   490,   491,   492,   493,   494,   495,   498,
-     505,   510,   514,   518,   522,   526,   539,   567,   591,   597,
-     603,   607,   611,   615,   619,   623,   627,   631,   635,   639,
-     643,   647,   651,   655,   659,   663,   667,   671,   675,   679,
-     683,   687,   691,   695,   699,   706,   717,   723,   728,   729,
-     730,   734,   738,   742,   746,   750,   754,   758,   762,   766,
-     784,   783,   801,   809,   818,   822,   826,   830,   834,   838,
-     842,   846,   850,   854,   858,   862,   866,   873,   880,   881,
-     900,   901,   913,   918,   923,   927,   931,   971,   997,  1018,
-    1026,  1030,  1031,  1045,  1053,  1062,  1107,  1108,  1117,  1118,
-    1124,  1131,  1133,  1135,  1145,  1144,  1152,  1157,  1164,  1172,
-    1184,  1200,  1219,  1223,  1227,  1232,  1236,  1240,  1244,  1248,
-    1253,  1259,  1265,  1271,  1277,  1283,  1289,  1301,  1308,  1312,
-    1349,  1359,  1365,  1365,  1368,  1440,  1444,  1473,  1486,  1503,
-    1512,  1517,  1525,  1537,  1556,  1566,  1585,  1608,  1614,  1626,
-    1632
+       0,   367,   367,   369,   403,   404,   406,   408,   412,   417,
+     419,   470,   471,   472,   473,   474,   475,   476,   477,   481,
+     484,   485,   486,   487,   488,   489,   490,   491,   492,   495,
+     502,   507,   511,   515,   519,   523,   536,   564,   588,   594,
+     600,   604,   608,   612,   616,   620,   624,   628,   632,   636,
+     640,   644,   648,   652,   656,   660,   664,   668,   672,   676,
+     680,   684,   688,   692,   696,   703,   714,   720,   725,   726,
+     727,   731,   735,   739,   743,   747,   751,   755,   759,   763,
+     780,   787,   786,   804,   812,   820,   829,   833,   837,   841,
+     845,   849,   853,   857,   861,   865,   869,   873,   877,   884,
+     891,   892,   911,   912,   924,   929,   934,   938,   942,   982,
+    1008,  1029,  1037,  1041,  1042,  1056,  1064,  1073,  1118,  1119,
+    1128,  1129,  1135,  1142,  1144,  1146,  1156,  1155,  1163,  1168,
+    1175,  1183,  1195,  1211,  1230,  1234,  1238,  1243,  1247,  1251,
+    1255,  1259,  1264,  1270,  1276,  1282,  1288,  1294,  1300,  1312,
+    1319,  1323,  1360,  1370,  1376,  1376,  1379,  1451,  1455,  1484,
+    1497,  1514,  1523,  1528,  1536,  1548,  1567,  1577,  1596,  1619,
+    1625,  1637,  1643
 };
 #endif
@@ -842 +844 @@
   "EXPORT_CMD", "HELP_CMD", "KILL_CMD", "LIB_CMD", "LISTVAR_CMD",
   "SETRING_CMD", "TYPE_CMD", "STRINGTOK", "BLOCKTOK", "INT_CONST",
-  "UNKNOWN_IDENT", "RINGVAR", "PROC_DEF", "APPLY", "BREAK_CMD",
-  "CONTINUE_CMD", "ELSE_CMD", "EVAL", "QUOTE", "FOR_CMD", "IF_CMD",
-  "SYS_BREAK", "WHILE_CMD", "RETURN", "PARAMETER", "SYSVAR", "'='", "'<'",
-  "'>'", "'+'", "'-'", "'/'", "'['", "']'", "'^'", "','", "';'", "'&'",
-  "':'", "'*'", "UMINUS", "'('", "')'", "'.'", "'`'", "$accept", "lines",
-  "pprompt", "flowctrl", "example_dummy", "command", "assign", "elemexpr",
-  "exprlist", "expr", "$@1", "quote_start", "quote_end", "expr_arithmetic",
-  "left_value", "extendedid", "declare_ip_variable", "stringexpr", "rlist",
-  "ordername", "orderelem", "OrderingList", "ordering", "cmdeq", "mat_cmd",
-  "filecmd", "$@2", "helpcmd", "examplecmd", "exportcmd", "killcmd",
-  "listcmd", "ringcmd1", "ringcmd", "scriptcmd", "setrings", "setringcmd",
-  "typecmd", "ifcmd", "whilecmd", "forcmd", "proccmd", "parametercmd",
-  "returncmd", 0
+  "UNKNOWN_IDENT", "RINGVAR", "PROC_DEF", "APPLY", "ASSUME_CMD",
+  "BREAK_CMD", "CONTINUE_CMD", "ELSE_CMD", "EVAL", "QUOTE", "FOR_CMD",
+  "IF_CMD", "SYS_BREAK", "WHILE_CMD", "RETURN", "PARAMETER", "SYSVAR",
+  "'='", "'<'", "'>'", "'+'", "'-'", "'/'", "'['", "']'", "'^'", "','",
+  "';'", "'&'", "':'", "'*'", "UMINUS", "'('", "')'", "'.'", "'`'",
+  "$accept", "lines", "pprompt", "flowctrl", "example_dummy", "command",
+  "assign", "elemexpr", "exprlist", "expr", "$@1", "quote_start",
+  "assume_start", "quote_end", "expr_arithmetic", "left_value",
+  "extendedid", "declare_ip_variable", "stringexpr", "rlist", "ordername",
+  "orderelem", "OrderingList", "ordering", "cmdeq", "mat_cmd", "filecmd",
+  "$@2", "helpcmd", "examplecmd", "exportcmd", "killcmd", "listcmd",
+  "ringcmd1", "ringcmd", "scriptcmd", "setrings", "setringcmd", "typecmd",
+  "ifcmd", "whilecmd", "forcmd", "proccmd", "parametercmd", "returncmd", 0
 };
 #endif
@@ -876 +878 @@
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-      61,    60,    62,    43,    45,    47,    91,    93,    94,    44,
-      59,    38,    58,    42,   385,    40,    41,    46,    96
+     385,    61,    60,    62,    43,    45,    47,    91,    93,    94,
+      44,    59,    38,    58,    42,   386,    40,    41,    46,    96
 };
 # endif
@@ -884 +886 @@
 static const yytype_uint8 yyr1[] =
 {
-       0,   149,   150,   150,   151,   151,   151,   151,   151,   151,
-     151,   152,   152,   152,   152,   152,   152,   152,   152,   153,
-     154,   154,   154,   154,   154,   154,   154,   154,   154,   155,
-     156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
-     156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
-     156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
-     156,   156,   156,   156,   156,   157,   157,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     159,   158,   160,   161,   162,   162,   162,   162,   162,   162,
-     162,   162,   162,   162,   162,   162,   162,   162,   163,   163,
-     164,   164,   165,   165,   165,   165,   165,   165,   165,   165,
-     166,   167,   167,   168,   169,   169,   170,   170,   171,   171,
-     172,   173,   173,   173,   175,   174,   176,   176,   177,   178,
-     179,   179,   180,   180,   180,   180,   180,   180,   180,   180,
-     180,   180,   180,   180,   180,   180,   180,   180,   181,   182,
-     182,   183,   184,   184,   185,   186,   186,   187,   187,   187,
-     187,   187,   188,   189,   190,   190,   190,   191,   191,   192,
-     192
+       0,   150,   151,   151,   152,   152,   152,   152,   152,   152,
+     152,   153,   153,   153,   153,   153,   153,   153,   153,   154,
+     155,   155,   155,   155,   155,   155,   155,   155,   155,   156,
+     157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
+     157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
+     157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
+     157,   157,   157,   157,   157,   158,   158,   159,   159,   159,
+     159,   159,   159,   159,   159,   159,   159,   159,   159,   159,
+     159,   160,   159,   161,   162,   163,   164,   164,   164,   164,
+     164,   164,   164,   164,   164,   164,   164,   164,   164,   164,
+     165,   165,   166,   166,   167,   167,   167,   167,   167,   167,
+     167,   167,   168,   169,   169,   170,   171,   171,   172,   172,
+     173,   173,   174,   175,   175,   175,   177,   176,   178,   178,
+     179,   180,   181,   181,   182,   182,   182,   182,   182,   182,
+     182,   182,   182,   182,   182,   182,   182,   182,   182,   182,
+     183,   184,   184,   185,   186,   186,   187,   188,   188,   189,
+     189,   189,   189,   189,   190,   191,   192,   192,   192,   193,
+     193,   194,   194
 };
 
@@ -915 +917 @@
        4,     8,     4,     8,     4,     3,     1,     1,     1,     3,
        6,     4,     6,     6,     6,     6,     6,     6,     3,     5,
-       0,     5,     2,     1,     2,     2,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     2,     2,     2,     2,
-       1,     3,     2,     2,     2,     2,     8,     2,     3,     2,
-       1,     1,     5,     1,     1,     4,     1,     3,     1,     3,
-       1,     1,     1,     1,     0,     4,     3,     2,     3,     2,
-       2,     3,     4,     4,     4,     4,     4,     4,     4,     4,
-       6,     6,     6,     6,     6,     6,     6,     3,     1,     8,
-       2,     2,     1,     1,     2,     2,     1,     5,     2,     5,
-       1,     1,     3,     5,     3,     3,     4,     2,     2,     4,
-       3
+       5,     0,     5,     2,     2,     1,     2,     2,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     2,     2,
+       2,     2,     1,     3,     2,     2,     2,     2,     8,     2,
+       3,     2,     1,     1,     5,     1,     1,     4,     1,     3,
+       1,     3,     1,     1,     1,     1,     0,     4,     3,     2,
+       3,     2,     2,     3,     4,     4,     4,     4,     4,     4,
+       4,     4,     6,     6,     6,     6,     6,     6,     6,     3,
+       1,     8,     2,     2,     1,     1,     2,     2,     1,     5,
+       2,     5,     1,     1,     3,     5,     3,     3,     4,     2,
+       2,     4,     3
 };
 
@@ -932 +934 @@
 static const yytype_uint8 yydefact[] =
 {
-       2,     0,     1,     0,     0,   123,   122,     0,   148,   121,
-     153,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   152,     0,
-     110,    37,   100,    30,     0,     0,   160,   161,     0,     0,
-       0,     0,     0,     8,     0,     0,     0,    38,     0,     0,
-       0,     9,     0,     0,     3,     4,    13,     0,    20,    68,
-     156,    66,     0,    67,     0,    31,     0,    39,     0,    16,
-      17,    18,    21,    22,    23,     0,    25,    26,     0,    27,
-      28,    11,    12,    14,    15,    24,     7,    10,     0,     0,
-       0,     0,     0,     0,    38,    96,     0,     0,    68,     0,
-      31,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    68,     0,    68,     0,    68,     0,    68,     0,    19,
-     129,     0,   127,    68,     0,   155,     0,     0,   158,    80,
-      82,     0,     0,     0,     0,     0,   168,   167,   151,   124,
-      97,     0,     0,     0,     5,     0,     0,    99,     0,     0,
-       0,    85,     0,    84,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    29,   120,     0,     6,    98,     0,
-      68,     0,    68,   154,     0,     0,     0,     0,     0,     0,
-      66,   164,     0,   111,     0,     0,     0,     0,     0,     0,
-       0,     0,    59,     0,    66,    43,     0,    66,    46,     0,
-     128,   126,     0,     0,     0,     0,     0,     0,   147,    68,
-       0,     0,   165,     0,     0,     0,     0,   162,   170,     0,
-       0,    36,    69,   101,    32,    34,     0,    65,    94,    93,
-      92,    90,    86,    87,    88,     0,    89,    91,    95,    33,
-       0,    83,    78,    68,     0,     0,    68,     0,     0,     0,
-       0,     0,     0,     0,    40,    66,    64,     0,    47,     0,
-       0,     0,    48,     0,    49,     0,     0,    50,    60,    41,
-      42,    44,    45,   138,   136,   132,   133,   134,   135,     0,
-     139,   137,   166,     0,     0,     0,     0,   169,   125,    35,
-      71,     0,     0,     0,    62,     0,   111,     0,    42,    45,
+       2,     0,     1,     0,     0,   125,   124,     0,   150,   123,
+     155,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   154,     0,
+     112,    37,   102,    30,     0,     0,     0,   162,   163,     0,
+       0,     0,     0,     0,     8,     0,     0,     0,    38,     0,
+       0,     0,     9,     0,     0,     3,     4,    13,     0,    20,
+      68,   158,    66,     0,     0,    67,     0,    31,     0,    39,
+       0,    16,    17,    18,    21,    22,    23,     0,    25,    26,
+       0,    27,    28,    11,    12,    14,    15,    24,     7,    10,
+       0,     0,     0,     0,     0,     0,    38,    98,     0,     0,
+      68,     0,    31,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    68,     0,    68,     0,    68,     0,    68,
+       0,    19,   131,     0,   129,    68,     0,   157,     0,     0,
+      84,   160,    81,    83,     0,     0,     0,     0,     0,   170,
+     169,   153,   126,    99,     0,     0,     0,     5,     0,     0,
+     101,     0,     0,     0,    87,     0,    86,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    29,   122,
+       0,     6,   100,     0,    68,     0,    68,   156,     0,     0,
+       0,     0,     0,     0,    66,   166,     0,   113,     0,     0,
+       0,     0,     0,     0,     0,     0,    59,     0,    66,    43,
+       0,    66,    46,     0,   130,   128,     0,     0,     0,     0,
+       0,     0,   149,    68,     0,     0,   167,     0,     0,     0,
+       0,   164,   172,     0,     0,    36,    69,   103,    32,    34,
+       0,    65,    96,    95,    94,    92,    88,    89,    90,     0,
+      91,    93,    97,    33,     0,    85,    78,     0,    68,     0,
+       0,    68,     0,     0,     0,     0,     0,     0,     0,    40,
+      66,    64,     0,    47,     0,     0,     0,    48,     0,    49,
+       0,     0,    50,    60,    41,    42,    44,    45,   140,   138,
+     134,   135,   136,   137,     0,   141,   139,   168,     0,     0,
+       0,     0,   171,   127,    35,    71,     0,     0,     0,     0,
+      62,     0,   113,     0,    42,    45,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    81,   163,   157,   159,     0,    79,     0,     0,     0,
-       0,     0,    51,     0,    52,     0,     0,    53,     0,    54,
-     146,   144,   140,   141,   142,   143,   145,    72,    73,    74,
-      75,    76,    77,    70,     0,     0,     0,   112,   113,     0,
-     114,   118,     0,     0,     0,     0,     0,     0,     0,     0,
-     116,     0,     0,    63,    55,    56,    57,    58,    61,   106,
-     149,     0,   119,     0,   117,   115
+       0,     0,     0,     0,     0,     0,     0,    82,   165,   159,
+     161,     0,    79,    80,     0,     0,     0,     0,     0,    51,
+       0,    52,     0,     0,    53,     0,    54,   148,   146,   142,
+     143,   144,   145,   147,    72,    73,    74,    75,    76,    77,
+      70,     0,     0,     0,   114,   115,     0,   116,   120,     0,
+       0,     0,     0,     0,     0,     0,     0,   118,     0,     0,
+      63,    55,    56,    57,    58,    61,   108,   151,     0,   121,
+       0,   119,   117
 };
 
@@ -976 +979 @@
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    54,    55,    56,    57,    58,    59,   142,    61,
-     214,    62,   242,    63,    64,    65,    66,    67,   184,   360,
-     361,   371,   362,   168,    96,    69,   220,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86
+      -1,     1,    55,    56,    57,    58,    59,    60,   145,    62,
+     218,    63,    64,   246,    65,    66,    67,    68,    69,   188,
+     367,   368,   378,   369,   172,    98,    71,   224,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -357
+#define YYPACT_NINF -359
 static const yytype_int16 yypact[] =
 {
-    -357,   296,  -357,  -118,  1780,  -357,  -357,  1838,   -94,  -357,
-    -357,   -89,   -76,   -67,   -48,   -38,   -31,   -28,   -25,  1897,
-    1955,  2014,  2072,  -103,  1780,  -106,  1780,   -21,  -357,  1780,
-    -357,  -357,  -357,  -357,    41,    20,  -357,  -357,   -46,    23,
-      25,    60,    42,  -357,    77,    44,  2131,    80,    80,  1780,
-    1780,  -357,  1780,  1780,  -357,  -357,  -357,   -69,  -357,   -10,
-    -109,  1287,  1780,  -357,  1780,  -357,  -120,  -357,  2189,  -357,
-    -357,  -357,  -357,    53,  -357,  1780,  -357,  -357,  1780,  -357,
-    -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,    51,   -94,
-      55,    59,    69,    78,  -357,   130,    79,  1780,   210,  1287,
-     115,  2248,  1780,  1780,  1780,  1780,  1780,  1780,  1780,  1422,
-    1780,   347,  1487,   373,  1780,   417,  1546,   443,    88,  -357,
-      90,    93,  -357,    18,  1604,  1287,   -75,  1780,  -357,  -357,
-    -357,   119,  1780,   122,  1663,  1838,  1287,    96,  -357,  -357,
-     130,  -133,  -132,    84,  -357,  1780,  1721,  -357,  1780,  1780,
-    1780,  -357,  1780,  -357,  1780,  1780,  1780,  1780,  1780,  1780,
-    1780,  1780,  1780,   109,    90,  -357,  1780,  -357,  -357,  1780,
-     183,  1780,   449,  1287,  1780,  1780,  1487,  1780,  1546,  1780,
-     518,  -357,  1780,   535,    97,   571,   588,   616,     8,   317,
-     676,   334,  -357,  -104,   691,  -357,   -99,   729,  -357,   -98,
-    -357,  -357,  -107,   -70,   -65,   -63,   -61,   -56,  -357,    21,
-     -50,   125,  -357,   757,  1780,   137,   772,  -357,  -357,   -87,
-     101,  -357,  -357,  -357,  -357,  -357,   -85,  1287,  1337,  1060,
-    1060,   239,   195,   195,   130,   360,    17,  1352,   195,  -357,
-    1780,  -357,  -357,   460,   430,  1780,    68,  2248,   518,   691,
-     -84,   729,   -82,   430,  -357,   789,  -357,  2248,  -357,  1780,
-    1780,  1780,  -357,  1780,  -357,  1780,  1780,  -357,  -357,  -357,
-    -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,  1200,
-    -357,  -357,  -357,  2306,   832,   140,   -44,  -357,  -357,  -357,
-    -357,  1780,   849,  1780,  -357,   870,  1287,   118,  -357,  -357,
-    1780,   120,   930,   947,   990,  1011,   475,   501,   107,   108,
-     116,   117,   121,   124,   126,   -45,   -42,   -40,   -36,   -23,
-    1026,  -357,  -357,  -357,  -357,  1043,  -357,  1088,   138,  2248,
-     -79,  -112,  -357,  1780,  -357,  1780,  1780,  -357,  1780,  -357,
-    -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,
-    -357,  -357,  -357,  -357,  1780,  1780,   134,  -357,  -357,   146,
-     131,  -357,   129,  1103,  1131,  1179,  1196,  1244,  1272,  -112,
-     139,   133,  1780,  -357,  -357,  -357,  -357,  -357,  -357,  -357,
-    -357,   146,  -357,   -74,  -357,  -357
+    -359,   303,  -359,  -115,  1827,  -359,  -359,  1887,  -107,  -359,
+    -359,  -103,   -72,   -68,   -62,   -42,   -35,   -30,   -21,  1952,
+    2012,  2077,  2137,   -90,  1827,  -104,  1827,    -3,  -359,  1827,
+    -359,  -359,  -359,  -359,    50,    21,    53,  -359,  -359,    44,
+      56,    63,    60,    64,  -359,   114,    85,  2202,   125,   125,
+    1827,  1827,  -359,  1827,  1827,  -359,  -359,  -359,   108,  -359,
+      -6,  -113,  1316,  1827,  1827,  -359,  1827,  -359,  -125,  -359,
+    2262,  -359,  -359,  -359,  -359,   110,  -359,  1827,  -359,  -359,
+    1827,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,
+     111,  -107,   113,   116,   117,   119,  -359,    18,   120,  1827,
+     115,  1316,   139,  2327,  1827,  1827,  1827,  1827,  1827,  1827,
+    1827,  1452,  1827,   127,  1512,   206,  1827,   404,  1577,   425,
+     129,  -359,   134,   135,  -359,    24,  1637,  1316,   -54,  1827,
+    -359,  -359,  -359,  -359,   143,  1827,   148,  1702,  1887,  1316,
+     138,  -359,  -359,    18,  -100,  -137,    10,  -359,  1827,  1762,
+    -359,  1827,  1827,  1827,  -359,  1827,  -359,  1827,  1827,  1827,
+    1827,  1827,  1827,  1827,  1827,  1827,    87,   529,   134,  -359,
+    1827,  -359,  -359,  1827,   161,  1827,    66,  1316,  1827,  1827,
+    1512,  1827,  1577,  1827,   544,  -359,  1827,   580,   140,   597,
+     625,   686,   105,   324,   701,   341,  -359,  -116,   739,  -359,
+    -106,   767,  -359,   -98,  -359,  -359,   -76,   -66,   -64,   -60,
+     -48,   -46,  -359,    22,   -40,   167,  -359,   784,  1827,   170,
+     799,  -359,  -359,   -88,   141,  -359,  -359,  -359,  -359,  -359,
+     -87,  1316,  1356,  1550,  1550,   918,    57,    57,    18,   370,
+       2,  1371,    57,  -359,  1827,  -359,  -359,  1827,   451,   438,
+    1827,    92,  2327,   544,   739,   -85,   767,   -84,   438,  -359,
+     843,  -359,  2327,  -359,  1827,  1827,  1827,  -359,  1827,  -359,
+    1827,  1827,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,
+    -359,  -359,  -359,  -359,   510,  -359,  -359,  -359,  2387,   858,
+     171,   -51,  -359,  -359,  -359,  -359,  1827,   881,   881,  1827,
+    -359,   941,  1316,   144,  -359,  -359,  1827,   146,   956,  1000,
+    1023,  1040,   483,   512,   147,   150,   152,   153,   159,   162,
+     163,   -28,   -26,   -24,    28,    45,  1055,  -359,  -359,  -359,
+    -359,  1098,  -359,  -359,  1113,   151,  2327,   -74,  -110,  -359,
+    1827,  -359,  1827,  1827,  -359,  1827,  -359,  -359,  -359,  -359,
+    -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,
+    -359,  1827,  1827,   168,  -359,  -359,   198,   169,  -359,   175,
+    1142,  1197,  1214,  1255,  1284,  1301,  -110,   174,   178,  1827,
+    -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,   198,  -359,
+     -71,  -359,  -359
 };
 
@@ -1032 +1036 @@
 static const yytype_int16 yypgoto[] =
 {
-    -357,  -357,  -357,  -357,  -357,  -357,  -357,   190,    -1,    24,
-    -357,  -357,   -12,  -357,  -357,   254,   236,   114,  -231,  -357,
-    -356,   -95,   -81,   123,    12,  -357,  -357,  -357,  -357,  -357,
-    -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,  -357,
-    -357,  -357,  -357,  -357
+    -359,  -359,  -359,  -359,  -359,  -359,  -359,   194,    -1,    25,
+    -359,  -359,  -359,  -205,  -359,  -359,   319,   282,   179,  -251,
+    -359,  -358,   -58,   -41,   160,     1,  -359,  -359,  -359,  -359,
+    -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,
+    -359,  -359,  -359,  -359,  -359
 };
 
@@ -1043 +1047 @@
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -151
+#define YYTABLE_NINF -153
 static const yytype_int16 yytable[] =
 {
-      60,   145,   358,   370,   221,   121,   148,   148,   118,   119,
-     165,   149,   150,    68,   222,   151,   297,   152,   153,   166,
-     167,   147,    87,   120,   151,   370,   301,   153,    95,   145,
-     148,    99,   145,   359,   122,   148,   211,   212,   174,   273,
-     148,   148,   268,    99,    99,    99,    99,   270,   272,   141,
-      99,   101,   148,   125,   148,   148,   102,   148,    68,   287,
-     148,   289,   298,   164,   299,   148,   128,   357,   323,   103,
-     136,   144,   385,   140,   324,   101,   274,   143,   104,   145,
-     175,   275,   176,   276,   177,   277,   163,   149,   150,   178,
-     278,   151,    99,   152,   153,   179,   281,   105,   356,    99,
-     102,   347,   173,   105,   348,   106,   349,   106,   193,   108,
-     350,   196,   149,   150,   107,   199,   151,   108,   152,   153,
-     109,   180,   109,   351,   124,   183,   185,   186,   187,   188,
-     189,   190,   191,   219,   194,   146,   210,   151,   197,   154,
-     153,   155,   156,   157,   158,   226,   159,   261,    99,   160,
-     161,   213,   126,   158,   262,   162,   216,  -130,  -130,    99,
-     279,   138,   139,   146,   162,   127,   146,   280,   129,    99,
-     130,   131,   227,   228,   229,   250,   230,   252,   231,   232,
-     233,   234,   235,   236,   237,   238,    99,   132,   133,   134,
-      99,    30,   171,   244,   145,    99,   174,    98,   248,   249,
-     175,   251,   151,   253,   176,   153,   255,  -131,  -131,   111,
-     113,   115,   117,   146,   177,   154,   123,   155,   156,   157,
-     158,   145,   159,   178,   179,   160,   161,   181,   200,   148,
-     215,   162,   223,   201,   217,   166,   257,   282,   284,   240,
-     154,   288,   155,   156,   157,   158,   151,   159,   285,   153,
-     160,   161,   322,   340,   341,   241,   162,   329,   170,   331,
-     358,   100,   342,   343,   292,   172,   158,   344,   159,   295,
-     345,   296,   346,   369,   355,   373,   372,   162,   381,   382,
-     326,   296,   137,   302,   303,   304,   384,   305,   380,   306,
-     307,   314,     0,     0,     0,   247,     2,     3,     0,   330,
-       0,     0,     0,     0,     4,     0,     0,   320,     0,     5,
-       6,     7,     8,  -107,   209,   325,     9,   327,     0,   245,
-     149,   150,  -107,  -107,   151,    98,   152,   153,   146,     0,
-     157,   158,     0,   159,     0,   224,    10,   149,   150,     0,
-    -109,   151,   162,   152,   153,     0,     0,     0,     0,  -109,
-    -109,     0,   239,   296,     0,   146,   243,   363,   145,   364,
-     365,   246,   366,   149,   150,     0,     0,   151,     0,   152,
-     153,   383,   155,   156,   157,   158,     0,   159,   367,   368,
-       0,   161,     0,     0,   145,     0,   162,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,     0,    27,    28,    29,    30,     0,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,     0,    48,   145,     0,
-      49,     0,    50,   149,   150,     0,    51,   151,     0,   152,
-     153,    52,     0,     0,    53,     0,     0,     0,   154,     0,
-     155,   156,   157,   158,   145,   159,   263,     0,   160,   161,
-     145,     0,     0,   264,   162,   154,     0,   155,   156,   157,
-     158,   145,   159,   266,     0,   160,   161,  -102,   149,   150,
-     267,   162,   151,     0,   152,   153,  -102,  -102,     0,     0,
-       0,   154,   146,   155,   156,   157,   158,   290,   159,   291,
-       0,   160,   161,  -103,   149,   150,     0,   162,   151,     0,
-     152,   153,  -103,  -103,     0,     0,     0,     0,   146,     0,
-       0,   149,   150,     0,     0,   151,     0,   152,   153,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   149,   150,
-       0,     0,   151,     0,   152,   153,     0,  -104,     0,     0,
-       0,     0,     0,     0,     0,     0,  -104,  -104,     0,     0,
-       0,   154,   146,   155,   156,   157,   158,     0,   159,   293,
-       0,   160,   161,  -105,   149,   150,   294,   162,   151,   165,
-     152,   153,  -105,  -105,     0,     0,     0,     0,   146,  -150,
-    -108,   149,   150,     0,   146,   151,     0,   152,   153,  -108,
-    -108,     0,     0,     0,     0,   146,   154,     0,   155,   156,
-     157,   158,     0,   159,   336,     0,   160,   161,     0,   149,
-     150,   337,   162,   151,     0,   152,   153,     0,     0,     0,
-       0,     0,   154,     0,   155,   156,   157,   158,     0,   159,
-     338,     0,   160,   161,     0,     0,     0,   339,   162,   154,
-       0,   155,   156,   157,   158,     0,   159,     0,     0,   160,
-     161,     0,     0,     0,   254,   162,   154,     0,   155,   156,
-     157,   158,     0,   159,     0,     0,   160,   161,     0,   149,
-     150,   256,   162,   151,     0,   152,   153,     0,     0,     0,
-       0,     0,     0,     0,   149,   150,     0,     0,   151,     0,
-     152,   153,   154,     0,   155,   156,   157,   158,     0,   159,
-       0,     0,   160,   161,     0,     0,     0,   258,   162,   154,
-       0,   155,   156,   157,   158,     0,   159,   259,     0,   160,
-     161,     0,   149,   150,     0,   162,   151,     0,   152,   153,
-       0,     0,     0,     0,     0,     0,     0,   154,     0,   155,
-     156,   157,   158,     0,   159,   260,     0,   160,   161,     0,
-     149,   150,     0,   162,   151,     0,   152,   153,     0,     0,
-       0,     0,     0,     0,     0,   149,   150,     0,     0,   151,
-       0,   152,   153,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   149,   150,     0,     0,   151,     0,   152,   153,
-       0,     0,     0,     0,     0,     0,     0,   154,     0,   155,
-     156,   157,   158,     0,   159,   265,     0,   160,   161,     0,
-       0,     0,   154,   162,   155,   156,   157,   158,     0,   159,
-       0,     0,   160,   161,     0,   149,   150,   269,   162,   151,
-       0,   152,   153,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   149,   150,     0,     0,   151,     0,   152,   153,
-     154,     0,   155,   156,   157,   158,     0,   159,     0,     0,
-     160,   161,     0,   149,   150,   271,   162,   151,     0,   152,
-     153,     0,     0,     0,     0,     0,     0,     0,   154,     0,
-     155,   156,   157,   158,     0,   159,   283,     0,   160,   161,
-       0,     0,     0,   154,   162,   155,   156,   157,   158,     0,
-     159,     0,     0,   160,   161,     0,     0,     0,   286,   162,
-     154,     0,   155,   156,   157,   158,     0,   159,   300,     0,
-     160,   161,     0,   149,   150,     0,   162,   151,     0,   152,
-     153,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     149,   150,     0,     0,   151,     0,   152,   153,     0,     0,
-       0,     0,     0,   154,     0,   155,   156,   157,   158,     0,
-     159,     0,     0,   160,   161,     0,     0,     0,   321,   162,
-     154,     0,   155,   156,   157,   158,     0,   159,     0,     0,
-     160,   161,     0,   149,   150,   241,   162,   151,     0,   152,
-     153,   154,     0,   155,   156,   157,   158,   328,   159,     0,
-       0,   160,   161,     0,   149,   150,     0,   162,   151,     0,
-     152,   153,     0,     0,     0,     0,     0,     0,     0,   149,
-     150,     0,     0,   151,     0,   152,   153,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   149,   150,     0,     0,
-     151,     0,   152,   153,     0,     0,     0,     0,     0,     0,
-       0,   154,     0,   155,   156,   157,   158,   151,   159,     0,
-     153,   160,   161,     0,     0,     0,   332,   162,   154,     0,
-     155,   156,   157,   158,     0,   159,   333,     0,   160,   161,
-       0,   149,   150,     0,   162,   151,     0,   152,   153,     0,
-       0,     0,     0,     0,     0,     0,   149,   150,     0,     0,
-     151,     0,   152,   153,     0,     0,     0,     0,     0,     0,
-       0,   154,     0,   155,   156,   157,   158,     0,   159,     0,
-       0,   160,   161,     0,   149,   150,   334,   162,   151,     0,
-     152,   153,   154,     0,   155,   156,   157,   158,     0,   159,
-     335,     0,   160,   161,     0,     0,     0,   154,   162,   155,
-     156,   157,   158,     0,   159,     0,     0,   160,   161,     0,
-       0,     0,   352,   162,   154,     0,   155,   156,   157,   158,
-     353,   159,   149,   150,   160,   161,   151,     0,   152,   153,
-     162,   154,     0,   155,   156,   157,   158,     0,   159,   149,
-     150,     0,   161,   151,     0,   152,   153,   162,     0,     0,
-       0,     0,     0,     5,     6,   308,   309,     0,     0,   154,
-       9,   155,   156,   157,   158,     0,   159,   354,     0,   160,
-     161,     0,     0,     0,   154,   162,   155,   156,   157,   158,
-       0,   159,     0,     0,   160,   161,     0,   149,   150,   374,
-     162,   151,     0,   152,   153,     0,     0,     0,     0,     0,
-       0,     0,   154,     0,   155,   156,   157,   158,     0,   159,
-       0,     0,   160,   161,     0,   149,   150,   375,   162,   151,
-       0,   152,   153,     0,     0,     0,     0,     0,     0,     0,
-     149,   150,     0,     0,   151,     0,   152,   153,     0,   310,
-     311,   312,   313,     0,     0,     0,     0,     0,     0,     0,
-     154,     0,   155,   156,   157,   158,     0,   159,     0,     0,
-     160,   161,     0,     0,     0,   376,   162,   154,     0,   155,
-     156,   157,   158,     0,   159,     0,     0,   160,   161,     0,
-    -151,   150,   377,   162,   151,     0,   152,   153,     0,     0,
-       0,     0,     0,     0,     0,     0,   150,     0,     0,   151,
-       0,   152,   153,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   154,     0,   155,   156,   157,
-     158,     0,   159,     0,     0,   160,   161,     0,     0,     0,
-     378,   162,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   154,     0,   155,   156,   157,   158,   379,
-     159,     0,     0,   160,   161,     0,     0,     0,   154,   162,
-     155,   156,   157,   158,     0,   159,     0,     0,   160,   161,
-       4,     0,     0,     0,   162,     5,     6,    88,    89,     0,
+      61,   303,    70,   151,   365,   148,   169,   123,   377,   154,
+     226,   307,   156,   152,   153,   170,   171,   154,   150,   155,
+     156,   120,   121,   122,   151,   154,    89,   151,   156,    97,
+     377,   273,   101,   148,   151,   148,   366,   124,   225,   103,
+     151,   275,   151,   104,   101,   101,   101,   101,    70,   277,
+     144,   101,   151,   151,   127,   151,   151,   215,   216,   292,
+     294,   329,   304,   305,   154,   168,   151,   156,   330,   151,
+     178,   278,   139,   364,   105,   143,   392,   148,   106,   146,
+     103,   279,   179,   280,   107,   363,   180,   281,   166,   167,
+     152,   153,   332,   333,   154,   101,   155,   156,   181,   282,
+     182,   283,   101,   148,   108,   177,   183,   286,   152,   153,
+     197,   109,   154,   200,   155,   156,   110,   203,   104,   354,
+     107,   355,   108,   356,   184,   111,   148,   214,   187,   189,
+     190,   191,   192,   193,   194,   195,   223,   198,   148,   161,
+     149,   201,   157,   126,   158,   159,   160,   161,   230,   162,
+     165,   101,   163,   164,   217,   161,   131,   162,   165,   227,
+     220,   128,   284,   101,  -132,  -132,   165,   129,   149,   285,
+     149,   134,   148,   101,   110,   357,   231,   232,   233,   255,
+     234,   257,   235,   236,   237,   238,   239,   240,   241,   242,
+     101,   111,   358,   160,   161,   101,   162,   169,   249,   130,
+     101,   100,   132,   253,   254,   165,   256,  -152,   258,   133,
+     135,   260,   149,   113,   115,   117,   119,   148,   244,   157,
+     125,   158,   159,   160,   161,   136,   162,   141,   142,   163,
+     164,   137,  -133,  -133,   245,   165,    30,   157,   149,   158,
+     159,   160,   161,   289,   162,   266,  -111,   163,   164,   147,
+     175,   185,   267,   165,   219,  -111,  -111,   178,  -104,   179,
+     221,   149,   180,   181,   174,   182,   183,  -104,  -104,   297,
+     204,   176,   298,   149,   151,   301,   205,   302,   170,   287,
+     262,   290,   293,   328,   336,   320,   338,   302,   362,   308,
+     309,   310,  -109,   311,   347,   312,   313,   348,   250,   349,
+     350,  -109,  -109,     2,     3,   337,   351,   149,   376,   352,
+     353,     4,   365,   326,   388,   379,     5,     6,     7,     8,
+     213,   331,   380,     9,   334,   389,   102,   152,   153,   140,
+     391,   154,   100,   155,   156,   387,   252,  -105,     0,     0,
+       0,     0,   228,    10,   152,   153,  -105,  -105,   154,     0,
+     155,   156,   149,     0,     0,     0,     0,     0,     0,   243,
+       0,   302,     0,     0,   248,   370,     0,   371,   372,   251,
+     373,     0,     0,   152,   153,     0,     0,   154,   390,   155,
+     156,     0,     0,     0,     0,     0,   374,   375,     0,     0,
+       0,     0,     0,     0,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+       0,    27,    28,    29,    30,   148,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,     0,    49,   148,     0,    50,     0,
+      51,   152,   153,     0,    52,   154,     0,   155,   156,    53,
+       0,     0,    54,     0,     0,     0,   157,     0,   158,   159,
+     160,   161,   148,   162,   268,     0,   163,   164,     0,     0,
+       0,   269,   165,   157,     0,   158,   159,   160,   161,     0,
+     162,   271,     0,   163,   164,     0,   152,   153,   272,   165,
+     154,     0,   155,   156,     0,     0,     0,     0,     0,     0,
+       0,     0,   157,     0,   158,   159,   160,   161,   295,   162,
+     296,     0,   163,   164,     0,   152,   153,     0,   165,   154,
+       0,   155,   156,     5,     6,   314,   315,     0,     0,     0,
+       9,     0,   152,   153,     0,  -106,   154,     0,   155,   156,
+       0,     0,     0,     0,  -106,  -106,     0,   152,   153,     0,
+     149,   154,     0,   155,   156,     0,  -107,     0,     0,     0,
+       0,     0,     0,     0,     0,  -107,  -107,     0,     0,     0,
+     157,   149,   158,   159,   160,   161,     0,   162,   299,     0,
+     163,   164,  -110,   152,   153,   300,   165,   154,     0,   155,
+     156,  -110,  -110,     0,     0,     0,     0,   149,     0,     0,
+     152,   153,     0,     0,   154,     0,   155,   156,     0,   316,
+     317,   318,   319,     0,     0,   157,     0,   158,   159,   160,
+     161,     0,   162,   343,     0,   163,   164,     0,   152,   153,
+     344,   165,   154,     0,   155,   156,     0,     0,     0,     0,
+       0,     0,     0,     0,   157,     0,   158,   159,   160,   161,
+       0,   162,   345,     0,   163,   164,     0,     0,     0,   346,
+     165,   157,     0,   158,   159,   160,   161,     0,   162,   247,
+       0,   163,   164,     0,     0,     0,   157,   165,   158,   159,
+     160,   161,     0,   162,     0,     0,   163,   164,     0,   152,
+     153,   259,   165,   154,     0,   155,   156,     0,     0,     0,
+       0,     0,     0,     0,   152,   153,     0,     0,   154,     0,
+     155,   156,   157,     0,   158,   159,   160,   161,     0,   162,
+       0,     0,   163,   164,     0,     0,     0,   261,   165,   157,
+       0,   158,   159,   160,   161,     0,   162,     0,     0,   163,
+     164,     0,   152,   153,   263,   165,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   157,     0,   158,
+     159,   160,   161,     0,   162,   264,     0,   163,   164,     0,
+     152,   153,     0,   165,   154,     0,   155,   156,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,     0,   157,     0,
+     158,   159,   160,   161,     0,   162,   265,     0,   163,   164,
+       0,     0,     0,   157,   165,   158,   159,   160,   161,     0,
+     162,   270,     0,   163,   164,     0,   152,   153,     0,   165,
+     154,     0,   155,   156,     0,     0,     0,     0,     0,     0,
+       0,   152,   153,     0,     0,   154,     0,   155,   156,     0,
+       0,   157,     0,   158,   159,   160,   161,     0,   162,     0,
+       0,   163,   164,     0,   152,   153,   274,   165,   154,     0,
+     155,   156,     0,     0,     0,     0,     0,     0,     0,   157,
+       0,   158,   159,   160,   161,     0,   162,     0,     0,   163,
+     164,     0,     0,     0,   276,   165,   157,     0,   158,   159,
+     160,   161,     0,   162,   288,   154,   163,   164,   156,     0,
+       0,   157,   165,   158,   159,   160,   161,     0,   162,     0,
+       0,   163,   164,     0,   152,   153,   291,   165,   154,     0,
+     155,   156,     0,     0,     0,     0,     0,     0,     0,   152,
+     153,     0,     0,   154,     0,   155,   156,     0,     0,     0,
+       0,     0,     0,     0,     0,   157,     0,   158,   159,   160,
+     161,     0,   162,   306,     0,   163,   164,     0,     0,     0,
+     157,   165,   158,   159,   160,   161,     0,   162,     0,     0,
+     163,   164,     0,   152,   153,   327,   165,   154,     0,   155,
+     156,     0,     0,   157,     0,   158,   159,   160,   161,     0,
+     162,     0,     0,   163,   164,     0,   152,   153,   245,   165,
+     154,     0,   155,   156,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   152,   153,     0,     0,   154,     0,   155,
+     156,     0,   158,   159,   160,   161,     0,   162,   152,   153,
+       0,   164,   154,     0,   155,   156,   165,     0,     0,     0,
+       0,     0,     0,   157,     0,   158,   159,   160,   161,   335,
+     162,     0,     0,   163,   164,     0,     0,     0,   157,   165,
+     158,   159,   160,   161,     0,   162,     0,     0,   163,   164,
+       0,   152,   153,   339,   165,   154,     0,   155,   156,     0,
+       0,     0,     0,     0,     0,     0,   152,   153,     0,     0,
+     154,     0,   155,   156,     0,     0,     0,     0,     0,     0,
+       0,     0,   157,     0,   158,   159,   160,   161,     0,   162,
+     340,     0,   163,   164,     0,   152,   153,     0,   165,   154,
+       0,   155,   156,     0,     0,   157,     0,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,     0,
+     341,   165,   157,     0,   158,   159,   160,   161,     0,   162,
+     342,     0,   163,   164,     0,     0,     0,   157,   165,   158,
+     159,   160,   161,     0,   162,     0,     0,   163,   164,     0,
+     152,   153,   359,   165,   154,     0,   155,   156,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+     157,     0,   158,   159,   160,   161,   360,   162,     0,     0,
+     163,   164,     0,     0,     0,   157,   165,   158,   159,   160,
+     161,     0,   162,   361,     0,   163,   164,     0,   152,   153,
+       0,   165,   154,     0,   155,   156,     0,     0,     0,     0,
+       0,     0,     0,     0,   157,     0,   158,   159,   160,   161,
+       0,   162,     0,     0,   163,   164,     0,   152,   153,   381,
+     165,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   152,   153,     0,     0,   154,     0,
+     155,   156,     0,     0,     0,     0,     0,     0,     0,   152,
+     153,     0,     0,   154,     0,   155,   156,     0,     0,   157,
+       0,   158,   159,   160,   161,     0,   162,     0,     0,   163,
+     164,     0,     0,     0,   382,   165,   157,     0,   158,   159,
+     160,   161,     0,   162,     0,     0,   163,   164,     0,  -153,
+     153,   383,   165,   154,     0,   155,   156,     0,     0,     0,
+       0,     0,     0,     0,     0,   153,     0,     0,   154,     0,
+     155,   156,     0,     0,     0,     0,     0,   157,     0,   158,
+     159,   160,   161,     0,   162,     0,     0,   163,   164,     0,
+       0,     0,   384,   165,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   157,     0,   158,   159,
+     160,   161,     0,   162,     0,     0,   163,   164,     0,     0,
+       0,   385,   165,   157,     0,   158,   159,   160,   161,   386,
+     162,     0,     0,   163,   164,     0,     0,     0,   157,   165,
+     158,   159,   160,   161,     0,   162,     0,     0,   163,   164,
+       4,     0,     0,     0,   165,     5,     6,    90,    91,     0,
        0,     0,     9,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   154,     0,
-     155,   156,   157,   158,     0,   159,     0,     0,   160,   161,
-       0,     0,     0,   154,   162,   155,   156,   157,   158,     0,
-     159,     0,     0,     0,   161,     4,     0,     0,     0,   162,
-       5,     6,    88,    89,     0,     0,     0,     9,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   157,     0,
+     158,   159,   160,   161,     0,   162,     0,     0,   163,   164,
+       0,     0,     0,   157,   165,   158,   159,   160,   161,     0,
+     162,     0,     0,     0,   164,     0,     0,     0,     0,   165,
+       4,     0,     0,     0,     0,     5,     6,    90,    91,     0,
+       0,     0,     9,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    11,    12,    13,    14,    15,    16,    17,
-      18,    90,    91,    92,    93,     0,     0,     0,     0,     0,
+      18,    92,    93,    94,    95,     0,     0,   154,     0,     0,
+     156,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,    96,     0,     0,     4,     0,    50,     0,    51,
+       5,     6,    90,    91,     0,     0,     0,     9,    53,   196,
+       0,    54,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
        0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
-       0,     0,     0,    39,    40,     0,     0,     0,     0,     0,
-       0,    94,     0,     0,     4,     0,    49,     0,    50,     5,
-       6,    88,    89,     0,     0,     0,     9,    52,   192,     0,
-      53,     0,     0,     0,     0,     0,     0,     0,    11,    12,
-      13,    14,    15,    16,    17,    18,    90,    91,    92,    93,
+      36,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,    96,     0,     0,     4,     0,    50,     0,    51,
+       5,     6,   206,   207,     0,     0,     0,     9,    53,   199,
+       0,    54,     0,     0,     0,     0,     0,     0,    11,    12,
+      13,    14,    15,    16,    17,    18,    92,    93,    94,    95,
+       0,     0,   157,     0,   158,   159,   160,   161,    30,   162,
+      31,    32,    33,   164,    35,    36,     0,     0,   165,    40,
+      41,     0,     0,     0,     0,     0,     0,    96,     0,     0,
+       4,     0,    50,     0,    51,     5,     6,    90,    91,     0,
+       0,     0,     9,    53,   202,     0,    54,     0,    11,    12,
+      13,    14,    15,    16,    17,    18,   208,   209,   210,   211,
        0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
-      31,    32,    33,     0,    35,     0,     0,     0,    39,    40,
-       0,     0,     4,     0,     0,     0,    94,     5,     6,   202,
-     203,    49,     0,    50,     9,     0,     0,     0,     0,     0,
-       0,     0,    52,   195,     0,    53,     0,    11,    12,    13,
-      14,    15,    16,    17,    18,    90,    91,    92,    93,     0,
-       0,     0,     0,     0,     0,     0,     0,    30,     0,    31,
-      32,    33,     0,    35,     0,     0,     0,    39,    40,     0,
-       0,     4,     0,     0,     0,    94,     5,     6,    88,    89,
-      49,     0,    50,     9,     0,     0,     0,     0,     0,     0,
-       0,    52,   198,     0,    53,    11,    12,    13,    14,    15,
-      16,    17,    18,   204,   205,   206,   207,     0,     0,     0,
-       0,     0,     0,     0,     0,    30,     0,    31,    32,    33,
-       0,    35,     0,     0,     0,    39,    40,     0,     0,     4,
-       0,     0,     0,    94,     5,     6,    88,    89,    49,     0,
-      50,     9,     0,     0,     0,     0,     0,     0,     0,    52,
-     208,     0,    53,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,    90,    91,    92,    93,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,     0,     0,     0,    39,    40,     0,     0,     4,     0,
-       0,     0,    94,     5,     6,    88,    89,    49,     0,    50,
-       9,     0,     0,     0,     0,     0,     0,     0,    52,   218,
-       0,    53,    11,    12,    13,    14,    15,    16,    17,    18,
-      90,    91,    92,    93,     0,     0,     0,     0,     0,     0,
-       0,     0,    30,     0,    31,    32,    33,     0,    35,     0,
-       0,     0,    39,    40,     0,     0,     4,     0,     0,     0,
-      94,     5,     6,    88,    89,    49,     0,    50,     9,     0,
-       0,     0,     0,     0,     0,     0,    52,   225,     0,    53,
-       0,    11,    12,    13,    14,    15,    16,    17,    18,    90,
-      91,    92,    93,     0,     0,     0,     0,     0,     0,     0,
-       0,    30,     0,    31,    32,    33,     0,    35,     0,     0,
-       0,    39,    40,     0,     0,     4,     0,     0,     0,    94,
-       5,     6,    88,    89,    49,     0,    50,     9,     0,     0,
-       0,     0,     0,     0,     0,    52,     0,     0,    53,    11,
-      12,    13,    14,    15,    16,    17,    18,    90,    91,    92,
-      93,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,    35,     0,     0,     0,    39,
-      40,     0,     0,     4,     0,     0,     0,    94,     5,     6,
-      88,    89,    49,     0,    50,     9,     0,     0,     0,     0,
-       0,     0,     0,    97,     0,     0,    53,     0,    11,    12,
-      13,    14,    15,    16,    17,    18,    90,    91,    92,    93,
+      31,    32,    33,     0,    35,    36,     0,     0,     0,    40,
+      41,     0,     0,     0,     0,     0,     0,    96,     0,     0,
+       4,     0,    50,     0,    51,     5,     6,    90,    91,     0,
+       0,     0,     9,    53,   212,     0,    54,     0,     0,     0,
+       0,     0,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
+       0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,    96,     0,     0,     4,     0,    50,     0,    51,
+       5,     6,    90,    91,     0,     0,     0,     9,    53,   222,
+       0,    54,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
+       0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,    96,     0,     0,     4,     0,    50,     0,    51,
+       5,     6,    90,    91,     0,     0,     0,     9,    53,   229,
+       0,    54,     0,     0,     0,     0,     0,     0,    11,    12,
+      13,    14,    15,    16,    17,    18,    92,    93,    94,    95,
        0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
-      31,    32,    33,     0,    35,     0,     0,     0,    39,    40,
-       0,     0,     4,     0,     0,     0,    94,     5,     6,    88,
-      89,    49,     0,    50,     9,     0,     0,     0,     0,     0,
-       0,     0,   110,     0,     0,    53,    11,    12,    13,    14,
-      15,    16,    17,    18,    90,    91,    92,    93,     0,     0,
-       0,     0,     0,     0,     0,     0,    30,     0,    31,    32,
-      33,     0,    35,     0,     0,     0,    39,    40,     0,     0,
-       4,     0,     0,     0,    94,     5,     6,    88,    89,    49,
-       0,    50,     9,     0,     0,     0,     0,     0,     0,     0,
-     112,     0,     0,    53,     0,    11,    12,    13,    14,    15,
-      16,    17,    18,    90,    91,    92,    93,     0,     0,     0,
-       0,     0,     0,     0,     0,    30,     0,    31,    32,    33,
-       0,    35,     0,     0,     0,    39,    40,     0,     0,     4,
-       0,     0,     0,    94,     5,     6,   135,    89,    49,     0,
-      50,     9,     0,     0,     0,     0,     0,     0,     0,   114,
-       0,     0,    53,    11,    12,    13,    14,    15,    16,    17,
-      18,    90,    91,    92,    93,     0,     0,     0,     0,     0,
+      31,    32,    33,     0,    35,    36,     0,     0,     0,    40,
+      41,     0,     0,     0,     0,     0,     0,    96,     0,     0,
+       4,     0,    50,     0,    51,     5,     6,    90,    91,     0,
+       0,     0,     9,    53,     0,     0,    54,     0,    11,    12,
+      13,    14,    15,    16,    17,    18,    92,    93,    94,    95,
+       0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
+      31,    32,    33,     0,    35,    36,     0,     0,     0,    40,
+      41,     0,     0,     0,     0,     0,     0,    96,     0,     0,
+       4,     0,    50,     0,    51,     5,     6,    90,    91,     0,
+       0,     0,     9,    99,     0,     0,    54,     0,     0,     0,
+       0,     0,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
        0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
-       0,     0,     0,    39,    40,     0,     0,     4,     0,     0,
-       0,    94,     5,     6,    88,    89,    49,     0,    50,     9,
-       0,     0,     0,     0,     0,     0,     0,   116,     0,     0,
-      53,     0,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,     0,     0,     0,     0,     0,     0,
-       0,     0,    30,     0,    31,    32,    33,     0,    35,     0,
-       0,     0,    39,    40,     0,     0,     4,     0,     0,     0,
-      94,     5,     6,    88,    89,    49,     0,    50,     9,     0,
-       0,     0,     0,     0,     0,     0,    52,     0,     0,    53,
-      11,    12,    13,    14,    15,    16,    17,    18,    90,    91,
-      92,    93,     0,     0,     0,     0,     0,     0,     0,     0,
-      30,     0,    31,    32,    33,     0,    35,     0,     0,     0,
-      39,    40,     0,     0,     4,     0,     0,     0,    94,     5,
-       6,    88,    89,    49,     0,    50,     9,     0,     0,     0,
-       0,     0,     0,     0,   169,     0,     0,    53,     0,    11,
-      12,    13,    14,    15,    16,    17,    18,    90,    91,    92,
-      93,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,    35,     0,     0,     0,    39,
-      40,     0,     0,     0,     0,     0,     0,    94,     0,     0,
-       0,     0,    49,     0,    50,     0,     0,     0,     0,     0,
-       0,     0,     0,   182,     0,     0,    53,   315,    12,    13,
-     316,   317,    16,   318,   319,    90,    91,    92,    93,     0,
-       0,     0,     0,     0,     0,     0,     0,    30,     0,    31,
-      32,    33,     0,    35,     0,     0,     0,    39,    40,     0,
-       0,     0,     0,     0,     0,    94,     0,     0,     0,     0,
-      49,     0,    50,     0,     0,     0,     0,     0,     0,     0,
-       0,    52,     0,     0,    53
+      36,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,    96,     0,     0,     4,     0,    50,     0,    51,
+       5,     6,    90,    91,     0,     0,     0,     9,   112,     0,
+       0,    54,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
+       0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,    96,     0,     0,     4,     0,    50,     0,    51,
+       5,     6,    90,    91,     0,     0,     0,     9,   114,     0,
+       0,    54,     0,     0,     0,     0,     0,     0,    11,    12,
+      13,    14,    15,    16,    17,    18,    92,    93,    94,    95,
+       0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
+      31,    32,    33,     0,    35,    36,     0,     0,     0,    40,
+      41,     0,     0,     0,     0,     0,     0,    96,     0,     0,
+       4,     0,    50,     0,    51,     5,     6,   138,    91,     0,
+       0,     0,     9,   116,     0,     0,    54,     0,    11,    12,
+      13,    14,    15,    16,    17,    18,    92,    93,    94,    95,
+       0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
+      31,    32,    33,     0,    35,    36,     0,     0,     0,    40,
+      41,     0,     0,     0,     0,     0,     0,    96,     0,     0,
+       4,     0,    50,     0,    51,     5,     6,    90,    91,     0,
+       0,     0,     9,   118,     0,     0,    54,     0,     0,     0,
+       0,     0,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,     0,     0,     0,     0,     0,
+       0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,    96,     0,     0,     4,     0,    50,     0,    51,
+       5,     6,    90,    91,     0,     0,     0,     9,    53,     0,
+       0,    54,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
+       0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,    96,     0,     0,     4,     0,    50,     0,    51,
+       5,     6,    90,    91,     0,     0,     0,     9,   173,     0,
+       0,    54,     0,     0,     0,     0,     0,     0,    11,    12,
+      13,    14,    15,    16,    17,    18,    92,    93,    94,    95,
+       0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
+      31,    32,    33,     0,    35,    36,     0,     0,     0,    40,
+      41,     0,     0,     0,     0,     0,     0,    96,     0,     0,
+       0,     0,    50,     0,    51,     0,     0,     0,     0,     0,
+       0,     0,     0,   186,     0,     0,    54,     0,   321,    12,
+      13,   322,   323,    16,   324,   325,    92,    93,    94,    95,
+       0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
+      31,    32,    33,     0,    35,    36,     0,     0,     0,    40,
+      41,     0,     0,     0,     0,     0,     0,    96,     0,     0,
+       0,     0,    50,     0,    51,     0,     0,     0,     0,     0,
+       0,     0,     0,    53,     0,     0,    54
 };
 
 static const yytype_int16 yycheck[] =
 {
-       1,    11,   114,   359,   137,   111,   139,   139,   111,   112,
-     130,     3,     4,     1,   146,     7,   247,     9,    10,   139,
-     140,   130,   140,    24,     7,   381,   257,    10,     4,    11,
-     139,     7,    11,   145,   140,   139,   111,   112,   145,   146,
-     139,   139,   146,    19,    20,    21,    22,   146,   146,    50,
-      26,   145,   139,    29,   139,   139,   145,   139,    46,   146,
-     139,   146,   146,    64,   146,   139,   112,   146,   112,   145,
-      46,   140,   146,    49,   118,   145,   146,    53,   145,    11,
-     145,   146,   145,   146,   145,   146,    62,     3,     4,   145,
-     146,     7,    68,     9,    10,   145,   146,   145,   329,    75,
-     145,   146,    78,   145,   146,   145,   146,   145,   109,   145,
-     146,   112,     3,     4,   145,   116,     7,   145,     9,    10,
-     145,    97,   145,   146,   145,   101,   102,   103,   104,   105,
-     106,   107,   108,   134,   110,   145,   124,     7,   114,   131,
-      10,   133,   134,   135,   136,   146,   138,   139,   124,   141,
-     142,   127,   111,   136,   146,   147,   132,   139,   140,   135,
-     139,    47,    48,   145,   147,   145,   145,   146,   145,   145,
-     145,   111,   148,   149,   150,   176,   152,   178,   154,   155,
-     156,   157,   158,   159,   160,   161,   162,   145,   111,   145,
-     166,   111,   139,   169,    11,   171,   145,     7,   174,   175,
-     145,   177,     7,   179,   145,    10,   182,   139,   140,    19,
-      20,    21,    22,   145,   145,   131,    26,   133,   134,   135,
-     136,    11,   138,   145,   145,   141,   142,   112,   140,   139,
-     111,   147,   148,   140,   112,   139,   139,   112,   214,   130,
-     131,   140,   133,   134,   135,   136,     7,   138,   111,    10,
-     141,   142,   112,   146,   146,   146,   147,   139,    68,   139,
-     114,     7,   146,   146,   240,    75,   136,   146,   138,   245,
-     146,   247,   146,   139,   136,   146,   145,   147,   139,   146,
-     292,   257,    46,   259,   260,   261,   381,   263,   369,   265,
-     266,   279,    -1,    -1,    -1,   172,     0,     1,    -1,   300,
-      -1,    -1,    -1,    -1,     8,    -1,    -1,   283,    -1,    13,
-      14,    15,    16,   130,   124,   291,    20,   293,    -1,   136,
-       3,     4,   139,   140,     7,   135,     9,    10,   145,    -1,
-     135,   136,    -1,   138,    -1,   145,    40,     3,     4,    -1,
-     130,     7,   147,     9,    10,    -1,    -1,    -1,    -1,   139,
-     140,    -1,   162,   329,    -1,   145,   166,   333,    11,   335,
-     336,   171,   338,     3,     4,    -1,    -1,     7,    -1,     9,
-      10,   372,   133,   134,   135,   136,    -1,   138,   354,   355,
-      -1,   142,    -1,    -1,    11,    -1,   147,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   105,   106,    -1,   108,   109,   110,   111,    -1,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,   127,   128,   129,    -1,   131,    11,    -1,
-     134,    -1,   136,     3,     4,    -1,   140,     7,    -1,     9,
-      10,   145,    -1,    -1,   148,    -1,    -1,    -1,   131,    -1,
-     133,   134,   135,   136,    11,   138,   139,    -1,   141,   142,
-      11,    -1,    -1,   146,   147,   131,    -1,   133,   134,   135,
-     136,    11,   138,   139,    -1,   141,   142,   130,     3,     4,
-     146,   147,     7,    -1,     9,    10,   139,   140,    -1,    -1,
-      -1,   131,   145,   133,   134,   135,   136,   137,   138,   139,
-      -1,   141,   142,   130,     3,     4,    -1,   147,     7,    -1,
-       9,    10,   139,   140,    -1,    -1,    -1,    -1,   145,    -1,
+       1,   252,     1,   140,   114,    11,   131,   111,   366,     7,
+     147,   262,    10,     3,     4,   140,   141,     7,   131,     9,
+      10,   111,   112,    24,   140,     7,   141,   140,    10,     4,
+     388,   147,     7,    11,   140,    11,   146,   141,   138,   146,
+     140,   147,   140,   146,    19,    20,    21,    22,    47,   147,
+      51,    26,   140,   140,    29,   140,   140,   111,   112,   147,
+     147,   112,   147,   147,     7,    66,   140,    10,   119,   140,
+     146,   147,    47,   147,   146,    50,   147,    11,   146,    54,
+     146,   147,   146,   147,   146,   336,   146,   147,    63,    64,
+       3,     4,   297,   298,     7,    70,     9,    10,   146,   147,
+     146,   147,    77,    11,   146,    80,   146,   147,     3,     4,
+     111,   146,     7,   114,     9,    10,   146,   118,   146,   147,
+     146,   147,   146,   147,    99,   146,    11,   126,   103,   104,
+     105,   106,   107,   108,   109,   110,   137,   112,    11,   137,
+     146,   116,   132,   146,   134,   135,   136,   137,   149,   139,
+     148,   126,   142,   143,   129,   137,   112,   139,   148,   149,
+     135,   111,   140,   138,   140,   141,   148,   146,   146,   147,
+     146,   111,    11,   148,   146,   147,   151,   152,   153,   180,
+     155,   182,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   146,   147,   136,   137,   170,   139,   131,   173,   146,
+     175,     7,   146,   178,   179,   148,   181,   141,   183,   146,
+     146,   186,   146,    19,    20,    21,    22,    11,   131,   132,
+      26,   134,   135,   136,   137,   111,   139,    48,    49,   142,
+     143,   146,   140,   141,   147,   148,   111,   132,   146,   134,
+     135,   136,   137,   218,   139,   140,   131,   142,   143,   141,
+     140,   112,   147,   148,   111,   140,   141,   146,   131,   146,
+     112,   146,   146,   146,    70,   146,   146,   140,   141,   244,
+     141,    77,   247,   146,   140,   250,   141,   252,   140,   112,
+     140,   111,   141,   112,   140,   284,   140,   262,   137,   264,
+     265,   266,   131,   268,   147,   270,   271,   147,   137,   147,
+     147,   140,   141,     0,     1,   306,   147,   146,   140,   147,
+     147,     8,   114,   288,   140,   146,    13,    14,    15,    16,
+     126,   296,   147,    20,   299,   147,     7,     3,     4,    47,
+     388,     7,   138,     9,    10,   376,   176,   131,    -1,    -1,
+      -1,    -1,   148,    40,     3,     4,   140,   141,     7,    -1,
+       9,    10,   146,    -1,    -1,    -1,    -1,    -1,    -1,   165,
+      -1,   336,    -1,    -1,   170,   340,    -1,   342,   343,   175,
+     345,    -1,    -1,     3,     4,    -1,    -1,     7,   379,     9,
+      10,    -1,    -1,    -1,    -1,    -1,   361,   362,    -1,    -1,
+      -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+      -1,   108,   109,   110,   111,    11,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,    -1,   132,    11,    -1,   135,    -1,
+     137,     3,     4,    -1,   141,     7,    -1,     9,    10,   146,
+      -1,    -1,   149,    -1,    -1,    -1,   132,    -1,   134,   135,
+     136,   137,    11,   139,   140,    -1,   142,   143,    -1,    -1,
+      -1,   147,   148,   132,    -1,   134,   135,   136,   137,    -1,
+     139,   140,    -1,   142,   143,    -1,     3,     4,   147,   148,
+       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   132,    -1,   134,   135,   136,   137,   138,   139,
+     140,    -1,   142,   143,    -1,     3,     4,    -1,   148,     7,
+      -1,     9,    10,    13,    14,    15,    16,    -1,    -1,    -1,
+      20,    -1,     3,     4,    -1,   131,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,   140,   141,    -1,     3,     4,    -1,
+     146,     7,    -1,     9,    10,    -1,   131,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   140,   141,    -1,    -1,    -1,
+     132,   146,   134,   135,   136,   137,    -1,   139,   140,    -1,
+     142,   143,   131,     3,     4,   147,   148,     7,    -1,     9,
+      10,   140,   141,    -1,    -1,    -1,    -1,   146,    -1,    -1,
+       3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    99,
+     100,   101,   102,    -1,    -1,   132,    -1,   134,   135,   136,
+     137,    -1,   139,   140,    -1,   142,   143,    -1,     3,     4,
+     147,   148,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   132,    -1,   134,   135,   136,   137,
+      -1,   139,   140,    -1,   142,   143,    -1,    -1,    -1,   147,
+     148,   132,    -1,   134,   135,   136,   137,    -1,   139,   140,
+      -1,   142,   143,    -1,    -1,    -1,   132,   148,   134,   135,
+     136,   137,    -1,   139,    -1,    -1,   142,   143,    -1,     3,
+       4,   147,   148,     7,    -1,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
+       9,    10,   132,    -1,   134,   135,   136,   137,    -1,   139,
+      -1,    -1,   142,   143,    -1,    -1,    -1,   147,   148,   132,
+      -1,   134,   135,   136,   137,    -1,   139,    -1,    -1,   142,
+     143,    -1,     3,     4,   147,   148,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   132,    -1,   134,
+     135,   136,   137,    -1,   139,   140,    -1,   142,   143,    -1,
+       3,     4,    -1,   148,     7,    -1,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   132,    -1,
+     134,   135,   136,   137,    -1,   139,   140,    -1,   142,   143,
+      -1,    -1,    -1,   132,   148,   134,   135,   136,   137,    -1,
+     139,   140,    -1,   142,   143,    -1,     3,     4,    -1,   148,
+       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,
-      -1,    -1,     7,    -1,     9,    10,    -1,   130,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   139,   140,    -1,    -1,
-      -1,   131,   145,   133,   134,   135,   136,    -1,   138,   139,
-      -1,   141,   142,   130,     3,     4,   146,   147,     7,   130,
-       9,    10,   139,   140,    -1,    -1,    -1,    -1,   145,   140,
-     130,     3,     4,    -1,   145,     7,    -1,     9,    10,   139,
-     140,    -1,    -1,    -1,    -1,   145,   131,    -1,   133,   134,
-     135,   136,    -1,   138,   139,    -1,   141,   142,    -1,     3,
-       4,   146,   147,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,    -1,   131,    -1,   133,   134,   135,   136,    -1,   138,
-     139,    -1,   141,   142,    -1,    -1,    -1,   146,   147,   131,
-      -1,   133,   134,   135,   136,    -1,   138,    -1,    -1,   141,
-     142,    -1,    -1,    -1,   146,   147,   131,    -1,   133,   134,
-     135,   136,    -1,   138,    -1,    -1,   141,   142,    -1,     3,
-       4,   146,   147,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
-       9,    10,   131,    -1,   133,   134,   135,   136,    -1,   138,
-      -1,    -1,   141,   142,    -1,    -1,    -1,   146,   147,   131,
-      -1,   133,   134,   135,   136,    -1,   138,   139,    -1,   141,
-     142,    -1,     3,     4,    -1,   147,     7,    -1,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   131,    -1,   133,
-     134,   135,   136,    -1,   138,   139,    -1,   141,   142,    -1,
-       3,     4,    -1,   147,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   131,    -1,   133,
-     134,   135,   136,    -1,   138,   139,    -1,   141,   142,    -1,
-      -1,    -1,   131,   147,   133,   134,   135,   136,    -1,   138,
-      -1,    -1,   141,   142,    -1,     3,     4,   146,   147,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-     131,    -1,   133,   134,   135,   136,    -1,   138,    -1,    -1,
-     141,   142,    -1,     3,     4,   146,   147,     7,    -1,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   131,    -1,
-     133,   134,   135,   136,    -1,   138,   139,    -1,   141,   142,
-      -1,    -1,    -1,   131,   147,   133,   134,   135,   136,    -1,
-     138,    -1,    -1,   141,   142,    -1,    -1,    -1,   146,   147,
-     131,    -1,   133,   134,   135,   136,    -1,   138,   139,    -1,
-     141,   142,    -1,     3,     4,    -1,   147,     7,    -1,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,   131,    -1,   133,   134,   135,   136,    -1,
-     138,    -1,    -1,   141,   142,    -1,    -1,    -1,   146,   147,
-     131,    -1,   133,   134,   135,   136,    -1,   138,    -1,    -1,
-     141,   142,    -1,     3,     4,   146,   147,     7,    -1,     9,
-      10,   131,    -1,   133,   134,   135,   136,   137,   138,    -1,
-      -1,   141,   142,    -1,     3,     4,    -1,   147,     7,    -1,
+      -1,   132,    -1,   134,   135,   136,   137,    -1,   139,    -1,
+      -1,   142,   143,    -1,     3,     4,   147,   148,     7,    -1,
+       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   132,
+      -1,   134,   135,   136,   137,    -1,   139,    -1,    -1,   142,
+     143,    -1,    -1,    -1,   147,   148,   132,    -1,   134,   135,
+     136,   137,    -1,   139,   140,     7,   142,   143,    10,    -1,
+      -1,   132,   148,   134,   135,   136,   137,    -1,   139,    -1,
+      -1,   142,   143,    -1,     3,     4,   147,   148,     7,    -1,
        9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
        4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   132,    -1,   134,   135,   136,
+     137,    -1,   139,   140,    -1,   142,   143,    -1,    -1,    -1,
+     132,   148,   134,   135,   136,   137,    -1,   139,    -1,    -1,
+     142,   143,    -1,     3,     4,   147,   148,     7,    -1,     9,
+      10,    -1,    -1,   132,    -1,   134,   135,   136,   137,    -1,
+     139,    -1,    -1,   142,   143,    -1,     3,     4,   147,   148,
+       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
+      10,    -1,   134,   135,   136,   137,    -1,   139,     3,     4,
+      -1,   143,     7,    -1,     9,    10,   148,    -1,    -1,    -1,
+      -1,    -1,    -1,   132,    -1,   134,   135,   136,   137,   138,
+     139,    -1,    -1,   142,   143,    -1,    -1,    -1,   132,   148,
+     134,   135,   136,   137,    -1,   139,    -1,    -1,   142,   143,
+      -1,     3,     4,   147,   148,     7,    -1,     9,    10,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
        7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   131,    -1,   133,   134,   135,   136,     7,   138,    -1,
-      10,   141,   142,    -1,    -1,    -1,   146,   147,   131,    -1,
-     133,   134,   135,   136,    -1,   138,   139,    -1,   141,   142,
-      -1,     3,     4,    -1,   147,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
-       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   131,    -1,   133,   134,   135,   136,    -1,   138,    -1,
-      -1,   141,   142,    -1,     3,     4,   146,   147,     7,    -1,
-       9,    10,   131,    -1,   133,   134,   135,   136,    -1,   138,
-     139,    -1,   141,   142,    -1,    -1,    -1,   131,   147,   133,
-     134,   135,   136,    -1,   138,    -1,    -1,   141,   142,    -1,
-      -1,    -1,   146,   147,   131,    -1,   133,   134,   135,   136,
-     137,   138,     3,     4,   141,   142,     7,    -1,     9,    10,
-     147,   131,    -1,   133,   134,   135,   136,    -1,   138,     3,
-       4,    -1,   142,     7,    -1,     9,    10,   147,    -1,    -1,
-      -1,    -1,    -1,    13,    14,    15,    16,    -1,    -1,   131,
-      20,   133,   134,   135,   136,    -1,   138,   139,    -1,   141,
-     142,    -1,    -1,    -1,   131,   147,   133,   134,   135,   136,
-      -1,   138,    -1,    -1,   141,   142,    -1,     3,     4,   146,
-     147,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   131,    -1,   133,   134,   135,   136,    -1,   138,
-      -1,    -1,   141,   142,    -1,     3,     4,   146,   147,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    99,
-     100,   101,   102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     131,    -1,   133,   134,   135,   136,    -1,   138,    -1,    -1,
-     141,   142,    -1,    -1,    -1,   146,   147,   131,    -1,   133,
-     134,   135,   136,    -1,   138,    -1,    -1,   141,   142,    -1,
-       3,     4,   146,   147,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     4,    -1,    -1,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   131,    -1,   133,   134,   135,
-     136,    -1,   138,    -1,    -1,   141,   142,    -1,    -1,    -1,
-     146,   147,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   131,    -1,   133,   134,   135,   136,   137,
-     138,    -1,    -1,   141,   142,    -1,    -1,    -1,   131,   147,
-     133,   134,   135,   136,    -1,   138,    -1,    -1,   141,   142,
-       8,    -1,    -1,    -1,   147,    13,    14,    15,    16,    -1,
+      -1,    -1,   132,    -1,   134,   135,   136,   137,    -1,   139,
+     140,    -1,   142,   143,    -1,     3,     4,    -1,   148,     7,
+      -1,     9,    10,    -1,    -1,   132,    -1,   134,   135,   136,
+     137,    -1,   139,    -1,    -1,   142,   143,    -1,    -1,    -1,
+     147,   148,   132,    -1,   134,   135,   136,   137,    -1,   139,
+     140,    -1,   142,   143,    -1,    -1,    -1,   132,   148,   134,
+     135,   136,   137,    -1,   139,    -1,    -1,   142,   143,    -1,
+       3,     4,   147,   148,     7,    -1,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+     132,    -1,   134,   135,   136,   137,   138,   139,    -1,    -1,
+     142,   143,    -1,    -1,    -1,   132,   148,   134,   135,   136,
+     137,    -1,   139,   140,    -1,   142,   143,    -1,     3,     4,
+      -1,   148,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   132,    -1,   134,   135,   136,   137,
+      -1,   139,    -1,    -1,   142,   143,    -1,     3,     4,   147,
+     148,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
+       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
+       4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,   132,
+      -1,   134,   135,   136,   137,    -1,   139,    -1,    -1,   142,
+     143,    -1,    -1,    -1,   147,   148,   132,    -1,   134,   135,
+     136,   137,    -1,   139,    -1,    -1,   142,   143,    -1,     3,
+       4,   147,   148,     7,    -1,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     4,    -1,    -1,     7,    -1,
+       9,    10,    -1,    -1,    -1,    -1,    -1,   132,    -1,   134,
+     135,   136,   137,    -1,   139,    -1,    -1,   142,   143,    -1,
+      -1,    -1,   147,   148,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   132,    -1,   134,   135,
+     136,   137,    -1,   139,    -1,    -1,   142,   143,    -1,    -1,
+      -1,   147,   148,   132,    -1,   134,   135,   136,   137,   138,
+     139,    -1,    -1,   142,   143,    -1,    -1,    -1,   132,   148,
+     134,   135,   136,   137,    -1,   139,    -1,    -1,   142,   143,
+       8,    -1,    -1,    -1,   148,    13,    14,    15,    16,    -1,
       -1,    -1,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   131,    -1,
-     133,   134,   135,   136,    -1,   138,    -1,    -1,   141,   142,
-      -1,    -1,    -1,   131,   147,   133,   134,   135,   136,    -1,
-     138,    -1,    -1,    -1,   142,     8,    -1,    -1,    -1,   147,
-      13,    14,    15,    16,    -1,    -1,    -1,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   132,    -1,
+     134,   135,   136,   137,    -1,   139,    -1,    -1,   142,   143,
+      -1,    -1,    -1,   132,   148,   134,   135,   136,   137,    -1,
+     139,    -1,    -1,    -1,   143,    -1,    -1,    -1,    -1,   148,
+       8,    -1,    -1,    -1,    -1,    13,    14,    15,    16,    -1,
+      -1,    -1,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,    -1,    -1,     7,    -1,    -1,
+      10,    -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,
+     118,    -1,    -1,    -1,   122,   123,    -1,    -1,    -1,    -1,
+      -1,    -1,   130,    -1,    -1,     8,    -1,   135,    -1,   137,
+      13,    14,    15,    16,    -1,    -1,    -1,    20,   146,   147,
+      -1,   149,    -1,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,
+     118,    -1,    -1,    -1,   122,   123,    -1,    -1,    -1,    -1,
+      -1,    -1,   130,    -1,    -1,     8,    -1,   135,    -1,   137,
+      13,    14,    15,    16,    -1,    -1,    -1,    20,   146,   147,
+      -1,   149,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+      -1,    -1,   132,    -1,   134,   135,   136,   137,   111,   139,
+     113,   114,   115,   143,   117,   118,    -1,    -1,   148,   122,
+     123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
+       8,    -1,   135,    -1,   137,    13,    14,    15,    16,    -1,
+      -1,    -1,    20,   146,   147,    -1,   149,    -1,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+     113,   114,   115,    -1,   117,   118,    -1,    -1,    -1,   122,
+     123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
+       8,    -1,   135,    -1,   137,    13,    14,    15,    16,    -1,
+      -1,    -1,    20,   146,   147,    -1,   149,    -1,    -1,    -1,
       -1,    -1,    -1,    91,    92,    93,    94,    95,    96,    97,
       98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,
-      -1,    -1,    -1,   121,   122,    -1,    -1,    -1,    -1,    -1,
-      -1,   129,    -1,    -1,     8,    -1,   134,    -1,   136,    13,
-      14,    15,    16,    -1,    -1,    -1,    20,   145,   146,    -1,
-     148,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+     118,    -1,    -1,    -1,   122,   123,    -1,    -1,    -1,    -1,
+      -1,    -1,   130,    -1,    -1,     8,    -1,   135,    -1,   137,
+      13,    14,    15,    16,    -1,    -1,    -1,    20,   146,   147,
+      -1,   149,    -1,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,
+     118,    -1,    -1,    -1,   122,   123,    -1,    -1,    -1,    -1,
+      -1,    -1,   130,    -1,    -1,     8,    -1,   135,    -1,   137,
+      13,    14,    15,    16,    -1,    -1,    -1,    20,   146,   147,
+      -1,   149,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
       93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
-     113,   114,   115,    -1,   117,    -1,    -1,    -1,   121,   122,
-      -1,    -1,     8,    -1,    -1,    -1,   129,    13,    14,    15,
-      16,   134,    -1,   136,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   145,   146,    -1,   148,    -1,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,   113,
-     114,   115,    -1,   117,    -1,    -1,    -1,   121,   122,    -1,
-      -1,     8,    -1,    -1,    -1,   129,    13,    14,    15,    16,
-     134,    -1,   136,    20,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   145,   146,    -1,   148,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   111,    -1,   113,   114,   115,
-      -1,   117,    -1,    -1,    -1,   121,   122,    -1,    -1,     8,
-      -1,    -1,    -1,   129,    13,    14,    15,    16,   134,    -1,
-     136,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   145,
-     146,    -1,   148,    -1,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   111,    -1,   113,   114,   115,    -1,
-     117,    -1,    -1,    -1,   121,   122,    -1,    -1,     8,    -1,
-      -1,    -1,   129,    13,    14,    15,    16,   134,    -1,   136,
-      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   145,   146,
-      -1,   148,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,    -1,
-      -1,    -1,   121,   122,    -1,    -1,     8,    -1,    -1,    -1,
-     129,    13,    14,    15,    16,   134,    -1,   136,    20,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   145,   146,    -1,   148,
-      -1,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   111,    -1,   113,   114,   115,    -1,   117,    -1,    -1,
-      -1,   121,   122,    -1,    -1,     8,    -1,    -1,    -1,   129,
-      13,    14,    15,    16,   134,    -1,   136,    20,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   145,    -1,    -1,   148,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,
-      -1,   113,   114,   115,    -1,   117,    -1,    -1,    -1,   121,
-     122,    -1,    -1,     8,    -1,    -1,    -1,   129,    13,    14,
-      15,    16,   134,    -1,   136,    20,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   145,    -1,    -1,   148,    -1,    91,    92,
+     113,   114,   115,    -1,   117,   118,    -1,    -1,    -1,   122,
+     123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
+       8,    -1,   135,    -1,   137,    13,    14,    15,    16,    -1,
+      -1,    -1,    20,   146,    -1,    -1,   149,    -1,    91,    92,
       93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
-     113,   114,   115,    -1,   117,    -1,    -1,    -1,   121,   122,
-      -1,    -1,     8,    -1,    -1,    -1,   129,    13,    14,    15,
-      16,   134,    -1,   136,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   145,    -1,    -1,   148,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,   113,   114,
-     115,    -1,   117,    -1,    -1,    -1,   121,   122,    -1,    -1,
-       8,    -1,    -1,    -1,   129,    13,    14,    15,    16,   134,
-      -1,   136,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     145,    -1,    -1,   148,    -1,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   111,    -1,   113,   114,   115,
-      -1,   117,    -1,    -1,    -1,   121,   122,    -1,    -1,     8,
-      -1,    -1,    -1,   129,    13,    14,    15,    16,   134,    -1,
-     136,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   145,
-      -1,    -1,   148,    91,    92,    93,    94,    95,    96,    97,
+     113,   114,   115,    -1,   117,   118,    -1,    -1,    -1,   122,
+     123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
+       8,    -1,   135,    -1,   137,    13,    14,    15,    16,    -1,
+      -1,    -1,    20,   146,    -1,    -1,   149,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    93,    94,    95,    96,    97,
       98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,
-      -1,    -1,    -1,   121,   122,    -1,    -1,     8,    -1,    -1,
-      -1,   129,    13,    14,    15,    16,   134,    -1,   136,    20,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   145,    -1,    -1,
-     148,    -1,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,    -1,
-      -1,    -1,   121,   122,    -1,    -1,     8,    -1,    -1,    -1,
-     129,    13,    14,    15,    16,   134,    -1,   136,    20,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   145,    -1,    -1,   148,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     111,    -1,   113,   114,   115,    -1,   117,    -1,    -1,    -1,
-     121,   122,    -1,    -1,     8,    -1,    -1,    -1,   129,    13,
-      14,    15,    16,   134,    -1,   136,    20,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   145,    -1,    -1,   148,    -1,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,
-      -1,   113,   114,   115,    -1,   117,    -1,    -1,    -1,   121,
-     122,    -1,    -1,    -1,    -1,    -1,    -1,   129,    -1,    -1,
-      -1,    -1,   134,    -1,   136,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   145,    -1,    -1,   148,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,   113,
-     114,   115,    -1,   117,    -1,    -1,    -1,   121,   122,    -1,
-      -1,    -1,    -1,    -1,    -1,   129,    -1,    -1,    -1,    -1,
-     134,    -1,   136,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   145,    -1,    -1,   148
+     118,    -1,    -1,    -1,   122,   123,    -1,    -1,    -1,    -1,
+      -1,    -1,   130,    -1,    -1,     8,    -1,   135,    -1,   137,
+      13,    14,    15,    16,    -1,    -1,    -1,    20,   146,    -1,
+      -1,   149,    -1,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,
+     118,    -1,    -1,    -1,   122,   123,    -1,    -1,    -1,    -1,
+      -1,    -1,   130,    -1,    -1,     8,    -1,   135,    -1,   137,
+      13,    14,    15,    16,    -1,    -1,    -1,    20,   146,    -1,
+      -1,   149,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+     113,   114,   115,    -1,   117,   118,    -1,    -1,    -1,   122,
+     123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
+       8,    -1,   135,    -1,   137,    13,    14,    15,    16,    -1,
+      -1,    -1,    20,   146,    -1,    -1,   149,    -1,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+     113,   114,   115,    -1,   117,   118,    -1,    -1,    -1,   122,
+     123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
+       8,    -1,   135,    -1,   137,    13,    14,    15,    16,    -1,
+      -1,    -1,    20,   146,    -1,    -1,   149,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,
+     118,    -1,    -1,    -1,   122,   123,    -1,    -1,    -1,    -1,
+      -1,    -1,   130,    -1,    -1,     8,    -1,   135,    -1,   137,
+      13,    14,    15,    16,    -1,    -1,    -1,    20,   146,    -1,
+      -1,   149,    -1,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,    -1,   113,   114,   115,    -1,   117,
+     118,    -1,    -1,    -1,   122,   123,    -1,    -1,    -1,    -1,
+      -1,    -1,   130,    -1,    -1,     8,    -1,   135,    -1,   137,
+      13,    14,    15,    16,    -1,    -1,    -1,    20,   146,    -1,
+      -1,   149,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+     113,   114,   115,    -1,   117,   118,    -1,    -1,    -1,   122,
+     123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
+      -1,    -1,   135,    -1,   137,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   146,    -1,    -1,   149,    -1,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+     113,   114,   115,    -1,   117,   118,    -1,    -1,    -1,   122,
+     123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
+      -1,    -1,   135,    -1,   137,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   146,    -1,    -1,   149
 };
 
@@ -1548 +1568 @@
 static const yytype_uint8 yystos[] =
 {
-       0,   150,     0,     1,     8,    13,    14,    15,    16,    20,
+       0,   151,     0,     1,     8,    13,    14,    15,    16,    20,
       40,    91,    92,    93,    94,    95,    96,    97,    98,    99,
      100,   101,   102,   103,   104,   105,   106,   108,   109,   110,
      111,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   131,   134,
-     136,   140,   145,   148,   151,   152,   153,   154,   155,   156,
-     157,   158,   160,   162,   163,   164,   165,   166,   173,   174,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   140,    15,    16,
-      99,   100,   101,   102,   129,   158,   173,   145,   156,   158,
-     164,   145,   145,   145,   145,   145,   145,   145,   145,   145,
-     145,   156,   145,   156,   145,   156,   145,   156,   111,   112,
-     157,   111,   140,   156,   145,   158,   111,   145,   112,   145,
-     145,   111,   145,   111,   145,    15,   158,   165,   166,   166,
-     158,   157,   157,   158,   140,    11,   145,   130,   139,     3,
-       4,     7,     9,    10,   131,   133,   134,   135,   136,   138,
-     141,   142,   147,   158,   157,   130,   139,   140,   172,   145,
-     156,   139,   156,   158,   145,   145,   145,   145,   145,   145,
-     158,   112,   145,   158,   167,   158,   158,   158,   158,   158,
-     158,   158,   146,   157,   158,   146,   157,   158,   146,   157,
-     140,   140,    15,    16,    99,   100,   101,   102,   146,   156,
-     173,   111,   112,   158,   159,   111,   158,   112,   146,   157,
-     175,   137,   146,   148,   156,   146,   157,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   156,
-     130,   146,   161,   156,   158,   136,   156,   172,   158,   158,
-     157,   158,   157,   158,   146,   158,   146,   139,   146,   139,
-     139,   139,   146,   139,   146,   139,   139,   146,   146,   146,
-     146,   146,   146,   146,   146,   146,   146,   146,   146,   139,
-     146,   146,   112,   139,   158,   111,   146,   146,   140,   146,
-     137,   139,   158,   139,   146,   158,   158,   167,   146,   146,
-     139,   167,   158,   158,   158,   158,   158,   158,    15,    16,
-      99,   100,   101,   102,   173,    91,    94,    95,    97,    98,
-     158,   146,   112,   112,   118,   158,   161,   158,   137,   139,
-     157,   139,   146,   139,   146,   139,   139,   146,   139,   146,
-     146,   146,   146,   146,   146,   146,   146,   146,   146,   146,
-     146,   146,   146,   137,   139,   136,   167,   146,   114,   145,
-     168,   169,   171,   158,   158,   158,   158,   158,   158,   139,
-     169,   170,   145,   146,   146,   146,   146,   146,   146,   137,
-     171,   139,   146,   157,   170,   146
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   132,
+     135,   137,   141,   146,   149,   152,   153,   154,   155,   156,
+     157,   158,   159,   161,   162,   164,   165,   166,   167,   168,
+     175,   176,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   141,
+      15,    16,    99,   100,   101,   102,   130,   159,   175,   146,
+     157,   159,   166,   146,   146,   146,   146,   146,   146,   146,
+     146,   146,   146,   157,   146,   157,   146,   157,   146,   157,
+     111,   112,   158,   111,   141,   157,   146,   159,   111,   146,
+     146,   112,   146,   146,   111,   146,   111,   146,    15,   159,
+     167,   168,   168,   159,   158,   158,   159,   141,    11,   146,
+     131,   140,     3,     4,     7,     9,    10,   132,   134,   135,
+     136,   137,   139,   142,   143,   148,   159,   159,   158,   131,
+     140,   141,   174,   146,   157,   140,   157,   159,   146,   146,
+     146,   146,   146,   146,   159,   112,   146,   159,   169,   159,
+     159,   159,   159,   159,   159,   159,   147,   158,   159,   147,
+     158,   159,   147,   158,   141,   141,    15,    16,    99,   100,
+     101,   102,   147,   157,   175,   111,   112,   159,   160,   111,
+     159,   112,   147,   158,   177,   138,   147,   149,   157,   147,
+     158,   159,   159,   159,   159,   159,   159,   159,   159,   159,
+     159,   159,   159,   157,   131,   147,   163,   140,   157,   159,
+     137,   157,   174,   159,   159,   158,   159,   158,   159,   147,
+     159,   147,   140,   147,   140,   140,   140,   147,   140,   147,
+     140,   140,   147,   147,   147,   147,   147,   147,   147,   147,
+     147,   147,   147,   147,   140,   147,   147,   112,   140,   159,
+     111,   147,   147,   141,   147,   138,   140,   159,   159,   140,
+     147,   159,   159,   169,   147,   147,   140,   169,   159,   159,
+     159,   159,   159,   159,    15,    16,    99,   100,   101,   102,
+     175,    91,    94,    95,    97,    98,   159,   147,   112,   112,
+     119,   159,   163,   163,   159,   138,   140,   158,   140,   147,
+     140,   147,   140,   140,   147,   140,   147,   147,   147,   147,
+     147,   147,   147,   147,   147,   147,   147,   147,   147,   147,
+     138,   140,   137,   169,   147,   114,   146,   170,   171,   173,
+     159,   159,   159,   159,   159,   159,   140,   171,   172,   146,
+     147,   147,   147,   147,   147,   147,   138,   173,   140,   147,
+     158,   172,   147
 };
 
@@ -2410 +2431 @@
 
 /* Line 1464 of yacc.c  */
-#line 373 "grammar.y"
+#line 370 "grammar.y"
     {
             if (timerv)
@@ -2446 +2467 @@
 
 /* Line 1464 of yacc.c  */
-#line 408 "grammar.y"
+#line 405 "grammar.y"
     {currentVoice->ifsw=0;;}
     break;
@@ -2453 +2474 @@
 
 /* Line 1464 of yacc.c  */
-#line 410 "grammar.y"
+#line 407 "grammar.y"
     { (yyvsp[(1) - (2)].lv).CleanUp(); currentVoice->ifsw=0;;}
     break;
@@ -2460 +2481 @@
 
 /* Line 1464 of yacc.c  */
-#line 412 "grammar.y"
+#line 409 "grammar.y"
     {
             YYACCEPT;
@@ -2469 +2490 @@
 
 /* Line 1464 of yacc.c  */
-#line 416 "grammar.y"
+#line 413 "grammar.y"
     {
             currentVoice->ifsw=0;
@@ -2479 +2500 @@
 
 /* Line 1464 of yacc.c  */
-#line 421 "grammar.y"
+#line 418 "grammar.y"
     {currentVoice->ifsw=0;;}
     break;
@@ -2486 +2507 @@
 
 /* Line 1464 of yacc.c  */
-#line 423 "grammar.y"
+#line 420 "grammar.y"
     {
             #ifdef SIQ
@@ -2540 +2561 @@
 
 /* Line 1464 of yacc.c  */
+#line 478 "grammar.y"
+    {if (currentVoice!=NULL) currentVoice->ifsw=0;;}
+    break;
+
+  case 19:
+
+/* Line 1464 of yacc.c  */
 #line 481 "grammar.y"
-    {if (currentVoice!=NULL) currentVoice->ifsw=0;;}
-    break;
-
-  case 19:
-
-/* Line 1464 of yacc.c  */
-#line 484 "grammar.y"
     { omFree((ADDRESS)(yyvsp[(2) - (2)].name)); ;}
     break;
@@ -2554 +2575 @@
 
 /* Line 1464 of yacc.c  */
-#line 499 "grammar.y"
+#line 496 "grammar.y"
     {
             if(iiAssign(&(yyvsp[(1) - (2)].lv),&(yyvsp[(2) - (2)].lv))) YYERROR;
@@ -2563 +2584 @@
 
 /* Line 1464 of yacc.c  */
-#line 506 "grammar.y"
+#line 503 "grammar.y"
     {
             if (currRing==NULL) MYYERROR("no ring active");
@@ -2573 +2594 @@
 
 /* Line 1464 of yacc.c  */
-#line 511 "grammar.y"
+#line 508 "grammar.y"
     {
             syMake(&(yyval.lv),(yyvsp[(1) - (1)].name));
@@ -2582 +2603 @@
 
 /* Line 1464 of yacc.c  */
-#line 515 "grammar.y"
+#line 512 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv), &(yyvsp[(1) - (3)].lv), COLONCOLON, &(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -2591 +2612 @@
 
 /* Line 1464 of yacc.c  */
-#line 519 "grammar.y"
+#line 516 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv), &(yyvsp[(1) - (3)].lv), '.', &(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -2600 +2621 @@
 
 /* Line 1464 of yacc.c  */
-#line 523 "grammar.y"
+#line 520 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'(')) YYERROR;
@@ -2609 +2630 @@
 
 /* Line 1464 of yacc.c  */
-#line 527 "grammar.y"
+#line 524 "grammar.y"
     {
             if ((yyvsp[(1) - (4)].lv).rtyp==UNKNOWN)
@@ -2627 +2648 @@
 
 /* Line 1464 of yacc.c  */
-#line 540 "grammar.y"
+#line 537 "grammar.y"
     {
             if (currRingHdl==NULL) MYYERROR("no ring active");
@@ -2660 +2681 @@
 
 /* Line 1464 of yacc.c  */
-#line 568 "grammar.y"
+#line 565 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2689 +2710 @@
 
 /* Line 1464 of yacc.c  */
-#line 592 "grammar.y"
+#line 589 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2700 +2721 @@
 
 /* Line 1464 of yacc.c  */
-#line 598 "grammar.y"
+#line 595 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2711 +2732 @@
 
 /* Line 1464 of yacc.c  */
-#line 604 "grammar.y"
+#line 601 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2720 +2741 @@
 
 /* Line 1464 of yacc.c  */
-#line 608 "grammar.y"
+#line 605 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2729 +2750 @@
 
 /* Line 1464 of yacc.c  */
-#line 612 "grammar.y"
+#line 609 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2738 +2759 @@
 
 /* Line 1464 of yacc.c  */
-#line 616 "grammar.y"
+#line 613 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2747 +2768 @@
 
 /* Line 1464 of yacc.c  */
-#line 620 "grammar.y"
+#line 617 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2756 +2777 @@
 
 /* Line 1464 of yacc.c  */
-#line 624 "grammar.y"
+#line 621 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2765 +2786 @@
 
 /* Line 1464 of yacc.c  */
-#line 628 "grammar.y"
+#line 625 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2774 +2795 @@
 
 /* Line 1464 of yacc.c  */
-#line 632 "grammar.y"
+#line 629 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2783 +2804 @@
 
 /* Line 1464 of yacc.c  */
-#line 636 "grammar.y"
+#line 633 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2792 +2813 @@
 
 /* Line 1464 of yacc.c  */
-#line 640 "grammar.y"
+#line 637 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2801 +2822 @@
 
 /* Line 1464 of yacc.c  */
-#line 644 "grammar.y"
+#line 641 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2810 +2831 @@
 
 /* Line 1464 of yacc.c  */
-#line 648 "grammar.y"
+#line 645 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2819 +2840 @@
 
 /* Line 1464 of yacc.c  */
-#line 652 "grammar.y"
+#line 649 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2828 +2849 @@
 
 /* Line 1464 of yacc.c  */
-#line 656 "grammar.y"
+#line 653 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2837 +2858 @@
 
 /* Line 1464 of yacc.c  */
-#line 660 "grammar.y"
+#line 657 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2846 +2867 @@
 
 /* Line 1464 of yacc.c  */
-#line 664 "grammar.y"
+#line 661 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2855 +2876 @@
 
 /* Line 1464 of yacc.c  */
-#line 668 "grammar.y"
+#line 665 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2864 +2885 @@
 
 /* Line 1464 of yacc.c  */
-#line 672 "grammar.y"
+#line 669 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2873 +2894 @@
 
 /* Line 1464 of yacc.c  */
-#line 676 "grammar.y"
+#line 673 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2882 +2903 @@
 
 /* Line 1464 of yacc.c  */
-#line 680 "grammar.y"
+#line 677 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2891 +2912 @@
 
 /* Line 1464 of yacc.c  */
-#line 684 "grammar.y"
+#line 681 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2900 +2921 @@
 
 /* Line 1464 of yacc.c  */
-#line 688 "grammar.y"
+#line 685 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2909 +2930 @@
 
 /* Line 1464 of yacc.c  */
-#line 692 "grammar.y"
+#line 689 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2918 +2939 @@
 
 /* Line 1464 of yacc.c  */
-#line 696 "grammar.y"
+#line 693 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),RING_CMD,&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2927 +2948 @@
 
 /* Line 1464 of yacc.c  */
-#line 700 "grammar.y"
+#line 697 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),RING_CMD)) YYERROR;
@@ -2936 +2957 @@
 
 /* Line 1464 of yacc.c  */
-#line 707 "grammar.y"
+#line 704 "grammar.y"
     {
             leftv v = &(yyvsp[(1) - (3)].lv);
@@ -2952 +2973 @@
 
 /* Line 1464 of yacc.c  */
-#line 718 "grammar.y"
+#line 715 "grammar.y"
     {
             (yyval.lv) = (yyvsp[(1) - (1)].lv);
@@ -2961 +2982 @@
 
 /* Line 1464 of yacc.c  */
-#line 724 "grammar.y"
+#line 721 "grammar.y"
     {
             /*if ($1.typ == eunknown) YYERROR;*/
@@ -2971 +2992 @@
 
 /* Line 1464 of yacc.c  */
+#line 725 "grammar.y"
+    { (yyval.lv) = (yyvsp[(1) - (1)].lv); ;}
+    break;
+
+  case 69:
+
+/* Line 1464 of yacc.c  */
+#line 726 "grammar.y"
+    { (yyval.lv) = (yyvsp[(2) - (3)].lv); ;}
+    break;
+
+  case 70:
+
+/* Line 1464 of yacc.c  */
 #line 728 "grammar.y"
-    { (yyval.lv) = (yyvsp[(1) - (1)].lv); ;}
-    break;
-
-  case 69:
-
-/* Line 1464 of yacc.c  */
-#line 729 "grammar.y"
-    { (yyval.lv) = (yyvsp[(2) - (3)].lv); ;}
-    break;
-
-  case 70:
-
-/* Line 1464 of yacc.c  */
-#line 731 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),'[',&(yyvsp[(1) - (6)].lv),&(yyvsp[(3) - (6)].lv),&(yyvsp[(5) - (6)].lv))) YYERROR;
@@ -2994 +3015 @@
 
 /* Line 1464 of yacc.c  */
-#line 735 "grammar.y"
+#line 732 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (4)].lv),'[',&(yyvsp[(3) - (4)].lv))) YYERROR;
@@ -3003 +3024 @@
 
 /* Line 1464 of yacc.c  */
-#line 739 "grammar.y"
+#line 736 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -3012 +3033 @@
 
 /* Line 1464 of yacc.c  */
-#line 743 "grammar.y"
+#line 740 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -3021 +3042 @@
 
 /* Line 1464 of yacc.c  */
-#line 747 "grammar.y"
+#line 744 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -3030 +3051 @@
 
 /* Line 1464 of yacc.c  */
-#line 751 "grammar.y"
+#line 748 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -3039 +3060 @@
 
 /* Line 1464 of yacc.c  */
-#line 755 "grammar.y"
+#line 752 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -3048 +3069 @@
 
 /* Line 1464 of yacc.c  */
-#line 759 "grammar.y"
+#line 756 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), 0, &(yyvsp[(5) - (6)].lv))) YYERROR;
@@ -3057 +3078 @@
 
 /* Line 1464 of yacc.c  */
-#line 763 "grammar.y"
+#line 760 "grammar.y"
     {
             (yyval.lv)=(yyvsp[(2) - (3)].lv);
@@ -3066 +3087 @@
 
 /* Line 1464 of yacc.c  */
-#line 767 "grammar.y"
+#line 764 "grammar.y"
     {
             #ifdef SIQ
@@ -3088 +3109 @@
 
 /* Line 1464 of yacc.c  */
-#line 784 "grammar.y"
+#line 781 "grammar.y"
+    {
+            iiTestAssume(&(yyvsp[(2) - (5)].lv),&(yyvsp[(4) - (5)].lv));
+            memset(&(yyval.lv),0,sizeof((yyval.lv)));
+            (yyval.lv).rtyp=NONE;
+          ;}
+    break;
+
+  case 81:
+
+/* Line 1464 of yacc.c  */
+#line 787 "grammar.y"
     {
             #ifdef SIQ
@@ -3096 +3128 @@
     break;
 
-  case 81:
-
-/* Line 1464 of yacc.c  */
-#line 790 "grammar.y"
+  case 82:
+
+/* Line 1464 of yacc.c  */
+#line 793 "grammar.y"
     {
             #ifdef SIQ
@@ -3111 +3143 @@
     break;
 
-  case 82:
-
-/* Line 1464 of yacc.c  */
-#line 802 "grammar.y"
+  case 83:
+
+/* Line 1464 of yacc.c  */
+#line 805 "grammar.y"
     {
             #ifdef SIQ
@@ -3122 +3154 @@
     break;
 
-  case 83:
-
-/* Line 1464 of yacc.c  */
-#line 810 "grammar.y"
+  case 84:
+
+/* Line 1464 of yacc.c  */
+#line 813 "grammar.y"
+    {
+            #ifdef SIQ
+            siq++;
+            #endif
+          ;}
+    break;
+
+  case 85:
+
+/* Line 1464 of yacc.c  */
+#line 821 "grammar.y"
     {
             #ifdef SIQ
@@ -3133 +3176 @@
     break;
 
-  case 84:
-
-/* Line 1464 of yacc.c  */
-#line 819 "grammar.y"
+  case 86:
+
+/* Line 1464 of yacc.c  */
+#line 830 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),PLUSPLUS)) YYERROR;
@@ -3142 +3185 @@
     break;
 
-  case 85:
-
-/* Line 1464 of yacc.c  */
-#line 823 "grammar.y"
+  case 87:
+
+/* Line 1464 of yacc.c  */
+#line 834 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),MINUSMINUS)) YYERROR;
@@ -3151 +3194 @@
     break;
 
-  case 86:
-
-/* Line 1464 of yacc.c  */
-#line 827 "grammar.y"
+  case 88:
+
+/* Line 1464 of yacc.c  */
+#line 838 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'+',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3160 +3203 @@
     break;
 
-  case 87:
-
-/* Line 1464 of yacc.c  */
-#line 831 "grammar.y"
+  case 89:
+
+/* Line 1464 of yacc.c  */
+#line 842 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'-',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3169 +3212 @@
     break;
 
-  case 88:
-
-/* Line 1464 of yacc.c  */
-#line 835 "grammar.y"
+  case 90:
+
+/* Line 1464 of yacc.c  */
+#line 846 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3178 +3221 @@
     break;
 
-  case 89:
-
-/* Line 1464 of yacc.c  */
-#line 839 "grammar.y"
+  case 91:
+
+/* Line 1464 of yacc.c  */
+#line 850 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'^',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3187 +3230 @@
     break;
 
-  case 90:
-
-/* Line 1464 of yacc.c  */
-#line 843 "grammar.y"
+  case 92:
+
+/* Line 1464 of yacc.c  */
+#line 854 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3196 +3239 @@
     break;
 
-  case 91:
-
-/* Line 1464 of yacc.c  */
-#line 847 "grammar.y"
+  case 93:
+
+/* Line 1464 of yacc.c  */
+#line 858 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3205 +3248 @@
     break;
 
-  case 92:
-
-/* Line 1464 of yacc.c  */
-#line 851 "grammar.y"
+  case 94:
+
+/* Line 1464 of yacc.c  */
+#line 862 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),NOTEQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3214 +3257 @@
     break;
 
-  case 93:
-
-/* Line 1464 of yacc.c  */
-#line 855 "grammar.y"
+  case 95:
+
+/* Line 1464 of yacc.c  */
+#line 866 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),EQUAL_EQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3223 +3266 @@
     break;
 
-  case 94:
-
-/* Line 1464 of yacc.c  */
-#line 859 "grammar.y"
+  case 96:
+
+/* Line 1464 of yacc.c  */
+#line 870 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),DOTDOT,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3232 +3275 @@
     break;
 
-  case 95:
-
-/* Line 1464 of yacc.c  */
-#line 863 "grammar.y"
+  case 97:
+
+/* Line 1464 of yacc.c  */
+#line 874 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),':',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3241 +3284 @@
     break;
 
-  case 96:
-
-/* Line 1464 of yacc.c  */
-#line 867 "grammar.y"
+  case 98:
+
+/* Line 1464 of yacc.c  */
+#line 878 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -3253 +3296 @@
     break;
 
-  case 97:
-
-/* Line 1464 of yacc.c  */
-#line 874 "grammar.y"
+  case 99:
+
+/* Line 1464 of yacc.c  */
+#line 885 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(2) - (2)].lv),'-')) YYERROR;
@@ -3262 +3305 @@
     break;
 
-  case 98:
-
-/* Line 1464 of yacc.c  */
-#line 880 "grammar.y"
+  case 100:
+
+/* Line 1464 of yacc.c  */
+#line 891 "grammar.y"
     { (yyval.lv) = (yyvsp[(1) - (2)].lv); ;}
     break;
 
-  case 99:
-
-/* Line 1464 of yacc.c  */
-#line 882 "grammar.y"
+  case 101:
+
+/* Line 1464 of yacc.c  */
+#line 893 "grammar.y"
     {
             if ((yyvsp[(1) - (2)].lv).rtyp==0)
@@ -3289 +3332 @@
     break;
 
-  case 101:
-
-/* Line 1464 of yacc.c  */
-#line 902 "grammar.y"
+  case 103:
+
+/* Line 1464 of yacc.c  */
+#line 913 "grammar.y"
     {
             if ((yyvsp[(2) - (3)].lv).Typ()!=STRING_CMD)
@@ -3303 +3346 @@
     break;
 
-  case 102:
-
-/* Line 1464 of yacc.c  */
-#line 914 "grammar.y"
+  case 104:
+
+/* Line 1464 of yacc.c  */
+#line 925 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot)))
@@ -3313 +3356 @@
     break;
 
-  case 103:
-
-/* Line 1464 of yacc.c  */
-#line 919 "grammar.y"
+  case 105:
+
+/* Line 1464 of yacc.c  */
+#line 930 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot)))
@@ -3323 +3366 @@
     break;
 
-  case 104:
-
-/* Line 1464 of yacc.c  */
-#line 924 "grammar.y"
+  case 106:
+
+/* Line 1464 of yacc.c  */
+#line 935 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR;
@@ -3332 +3375 @@
     break;
 
-  case 105:
-
-/* Line 1464 of yacc.c  */
-#line 928 "grammar.y"
+  case 107:
+
+/* Line 1464 of yacc.c  */
+#line 939 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR;
@@ -3341 +3384 @@
     break;
 
-  case 106:
-
-/* Line 1464 of yacc.c  */
-#line 932 "grammar.y"
+  case 108:
+
+/* Line 1464 of yacc.c  */
+#line 943 "grammar.y"
     {
             int r; TESTSETINT((yyvsp[(4) - (8)].lv),r);
@@ -3386 +3429 @@
     break;
 
-  case 107:
-
-/* Line 1464 of yacc.c  */
-#line 972 "grammar.y"
+  case 109:
+
+/* Line 1464 of yacc.c  */
+#line 983 "grammar.y"
     {
             if ((yyvsp[(1) - (2)].i) == MATRIX_CMD)
@@ -3417 +3460 @@
     break;
 
-  case 108:
-
-/* Line 1464 of yacc.c  */
-#line 998 "grammar.y"
+  case 110:
+
+/* Line 1464 of yacc.c  */
+#line 1009 "grammar.y"
     {
             int t=(yyvsp[(1) - (3)].lv).Typ();
@@ -3443 +3486 @@
     break;
 
-  case 109:
-
-/* Line 1464 of yacc.c  */
-#line 1019 "grammar.y"
+  case 111:
+
+/* Line 1464 of yacc.c  */
+#line 1030 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot)))
@@ -3453 +3496 @@
     break;
 
-  case 112:
-
-/* Line 1464 of yacc.c  */
-#line 1032 "grammar.y"
+  case 114:
+
+/* Line 1464 of yacc.c  */
+#line 1043 "grammar.y"
     {
             leftv v = &(yyvsp[(2) - (5)].lv);
@@ -3469 +3512 @@
     break;
 
-  case 113:
-
-/* Line 1464 of yacc.c  */
-#line 1046 "grammar.y"
+  case 115:
+
+/* Line 1464 of yacc.c  */
+#line 1057 "grammar.y"
     {
           // let rInit take care of any errors
@@ -3479 +3522 @@
     break;
 
-  case 114:
-
-/* Line 1464 of yacc.c  */
-#line 1054 "grammar.y"
+  case 116:
+
+/* Line 1464 of yacc.c  */
+#line 1065 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -3493 +3536 @@
     break;
 
-  case 115:
-
-/* Line 1464 of yacc.c  */
-#line 1063 "grammar.y"
+  case 117:
+
+/* Line 1464 of yacc.c  */
+#line 1074 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -3540 +3583 @@
     break;
 
-  case 117:
-
-/* Line 1464 of yacc.c  */
-#line 1109 "grammar.y"
+  case 119:
+
+/* Line 1464 of yacc.c  */
+#line 1120 "grammar.y"
     {
             (yyval.lv) = (yyvsp[(1) - (3)].lv);
@@ -3551 +3594 @@
     break;
 
-  case 119:
-
-/* Line 1464 of yacc.c  */
-#line 1119 "grammar.y"
+  case 121:
+
+/* Line 1464 of yacc.c  */
+#line 1130 "grammar.y"
     {
             (yyval.lv) = (yyvsp[(2) - (3)].lv);
@@ -3560 +3603 @@
     break;
 
-  case 120:
-
-/* Line 1464 of yacc.c  */
-#line 1125 "grammar.y"
+  case 122:
+
+/* Line 1464 of yacc.c  */
+#line 1136 "grammar.y"
     {
             expected_parms = TRUE;
@@ -3569 +3612 @@
     break;
 
-  case 121:
-
-/* Line 1464 of yacc.c  */
-#line 1132 "grammar.y"
+  case 123:
+
+/* Line 1464 of yacc.c  */
+#line 1143 "grammar.y"
     { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
     break;
 
-  case 122:
-
-/* Line 1464 of yacc.c  */
-#line 1134 "grammar.y"
+  case 124:
+
+/* Line 1464 of yacc.c  */
+#line 1145 "grammar.y"
     { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
     break;
 
-  case 123:
-
-/* Line 1464 of yacc.c  */
-#line 1136 "grammar.y"
+  case 125:
+
+/* Line 1464 of yacc.c  */
+#line 1147 "grammar.y"
     { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
     break;
 
-  case 124:
-
-/* Line 1464 of yacc.c  */
-#line 1145 "grammar.y"
+  case 126:
+
+/* Line 1464 of yacc.c  */
+#line 1156 "grammar.y"
     { if ((yyvsp[(1) - (2)].i) != '<') YYERROR;
             if((feFilePending=feFopen((yyvsp[(2) - (2)].name),"r",NULL,TRUE))==NULL) YYERROR; ;}
     break;
 
-  case 125:
-
-/* Line 1464 of yacc.c  */
-#line 1148 "grammar.y"
+  case 127:
+
+/* Line 1464 of yacc.c  */
+#line 1159 "grammar.y"
     { newFile((yyvsp[(2) - (4)].name),feFilePending); ;}
     break;
 
-  case 126:
-
-/* Line 1464 of yacc.c  */
-#line 1153 "grammar.y"
+  case 128:
+
+/* Line 1464 of yacc.c  */
+#line 1164 "grammar.y"
     {
             feHelp((yyvsp[(2) - (3)].name));
@@ -3615 +3658 @@
     break;
 
-  case 127:
-
-/* Line 1464 of yacc.c  */
-#line 1158 "grammar.y"
+  case 129:
+
+/* Line 1464 of yacc.c  */
+#line 1169 "grammar.y"
     {
             feHelp(NULL);
@@ -3624 +3667 @@
     break;
 
-  case 128:
-
-/* Line 1464 of yacc.c  */
-#line 1165 "grammar.y"
+  case 130:
+
+/* Line 1464 of yacc.c  */
+#line 1176 "grammar.y"
     {
             singular_example((yyvsp[(2) - (3)].name));
@@ -3634 +3677 @@
     break;
 
-  case 129:
-
-/* Line 1464 of yacc.c  */
-#line 1173 "grammar.y"
+  case 131:
+
+/* Line 1464 of yacc.c  */
+#line 1184 "grammar.y"
     {
           if (basePack!=(yyvsp[(2) - (2)].lv).req_packhdl)
@@ -3648 +3691 @@
     break;
 
-  case 130:
-
-/* Line 1464 of yacc.c  */
-#line 1185 "grammar.y"
+  case 132:
+
+/* Line 1464 of yacc.c  */
+#line 1196 "grammar.y"
     {
           leftv v=&(yyvsp[(2) - (2)].lv);
@@ -3669 +3712 @@
     break;
 
-  case 131:
-
-/* Line 1464 of yacc.c  */
-#line 1201 "grammar.y"
+  case 133:
+
+/* Line 1464 of yacc.c  */
+#line 1212 "grammar.y"
     {
           leftv v=&(yyvsp[(3) - (3)].lv);
@@ -3690 +3733 @@
     break;
 
-  case 132:
-
-/* Line 1464 of yacc.c  */
-#line 1220 "grammar.y"
+  case 134:
+
+/* Line 1464 of yacc.c  */
+#line 1231 "grammar.y"
     {
             list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE);
@@ -3699 +3742 @@
     break;
 
-  case 133:
-
-/* Line 1464 of yacc.c  */
-#line 1224 "grammar.y"
+  case 135:
+
+/* Line 1464 of yacc.c  */
+#line 1235 "grammar.y"
     {
             list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE);
@@ -3708 +3751 @@
     break;
 
-  case 134:
-
-/* Line 1464 of yacc.c  */
-#line 1228 "grammar.y"
+  case 136:
+
+/* Line 1464 of yacc.c  */
+#line 1239 "grammar.y"
     {
             if ((yyvsp[(3) - (4)].i)==QRING_CMD) (yyvsp[(3) - (4)].i)=RING_CMD;
@@ -3718 +3761 @@
     break;
 
-  case 135:
-
-/* Line 1464 of yacc.c  */
-#line 1233 "grammar.y"
+  case 137:
+
+/* Line 1464 of yacc.c  */
+#line 1244 "grammar.y"
     {
             list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE);
@@ -3727 +3770 @@
     break;
 
-  case 136:
-
-/* Line 1464 of yacc.c  */
-#line 1237 "grammar.y"
+  case 138:
+
+/* Line 1464 of yacc.c  */
+#line 1248 "grammar.y"
     {
             list_cmd(RING_CMD,NULL,"// ",TRUE);
@@ -3736 +3779 @@
     break;
 
-  case 137:
-
-/* Line 1464 of yacc.c  */
-#line 1241 "grammar.y"
+  case 139:
+
+/* Line 1464 of yacc.c  */
+#line 1252 "grammar.y"
     {
             list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE);
@@ -3745 +3788 @@
     break;
 
-  case 138:
-
-/* Line 1464 of yacc.c  */
-#line 1245 "grammar.y"
+  case 140:
+
+/* Line 1464 of yacc.c  */
+#line 1256 "grammar.y"
     {
             list_cmd(PROC_CMD,NULL,"// ",TRUE);
@@ -3754 +3797 @@
     break;
 
-  case 139:
-
-/* Line 1464 of yacc.c  */
-#line 1249 "grammar.y"
+  case 141:
+
+/* Line 1464 of yacc.c  */
+#line 1260 "grammar.y"
     {
             list_cmd(0,(yyvsp[(3) - (4)].lv).Fullname(),"// ",TRUE);
@@ -3764 +3807 @@
     break;
 
-  case 140:
-
-/* Line 1464 of yacc.c  */
-#line 1254 "grammar.y"
+  case 142:
+
+/* Line 1464 of yacc.c  */
+#line 1265 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3775 +3818 @@
     break;
 
-  case 141:
-
-/* Line 1464 of yacc.c  */
-#line 1260 "grammar.y"
+  case 143:
+
+/* Line 1464 of yacc.c  */
+#line 1271 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3786 +3829 @@
     break;
 
-  case 142:
-
-/* Line 1464 of yacc.c  */
-#line 1266 "grammar.y"
+  case 144:
+
+/* Line 1464 of yacc.c  */
+#line 1277 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3797 +3840 @@
     break;
 
-  case 143:
-
-/* Line 1464 of yacc.c  */
-#line 1272 "grammar.y"
+  case 145:
+
+/* Line 1464 of yacc.c  */
+#line 1283 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3808 +3851 @@
     break;
 
-  case 144:
-
-/* Line 1464 of yacc.c  */
-#line 1278 "grammar.y"
+  case 146:
+
+/* Line 1464 of yacc.c  */
+#line 1289 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3819 +3862 @@
     break;
 
-  case 145:
-
-/* Line 1464 of yacc.c  */
-#line 1284 "grammar.y"
+  case 147:
+
+/* Line 1464 of yacc.c  */
+#line 1295 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3830 +3873 @@
     break;
 
-  case 146:
-
-/* Line 1464 of yacc.c  */
-#line 1290 "grammar.y"
+  case 148:
+
+/* Line 1464 of yacc.c  */
+#line 1301 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3841 +3884 @@
     break;
 
-  case 147:
-
-/* Line 1464 of yacc.c  */
-#line 1302 "grammar.y"
+  case 149:
+
+/* Line 1464 of yacc.c  */
+#line 1313 "grammar.y"
     {
             list_cmd(-1,NULL,"// ",TRUE);
@@ -3850 +3893 @@
     break;
 
-  case 148:
-
-/* Line 1464 of yacc.c  */
-#line 1308 "grammar.y"
+  case 150:
+
+/* Line 1464 of yacc.c  */
+#line 1319 "grammar.y"
     { yyInRingConstruction = TRUE; ;}
     break;
 
-  case 149:
-
-/* Line 1464 of yacc.c  */
-#line 1317 "grammar.y"
+  case 151:
+
+/* Line 1464 of yacc.c  */
+#line 1328 "grammar.y"
     {
             const char *ring_name = (yyvsp[(2) - (8)].lv).name;
@@ -3895 +3938 @@
     break;
 
-  case 150:
-
-/* Line 1464 of yacc.c  */
-#line 1350 "grammar.y"
+  case 152:
+
+/* Line 1464 of yacc.c  */
+#line 1361 "grammar.y"
     {
             const char *ring_name = (yyvsp[(2) - (2)].lv).name;
@@ -3907 +3950 @@
     break;
 
-  case 151:
-
-/* Line 1464 of yacc.c  */
-#line 1360 "grammar.y"
+  case 153:
+
+/* Line 1464 of yacc.c  */
+#line 1371 "grammar.y"
     {
             if (((yyvsp[(1) - (2)].i)!=LIB_CMD)||(jjLOAD((yyvsp[(2) - (2)].name),TRUE))) YYERROR;
@@ -3916 +3959 @@
     break;
 
-  case 154:
-
-/* Line 1464 of yacc.c  */
-#line 1369 "grammar.y"
+  case 156:
+
+/* Line 1464 of yacc.c  */
+#line 1380 "grammar.y"
     {
             if (((yyvsp[(1) - (2)].i)==KEEPRING_CMD) && (myynest==0))
@@ -3990 +4033 @@
     break;
 
-  case 155:
-
-/* Line 1464 of yacc.c  */
-#line 1441 "grammar.y"
+  case 157:
+
+/* Line 1464 of yacc.c  */
+#line 1452 "grammar.y"
     {
             type_cmd(&((yyvsp[(2) - (2)].lv)));
@@ -3999 +4042 @@
     break;
 
-  case 156:
-
-/* Line 1464 of yacc.c  */
-#line 1445 "grammar.y"
+  case 158:
+
+/* Line 1464 of yacc.c  */
+#line 1456 "grammar.y"
     {
             //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp);
@@ -4027 +4070 @@
     break;
 
-  case 157:
-
-/* Line 1464 of yacc.c  */
-#line 1474 "grammar.y"
+  case 159:
+
+/* Line 1464 of yacc.c  */
+#line 1485 "grammar.y"
     {
             int i; TESTSETINT((yyvsp[(3) - (5)].lv),i);
@@ -4045 +4088 @@
     break;
 
-  case 158:
-
-/* Line 1464 of yacc.c  */
-#line 1487 "grammar.y"
+  case 160:
+
+/* Line 1464 of yacc.c  */
+#line 1498 "grammar.y"
     {
             if (currentVoice->ifsw==1)
@@ -4067 +4110 @@
     break;
 
-  case 159:
-
-/* Line 1464 of yacc.c  */
-#line 1504 "grammar.y"
+  case 161:
+
+/* Line 1464 of yacc.c  */
+#line 1515 "grammar.y"
     {
             int i; TESTSETINT((yyvsp[(3) - (5)].lv),i);
@@ -4081 +4124 @@
     break;
 
-  case 160:
-
-/* Line 1464 of yacc.c  */
-#line 1513 "grammar.y"
+  case 162:
+
+/* Line 1464 of yacc.c  */
+#line 1524 "grammar.y"
     {
             if (exitBuffer(BT_break)) YYERROR;
@@ -4091 +4134 @@
     break;
 
-  case 161:
-
-/* Line 1464 of yacc.c  */
-#line 1518 "grammar.y"
+  case 163:
+
+/* Line 1464 of yacc.c  */
+#line 1529 "grammar.y"
     {
             if (contBuffer(BT_break)) YYERROR;
@@ -4101 +4144 @@
     break;
 
-  case 162:
-
-/* Line 1464 of yacc.c  */
-#line 1526 "grammar.y"
+  case 164:
+
+/* Line 1464 of yacc.c  */
+#line 1537 "grammar.y"
     {
             /* -> if(!$2) break; $3; continue;*/
@@ -4115 +4158 @@
     break;
 
-  case 163:
-
-/* Line 1464 of yacc.c  */
-#line 1538 "grammar.y"
+  case 165:
+
+/* Line 1464 of yacc.c  */
+#line 1549 "grammar.y"
     {
             /* $2 */
@@ -4136 +4179 @@
     break;
 
-  case 164:
-
-/* Line 1464 of yacc.c  */
-#line 1557 "grammar.y"
+  case 166:
+
+/* Line 1464 of yacc.c  */
+#line 1568 "grammar.y"
     {
             idhdl h = enterid((yyvsp[(2) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE);
@@ -4151 +4194 @@
     break;
 
-  case 165:
-
-/* Line 1464 of yacc.c  */
-#line 1567 "grammar.y"
+  case 167:
+
+/* Line 1464 of yacc.c  */
+#line 1578 "grammar.y"
     {
             idhdl h = enterid((yyvsp[(1) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE);
@@ -4175 +4218 @@
     break;
 
-  case 166:
-
-/* Line 1464 of yacc.c  */
-#line 1586 "grammar.y"
+  case 168:
+
+/* Line 1464 of yacc.c  */
+#line 1597 "grammar.y"
     {
             omFree((ADDRESS)(yyvsp[(3) - (4)].name));
@@ -4200 +4243 @@
     break;
 
-  case 167:
-
-/* Line 1464 of yacc.c  */
-#line 1609 "grammar.y"
+  case 169:
+
+/* Line 1464 of yacc.c  */
+#line 1620 "grammar.y"
     {
             // decl. of type proc p(int i)
@@ -4211 +4254 @@
     break;
 
-  case 168:
-
-/* Line 1464 of yacc.c  */
-#line 1615 "grammar.y"
+  case 170:
+
+/* Line 1464 of yacc.c  */
+#line 1626 "grammar.y"
     {
             // decl. of type proc p(i)
@@ -4225 +4268 @@
     break;
 
-  case 169:
-
-/* Line 1464 of yacc.c  */
-#line 1627 "grammar.y"
+  case 171:
+
+/* Line 1464 of yacc.c  */
+#line 1638 "grammar.y"
     {
             iiRETURNEXPR.Copy(&(yyvsp[(3) - (4)].lv));
@@ -4236 +4279 @@
     break;
 
-  case 170:
-
-/* Line 1464 of yacc.c  */
-#line 1633 "grammar.y"
+  case 172:
+
+/* Line 1464 of yacc.c  */
+#line 1644 "grammar.y"
     {
             if ((yyvsp[(1) - (3)].i)==RETURN)
@@ -4253 +4296 @@
 
 /* Line 1464 of yacc.c  */
-#line 4258 "grammar.cc"
+#line 4297 "grammar.cc"
       default: break;
     }

Singular/grammar.h

@@ -154 +154 @@
      PROC_DEF = 371,
      APPLY = 372,
-     BREAK_CMD = 373,
-     CONTINUE_CMD = 374,
-     ELSE_CMD = 375,
-     EVAL = 376,
-     QUOTE = 377,
-     FOR_CMD = 378,
-     IF_CMD = 379,
-     SYS_BREAK = 380,
-     WHILE_CMD = 381,
-     RETURN = 382,
-     PARAMETER = 383,
-     SYSVAR = 384,
-     UMINUS = 385
+     ASSUME_CMD = 373,
+     BREAK_CMD = 374,
+     CONTINUE_CMD = 375,
+     ELSE_CMD = 376,
+     EVAL = 377,
+     QUOTE = 378,
+     FOR_CMD = 379,
+     IF_CMD = 380,
+     SYS_BREAK = 381,
+     WHILE_CMD = 382,
+     RETURN = 383,
+     PARAMETER = 384,
+     SYSVAR = 385,
+     UMINUS = 386
    };
 #endif

Singular/grammar.y

@@ -315 +315 @@
 /* control */
 %token <i> APPLY
+%token <i> ASSUME_CMD
 %token <i> BREAK_CMD
 %token <i> CONTINUE_CMD
@@ -777 +778 @@
             #endif
           }
+        | assume_start expr ',' expr quote_end
+          {
+            iiTestAssume(&$2,&$4);
+            memset(&$$,0,sizeof($$));
+            $$.rtyp=NONE;
+          }
         | EVAL  '('
           {
@@ -796 +803 @@
 
 quote_start:    QUOTE  '('
+          {
+            #ifdef SIQ
+            siq++;
+            #endif
+          }
+          ;
+
+assume_start:    ASSUME_CMD '('
           {
             #ifdef SIQ

Singular/ipid.cc

@@ -433 +433 @@
   else if ((IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))
     rKill(h);
-  else
+  else if (IDDATA(h)!=NULL)
     s_internalDelete(IDTYP(h),IDDATA(h),r);
   //  general  -------------------------------------------------------------

Singular/iplib.cc

@@ -298 +298 @@
   return NULL;
 }
-#ifndef LIBSINGULAR
+
 // see below:
 struct soptionStruct
@@ -308 +308 @@
 extern struct soptionStruct optionStruct[];
 extern struct soptionStruct verboseStruct[];
-#endif
+
 
 BOOLEAN iiAllStart(procinfov pi, char *p,feBufferTypes t, int l)
 {
+  // see below:
+  BITSET save1=si_opt_1;
+  BITSET save2=si_opt_2;
   newBuffer( omStrDup(p /*pi->data.s.body*/), t /*BT_proc*/,
                pi, l );
-  #ifndef LIBSINGULAR
-  // see below:
-  BITSET save1=(test & ~TEST_RINGDEP_OPTS);
-  BITSET save2=verbose;
-  #endif
   BOOLEAN err=yyparse();
   if (sLastPrinted.rtyp!=0)
@@ -324 +322 @@
     sLastPrinted.CleanUp();
   }
-  #ifndef LIBSINGULAR
   // the access to optionStruct and verboseStruct do not work
   // on x86_64-Linux for pic-code
-  BITSET save11= ( test & ~TEST_RINGDEP_OPTS);
   if ((TEST_V_ALLWARN) &&
   (t==BT_proc) &&
-  ((save1!=save11)||(save2!=verbose)) &&
+  ((save1!=si_opt_1)||(save2!=si_opt_2)) &&
   (pi->libname!=NULL) && (pi->libname[0]!='\0'))
   {
@@ -340 +336 @@
     for (i=0; optionStruct[i].setval!=0; i++)
     {
-      if ((optionStruct[i].setval & save11)
+      if ((optionStruct[i].setval & si_opt_1)
       && (!(optionStruct[i].setval & save1)))
       {
           Print(" +%s",optionStruct[i].name);
       }
-      if (!(optionStruct[i].setval & save11)
+      if (!(optionStruct[i].setval & si_opt_1)
       && ((optionStruct[i].setval & save1)))
       {
@@ -353 +349 @@
     for (i=0; verboseStruct[i].setval!=0; i++)
     {
-      if ((verboseStruct[i].setval & verbose)
+      if ((verboseStruct[i].setval & si_opt_2)
       && (!(verboseStruct[i].setval & save2)))
       {
           Print(" +%s",verboseStruct[i].name);
       }
-      if (!(verboseStruct[i].setval & verbose)
+      if (!(verboseStruct[i].setval & si_opt_2)
       && ((verboseStruct[i].setval & save2)))
       {
@@ -366 +362 @@
     PrintLn();
   }
-  #endif
   return err;
 }

Singular/ipshell.cc

@@ -5196 +5196 @@
         if (mpz_cmp_ui(modBase,0)==0)
         {
-          WerrorS("modulus must not be 0");
+          WerrorS("modulus must not be 0 or parameter not allowed");
           goto rInitError;
         }
@@ -5211 +5211 @@
       if (mpz_cmp_ui(modBase,0)==0)
       {
-        WerrorS("modulus must not be 0");
+        WerrorS("modulus must not be 0 or parameter not allowed");
         goto rInitError;
       }
@@ -5813 +5813 @@
   return TRUE;
 }
+
+BOOLEAN iiTestAssume(leftv a, leftv b)
+{
+  // assume a: level
+  if ((a->Typ()==INT_CMD)&&((long)a->Data()>=0))
+  {
+    int lev=(long)a->Data();
+    int startlev=0;
+    idhdl h=ggetid("assumeLevel");
+    if ((h!=NULL)&&(IDTYP(h)==INT_CMD)) startlev=(long)IDINT(h);
+    if(lev <=startlev)
+    {
+      BOOLEAN bo=b->Eval();
+      if (bo) { WerrorS("syntax error in ASSUME");return TRUE;}
+      if (b->Typ()!=INT_CMD) { WerrorS("ASUMME(<level>,<int expr>)");return TRUE; }
+      if (b->Data()==NULL) { WerrorS("ASSUME failed");return TRUE;}
+    }
+  }
+  else
+     b->CleanUp();
+  a->CleanUp();
+  return FALSE;
+}

Singular/ipshell.h

@@ -247 +247 @@
 
 
-#endif
-
+BOOLEAN iiTestAssume(leftv a, leftv b);
+#endif
+

Singular/singular-libs

@@ -23 +23 @@
         paraplanecurves.lib phindex.lib \
         pointid.lib poly.lib \
-        oldpolymake.lib presolve.lib primdec.lib primdecint.lib \
+        presolve.lib primdec.lib primdecint.lib \
         primitiv.lib qhmoduli.lib random.lib realclassify.lib \
         realrad.lib reesclos.lib resbinomial.lib \
@@ -32 +32 @@
         surf.lib surfacesignature.lib surfex.lib \
         teachstd.lib toric.lib triang.lib \
-        tropical.lib weierstr.lib zeroset.lib
+        weierstr.lib zeroset.lib
 
 # libs in beta testing:
@@ -41 +41 @@
 # for new libs
 
-SLIB1 = classifyci.lib classify_aeq.lib ffsolve.lib decomp.lib template.lib\
+SLIB1 = classifyci.lib classify_aeq.lib \
+        divisors.lib \
+        ffsolve.lib decomp.lib template.lib \
         findifs.lib finitediff.lib \
+        gitfan.lib \
         locnormal.lib modnormal.lib \
-        JMBTest.lib JMSConst.lib multigrading.lib parallel.lib realizationMatroids.lib ringgb.lib \
+        JMBTest.lib JMSConst.lib multigrading.lib\
+        orbitparam.lib parallel.lib polymake.lib\
+        realizationMatroids.lib resources.lib ringgb.lib \
         schreyer.lib symodstd.lib derham.lib polybori.lib ellipticcovers.lib \
-        schubert.lib
+        schubert.lib tasks.lib tropical.lib
 
 PLIBS = bfun.lib central.lib dmod.lib dmodapp.lib dmodvar.lib fpadim.lib \
@@ -52 +57 @@
         ncfactor.lib nctools.lib perron.lib qmatrix.lib \
         ncall.lib
-        
 
+

Singular/subexpr.cc

@@ -455 +455 @@
 void s_internalDelete(const int t,  void *d, const ring r)
 {
+  assume(d!=NULL);
   switch (t)
   {
@@ -1585 +1586 @@
         {
         // WARNING: do not use ring variable names in procedures
-          Warn("use of variable >>%s<< in a procedure in line %s",id);
+          Warn("use of variable >>%s<< in a procedure in line %s",id,my_yylinebuf);
         }
         return;

Singular/table.h

@@ -798 +798 @@
 {  // name-string alias tokval          toktype
   { "$INVALID$",   0, -1,                 0},
+  { "ASSUME",      0, ASSUME_CMD,         ASSUME_CMD},
   { "LIB",         0, LIB_CMD ,           SYSVAR},
   { "alias",       0, ALIAS_CMD ,         PARAMETER},

Singular/tesths.cc

@@ -49 +49 @@
 #include <time.h>
 #include <errno.h>
-#ifdef HAVE_SIMPLEIPC
-#include <Singular/links/simpleipc.h>
-#endif
-
-
-
 
 
 extern int siInit(char *);
-
-#if ! defined(LIBSINGULAR)
 
 int initializeGMP(){ return 1; }
@@ -127 +119 @@
     if (optc == 'h') exit(0);
   }
-
-// semaphore0: CPUs --------------------------------------------------
-#ifdef HAVE_SIMPLEIPC
-  feOptIndex cpu_opt = feGetOptIndex("cpus");
-  int cpus = (int)(long)feOptValue(FE_OPT_CPUS);
-  sipc_semaphore_init(0, cpus-1);
-#endif
 
   /* say hello */
@@ -249 +234 @@
   return 0;
 }
-#endif // not LIBSINGULAR
-
+