Changeset 728288 in git

Timestamp:

Apr 18, 2008, 2:11:40 PM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3ad53dd58ab62b367f6a39e871372997e9c519bd

Parents:

936551d9412a5b90762e763a532a71c37dbe42c1

Message:

*motsak: fixed twostd


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

File:

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

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.51 2008-01-24 10:07:14 Singular Exp $
+ *  Version: $Id: gring.cc,v 1.52 2008-04-18 12:11:40 motsak Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -2010 +2010 @@
 }
 
-ideal twostd(ideal I)
-{
-  int i;
-  int j;
-  int s;
-  bool flag;
-  poly p=NULL;
-  poly q=NULL;
-  ideal J=kStd(I, currQuotient,testHomog,NULL,NULL,0,0,NULL);
-  idSkipZeroes(J);
-  ideal K=NULL;
-  poly varj=NULL;
-  ideal Q=NULL;
-  ideal id_tmp=NULL;
-  int rN=currRing->N;
-  int iSize=0;
+ideal twostd(ideal I) // works in currRing only!
+{
+  ideal J = kStd(I, currQuotient, testHomog, NULL, NULL, 0, 0, NULL); // in currRing!!!
+  idSkipZeroes(J); // ring independent!
+
+  const int rN = currRing->N;
 
   loop
   {
-    flag = true; // nothing new!
-    K    = NULL;
-    s    = idElem(J);
-
-    for (i=0;i<=s-1;i++)
-    {
-      p=J->m[i];
-
-        #ifdef PDEBUG
-          p_Test(p, currRing);
-        #if 0
-          Print("p: "); // !
+    ideal     K    = NULL;
+    const int s    = idElem(J); // ring independent
+
+    for(int i = 0; i < s; i++)
+    {
+      const poly p = J->m[i];
+
+#ifdef PDEBUG
+      p_Test(p, currRing);
+#if 0
+      Print("p: "); // !
+      p_Write(p, currRing);
+#endif
+#endif
+
+      for (int j = 1; j <= rN; j++) // for all j = 1..N
+      {
+        poly varj = p_ISet(1, currRing);
+        p_SetExp(varj, j, 1, currRing); 
+        p_Setm(varj, currRing);
+
+        poly q = pp_Mult_mm(p, varj, currRing); // q = J[i] * var(j),
+
+#ifdef PDEBUG
+        p_Test(varj, currRing);
+        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
+
+        p_Delete(&varj, currRing);
+
+        if (q != NULL)
+        {
+#ifdef PDEBUG          
+#if 0
+          Print("Reducing q[j = %d]: ", j); // !
+          p_Write(q, currRing);
+
+          Print("With 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 = J[i] * var(j),
-        pDelete(&varj);
-
-        #ifdef PDEBUG
-          p_Test(p, currRing);
+
+#endif
+#endif
+
+          // bug: lm(p) may not divide lm(p * var(i)) in a SCA!
+          if( p_LmDivisibleBy(p, q, currRing) )
+            q = nc_ReduceSpoly(p, q, currRing);
+
+
+#ifdef PDEBUG
           p_Test(q, currRing);
-        #if 0
-          Print("Reducing p: "); // !
-          p_Write(p, currRing);
-
-          Print("With q: "); // !
+#if 0
+          Print("reductum q/p: ");
           p_Write(q, currRing);
-        #endif
-        #endif
-
-        if (q!=NULL)
-        {
-          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
-
-          if (q!=NULL) q = kNF(J,currQuotient,q,0,KSTD_NF_NONORM);
-
-          #ifdef PDEBUG
-            p_Test(q, currRing);
-          #if 0
-            Print("=> q: "); // !
-            p_Write(q, currRing);
-          #endif
-          #endif
-        }
-        if (q!=NULL)
-        {
-          if (pIsConstant(q)) // => return (1)!
+
+          // Print("With J!\n");
+#endif
+#endif
+          
+//          if( q != NULL)
+          q = kNF(J, currQuotient, q, 0, KSTD_NF_NONORM); // in currRing!!!
+
+#ifdef PDEBUG
+          p_Test(q, currRing);
+#if 0
+          Print("NF(J/currQuotient)=> q: "); // !
+          p_Write(q, currRing);
+#endif
+#endif
+          if (q!=NULL)
           {
-            Q=idInit(1,1);
-            Q->m[0]=pOne();
-            idDelete(&J);
-            pDelete(&q);
-            if (K!=NULL) idDelete(&K);
-            return(Q);
+            if (p_IsConstant(q, currRing)) // => return (1)!
+            {
+              p_Delete(&q, currRing);
+              id_Delete(&J, currRing);
+
+              if (K != NULL)
+                id_Delete(&K, currRing);
+
+              ideal Q = idInit(1,1); // ring independent!
+              Q->m[0] = p_ISet(1,currRing);
+
+              return(Q);
+            }
+
+//            flag = false;
+
+            // K += q:
+
+            ideal Q = idInit(1,1); // ring independent
+            Q->m[0]=q;
+
+            if( K == NULL )
+              K = Q;
+            else
+            {
+              ideal id_tmp = idSimpleAdd(K, Q); // in currRing
+              id_Delete(&K, currRing);
+              id_Delete(&Q, currRing);
+              K = id_tmp; // K += Q
+            }
           }
 
-          flag=false;
-          Q=idInit(1,1);
-          Q->m[0]=q;
-          id_tmp=idSimpleAdd(K,Q);
-          idDelete(&K);
-          K=id_tmp;
-          idDelete(&Q);
-        }
-      }
-    }
-    if (flag) // nothing new!
-      /* i.e. all elements are two-sided */
-    {
-//      idDelete(&K);
+
+        } // if q != NULL
+      } // for all variables
+
+    }
+    
+    if (K == NULL) // nothing new: i.e. all elements are two-sided
       return(J);
-    }
     /* now we update GrBasis J with K */
     //    iSize=IDELEMS(J);
-  #ifdef PDEBUG
-    idTest(J);
-  #if 0
+#ifdef PDEBUG
+    idTest(J); // in currRing!
+#if 0
     Print("J:");
     idPrint(J);
     PrintLn();
-  #endif // debug
-  #endif
-
-
-
-  #ifdef PDEBUG
-    idTest(K);
-  #if 0
+#endif // debug
+#endif
+
+
+
+#ifdef PDEBUG
+    idTest(K); // in currRing!
+#if 0
     Print("+K:");
     idPrint(K);
     PrintLn();
-  #endif // debug
-  #endif
-
-
-    iSize=idElem(J);
-    id_tmp=idSimpleAdd(J,K);
-    idDelete(&K);
-    idDelete(&J);
-
+#endif // debug
+#endif
+
+
+    int iSize = idElem(J); // ring independent
+
+    // J += K:    
+    ideal id_tmp = idSimpleAdd(J,K); // in currRing
+    id_Delete(&K, currRing); id_Delete(&J, currRing);
+
+#if 1
     BITSET save_test=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|=Sy_bit(OPT_SB_1); // ring independent
+    J = kStd(id_tmp, currQuotient, testHomog, NULL, NULL, 0, iSize); // J = J + K, J - std // in currRing!
     test = save_test;
-
-    idDelete(&id_tmp); // !!!
-
-    idSkipZeroes(J);
-
-  #ifdef PDEBUG
-    idTest(J);
-  #if 0
+#else
+    J=kStd(id_tmp, currQuotient,testHomog,NULL,NULL,0,0,NULL);
+#endif
+
+    id_Delete(&id_tmp, currRing);
+    idSkipZeroes(J); // ring independent
+
+#ifdef PDEBUG
+    idTest(J); // in currRing!
+#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
-
-
-
-
-  }
-}
+#endif // debug
+#endif
+  } // loop
+}
+
 
 matrix nc_PrintMat(int a, int b, ring r, int metric)