Changeset 2bb676 in git

Timestamp:

Nov 18, 1999, 2:07:54 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e3acb58ef7e10eaf59a50b0858ca2a00c754452b

Parents:

39093f3d4e130d840bd586936f5292d5a64a48f9

Message:

* fixed factorizing groebner


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

Location:

Singular

Files:

• kstdfac.cc (modified) (4 diffs)
• mmisc.c (modified) (2 diffs)

Singular/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.31 1999-11-17 12:09:25 obachman Exp $ */
+/* $Id: kstdfac.cc,v 1.32 1999-11-18 13:07:53 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -319 +319 @@
       enterpairs(n->P.p,n->sl,n->P.ecart,pos,n);
       n->enterS(n->P,pos,n);
-
-      /* enter P.p into T */
-      if ((IDELEMS(fac)>1)||(facdeg!=pFDeg(fac->m[0])))
-      {
-        int pos=n->posInT(n->T,n->tl,n->P);
-        enterTBba(n->P,pos,n);
-      }
+      enterTBba(n->P,n->posInT(n->T,n->tl,n->P),n);
 
       /* construct D */
@@ -505 +499 @@
     }
     /* reduction of the element choosen from L */
+    kTest_TS(strat);
     strat->red(&strat->P,strat);
+    kTest_TS(strat);
     if (strat->P.p != NULL)
     {
@@ -600 +596 @@
         }
 
-        //if (n->redTailChange)
-        //{
-        //  int pos = n->posInL(n->L,n->Ll,n->P,n);
-        //  enterL(&n->L,&n->Ll,&n->Lmax,n->P,pos);
-        //}
-        //else
-        {
-          if (TEST_OPT_DEBUG)
-          {
-            PrintS("new s:");
-            wrp(n->P.p);
-            PrintLn();
-          }
-          enterpairs(n->P.p,n->sl,n->P.ecart,pos,n);
-          n->enterS(n->P,pos,n);
-          if (n->sl>srmax) srmax = n->sl;
-
-          /* enter P.p into T */
-          if ((IDELEMS(fac)>1)||(facdeg!=pFDeg(fac->m[0])))
-          {
-            int pos=n->posInT(n->T,n->tl,n->P);
-            enterTBba(n->P,pos,n);
-          }
-        }
+        if (TEST_OPT_DEBUG)
+        {
+          PrintS("new s:");
+          wrp(n->P.p);
+          PrintLn();
+        }
+        enterpairs(n->P.p,n->sl,n->P.ecart,pos,n);
+        n->enterS(n->P,pos,n);
+        if (n->sl>srmax) srmax = n->sl;
+        enterTBba(n->P,n->posInT(n->T,n->tl,n->P),n);
 
         /* construct D */

Singular/mmisc.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmisc.c,v 1.22 1999-11-15 17:20:25 obachman Exp $ */
+/* $Id: mmisc.c,v 1.23 1999-11-18 13:07:54 obachman Exp $ */
 
 /*
@@ -88 +88 @@
       fprintf(stderr, "Warning: mmUngetSpecHeap: heap not previously gotten with mmGetSpecHeap\n");
 #else
-      feReportBug("SpecHeap memory managment");
+//      feReportBug("SpecHeap memory managment");
 #endif
       return;