Changeset 6a5712c in git for Singular/LIB

Timestamp:

Nov 26, 2009, 1:45:36 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

28f60ccf21a7ca5ee6bd5aaa6eba3291e8c46a09

Parents:

bd19b6bb49208a846ad48960d27e4262b206efea

Message:

*hannes: error handling

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

File:

• Singular/LIB/toric.lib (modified) (14 diffs)

Singular/LIB/toric.lib

@@ -21 +21 @@
   if(nvars(basering)<ncols(A))
   {
-    "ERROR: The number of matrix columns is smaller than the number of ring variables.";
-    return(I);
+    ERROR("The number of matrix columns is smaller than the number of ring variables.");
   }
 
@@ -205 +204 @@
   if(external_ord=="")
   {
-    "ERROR: The term ordering of the actual basering is not supported.";
-    return(I);
+    ERROR("The term ordering of the actual basering is not supported.");
   }
 
@@ -215 +213 @@
     // extended matrix
   {
-    "ERROR: The chosen algorithm is not suitable.";
-    return(I);
+    ERROR("The chosen algorithm is not suitable.");
   }
 
@@ -263 +260 @@
     if(found==0)
     {
-      "ERROR: The chosen algorithm needs a positive vector in the row space of the matrix.";
       close(MATRIX);
       dummy=system("sh","rm -f "+matrixfile);
-      return(I);
+      ERROR("The chosen algorithm needs a positive vector in the row space of the matrix.");
     }
     write(MATRIX,"positive row space vector:");
@@ -279 +275 @@
   // call external program
   dummy=system("sh","toric_ideal -alg "+alg+" "+matrixfile);
+  if (dummy!=0) { ERROR("toric_ideal failed with error code "+string(dummy)); }
 
   // read toric ideal from created file
@@ -355 +352 @@
   if(size(prsv)<ncols(A))
   {
-    "ERROR: The number of matrix columns does not equal the size of the positive row space vector.";
-    return(I);
+    ERROR("The number of matrix columns does not equal the size of the positive row space vector.");
   }
 
@@ -362 +358 @@
   if(nvars(basering)!=ncols(A))
   {
-    "ERROR: The number of matrix columns is smaller than the number of ring variables.";
-    return(I);
+    ERROR("The number of matrix columns is smaller than the number of ring variables.");
   }
 
@@ -546 +541 @@
   if(external_ord=="")
   {
-    "ERROR: The term ordering of the actual basering is not supported.";
-    return(I);
+    ERROR("The term ordering of the actual basering is not supported.");
   }
 
@@ -556 +550 @@
     // extended matrix
   {
-    "ERROR: The chosen algorithm is not suitable.";
-    return(I);
+    ERROR("The chosen algorithm is not suitable.");
   }
 
@@ -595 +588 @@
   // call external program
   dummy=system("sh","toric_ideal -alg "+alg+" "+matrixfile);
+  if (dummy!=0) { ERROR("toric_ideal failed with error code "+string(dummy)); }
 
   // read toric ideal from created file
@@ -930 +924 @@
   if(external_ord=="")
   {
-    "ERROR: The term ordering of the actual basering is not supported.";
-    return(I);
+    ERROR("The term ordering of the actual basering is not supported.");
   }
 
@@ -967 +960 @@
     if(head==0 && tail==0 && rest!=0)
     {
-      "ERROR: Generator "+string(j)+" of the input ideal is no binomial.";
       close(GROEBNER);
       dummy=system("sh","rm -f "+groebnerfile);
-      return(J);
+      ERROR("Generator "+string(j)+" of the input ideal is no binomial.");
     }
 
@@ -976 +968 @@
       // generator is no difference of monomials (or a constant multiple)
     {
-      "ERROR: Generator "+string(j)+" of the input ideal is no difference of monomials.";
       close(GROEBNER);
       dummy=system("sh","rm -f "+groebnerfile);
-      return(J);
+      ERROR("Generator "+string(j)+" of the input ideal is no difference of monomials.");
     }
 
@@ -1010 +1001 @@
   // call external program
   dummy=system("sh","change_cost "+groebnerfile+" "+newcostfile);
+  if (dummy!=0) { ERROR("change_cost failed with error code "+string(dummy)); }
 
   // read toric standard basis from created file