Changeset b6f755 in git

Timestamp:

Sep 14, 2000, 2:38:55 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b4e536263bb0aa911b1f252afe51fd37579eaaa1

Parents:

88f41c23800323735502f1de13789462ad26d128

Message:

*hannes: ip.lib -> intprog.lib


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

Files:

• Singular/LIB/all.lib (modified) (2 diffs)
• Singular/LIB/intprog.lib (added)
• Singular/LIB/toric.lib (modified) (41 diffs)
• doc/singular.doc (modified) (previous)
• doc/ti_ip.doc (modified) (previous)

Singular/LIB/all.lib

@@ -1 @@
-// $Id: all.lib,v 1.26 2000-08-18 11:58:31 Singular Exp $
+// $Id: all.lib,v 1.27 2000-09-14 12:37:08 Singular Exp $
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: all.lib,v 1.26 2000-08-18 11:58:31 Singular Exp $";
+version="$Id: all.lib,v 1.27 2000-09-14 12:37:08 Singular Exp $";
 info="
 LIBRARY:  all.lib   Load all libraries
@@ -69 +69 @@
 LIB "spcurve.lib";
 LIB "algebra.lib";
-LIB "ip.lib";
+LIB "intprog.lib";
 LIB "toric.lib";
 LIB "mregular.lib"

Singular/LIB/toric.lib

@@ -1 @@
-// version="$Id: toric.lib,v 1.6 2000-08-14 12:56:58 obachman Exp $";
+// version="$Id: toric.lib,v 1.7 2000-09-14 12:37:10 Singular Exp $";
 
 ///////////////////////////////////////////////////////////////////////////////
 
 info="
-LIBRARY: toric.lib              COMPUTING TORIC IDEALS   
+LIBRARY: toric.lib                COMPUTING TORIC IDEALS
 
 AUTHOR:  Christine Theis, email: ctheis@math.uni-sb.de
@@ -10 +10 @@
 PROCEDURES:
 
-toric_ideal(intmat A, string alg [,intvec prsv]);       computes the toric ideal of A
-
-toric_std(ideal I);     computes the standard basis of I using a specialized Buchberger algorithm 
+toric_ideal(intmat A, string alg [,intvec prsv]);        computes the toric ideal of A
+
+toric_std(ideal I);        computes the standard basis of I using a specialized Buchberger algorithm
 ";
 
@@ -20 +20 @@
 
 static proc toric_ideal_1(intmat A, string alg)
-{       
+{
   ideal I;
   // to be returned
@@ -29 +29 @@
     "ERROR: The number of matrix columns is smaller than the number of ring variables.";
     return(I);
-  }     
+  }
 
   // check suitability of actual term ordering
@@ -118 +118 @@
       "Warning: Block orderings are not supported; Dp used for computation.";
     }
-  }  
+  }
 
   int pos;
@@ -214 +214 @@
     return(I);
   }
- 
+
   // check algorithm
   if(alg=="ct" || alg=="pct")
@@ -225 +225 @@
   }
 
-  // create temporary file with which the external program is called 
+  // create temporary file with which the external program is called
 
   int dummy;
   int process=system("pid");
-  string matrixfile="temp_MATRIX"+string(process);      
+  string matrixfile="temp_MATRIX"+string(process);
   link MATRIX=":w "+matrixfile;
   open(MATRIX);
@@ -246 +246 @@
     }
   }
- 
+
   // search for positive row space vector, if required by the
-  // algorithm    
+  // algorithm
   int found=0;
   if((alg=="blr") || (alg=="hs"))
-  { 
+  {
     for(i=1;i<=nrows(A);i++)
     {
@@ -269 +269 @@
     if(found==0)
     {
-      "ERROR: The chosen algorithm needs a positive vector in the row space of the matrix.";     
+      "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);
-    } 
+    }
     write(MATRIX,"positive row space vector:");
     for(j=1;j<=ncols(A);j++)
-    { 
+    {
       write(MATRIX,A[found,j]);
     }
@@ -294 +294 @@
   pos=find(toric_id,":",pos);
   pos++;
-  
+
   while(toric_id[pos]==" " || toric_id[pos]==newline)
   {
@@ -306 +306 @@
   }
   execute("generators="+number_string+";");
-  
+
   intvec v;
   poly head;
@@ -339 +339 @@
       if(v[j]>0)
       {
-        head=head*var(j)^v[j];    
+        head=head*var(j)^v[j];
       }
     }
     I[i]=head-tail;
   }
-     
+
   // delete all created files
   dummy=system("sh","rm -f "+matrixfile);
@@ -355 +355 @@
 
 static proc toric_ideal_2(intmat A, string alg, intvec prsv)
-{       
+{
   ideal I;
   // to be returned
@@ -364 +364 @@
     "ERROR: The number of matrix columns does not equal the size of the positive row space vector.";
     return(I);
-  }     
+  }
 
   // check suitability of actual basering
@@ -371 +371 @@
     "ERROR: The number of matrix columns is smaller than the number of ring variables.";
     return(I);
-  }     
+  }
 
   // check suitability of actual term ordering
