Changeset 0a7dbb8 in git

Timestamp:

May 31, 2003, 4:13:42 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

6e365276f16e9011f5e59f6826818c488b3f568a

Parents:

3a218a195e51a92cd2ba37146f5129e3d85d99b5

Message:

*hannes: V-2-0 port


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

Location:

Singular

Files:

• kutil.cc (modified) (10 diffs)
• tok.h (modified) (3 diffs)

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.120 2003-05-26 13:09:34 Singular Exp $ */
+/* $Id: kutil.cc,v 1.121 2003-05-31 14:13:33 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -244 +244 @@
   int  i;
   poly h;
+
+  if(currRing->OrdSgn != -1) return;
+  if(TEST_OPT_CANCELUNIT) return;
+
   ring r = L->tailRing;
-
   poly p = L->GetLmTailRing();
 
@@ -2929 +2932 @@
     else if (red_result < 0)
       PrintS(".");
-    else
+    if ((red_result > 0) || ((strat->Ll % 100)==99))
     {
       if (strat->Ll != *reduc && strat->Ll > 0)
@@ -3195 +3198 @@
   int   i,pos;
 
-  if (Q!=NULL) i=IDELEMS(Q);
-  else i=0;
+  if (Q!=NULL) i=((IDELEMS(Q)+(setmaxTinc-1))/setmaxTinc)*setmaxTinc;
+  else i=setmaxT;
   i=((i+IDELEMS(F)+15)/16)*16;
   strat->ecartS=initec(i);
@@ -3356 +3359 @@
 *tests if p.p=monomial*unit and cancels the unit
 */
-void cancelunit1 (LObject* p,int index,kStrategy strat )
+void cancelunit1 (LObject* p,int *suc, int index,kStrategy strat )
 {
   int k;
@@ -3374 +3377 @@
         (*p).ecart = 0;
         (*p).length = 1;
+        (*suc)=0;
         return;
       }
@@ -3569 +3573 @@
       for (i=0; i<=strat->sl; i++)
       {
-        if (((strat->fromQ==NULL) || (strat->fromQ[i]==0))
-        )
+        if ((strat->fromQ==NULL) || (strat->fromQ[i]==0))
+        {
           h.p = redtailBba(strat->S[i],i-1,strat);
+          if (TEST_OPT_INTSTRATEGY)
+          {
+            pCleardenom(h.p);// also does a pContent
+          }
+        }
         else
         {
@@ -3595 +3604 @@
     while (suc != -1)
     {
-      i=suc+1;
+      i=suc;
       while (i<=strat->sl)
       {
@@ -3666 +3675 @@
       }
       if ((strat->fromQ==NULL) || (strat->fromQ[i]==0))
-        cancelunit1(&h,strat->sl,strat);
+        cancelunit1(&h,&suc,strat->sl,strat);
       h.length = pLength(h.p);
       h.SetpFDeg();
@@ -3673 +3682 @@
       strat->S_2_R[i] = strat->tl;
     }
+    if (suc!= -1) updateS(toT,strat);
   }
   if (redSi!=NULL) pDeleteLm(&redSi);

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.54 2002-12-13 16:19:15 Singular Exp $ */
+/* $Id: tok.h,v 1.55 2003-05-31 14:13:42 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -186 +186 @@
 #define V_NSB       14
 #define V_CONTENTSB 15
+#define V_CANCELUNIT 16
 #define V_DEG_STOP  31
 
@@ -236 +237 @@
 #define TEST_OPT_OLDSTD            BTEST1(OPT_OLDSTD)
 #define TEST_OPT_CONTENTSB         BVERBOSE(V_CONTENTSB)
+#define TEST_OPT_CANCELUNIT        BVERBOSE(V_CANCELUNIT)
 
 #define TEST_VERB_NSB              BVERBOSE(V_NSB)