Changeset 19df79 in git for Singular/kstd1.cc

Timestamp:

Dec 21, 2000, 5:37:52 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cc3a04e207e65e63ef1f42613861ce5365082fff

Parents:

d9f665b2cc780458978ceb1111b560b41f9f9d4e

Message:

* towards tailRings for local case


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

File:

• Singular/kstd1.cc (modified) (10 diffs)

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.75 2000-12-20 11:15:43 obachman Exp $ */
+/* $Id: kstd1.cc,v 1.76 2000-12-21 16:37:49 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -11 +11 @@
 
 // define if tailrings should be used
-#define HAVE_TAIL_RING
+// #define HAVE_TAIL_RING
 
 #include "mod2.h"
@@ -134 +134 @@
     h->GetP();
     h->SetLength(strat->length_pLength);
-    ret = ksReducePoly(&L, with, strat->kNoether, NULL, strat);
+    ret = ksReducePoly(&L, with, strat->kNoetherTail(), NULL, strat);
     if (ret)
     {
@@ -147 +147 @@
   }
   else
-    ret = ksReducePoly(h, with, strat->kNoether, NULL, strat);
+    ret = ksReducePoly(h, with, strat->kNoetherTail(), NULL, strat);
 #ifdef KDEBUG
   if (TEST_OPT_DEBUG)
@@ -357 +357 @@
     }
 #endif
-    ksReducePoly(h, &(strat->T[j]), strat->kNoether, NULL, strat);
+    ksReducePoly(h, &(strat->T[j]), strat->kNoetherTail(), NULL, strat);
 #ifdef KDEBUG
     if (TEST_OPT_DEBUG)
@@ -527 +527 @@
       /*- try to reduce the s-polynomial -*/
       o = H.SetpFDeg();
-      cancelunit(&H);
+      if (flag != 2) cancelunit(&H);
       H.ecart = pLDeg(H.p,&(H.length))-o;
       j = 0;
@@ -749 +749 @@
         }
         /* create the real one */
-        ksCreateSpoly(&(strat->L[j]), strat->kNoether, FALSE, 
+        ksCreateSpoly(&(strat->L[j]), strat->kNoetherTail(), FALSE, 
                       strat->tailRing, m1, m2, strat->R);
 
@@ -806 +806 @@
         }
         /* create the real one */
-        ksCreateSpoly(&(strat->L[i]), strat->kNoether, FALSE, 
+        ksCreateSpoly(&(strat->L[i]), strat->kNoetherTail(), FALSE, 
                       strat->tailRing, m1, m2, strat->R);
         if (! strat->L[i].IsNull())
@@ -1098 +1098 @@
 
 #ifdef HAVE_TAIL_RING
-  if (strat->homog && strat->red == redFirst)
+//  if (strat->homog && strat->red == redFirst)
     kStratInitChangeTailRing(strat);
 #endif  
@@ -1150 +1150 @@
       }
       /* create the real one */
-      ksCreateSpoly(&(strat->P), strat->kNoether, strat->use_buckets, 
+      ksCreateSpoly(&(strat->P), strat->kNoetherTail(), strat->use_buckets, 
                     strat->tailRing, m1, m2, strat->R);
       if (!strat->use_buckets)