@@ -460 +460 @@
       "Warning: Block orderings are not supported; Dp used for computation.";
     }
-  }  
+  }
 
   int pos;
@@ -556 +556 @@
     return(I);
   }
- 
+
   // check algorithm
   if(alg=="ct" || alg=="pct")
@@ -567 +567 @@
   }
 
-  // create temporary file with that the external program is called 
+  // create temporary file with that the external program is called
 
   int dummy;
   int process=system("pid");
-  string matrixfile="temp_MATRIX"+string(process);      
+  string matrixfile="temp_MATRIX"+string(process);
   link MATRIX=":w "+matrixfile;
   open(MATRIX);
@@ -591 +591 @@
   // enter positive row space vector, if required by the algorithm
   if((alg=="blr") || (alg=="hs"))
-  { 
+  {
     write(MATRIX,"positive row space vector:");
     for(j=1;j<=ncols(A);j++)
-    { 
+    {
       write(MATRIX,prsv[j]);
     }
@@ -611 +611 @@
   pos=find(toric_id,":",pos);
   pos++;
-  
+
   while(toric_id[pos]==" " || toric_id[pos]==newline)
   {
@@ -623 +623 @@
   }
   execute("generators="+number_string+";");
-  
+
   intvec v;
   poly head;
@@ -656 +656 @@
       if(v[j]>0)
       {
-        head=head*var(j)^v[j];    
+        head=head*var(j)^v[j];
       }
     }
     I[i]=head-tail;
   }
-     
+
   // delete all created files
   dummy=system("sh","rm -f "+matrixfile);
@@ -674 +674 @@
 "USAGE:    toric_ideal(A,alg);      A intmat, alg string
            toric_ideal(A,alg,prsv); A intmat, alg string, prsv intvec
-RETURN:   ideal: standard basis of the toric ideal of A 
+RETURN:   ideal: standard basis of the toric ideal of A
 NOTE:     These procedures return the standard basis of the toric ideal of A with respect to the term ordering in the actual basering. Not all term orderings are supported: The usual global term orderings may be used, but no block orderings combining them.
- 
+
 One may call the procedure with several different algorithms:
 
@@ -689 +689 @@
 - the algorithm of DiBiase/Urbanke (du).
 
-The argument `alg' should be the abbreviation for an algorithm as above: ect, pt, blr, hs or du. 
+The argument `alg' should be the abbreviation for an algorithm as above: ect, pt, blr, hs or du.
 
 If `alg' is chosen to be `blr' or `hs', the algorithm needs a vector with positive coefficcients in the row space of A. If no row of A contains only positive entries, one has to use the second version of toric_ideal which takes such a vector as its third argument.
 
-For the mathematical background, see 
-@texinfo 
-@ref{Toric ideals and integer programming}. 
+For the mathematical background, see
+@texinfo
+@ref{Toric ideals and integer programming}.
 @end texinfo
 EXAMPLE:  example toric_ideal; shows an example
-SEE ALSO: toric_std, toric_lib, ip_lib, Toric ideals
+SEE ALSO: toric_std, toric_lib, intprog_lib, Toric ideals
 "
 {
@@ -717 +717 @@
 "EXAMPLE"; echo=2;
 
-ring r=0,(x,y,z),dp; 
+ring r=0,(x,y,z),dp;
 
 // call with two arguments
@@ -725 +725 @@
 ideal I=toric_ideal(A,"du");
 I;
- 
+
 I=toric_ideal(A,"blr");
 I;
- 
+
 // call with three arguments
 intvec prsv=1,2,1;
 I=toric_ideal(A,"blr",prsv);
 I;
- 
+
 }
 
@@ -740 +740 @@
 proc toric_std(ideal I)
 "USAGE:   toric_std(I);      I ideal
-RETURN:   ideal: standard basis of I 
-NOTE:     This procedure computes the standard basis of I using a specialized Buchberger algorithm. The generating system by which I is given has to consist of binomials of the form x^u-x^v. There is no real check if I is toric. If I is generated by binomials of the above form, but not toric, toric_std computes an ideal `between' I and its saturation with respect to all variables. 
-For the mathematical background, see 
-@texinfo 
-@ref{Toric ideals and integer programming}. 
+RETURN:   ideal: standard basis of I
+NOTE:     This procedure computes the standard basis of I using a specialized Buchberger algorithm. The generating system by which I is given has to consist of binomials of the form x^u-x^v. There is no real check if I is toric. If I is generated by binomials of the above form, but not toric, toric_std computes an ideal `between' I and its saturation with respect to all variables.
+For the mathematical background, see
+@texinfo
+@ref{Toric ideals and integer programming}.
 @end texinfo
 EXAMPLE:  example toric_std; shows an example
-SEE ALSO: toric_ideal, toric_lib, ip_lib, Toric ideals
+SEE ALSO: toric_ideal, toric_lib, intprog_lib, Toric ideals
 "
 {
@@ -840 +840 @@
       "Warning: Block orderings are not supported; Dp used for computation.";
     }
-  }  
+  }
 
   int pos;
