Changeset aef8bb in git for kernel/ringgb.cc

Timestamp:

May 19, 2007, 3:59:03 PM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

8de151f9727ea85227080d62f49717e27a4472c7

Parents:

d681e8e1731aab445ce81a84c0c6d90e0ab546bb

Message:

ringgb.cc:
besseres testGB


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

File:

• kernel/ringgb.cc (modified) (7 diffs)

kernel/ringgb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ringgb.cc,v 1.14 2007-05-11 11:40:28 wienand Exp $ */
+/* $Id: ringgb.cc,v 1.15 2007-05-19 13:59:03 wienand Exp $ */
 /*
 * ABSTRACT: ringgb interface
@@ -173 +173 @@
 }
 
+/*2
+* Generates spoly(0, h) if applicable. Assumes ring in Z/2^n.
+*/
+poly plain_zero_spoly(poly h)
+{
+  poly p = NULL;
+  number gcd = nGcd((number) 0, pGetCoeff(h), currRing);
+  if ((NATNUMBER) gcd > 1)
+  {
+    p = p_Copy(h->next, currRing);
+    p = p_Mult_nn(p, nIntDiv(0, gcd), currRing);
+  }
+  return p;
+}
+
 poly ringNF(poly f, ideal G, ring r) {
   // If f = 0, then normal form is also 0
   if (f == NULL) { return NULL; }
+  poly tmp = NULL;
   poly h = pCopy(f);
   int i = findRingSolver(h, G, r);
@@ -186 +202 @@
 //    wrp(G->m[i]);
 //    PrintLn();
+    tmp = h;
     h = plain_spoly(h, G->m[i]);
+    pDelete(&tmp);
 //    PrintS("=> h=");
 //    wrp(h);
@@ -197 +215 @@
 
 int testGB(ideal I, ideal GI) {
-  poly f, g, h;
+  poly f, g, h, nf;
   int i = 0;
   int j = 0;
-  Print("I");
+  Print("I included?");
   for (i = 0; i < IDELEMS(I); i++) {
     if (ringNF(I->m[i], GI, currRing) != NULL) {
@@ -212 +230 @@
     Print("-");
   }
-  Print("G");
+  Print(" Yes!\nspoly --> 0?");
   for (i = 0; i < IDELEMS(GI); i++) {
     for (j = i + 1; j < IDELEMS(GI); j++) {
@@ -218 +236 @@
       g = pCopy(GI->m[j]);
       h = plain_spoly(f, g);
-      if (ringNF(h, GI, currRing) != NULL) {
+      nf = ringNF(h, GI, currRing);
+      if (nf != NULL) {
         Print("spoly(");
         wrp(GI->m[i]);
@@ -226 +245 @@
         wrp(h);
         Print(" --> ");
-        wrp(ringNF(h, GI, currRing));
+        wrp(nf);
         PrintLn();
         return(0);
       }
+      pDelete(&f);
+      pDelete(&g);
       pDelete(&h);
+      pDelete(&nf);
       Print("-");
     }
   }
-//  Print("Fine.");
-//  PrintLn();
+  Print(" Yes!\nzero-spoly --> 0?");
+  for (i = 0; i < IDELEMS(GI); i++) 
+  {
+    f = plain_zero_spoly(GI->m[i]);
+    nf = ringNF(f, GI, currRing);
+    if (nf != NULL) {
+      Print("spoly(");
+      wrp(GI->m[i]);
+      Print(", ");
+      wrp(0);
+      Print(") = ");
+      wrp(h);
+      Print(" --> ");
+      wrp(nf);
+      PrintLn();
+      return(0);
+    }
+    pDelete(&f);
+    pDelete(&nf);
+    Print("-");
+  }
+  Print(" Yes!");
+  PrintLn();
   return(1);
 }