Changeset 2dc9911 in git

Timestamp:

May 11, 2007, 1:40:28 PM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

c4002e9d130952e0a59c8e7fb57356ef52846f3b

Parents:

a5d7c1678c0189cdbfc0cdf82adb206d80d8bcbb

Message:

*** empty log message ***


git-svn-id: file:///usr/local/Singular/svn/trunk@10037 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.13 2007-05-11 10:48:05 wienand Exp $ */
+/* $Id: ringgb.cc,v 1.14 2007-05-11 11:40:28 wienand Exp $ */
 /*
 * ABSTRACT: ringgb interface
@@ -161 +161 @@
 
 poly plain_spoly(poly f, poly g) {
-  number cf = pGetCoeff(f), cg = pGetCoeff(g);
+  number cf = nCopy(pGetCoeff(f)), cg = nCopy(pGetCoeff(g));
   int ct = ksCheckCoeff(&cf, &cg); // gcd and zero divisors
   poly fm, gm;
@@ -167 +167 @@
   pSetCoeff0(fm, cg);
   pSetCoeff0(gm, cf);  // and now, m1 * LT(p1) == m2 * LT(p2)
-  poly sp = pSub(pMult_mm(f, fm), pMult_mm(g, gm));
+  poly sp = pSub(ppMult_mm(f, fm), ppMult_mm(g, gm));
   pDelete(&fm);
   pDelete(&gm);
@@ -180 +180 @@
   int c = 1;
   while (h != NULL && i >= 0) {
-    Print("%d-step NF - h:", c);
-    wrp(h);
-    PrintS(" ");
-    PrintS("G->m[i]:");
-    wrp(G->m[i]);
-    PrintLn();
+//    Print("%d-step NF - h:", c);
+//    wrp(h);
+//    PrintS(" ");
+//    PrintS("G->m[i]:");
+//    wrp(G->m[i]);
+//    PrintLn();
     h = plain_spoly(h, G->m[i]);
-    PrintS("=> h=");
-    wrp(h);
-    PrintLn();
+//    PrintS("=> h=");
+//    wrp(h);
+//    PrintLn();
     i = findRingSolver(h, G, r);
     c++;
@@ -200 +200 @@
   int i = 0;
   int j = 0;
+  Print("I");
   for (i = 0; i < IDELEMS(I); i++) {
     if (ringNF(I->m[i], GI, currRing) != NULL) {
@@ -209 +210 @@
       return(0);
     }
-  }
-  Print("I");
+    Print("-");
+  }
+  Print("G");
   for (i = 0; i < IDELEMS(GI); i++) {
-    Print("-");
     for (j = i + 1; j < IDELEMS(GI); j++) {
       f = pCopy(GI->m[i]);
@@ -230 +231 @@
       }
       pDelete(&h);
-    }
-  }
+      Print("-");
+    }
+  }
+//  Print("Fine.");
+//  PrintLn();
   return(1);
 }