Changeset f4b74e2 in git

Timestamp:

Feb 1, 2007, 6:24:03 PM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

ec69aa9f2368fd5481b412fc4b4a37844f40d997

Parents:

c903a38865fcce626ced071280b6bf975d3d60f8

Message:

*motsak: found the twostd's bug in kStd with SB_1


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

File:

• kernel/gring.cc (modified) (5 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.39 2007-01-31 23:51:23 motsak Exp $
+ *  Version: $Id: gring.cc,v 1.40 2007-02-01 17:24:03 motsak Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -1947 +1947 @@
   int j;
   int s;
-  int flag;
+  bool flag;
   poly p=NULL;
   poly q=NULL;
@@ -1958 +1958 @@
   int rN=currRing->N;
   int iSize=0;
+
   loop
   {
-    flag=0;
-    K=NULL;
-    s=idElem(J);
+    flag = true; // nothing new!
+    K    = NULL;
+    s    = idElem(J);
+    
     for (i=0;i<=s-1;i++)
     {
       p=J->m[i];
-      for (j=1;j<=rN;j++)
+
+        #ifdef PDEBUG
+          p_Test(p, currRing);
+        #if 0
+          Print("p: "); // !
+          p_Write(p, currRing);
+        #endif
+        #endif
+
+      for (j=1;j<=rN;j++) // for all j = 1..N
       {
         varj = pOne();
         pSetExp(varj,j,1);
         pSetm(varj);
-        q = pp_Mult_mm(p,varj,currRing);
+        q = pp_Mult_mm(p,varj,currRing); // q = J[i] * var(j), 
         pDelete(&varj);
+
+        #ifdef PDEBUG
+          p_Test(p, currRing);
+          p_Test(q, currRing);
+        #if 0
+          Print("Reducing p: "); // !
+          p_Write(p, currRing);
+
+          Print("With q: "); // !
+          p_Write(q, currRing);
+        #endif
+        #endif
+        
         q = nc_ReduceSPoly(p,q,currRing);
+
+        #ifdef PDEBUG
+          p_Test(q, currRing);
+        #if 0
+          Print("Reducing q: "); // !
+          p_Write(q, currRing);
+
+          Print("With J!\n"); 
+        #endif
+        #endif
+
         q = kNF(J,currQuotient,q,0,0);
+
+        #ifdef PDEBUG
+          p_Test(q, currRing);
+        #if 0
+          Print("=> q: "); // !
+          p_Write(q, currRing);
+        #endif
+        #endif
+
         if (q!=NULL)
         {
-          if (pIsConstant(q))
+          if (pIsConstant(q)) // => return (1)!
           {
             Q=idInit(1,1);
@@ -1986 +2030 @@
             return(Q);
           }
-          flag=1;
+          
+          flag=false;
           Q=idInit(1,1);
           Q->m[0]=q;
@@ -1996 +2041 @@
       }
     }
-    if (flag==0)
+    if (flag) // nothing new!
       /* i.e. all elements are two-sided */
     {
-      idDelete(&K);
+//      idDelete(&K);
       return(J);
     }
     /* now we update GrBasis J with K */
     //    iSize=IDELEMS(J);
+  #ifdef PDEBUG
+    idTest(J);
+  #if 0
+    Print("J:");
+    idPrint(J);
+    PrintLn();
+  #endif // debug
+  #endif  
+
+
+
+  #ifdef PDEBUG
+    idTest(K);
+  #if 0
+    Print("+K:");
+    idPrint(K);
+    PrintLn();
+  #endif // debug
+  #endif  
+
+
     iSize=idElem(J);
     id_tmp=idSimpleAdd(J,K);
     idDelete(&K);
     idDelete(&J);
+    
     BITSET save_test=test;
-    test|=Sy_bit(OPT_SB_1);
-    J=kStd(id_tmp, currQuotient, testHomog,NULL,NULL,0,iSize);
-    test=save_test;
+
+    #if 1
+      test|=Sy_bit(OPT_SB_1);
+      J = kStd(id_tmp, currQuotient, testHomog, NULL, NULL, 0, iSize); // J = J + K, J - std    
+    #else
+      J=kStd(id_tmp, currQuotient,testHomog,NULL,NULL,0,0,NULL);
+    #endif
+    test = save_test;
+    
+    idDelete(&id_tmp); // !!!
+
     idSkipZeroes(J);
+        
+  #ifdef PDEBUG
+    idTest(J);
+  #if 0
+    Print("J:");
+    idPrint(J);
+    PrintLn();
+  #endif // debug
+  #endif  
+
+// bug:
+
+//J:Module of rank 1,real rank 0 and 4 generators.
+//generator 0: f
+//generator 1: h2+h
+//generator 2: eh+e
+//generator 3: e2
+
+//+K:Module of rank 1,real rank 0 and 2 generators.
+//generator 0: h
+//generator 1: e
+
+// =>>>>
+
+//J:Module of rank 1,real rank 0 and 6 generators.
+//generator 0: h
+//generator 1: f
+//generator 2: e
+//generator 3: h2+h
+//generator 4: eh+e
+//generator 5: e2
+
+
+
+    
   }
 }