Changeset a725dae in git for kernel/kstd2.cc

Timestamp:

Jan 22, 2006, 5:29:37 AM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

76a71142ba90e62cb5e72eedf1029c5f98235e46

Parents:

7f06ccaffa6e5a520078549a3e37d7d51d338274

Message:

kutil.h:
---> krude twoPow Funktion

kutil.cc:
---> krude two Pow Funktion
---> alle Kriterien in HAVE_RING2TOM reaktiviert
---> krit. Element durch Multiplikation mit Nullteiler erzeugen (in enterpairs)
      ---> Protokollausgabe Z

kstd2.cc:
---> Fehler in kFindZeroPoly behoben
---> Protokollausgabe z (für ZeroPolynom)


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

File:

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

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.8 2006-01-20 01:15:07 wienand Exp $ */
+/* $Id: kstd2.cc,v 1.9 2006-01-22 04:29:37 wienand Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -164 +164 @@
 */
 
+/* now in kutil.cc
 long twoPow(long arg) {
   long t = arg;
@@ -173 +174 @@
   return result;
 }
+*/
 
 long factorial(long arg)
@@ -242 +244 @@
     tmp2 = p_ISet((long) pGetCoeff(zeroPoly), leadRing);
     for (int i = 1; i <= leadRing->N; i++) {
-      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, leadRing));
+      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, tailRing));
     }
     p_Setm(tmp2, leadRing);
@@ -269 +271 @@
     tmp2 = p_ISet((long) pGetCoeff(zeroPoly), leadRing);
     for (int i = 1; i <= leadRing->N; i++) {
-      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, leadRing));
+      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, tailRing));
     }
     p_Setm(tmp2, leadRing);
@@ -311 +313 @@
 //#endif
 
-  h->SetShortExpVector();
+  h->SetShortExpVector(); 
   loop
   {
-    zeroPoly = NULL;// kFindDivisibleByZeroPoly(h);
+    zeroPoly = kFindDivisibleByZeroPoly(h);
     if (zeroPoly != NULL)
     {
+      if (TEST_OPT_PROT)
+      {
+        PrintS("z");
+      }
 #ifdef KDEBUG
       if (TEST_OPT_DEBUG)
@@ -331 +337 @@
       tmp_h.sev = pGetShortExpVector(tmp_h.p);
       tmp_h.SetpFDeg();
+/*      if (TEST_OPT_PROT)
+      {
+        tstcount ++;
+        if (tstcount > 49)
+        {
+          PrintLn();
+          p_wrp(zeroPoly,currRing);
+          PrintLn();
+          tstcount = 0;
+        }
+      } */
 
       enterT(tmp_h, strat, strat->tl + 1);