Changeset 6b32990 in git for Singular/kstd1.cc

Timestamp:

Dec 12, 2000, 9:44:55 AM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

de7793b9aaa39c2f00b6e30ee4ad5c82915497aa

Parents:

52ea3f939ec0aa2915d2d6a747bab3976eb9bfb7

Message:

* dynamic kernel modules for MP and DBM links
* p_Procs improvements


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

File:

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

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.68 2000-11-28 11:50:52 obachman Exp $ */
+/* $Id: kstd1.cc,v 1.69 2000-12-12 08:44:45 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -10 +10 @@
 // #define NO_LDEG
 
-// define if buckets should be use
-#define MORA_USE_BUCKETS
+// define if buckets should be used
+// #define MORA_USE_BUCKETS
+
+// define if tailrings should be used
+// #define HAVE_TAIL_RING
 
 #include "mod2.h"
@@ -204 +207 @@
                                         strat->T[i].length < li))
             &&
-            pLmShortDivisibleBy(strat->T[i].p, strat->sevT[i], h->p, ~h->sev))
+            p_LmShortDivisibleBy(strat->T[i].GetLmTailRing(), strat->sevT[i], h->GetLmTailRing(), ~h->sev, strat->tailRing))
 #else
           j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, h, i);
@@ -475 +478 @@
       if (H.p==NULL) return NULL;
     }
-    if (pLmShortDivisibleBy(strat->T[j].p, strat->sevT[j], H.p, not_sev))
+    if (p_LmShortDivisibleBy(strat->T[j].GetLmTailRing(), strat->sevT[j], H.GetLmTailRing(), not_sev, strat->tailRing))
     {
       //if (strat->interpt) test_int_std(strat->kIdeal);
@@ -1106 +1109 @@
   strat->use_buckets = kMoraUseBucket(strat);
   /*- compute-------------------------------------------*/
+
+#ifdef HAVE_TAIL_RING
+  kStratInitChangeTailRing(strat);
+#endif  
+  
   while (strat->Ll >= 0)
   {
@@ -1522 +1530 @@
 long kModDeg(poly p, ring r)
 {
-  long o=pWDegree(p, r);
+  // Hmm obachman: on 1-2, this is pTotalDegree
+  // I think that I had changed this to pWDegree sometime in 10/2000
+  // However, this breaks eliminate, etc
+  // long o=pWDegree(p, r);
+  long o=pTotaldegree(p, r);
   long i=p_GetComp(p, r);
   if (i==0) return o;