@@ -866 +866 @@
     }
   }
-  
+
   if(external_ord=="" && find(singular_ord,"wp")==3)
   {
@@ -937 +937 @@
     return(I);
   }
- 
+
   // create first temporary file with which the external program is called
- 
+
   int dummy;
   int process=system("pid");
-  string groebnerfile="temp_GROEBNER"+string(process);  
+  string groebnerfile="temp_GROEBNER"+string(process);
   link GROEBNER=":w "+groebnerfile;
   open(GROEBNER);
@@ -948 +948 @@
   write(GROEBNER,"GROEBNER","computed with algorithm:","pt","term ordering:","elimination block",0,"weighted block",nvars(basering),external_ord);
   // algorithm is totally unimportant, only required by the external program
-  
+
   for(i=1;i<=nvars(basering);i++)
   {
     write(GROEBNER,weightvec[i]);
   }
-  
+
   write(GROEBNER,"size:",size(I),"Groebner basis:");
   poly head;
@@ -962 +962 @@
   for(j=1;j<=size(I);j++)
   {
-    // test suitability of generator j 
+    // test suitability of generator j
     rest=I[j];
     head=lead(rest);
@@ -968 +968 @@
     tail=lead(rest);
     rest=rest-tail;
-    
+
     if(head==0 && tail==0 && rest!=0)
     {
@@ -976 +976 @@
       return(J);
     }
-    
+
     if(leadcoef(tail)!=-leadcoef(head))
       // generator is no difference of monomials (or a constant multiple)
@@ -985 +985 @@
       return(J);
     }
-       
+
     if(gcd(head,tail)!=1)
     {
       "Warning: The monomials of generator "+string(j)+" of the input ideal are not relatively prime.";
     }
-    
+
     // write vector representation of generator j into the file
     v=leadexp(head)-leadexp(tail);
@@ -999 +999 @@
   }
   close(GROEBNER);
-  
+
   // create second temporary file
 
-  string newcostfile="temp_NEW_COST"+string(process);   
+  string newcostfile="temp_NEW_COST"+string(process);
   link NEW_COST=":w "+newcostfile;
   open(NEW_COST);
 
-  write(NEW_COST,"NEW_COST","variables:",nvars(basering),"cost vector:");  
+  write(NEW_COST,"NEW_COST","variables:",nvars(basering),"cost vector:");
   for(i=1;i<=nvars(basering);i++)
   {
     write(NEW_COST,weightvec[i]);
   }
-  
+
   // call external program
   dummy=system("sh","change_cost "+groebnerfile+" "+newcostfile);
-  
+
   // read toric standard basis from created file
   link TORIC_IDEAL=":r "+newcostfile+".GB.pt";
@@ -1023 +1023 @@
   pos=find(toric_id,":",pos);
   pos++;
-  
+
   while(toric_id[pos]==" " || toric_id[pos]==newline)
   {
@@ -1064 +1064 @@
       if(v[i]>0)
       {
-        head=head*var(i)^v[i];    
+        head=head*var(i)^v[i];
       }
     }
     J[j]=head-tail;
   }
-     
+
   // delete all created files
   dummy=system("sh","rm -f "+groebnerfile);
   dummy=system("sh","rm -f "+groebnerfile+".GB.pt");
-  dummy=system("sh","rm -f "+newcostfile);  
+  dummy=system("sh","rm -f "+newcostfile);
 
   return(J);
@@ -1090 +1090 @@
 ideal J=toric_std(I);
 J;
- 
+
 // call with the same ideal, but badly chosen generators:
-// 1) not only binomials 
+// 1) not only binomials
 I=x-y,2x-y-z;
 J=toric_std(I);
@@ -1099 +1099 @@
 J=toric_std(I);
 J;
- 
+
 // call with a non-toric ideal that seems to be toric
 I=x-yz,xy-z;
 J=toric_std(I);
 J;
-// comparison with real standard basis and saturation 
+// comparison with real standard basis and saturation
 ideal H=std(I);
 H;
@@ -1110 +1110 @@
 sat(H,xyz);
 }
-
-