Changeset 8b368ff in git for Singular/LIB/schreyer.lib

Timestamp:

May 31, 2013, 6:43:08 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2407cbbcbfa07c81823bde4407a9c0ae473b292c

Parents:

b2fb0c0e98297019d6f0ef81e8a72354659ad7dd

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-05-31 18:43:08+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 04:41:44+02:00

Message:

Minor chages + defaults

File:

• Singular/LIB/schreyer.lib (modified) (18 diffs)

Singular/LIB/schreyer.lib

@@ -495 +495 @@
   }
 
-  if( typeof( attrib(basering, "SYZCHECK") ) == "int" )
-  {
-    int @SYZCHECK = attrib(basering, "SYZCHECK");
-  } else
-  {
-    int @SYZCHECK = @DEBUG;
+  if( typeof( attrib(basering, "KERCHECK") ) == "int" )
+  {
+    int @KERCHECK = attrib(basering, "KERCHECK");
+  } else
+  {
+    int @KERCHECK = @DEBUG; // TODO: @SYZCHECK:(
   }
 
@@ -511 +511 @@
   def @N = M; Sort_c_ds(@N);
   
-  if( @SYZCHECK )
+  if( @KERCHECK )
   {
     def iv = sort(lead(M), "c,ds", 1)[2]; // ,1 => reversed! // TODO: not needed?
@@ -518 +518 @@
     
     // 0^th syz. property
-    if( size(module( matrix(@N) - matrix(@M) )) > 0 )
+    if(size(@N) * size(@M) > 0 )
+    {
+    if( size(module( matrix(module(matrix(@N))) - matrix(module(matrix(@M))) )) > 0 )
     {
       "@M:"; @M;
@@ -526 +528 @@
       module( matrix(@N) - matrix(@M) );
 
-      "ERROR: wrong sorting in 'MySort': @N != @M!!!";
+      "ERROR: MySort: wrong sorting in 'MySort': @N != @M!!!";
       $
     }
+    } 
   }
 
@@ -563 +566 @@
     @SYZCHECK = attrib(SSinit, "SYZCHECK");
   }
-  
+
+  int @KERCHECK = @SYZCHECK;
+
+  if( typeof( attrib(SSinit, "KERCHECK") ) == "int" )
+  {
+    @KERCHECK = attrib(SSinit, "KERCHECK");
+  }
+
   if( @DEBUG )
   {
@@ -743 +753 @@
   attrib(S, "DEBUG", @DEBUG);
   attrib(S, "SYZCHECK", @SYZCHECK);
+  attrib(S, "KERCHECK", @KERCHECK);
   
   if( @DEBUG )
@@ -805 +816 @@
     int @SYZCHECK = @DEBUG;
   }
-  
+
+  if( typeof( attrib(basering, "KERCHECK") ) == "int" )
+  {
+    int @KERCHECK = attrib(basering, "KERCHECK");
+  } else
+  {
+    int @KERCHECK = @SYZCHECK;
+  }
+
   if( @DEBUG )
   {
@@ -814 +833 @@
   module SS = ComputeLeadingSyzygyTerms(L);
 
-  if( @SYZCHECK )
+  if( @KERCHECK )
   {  
     int i, j, r; 
@@ -860 +879 @@
     S = MySort(simplify(S, 2));
 
+    if( size(S) * size(SS) > 0 )
+    {
     if( size(module(matrix(S) - matrix(SS))) > 0 )
     {
-        "ERROR: S != SS ";
+        "ERROR: SSComputeLeadingSyzygyTerms: S != SS ";
 
         "basering: ";
@@ -877 +898 @@
         $
     }
+    }
   }
 
@@ -887 +909 @@
   }
   
-  attrib(SS, "isSB", 1); 
-
+  if( size(SS) > 0 )
+  {
+    attrib(SS, "isSB", 1); 
+  }
+  
   return (SS);
 }
@@ -909 +934 @@
   {
     int @SYZCHECK = @DEBUG;
+  }
+
+  if( typeof( attrib(basering, "KERCHECK") ) == "int" )
+  {
+    int @KERCHECK = attrib(basering, "KERCHECK");
+  } else
+  {
+    int @KERCHECK = @SYZCHECK;
   }
 
@@ -942 +975 @@
       }
     }
+  }
+    
+  if( @KERCHECK )
+  {
 
     int i, j, r; 
@@ -1008 +1045 @@
     if( size(module(matrix(S) - matrix(SS))) > 0 )
     {
-      "ERROR: S != SS ";
+      "ERROR: SSCompute2LeadingSyzygyTerms: S != SS ";
 
       "basering: ";
@@ -1291 +1328 @@
     int @SYZCHECK = @DEBUG;
   }
-  
+ 
   
   if( @DEBUG )
@@ -1652 +1689 @@
   def S = SSres(M, 0); setring S; S;
   MRES;
+  print(_);
   RES;
+
+  kill S; setring r; kill M;
+
+  kill r;
+  
+  ring R = 0, (w, x, y, z), dp;
+  ideal M = w^2 - x*z,  w*x - y*z,  x^2 - w*y, x*y - z^2, y^2 - w*z;
+  
+  def S = SSres(M, 0); setring S; S;
   "";
   LRES;
   "";
-  TRES;
-
-  kill S; setring r; kill M;
-
-  kill r;
-  
-  ring R = 0, (w, x, y, z), dp;
-  ideal M = w^2 - x*z,  w*x - y*z,  x^2 - w*y, x*y - z^2, y^2 - w*z;
-  
-  def S = SSres(M, 0); setring S; S;
+  TRES; 
+  "";
   MRES;
+  print(_);
   RES;
-  "";
-  LRES;
-  "";
-  TRES;
 }
 
@@ -1925 +1961 @@
 {
   attrib(SSinit, "SYZCHECK", 1); // TODO: only for now!!
+  attrib(SSinit, "KERCHECK", 0); // TODO: only for now!!
 
   ring r; r; ideal M = maxideal(1); M;
@@ -1966 +2003 @@
 
 // TODO: betti!!!
-