Changeset 823ff8 in git

Timestamp:

Feb 12, 2009, 2:57:00 PM (14 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

3735d1567b97cc35de0aeae181e4401fcb3a6178

Parents:

59290668f43ddad59db23c4230c5c49c26bebd53

Message:

*motsak: dafault optional argument for prodcrit instead of global variable


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

File:

• Singular/LIB/teachstd.lib (modified) (3 diffs)

Singular/LIB/teachstd.lib

@@ -2 +2 @@
 //GMG, last modified 28.9.01
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: teachstd.lib,v 1.9 2009-01-14 16:07:05 Singular Exp $";
+version="$Id: teachstd.lib,v 1.10 2009-02-12 13:57:00 motsak Exp $";
 category="Teaching";
 info="
@@ -24 +24 @@
  minEcart(T,h);         element g from T of minimal ecart s.t. LM(g)|LM(h)
  NFMora(i);             normal form of i w.r.t Mora algorithm
- prodcrit(f,g);         test for product criterion
+ prodcrit(f,g[,o]);     test for product criterion
  chaincrit(f,g,h);      test for chain criterion
  pairset(G);            pairs form G neither satifying prodcrit nor chaincrit
@@ -409 +409 @@
 }
 ///////////////////////////////////////////////////////////////////////////////
-proc prodcrit(f,g)
-"USAGE:   prodcrit(f,g); f,g poly or vector
+proc prodcrit(f,g,list #)
+"USAGE:   prodcrit(f,g[,o]); f,g poly or vector, and optional int argument o
 RETURN:  1 if product criterion applies in the same module component,
          2 if lead(f) and lead(g) involve different components, 0 else
 NOTE:    if product criterion applies we can delete (f,g) from pairset
+         This procedure returns 0 if o is given and is a positive integer, or
+         you may set the attribute \"default_arg\" for prodcrit to 1.
 EXAMPLE: example prodcrit; shows an example
 "
 {
-  if( defined(@@@NOPC) )
-  {
-    if( @@@NOPC == 1) { return(0); }
-  }
-
-  if(typeof(f)=="poly")    //product criterion for polynomials
+// ------------------ check for optional disabling argument -------------
+  if( size(#) > 0 )
+  {// "size(#): ", size(#);   "typeof(#[1]): ", typeof(#[1]);
+    
+    if( typeof(#[1]) == "int" )
+    {// "#[1] = int ", #[1];
+      if( #[1] > 0 )
+      {        
+        return(0);
+      }
+    }
+  }
+
+// ------------------- product criterion for polynomials ---------------------
+  if(typeof(f)=="poly")
   {
     if( monomialLcm(f,g)==leadmonom(f)*leadmonom(g))