Changeset 355c71 in git for Singular/LIB

Timestamp:

Feb 13, 2010, 3:48:41 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4bd32dfef92ec9f5ed8dceee82d14318ae147107')

Children:

31c447291e9eccdbde66296a43b320588c671e83

Parents:

c5d0aed165ab1ec8a6bf40d0595d42a2ada6436b

Message:

return type/status

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

File:

• Singular/LIB/normaliz.lib (modified) (13 diffs)

Singular/LIB/normaliz.lib

@@ -150 +150 @@
 static proc fileExists(string f)
 {
-    return(!system("sh","ls "+f+" &> /dev/null"));
+    return(status (f,"exists")=="yes");
 }
 
@@ -820 +820 @@
     }
 
-    if(!GenGen) // return nothing if "gen" has not been generated
-    {
-        return();
+    if(!GenGen) // return input matrix if "gen" has not been generated
+    {
+        if(!queryInt("nmz_files_keep_switch"))
+        {
+            eraseTempNmzDataPath();
+        }
+        return(sgr);
     }
     intmat Gen=readNmzData("gen");
@@ -1123 +1127 @@
     string dummy=collectNmzOptions(); // only to set GenGen
 
-    if(!GenGen) // return I
+/*    if(!GenGen) // return I
     {
         runNormaliz(expo_vecs,ncols(expo_vecs),nmz_mode);
         return(I);
     }
-    return( intmat2mons( runNormaliz(expo_vecs,ncols(expo_vecs),nmz_mode) ) );
+*/    return( intmat2mons( runNormaliz(expo_vecs,ncols(expo_vecs),nmz_mode) ) );
 }
 
@@ -1200 +1204 @@
     string dummy=collectNmzOptions(); // only to set GenGen
 
-    if(!GenGen) // return I
+/*    if(!GenGen) // return I
     {
         runNormaliz(expo_vecs,ncols(expo_vecs),nmz_mode);
-        return(I);
-    }
-
+        return(list(I));
+    }
+*/
     intmat nmz_data=runNormaliz(expo_vecs,ncols(expo_vecs)-1+last_comp,
                                                                   nmz_mode);
@@ -1241 +1245 @@
                 representing the lattice points of the polytope.
 @*
-@*        The function returns the input ideal I if one of the options
-          @code{supp}, @code{triang}, or @code{hvect} has been activated.
+@*        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.
           However, in this case some numerical invariants are computed, and
           some other data may be contained in files that you can read into
@@ -1277 +1282 @@
         contains only one ideal, namely the monomials generating the integral
         closure of the ideal.
-@*        The function returns the input ideal I if one of the options
-          @code{supp}, @code{triang}, or @code{hvect} has been activated.
+@*        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.
           However, in this case some numerical invariants are computed, and
           some other data may be contained in files that you can read into
@@ -1309 +1315 @@
 $R^T$.
 @end tex
-@*        The function returns the input matrix T if one of the options
-          @code{supp}, @code{triang}, or @code{hvect} has been activated.
+@*        The function returns the ideal given by the input matrix T 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
@@ -1346 +1353 @@
     string dummy=collectNmzOptions();  // only to set GenGen
 
-    if(!GenGen) // return T
+/*    if(!GenGen) // return T
     {
         runNormaliz(T,ncols(T),5);
-        return(Z);
-    }
-    return( intmat2mons( runNormaliz(T,ncols(T),5) ) );
+        return(T);
+    }
+*/    return( intmat2mons( runNormaliz(T,ncols(T),5) ) );
 }
 example
@@ -1364 +1371 @@
 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.
+          field.
 BACKGROUND: @texinfo
 @tex
@@ -1374 +1381 @@
 @end tex
 @end texinfo
-@*        The function returns the input matrix V if one of the options
-          @code{supp}, @code{triang}, or @code{hvect} has been activated.
+@*        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
@@ -1415 +1423 @@
     string dummy=collectNmzOptions();  // only to set GenGen
 
-    if(!GenGen) // return V
+/*    if(!GenGen) // return V
     {
         runNormaliz(V1,ncols(V),4);
         return(V);
     }
-
+*/
     return(intmat2mons(runNormaliz(V1,ncols(V),4)));
 }
@@ -1435 +1443 @@
           monomials which generate an algebra over the coefficient field. The
           first is the system of monomial generators of @math{S}, the second
-             the system of generators of @math{M}.
-@*        The function returns the input matrix V if one of the options
-          @code{supp}, @code{triang}, or @code{hvect} has been activated.
+          the system of generators of @math{M}.
+@*        The function returns a list consisting of the ideal given by the 
+          input matrix T 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
@@ -1493 +1502 @@
     string dummy=collectNmzOptions();  // only to set GenGen
 
-    if(!GenGen) // return V
+/*    if(!GenGen) // return V
     {
         runNormaliz(V1,ncols(V),4);
         return(V);
     }
-
+*/
     intmat nmz_data=runNormaliz(V1,ncols(V),4);