Changeset 8907a4 in git

Timestamp:

Jan 12, 2015, 2:33:50 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

37c2b35026800c66eeabc04e5cdb28d10ddb012b

Parents:

237b18fd2b55f9e94a90732997e9dfe365995f97eb3c5f137de23b81a3905cbe0c556cc5a7f069e1

Message:

Merge pull request #686 from csoeger/normaliz

normaliz.lib support for gradings for normaliz 2.8 and above

Location:

Singular

Files:

• LIB/normaliz.lib (modified) (54 diffs)
• LIB/primdec.lib (modified) (1 diff)
• emacs.cc (modified) (3 diffs)
• ipshell.cc (modified) (1 diff)

Singular/LIB/normaliz.lib

@@ -1 +1 @@
 //// Singular library normaliz.lib
 
-version="version normaliz.lib 4.0.0.0 Jun_2013 "; // $Id$
+version="version normaliz.lib 4.1.0.0 Jan_2015 "; // $Id$
 category="Commutative Algebra";
 info="
-LIBRARY: normaliz.lib  Provides an interface for the use of Normaliz 2.7
-         within SINGULAR.
-AUTHORS:  Winfried Bruns, Winfried.Bruns@Uni-Osnabrueck.de
-          Christof Soeger, Christof.Soeger@Uni-Osnabrueck.de
+LIBRARY: normaliz.lib  Provides an interface for the use of Normaliz 2.8 or
+         newer within SINGULAR.
+AUTHORS: Winfried Bruns, Winfried.Bruns@Uni-Osnabrueck.de
+         Christof Soeger, Christof.Soeger@Uni-Osnabrueck.de
 
 OVERVIEW:
-The library normaliz.lib provides an interface for the use of Normaliz 2.7
-within SINGULAR. The exchange of data is via files.
+@texinfo
+The library normaliz.lib provides an interface for the use of Normaliz 2.8 or
+newer within SINGULAR. The exchange of data is via files.
 In addition to the top level
 functions that aim at objects of type ideal or ring, several other auxiliary
 functions allow the user to apply Normaliz to data of type intmat. Therefore
 SINGULAR can be used as a comfortable environment for the work with Normaliz.
-@* Please see the @code{Normaliz2.7Documentation.pdf} (included in the Normaliz
+@* Please see the @code{Normaliz.pdf} (included in the Normaliz
 distribution) for a more extensive documentation of Normaliz.
-@code{nmz_sing.pdf} describes this library version 2.2, but most points are
-still valid.
-
-@*Singular and Normaliz exchange data via files. These files are automatically
+
+Normaliz allows the use of a grading. In the Singular functions that access
+Normaliz the parameter grading is an intvec that assigns a (not necessarily
+positive) degree to every variable of the ambient polynomial ring.
+But it must give positive degrees to the generators given to function.
+
+Singular and Normaliz exchange data via files. These files are automatically
 created and erased behind the scenes. As long as one wants to use only the
 ring-theoretic functions there is no need for file management.
-
 @*Note that the numerical invariants computed by Normaliz can be
 accessed in this \"automatic file mode\".
-
 @*However, if Singular is used as a frontend for Normaliz or the user
 wants to inspect data not automatically returned to Singular, then
@@ -34 +36 @@
 Deletion of the files is left to the user.
 
-@* Use of this library requires the program Normaliz to be installed.
+Use of this library requires the program Normaliz to be installed.
 You can download it from
 @uref{http://www.mathematik.uni-osnabrueck.de/normaliz/}. Please make sure
 that the executables are in the search path or use setNmzExecPath
 (@ref{setNmzExecPath}).
-
-KEYWORDS: integral closure; normalization
+@end texinfo
+
+KEYWORDS: integral closure; normalization; toric ring
 
 PROCEDURES:
@@ -50 +53 @@
                               elements of I
  normalToricRingFromBinomials(ideal I)  computes the normalization of the
-                              polynomial ring modulo the unique minimal prime
-                              ideal of the binomial ideal I
- ehrhartRing(ideal I)         computes the monomials representing the lattice
-                              points of the polytop generated leading monomials
-                              of the elements of I
- intclMonIdeal(ideal I)       the exponent vectors of the leading monomials of
-                              the elements of I are considered as generators of
-                              a monomial ideal whose Rees algebra is computed
-
+                              polynomial ring modulo the unique minimal binomial
+                              prime ideal of the binomial ideal I
+ ehrhartRing(ideal I)         considers the exponent vectors of the elements of I
+                              as points of a lattice polytope and computes the
+                              integral cloure of the polytopal algebra
+ intclMonIdeal(ideal I)       Computes the integral closure of the Rees algebra
+                              of the ideal generated by the leading monomials of
+                              the elements of I
  torusInvariants(intmat T)    computes the ring of invariants of a torus action
  finiteDiagInvariants(intmat C)  computes the ring of invariants of a finite
@@ -70 +72 @@
  intersectionValRingIdeals(intmat V)       computes ideals of monomial valuations
 
- showNuminvs()                prints the numerical invariants
- exportNuminvs()              exports the numerical invariants
+ showNuminvs()                prints the numerical invariants found by Normaliz
+ exportNuminvs()              exports the numerical invariants found by Normaliz
 
  setNmzOption(string s, int onoff) sets the option s to onoff
@@ -237 +239 @@
     desString("nmz_data_path",nmz_data_path_name);
     nmz_data_path=appendSlash(nmz_data_path);
-}example
+}
+example
 { "EXAMPLE:";echo = 2;
   setNmzDataPath("examples/");
@@ -395 +398 @@
     {
         f=getNmzFile()+"."+suffixes[i];
-        if (fileExists(f)) { dummy=system("sh","rm "+f+ "&> /dev/null"); }
+        if (fileExists(f))
+        {
+            dummy=system("sh","rm "+f+ "&> /dev/null");
+        }
     }
 }
