Changeset 2c16b8 in git

Timestamp:

Jun 14, 2012, 10:16:48 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

14e93b441b4c859a8d51eeeb99f68c2ff924c4bd

Parents:

f12f9afa4f10601ec91e93721efb6b1863d06be6

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-06-14 22:16:48+02:00

git-committer:

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

Message:

first call to sort cannot ask for temp ring attributes + minor changes

Files:

• Singular/LIB/schreyer.lib (modified) (6 diffs)
• dyn_modules/syzextra/mod_main.cc (modified) (4 diffs)

Singular/LIB/schreyer.lib

@@ -139 +139 @@
     "Sinit::Input";
     type(M);
-    DetailedPrint(M);
+//    DetailedPrint(M);
     attrib(M);
   }
@@ -185 +185 @@
     attrib(M);
     attrib(M, "isHomog");
-    DetailedPrint(M);
+//    DetailedPrint(M);
   }
 
@@ -496 +496 @@
   } else
   {
-    int @DEBUG = !system("with", "ndebug");
+    int @DEBUG = 0; // !system("with", "ndebug");
   }
 
@@ -912 +912 @@
   {
     "SSComputeLeadingSyzygyTerms::Output: ";
-    "SS: "; 
-    SS;
+    "SS: "; SS;
   }
   
@@ -1122 +1121 @@
   module S2 = Tail(SS);
   SS = lead(SS); // (C,lp) on base ring!
+
+  if( @SYZCHECK )
+  {
+    if( ncols(SS) != ncols(S2) ) // || size(SS) != ncols(SS) || size(S2) != ncols(S2) 
+    {
+      "ERROR: SSCompute2LeadingSyzygyTerms: inappropriate S2 / SS: ";      
+      type(SS);
+      type(S2);
+      L;
+      $
+    }
+  }  
               
   if( @DEBUG )
@@ -1547 +1558 @@
   }
 
-  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; 
+  }
   
   if( @DEBUG )

dyn_modules/syzextra/mod_main.cc

@@ -517 +517 @@
           newid->m[i] = NULL;
       
+      newid->rank = id_RankFreeModule(newid, currRing);
+      
       res->data = newid; 
     }
@@ -804 +806 @@
 
 #ifndef NDEBUG
-  const BOOLEAN __DEBUG__ = (BOOLEAN)((long)(atGet(currRingHdl,"DEBUG",INT_CMD, (void*)TRUE)));
+  const BOOLEAN __DEBUG__ = (BOOLEAN)((long)(atGet(currRingHdl,"DEBUG",INT_CMD, (void*)FALSE)));
 #else
   const BOOLEAN __DEBUG__ = (BOOLEAN)((long)(atGet(currRingHdl,"DEBUG",INT_CMD, (void*)FALSE)));
@@ -1431 +1433 @@
   const BOOLEAN __SYZCHECK__ = (BOOLEAN)((long)(atGet(currRingHdl,"SYZCHECK",INT_CMD, (void*)0)));   
 
+  const BOOLEAN __HYBRIDNF__ = (BOOLEAN)((long)(atGet(currRingHdl,"HYBRIDNF",INT_CMD, (void*)0)));
+
+  assume( __HYBRIDNF__ );
+  
   if ((h==NULL) || (h->Typ() != VECTOR_CMD) || (h->Data() == NULL))
   {
@@ -1962 +1968 @@
   ideal FF = id_Copy(F, r);
 
+
+  
   lists l=(lists)omAllocBin(slists_bin);
   l->Init(2);