@@ -580 +586 @@
     for (int k=1; k+1<=size(#); k=k+2) {
     //get data from the parameter list
-      sgr   = #[k];
-      num_rows = nrows(sgr);
-      num_cols = ncols(sgr);
-                n_mode   = #[k+1];
-
-      write(outf,num_rows);
-      write(outf,num_cols);
-
-      for(i=1;i<=nrows(sgr);i++)
-      {
-        s="";
-        for(j=1;j<=num_cols;j++)
-        {
-           s=s+string(sgr[i,j])+" ";
-        }
-        write(outf,s);
-      }
-      write(outf,n_mode);
-      write(outf,"");
+        n_mode   = #[k+1];
+        if (n_mode != -1) { //skip -1 mode
+            sgr = #[k];
+            num_rows = nrows(sgr);
+            num_cols = ncols(sgr);
+
+            write(outf,num_rows);
+            write(outf,num_cols);
+
+            for(i=1;i<=nrows(sgr);i++)
+            {
+                s="";
+                for(j=1;j<=num_cols;j++)
+                {
+                    s=s+string(sgr[i,j])+" ";
+                }
+                write(outf,s);
+            }
+            if (n_mode == 20) {
+                write(outf,"grading");
+            } else {
+                write(outf,n_mode);
+            }
+            write(outf,"");
+        }
     }
     close(outf);
+}
+
+
+static proc prepareGrading(list #)
+{
+    if (size(#)==0) {
+        return(0,-1); // mode -1 specifies discard the matrix
+    }
+    if (size(#)>1) {
+        print(#);
+        ERROR("To many parameters!");
+    }
+    intmat g = intmat(#[1],1,size(#[1]));
+    return (g,20);
 }
 
@@ -611 +637 @@
           mode. See the Normaliz documentation for more information.
 
-                         It is also possible to give more than one pair of matrix and mode. In
-                         this case all matrices and modes are written. This can be used to
-                         combine modes 4,5,6.
+          It is also possible to give more than one pair of matrix and mode. In
+          this case all matrices and modes are written. This can be used to
+          combine modes 4,5,6.
+          Use mode=20 to specify a grading.
 NOTE:     Needs an explicit filename set. The filename is created from the
           current filename.
@@ -677 +704 @@
     (n_cols,p)=getInt(s,p);
     if (n_rows <= 0 || n_cols <= 0) {
-             intmat empty;
-             return(empty);
-    }
-         intmat nmz_gen[n_rows][n_cols];
+         intmat empty;
+         return(empty);
+    }
+    intmat nmz_gen[n_rows][n_cols];
     for(i=1;i<=n_rows;i++)
     {
@@ -696 +723 @@
   intmat sgrnormal=normaliz(sgr,0);
   readNmzData("cst");
-  readNmzData("typ");
 }
 
@@ -714 +740 @@
         list nmz_options=
         list("supp",0,"-s",0),
-        list("triang",0,"-v",0),
-        list("volume",0,"-V",0),
+        list("triang",0,"-tT",0),
+        list("volume",0,"-v",0),
         list("hvect",0,"-p",0),
-        list("hvect_l",0,"-P",0),
         list("height1",0,"-1",0),
         list("normal",0,"-n",1),
         list("normal_l",0,"-N",1),
         list("hilb",0,"-h",1),
-        list("hilb_l",0,"-H",1),
         list("dual",0,"-d",1),
         list("control",0,"-c",2),
@@ -739 +763 @@
 The Normaliz options are accessible via the following names:
 @* @code{-s:  supp}
-@* @code{-v:  triang}
-@* @code{-V:  volume}
+@* @code{-t:  triang}
+@* @code{-v:  volume}
 @* @code{-p:  hvect}
-@* @code{-P:  hvect_l}
 @* @code{-1:  height1}
 @* @code{-n:  normal}
 @* @code{-N:  normal_l}
 @* @code{-h:  hilb}
-@* @code{-H:  hilb_l}
 @* @code{-d:  dual}
 @* @code{-a:  allf}
@@ -788 +810 @@
         {
             run_options=run_options+nmz_options[i][3];
-                                if (nmz_options[i][1]=="threads") {
-                                        run_options=run_options+string(nmz_options[i][2]);
-                                }
-                                run_options=run_options+" ";
+                if (nmz_options[i][1]=="threads") {
+                    run_options=run_options+string(nmz_options[i][2]);
+                }
+                run_options=run_options+" ";
             if(nmz_options[i][4]!=2)
             {
@@ -818 +840 @@
 
 
-static proc runNormaliz(intmat sgr,def nmz_mode, list #)
+static proc runNormaliz(intmat sgr, int nmz_mode, list #)
 {
     if(!queryInt("nmz_files_keep_switch"))
@@ -876 +898 @@
 
           It is also possible to give more than one pair of matrix and mode. In
-                         this case all matrices and modes are used. This can be used to
-                         combine modes 4,5,6.
+          this case all matrices and modes are used. This can be used to
+          combine modes 4,5,6.
+          Use nmz_mode=20 to specify a grading.
 NOTE:     You will find procedures for many applications of Normaliz in this
           library, so the explicit call of this procedure may not be necessary.
 SEE ALSO: intclToricRing, normalToricRing, ehrhartRing, intclMonIdeal,
           torusInvariants, diagInvariants, finiteDiagInvariants, intersectionValRings,
-                         intersectionValRingIdeals
+             intersectionValRingIdeals
 EXAMPLE:  example normaliz; shows an example
 "
@@ -935 +958 @@
                 name_inv="h_vector";
             }
-            if(name_inv!="hilbert_polynomial")
+            if(name_inv!="hilbert_polynomial"
+              && name_inv!="hilbert_quasipolynomial")
             {
                 for(i=1;i<=v_length;i++)
@@ -961 +985 @@
             (sw,p)=nextWord(s,p);
             name_inv=s[sw..p-1];
-            (dummy_int,p)=getInt(s,p);
-            num_invs=num_invs+list(list(name_inv,dummy_int,"int"));
+            if (name_inv!="hilbert_quasipolynomial_denom") {
+              (dummy_int,p)=getInt(s,p);
+              num_invs=num_invs+list(list(name_inv,dummy_int,"int"));
+            }
         }
         if(type_inv=="boolean")
@@ -1000 +1026 @@
 { "EXAMPLE:"; echo=2;
   ring R=0,(x,y,z,t),dp;
-  ideal I=x^2,y^2,z^3;
+  ideal I=x3,x2y,y3;
   list l=intclMonIdeal(I);
   showNuminvs();
@@ -1029 +1055 @@
 { "EXAMPLE:"; echo=2;
   ring R=0,(x,y,z,t),dp;
-  ideal I=x^2,y^2,z^3;
+  ideal I=x3,x2y,y3;
   list l=intclMonIdeal(I);
   exportNuminvs();
@@ -1038 +1064 @@
   nmz_index;
   nmz_number_support_hyperplanes;
-  nmz_homogeneous;
+  nmz_size_triangulation;
+  nmz_sum_dets;
+  nmz_graded;
+  nmz_degree_1_elements;
+  nmz_grading;
+  nmz_grading_denom;
+  nmz_multiplicity;
+  nmz_multiplicity_denom;
+  nmz_hilbert_series_num;
+  nmz_hilbert_series_denom;
   nmz_primary;
-  nmz_ideal_multiplicity;
 }
 
@@ -1137 +1171 @@
         if(expo_vecs[i,ncols(expo_vecs)]==d)
         {
-
             m=1;
             for(j=1;j<=ncols(expo_vecs)-1;j++)
@@ -1146 +1179 @@
         }
     }
-     mons=simplify(mons,2);    // get rid of starting 0
-     return(mons);
+    mons=simplify(mons,2);    // get rid of starting 0
+    return(mons);
 }
 
@@ -1155 +1188 @@
 RETURN:   Returns the intmat whose rows represent the exponents of the
           (non-zero) elements of I which have to be binomials.
-                         The length of each row is nvars(basering).
+          The length of each row is nvars(basering).
 SEE ALSO: mons2intmat, intmat2mons
 EXAMPLE:  example binomials2intmat; shows an example"
 {
-  int i,j,k;
-  intmat expo_vecs[size(I)][nvars(basering)];
-  intvec expo_v;
-
-  k=0;
-  poly f;
-
-  for(i=1; i<=ncols(I); i++)
-  {
-    if( I[i] != 0 )
-    {
-      k++;
-      f = I[i];
-      if (leadcoef(f) != 1) {f = -f};  //works in all characteristics
-      if (size(f)!=2 || leadcoef(f)!=1 || leadcoef(f[2])!=-1)
-      {
-        ERROR(string("normalToricRing: binomial ideal expected: generator ",i,": ",I[i]));
-      }
-      expo_v = leadexp(f)-leadexp(f[2]);
-      for(j=1;j<=nvars(basering);j++)
-      {
-        expo_vecs[k,j]=expo_v[j];
-      }
-    }
-  }
-  return(expo_vecs);
+    int i,j,k;
+    intmat expo_vecs[size(I)][nvars(basering)];
+    intvec expo_v;
+
+    k=0;
+    poly f;
+
+    for(i=1; i<=ncols(I); i++)
+    {
+        if( I[i] != 0 )
+        {
+            k++;
+            f = I[i];
+            if (leadcoef(f) != 1) {f = -f};  //works in all characteristics
+            if (size(f)!=2 || leadcoef(f)!=1 || leadcoef(f[2])!=-1)
+            {
+                ERROR(string("normalToricRing: binomial ideal expected: generator ",i,": ",I[i]));
+            }
+
+            expo_v = leadexp(f)-leadexp(f[2]);
+            for(j=1;j<=nvars(basering);j++)
+            {
+                expo_vecs[k,j]=expo_v[j];
+            }
+        }
+    }
+    return(expo_vecs);
 }
 example
@@ -1196 +1230 @@
 // integral closure of rings and ideals
 
-static proc runIntclToricRing(ideal I, int nmz_mode)
+static proc runIntclToricRing(ideal I, int nmz_mode, list #)
 {
     intmat expo_vecs=mons2intmat(I);
 
     string dummy=collectNmzOptions(); // only to set GenGen
-
-    return( intmat2mons( runNormaliz(expo_vecs,nmz_mode) ) );
-}
-
-proc intclToricRing(ideal I)
+    return( intmat2mons( runNormaliz(expo_vecs,nmz_mode, prepareGrading(#)) ) );
+}
+
+proc intclToricRing(ideal I, list #)
 "USAGE:   intclToricRing(ideal I);
-RETURN:   The toric ring S is the subalgebra of the basering generated by the
-          leading monomials of the elements of I. The function computes the
-          integral closure T of S in the basering and returns an ideal listing
+          intclToricRing(ideal I, intvec grading);
+RETURN:   The toric ring S is the subalgebra of the basering generated by
+          the leading monomials of the elements of I (considered as a list
+          of polynomials). The function computes the integral
+          closure T of S in the basering and returns an ideal listing
           the algebra generators of T over the coefficient field.
 @*        The function returns the input ideal I if one of the options
-          @code{supp}, @code{triang}, or @code{hvect} has been activated.
+          @code{supp}, @code{triang}, @code{volume}, or @code{hseries}
+          has been activated.
           However, in this case some numerical invariants are computed, and
           some other data may be contained in files that you can read into
@@ -1222 +1258 @@
 "
 {
-    return(runIntclToricRing(I,0));
+    return(runIntclToricRing(I,0,#));
 }
 example
@@ -1229 +1265 @@
   ideal I=x3,x2y,y3;
   intclToricRing(I);
-}
-
-proc normalToricRing(ideal I)
+  showNuminvs();
+  //now the same example with another grading
+  intvec grading = 2,3,1;
+  intclToricRing(I,grading);
+  showNuminvs();
+
+}
+
+proc normalToricRing(ideal I, list #)
 "USAGE:   normalToricRing(ideal I);
+          normalToricRing(ideal I, intvec grading);
 RETURN:   The toric ring S is the subalgebra of the basering generated by the
-          leading monomials of the elements of I. The function computes the
+          leading monomials of the elements of I (considered as a list of
+          polynomials). The function computes the
           normalisation T of S and returns an ideal listing the algebra
           generators of T over the coefficient field.
 @*        The function returns the input ideal I if one of the options
-          @code{supp}, @code{triang}, or @code{hvect} has been activated.
+          @code{supp}, @code{triang}, @code{volume}, or @code{hseries}
+          has been activated.
           However, in this case some numerical invariants are computed, and
           some other data may be contained in files that you can read into
@@ -1248 +1293 @@
 "
 {
-    return(runIntclToricRing(I,1));
+    return(runIntclToricRing(I,1,#));
 }
 example
@@ -1258 +1303 @@
 
 
-proc normalToricRingFromBinomials(ideal I)
+proc normalToricRingFromBinomials(ideal I, list #)
 "USAGE:   normalToricRingFromBinomials(ideal I);
-RETURN:
+          normalToricRingFromBinomials(ideal I, intvec grading);
+RETURN:   @texinfo
 @tex
 The ideal $I$ is generated by binomials of type $X^a-X^b$ (multiindex notation)
@@ -1278 +1324 @@
 generators of the normalization of $K[N]$.
 @end tex
+@end texinfo
 @*        The function returns the input ideal I if one of the options
-          @code{supp}, @code{triang}, or @code{hvect} has been activated.
+          @code{supp}, @code{triang}, @code{volume}, or @code{hseries}
+          has been activated.
           However, in this case some numerical invariants are computed, and
           some other data may be contained in files that you can read into
-          Singular.
+          Singular (see @ref{showNuminvs}, @ref{exportNuminvs}).
 SEE ALSO: intclToricRing, normalToricRing, ehrhartRing, intclMonIdeal
 EXAMPLE:  example normalToricRing; shows an example
 "
 {
-        intmat expo_vecs = binomials2intmat(I);
-        string dummy=collectNmzOptions(); // only to set GenGen
-        intmat result = runNormaliz(expo_vecs,10);
-
-        list baseringlist = ringlist(basering);
-        ring S = (baseringlist[1]),(x(1..ncols(result))),dp;
-        ideal I = intmat2mons(result);
-        export(I);
-        return (S);
+    intmat expo_vecs = binomials2intmat(I);
+    string dummy=collectNmzOptions(); // only to set GenGen
+    intmat result = runNormaliz(expo_vecs,10,prepareGrading(#));
+
+    list baseringlist = ringlist(basering);
+    ring S = (baseringlist[1]),(x(1..ncols(result))),dp;
+    ideal I = intmat2mons(result);
+    export(I);
+    return (S);
 }
 example
@@ -1306 +1354 @@
 }
 
-static proc runIntclMonIdeal(ideal I, int nmz_mode)
+static proc runIntclMonIdeal(ideal I, int nmz_mode, list #)
 {
     intmat expo_vecs=mons2intmat(I);
@@ -1324 +1372 @@
 
     //adjust size of input matrix
-         if (!last_comp) { // remove last component
-             intmat tmp[nrows(expo_vecs)][ncols(expo_vecs)-1] = expo_vecs[1..nrows(expo_vecs),1..(ncols(expo_vecs)-1)];
-                  expo_vecs = tmp;
-         }
-    intmat nmz_data=runNormaliz(expo_vecs,nmz_mode);
+    if (!last_comp) { // remove last component
+        intmat tmp[nrows(expo_vecs)][ncols(expo_vecs)-1]
+               = expo_vecs[1..nrows(expo_vecs),1..(ncols(expo_vecs)-1)];
+        expo_vecs = tmp;
+    }
+    intmat nmz_data=runNormaliz(expo_vecs,nmz_mode,prepareGrading(#));
 
     if(last_comp)
@@ -1346 +1395 @@
 "USAGE:    ehrhartRing(ideal I);
 RETURN:    The exponent vectors of the leading monomials of the elements of I
-           are considered as vertices of a lattice polytope P.
+           are considered as points of a lattice polytope P.
            The Ehrhart ring of a (lattice) polytope P is the monoid algebra
            defined by the monoid of lattice points in the cone over the
@@ -1355 +1404 @@
                treated as the auxiliary variable of the Ehrhart ring. The
                function returns two ideals, the first containing the monomials
-               representing the lattice points of the polytope, the second
+               representing all the lattice points of the polytope, the second
                containing the algebra generators of the Ehrhart ring over the
-                    coefficient field.
+               coefficient field.
 @*         (ii) If the last ring variable is used by the monomials, the list
                 returned contains only one ideal, namely the monomials
@@ -1363 +1412 @@
 @*
 @*        The function returns the a list containing the input ideal I if one
-          of the options @code{supp}, @code{triang}, or @code{hvect} has been
-                         activated.
+          of the options @code{supp}, @code{triang}, @code{volume}, or
+          @code{hseries} has been activated.
           However, in this case some numerical invariants are computed, and
           some other data may be contained in files that you can read into
-          Singular.
+          Singular (see @ref{showNuminvs}, @ref{exportNuminvs}).
 NOTE:      A mathematical remark: the Ehrhart ring depends on the list of
            monomials given, and not only on the ideal they generate!
@@ -1383 +1432 @@
 }
 
-proc intclMonIdeal(ideal I)
+proc intclMonIdeal(ideal I, list #)
 "USAGE:   intclMonIdeal(ideal I);
+          intclMonIdeal(ideal I, intvec grading);
 RETURN:   The exponent vectors of the leading monomials of the elements of I
           are considered as generators of a monomial ideal for which the
@@ -1400 +1450 @@
         closure of the ideal.
 @*        The function returns the a list containing the input ideal I if one
-          of the options @code{supp}, @code{triang}, or @code{hvect} has been
-                         activated.
+          of the options @code{supp}, @code{triang}, @code{volume}, or
+          @code{hseries} has been activated.
           However, in this case some numerical invariants are computed, and
           some other data may be contained in files that you can read into
@@ -1409 +1459 @@
 "
 {
-    return(runIntclMonIdeal(I,3));
+    return(runIntclMonIdeal(I,3,#));
 }
 example
@@ -1422 +1472 @@
 // torus invariants and valuation rings and ideals
 
-proc torusInvariants(intmat E)
+proc torusInvariants(intmat E, list #)
 "USAGE:   torusInvariants(intmat A);
-RETURN:
+          torusInvariants(intmat A, intvec grading);
+RETURN:   @texinfo
 Returns an ideal representing the list of monomials generating the ring of
 invariants as an algebra over the coefficient field.
@@ -1430 +1481 @@
 $R^T$.
 @end tex
-@*The function returns the ideal given by the input matrix A if one of
-the options @code{supp}, @code{triang}, or @code{hvect} has been
-activated.
-However, in this case some numerical invariants are computed, and
-some other data may be contained in files that you can read into
-Singular.
-BACKGROUND:
+@*        The function returns the ideal given by the input matrix A if one of
+          the options @code{supp}, @code{triang}, @code{volume}, or
+          @code{hseries} has been activated.
+          However, in this case some numerical invariants are computed, and
+          some other data may be contained in files that you can read into
+          Singular (see @ref{showNuminvs}, @ref{exportNuminvs}).
+@end texinfo
+BACKGROUND: @texinfo
 @tex
  Let $T = (K^*)^r$ be the $r$-dimensional torus acting on the polynomial ring
@@ -1447 +1499 @@
 $A=(a_{i,j})$.
 @end tex
+@end texinfo
 SEE ALSO: diagInvariants, finiteDiagInvariants, intersectionValRings,
           intersectionValRingIdeals
@@ -1459 +1512 @@
     string dummy=collectNmzOptions();  // only to set GenGen
 
-    return( intmat2mons( runNormaliz(E,5) ) );
+    return( intmat2mons( runNormaliz(E,5,prepareGrading(#)) ) );
 }
 example
@@ -1468 +1521 @@
 }
 
-proc finiteDiagInvariants(intmat C)
+proc finiteDiagInvariants(intmat C, list #)
 "USAGE:   finiteDiagInvariants(intmat U);
-RETURN:
+          finiteDiagInvariants(intmat U, intvec grading);
+RETURN:   @texinfo
 @tex
 This function computes the ring of invariants of a finite abelian group $G$
@@ -1485 +1539 @@
 {$R^G=\{f\in R : g_i f = f$ for all $i=1,\ldots,w\}$}.
 @end tex
-@*The function returns the ideal given by the input matrix C if one of
-the options @code{supp}, @code{triang}, or @code{hvect} has been
-activated.
-However, in this case some numerical invariants are computed, and
-some other data may be contained in files that you can read into
-Singular.
+@end texinfo
+@*        The function returns the ideal given by the input matrix C if one of
+          the options @code{supp}, @code{triang}, @code{volume}, or
+          @code{hseries} has been activated.
+          However, in this case some numerical invariants are computed, and
+          some other data may be contained in files that you can read into
+          Singular (see @ref{showNuminvs}, @ref{exportNuminvs}).
 NOTE:
 SEE ALSO: torusInvariants, diagInvariants, intersectionValRings,
-          intersectionValRingIdeals,showNuminvs,exportNuminvs
+          intersectionValRingIdeals
 EXAMPLE:  example finiteDiagInvariants; shows an example
 "
@@ -1504 +1559 @@
     string dummy=collectNmzOptions();  // only to set GenGen
 
-    return( intmat2mons( runNormaliz(C,6) ) );
+    return( intmat2mons( runNormaliz(C,6,prepareGrading(#)) ) );
 }
 example
@@ -1513 +1568 @@
 }
 
-proc diagInvariants(intmat E, intmat C)
+proc diagInvariants(intmat E, intmat C, list #)
 "USAGE:   diagInvariants(intmat A, intmat U);
-RETURN:
+          diagInvariants(intmat A, intmat U, intvec grading);
+RETURN:   @texinfo
 @tex
 This function computes the ring of invariants of a diagonalizable group
@@ -1525 +1581 @@
 monomial ideal listing the algebra generators of the subalgebra of invariants.
 @end tex
-@*The function returns the ideal given by the input matrix A if one of
-the options @code{supp}, @code{triang}, or @code{hvect} has been
-activated.
-However, in this case some numerical invariants are computed, and
-some other data may be contained in files that you can read into
-Singular.
-SEE ALSO: torusInvariants, finiteDiagInvariants, intersectionValRings, intersectionValRingIdeals,showNuminvs,exportNuminvs
+@end texinfo
+@*        The function returns the ideal given by the input matrix A if one of
+          the options @code{supp}, @code{triang}, @code{volume}, or
+          @code{hseries} has been activated.
+          However, in this case some numerical invariants are computed, and
+          some other data may be contained in files that you can read into
+          Singular (see @ref{showNuminvs}, @ref{exportNuminvs}).
+SEE ALSO: torusInvariants, finiteDiagInvariants, intersectionValRings, intersectionValRingIdeals
 EXAMPLE:  example diagInvariants; shows an example
 "
@@ -1542 +1599 @@
     string dummy=collectNmzOptions();  // only to set GenGen
 
-    return( intmat2mons( runNormaliz(E,5,C,6) ) );
+    return( intmat2mons( runNormaliz(E,5,C,6,prepareGrading(#)) ) );
 }
 example
@@ -1552 +1609 @@
 }
 
-proc intersectionValRings(intmat V)
-"USAGE:   intersectionValRings(intmat V);
+proc intersectionValRings(intmat V, list #)
+"USAGE:   intersectionValRings(intmat V, intvec grading);
 RETURN:   The function returns a monomial ideal, to be considered as the list
           of monomials generating @math{S} as an algebra over the coefficient
           field.
-BACKGROUND:
+BACKGROUND: @texinfo
 @tex
 A discrete monomial valuation $v$ on $R = K[X_1 ,\ldots,X_n]$ is determined by
@@ -1565 +1622 @@
 its input.
 @end tex
-@*The function returns the ideal given by the input matrix V if one of
-the options @code{supp}, @code{triang}, or @code{hvect} has been
-activated.
-However, in this case some numerical invariants are computed, and
-some other data may be contained in files that you can read into
-Singular.
-SEE ALSO: torusInvariants, diagInvariants, finiteDiagInvariants, intersectionValRingIdeals,showNuminvs,exportNuminvs
+@end texinfo
+@*        The function returns the ideal given by the input matrix V if one of
+          the options @code{supp}, @code{triang}, @code{volume}, or
+          @code{hseries} has been activated.
+          However, in this case some numerical invariants are computed, and
+          some other data may be contained in files that you can read into
+          Singular (see @ref{showNuminvs}, @ref{exportNuminvs}).
+SEE ALSO: torusInvariants, diagInvariants, finiteDiagInvariants, intersectionValRingIdeals
 EXAMPLE:  example intersectionValRings; shows an example
 "
@@ -1601 +1659 @@
 /*    if(!GenGen) // return V
     {
-        runNormaliz(V1,4);
+        runNormaliz(V1,4,prepareGrading(#));
         return(V);
     }
 */
-    return(intmat2mons(runNormaliz(V1,4)));
+    return(intmat2mons(runNormaliz(V1,4,prepareGrading(#))));
 }
 example
@@ -1614 +1672 @@
 }
 
-proc intersectionValRingIdeals(intmat V)
+proc intersectionValRingIdeals(intmat V, list #)
 "USAGE:   intersectionValRingIdeals(intmat V);
+          intersectionValRingIdeals(intmat V, intvec grading);
 RETURN:   The function returns two ideals, both to be considered as lists of
-          monomials which generate an algebra over the coefficient field. The
+          monomials. The
           first is the system of monomial generators of @math{S}, the second
           the system of generators of @math{M}.
@@ -1626 +1685 @@
           some other data may be contained in files that you can read into
           Singular (see @ref{showNuminvs}, @ref{exportNuminvs}).
-BACKGROUND:
+BACKGROUND: @texinfo
 @tex
 A discrete monomial valuation $v$ on $R = K[X_1 ,\ldots,X_n]$ is determined by
@@ -1639 +1698 @@
 The numbers $w_i$ form the $(n+1)$th column of the input matrix.
 @end tex
+@end texinfo
 NOTE:   The function also gives an error message if the matrix V has the
         wrong number of columns.
@@ -1671 +1731 @@
     string dummy=collectNmzOptions();  // only to set GenGen
 
-    intmat nmz_data=runNormaliz(V1,4);
+    intmat nmz_data=runNormaliz(V1,4,prepareGrading(#));
 
     ideal I1=intmat2monsSel(nmz_data,0);

Singular/LIB/primdec.lib

@@ -3935 +3935 @@
    ideal F=imap(R,F);
 
-   string nR1="ring @S1="+string(p)+",("+varstr(R)+","+parstr(R)+",@y(1..m)),dp;";
-   execute(nR1);
-   list lR=ringlist(@S1)[2];
-   lR=lR[(size(lR)-m+1)..(size(lR))];
-
-   string nR="ring @S="+string(p)+",("+string(lR)+","+varstr(R)+","+parstr(R)+"),dp;";
+   string nR="ring @S="+string(p)+",(@y(1..m),"+varstr(R)+","+parstr(R)+"),dp;";
    execute(nR);
 

Singular/emacs.cc

@@ -9 +9 @@
 
 
+#include <kernel/mod2.h>
+#include <omalloc/omalloc.h>
+#include <resources/feResource.h>
+#include <Singular/feOpt.h>
+
 #ifdef __CYGWIN__
 #define BOOLEAN boolean
 #endif
-#include <kernel/mod2.h>
-
 
 #include <stdio.h>
@@ -30 +33 @@
 #endif
 
-#include <omalloc/omalloc.h>
-#include <resources/feResource.h>
-#include <Singular/feOpt.h>
 
 #if !defined(TSINGULAR) && !defined(ESINGULAR)
@@ -63 +63 @@
 }
 #else
-void error(char* fmt, ...)
+void error(const char* fmt, ...)
 {
    char buf[4096];

Singular/ipshell.cc

@@ -1219 +1219 @@
     //Print("branchTo: %s\n",h->Name());
     iiCurrProc=(idhdl)h->data;
-    err=iiAllStart(IDPROC(iiCurrProc),IDPROC(iiCurrProc)->data.s.body,BT_proc,IDPROC(iiCurrProc)->data.s.body_lineno-(iiCurrArgs==NULL));
+    procinfo * pi=IDPROC(iiCurrProc);
+    if( pi->data.s.body==NULL )
+    {
+      iiGetLibProcBuffer(pi);
+      if (pi->data.s.body==NULL) return TRUE;
+    }
+    err=iiAllStart(pi,pi->data.s.body,BT_proc,pi->data.s.body_lineno-(iiCurrArgs==NULL));
     exitBuffer(BT_proc);
     if (iiCurrArgs!=NULL)