Changeset 8d679fd in git

Timestamp:

Dec 3, 2009, 3:56:44 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7a4a438c344423ba7293bff2ab899900189f2830

Parents:

725ef18d92b06980ce6d68815819fcbf02497748

Message:

format, redRing

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

File:

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

kernel/kstd2.cc

@@ -12 +12 @@
 
 // define to enable tailRings
-#define HAVE_TAIL_RING
+//#define HAVE_TAIL_RING
 
 #include "mod2.h"
@@ -22 +22 @@
 #endif /* ifndef NDEBUG */
 
-#if MYTEST 
+#if MYTEST
 # ifdef HAVE_TAIL_RING
 #  undef HAVE_TAIL_RING
@@ -301 +301 @@
 int redRing (LObject* h,kStrategy strat)
 {
-  if (h->p == NULL && h->t_p == NULL) return 0; // spoly is zero (can only occure with zero divisors)
-
-//  if (strat->tl<0) return 1;
+  if (h->IsNull()) return 0; // spoly is zero (can only occure with zero divisors)
+  if (strat->tl<0) return 1;
+
   int at,i;
   long d;
@@ -318 +318 @@
   loop
   {
-      j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, h);
-      if (j < 0) return 1;
-#ifdef KDEBUG
-      if (TEST_OPT_DEBUG)
-      {
-        PrintS("T red:");
-      }
-#endif
+    j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, h);
+    if (j < 0) return 1;
 #ifdef KDEBUG
     if (TEST_OPT_DEBUG)
     {
+      PrintS("T red:");
       h->wrp();
       PrintS(" with ");
@@ -352 +347 @@
       h->lcm=NULL;
 #endif
+      h->Clear();
       return 0;
     }
@@ -362 +358 @@
     {
       h->SetLmCurrRing();
+      if (strat->posInLDependsOnLength)
+        h->SetLength(strat->length_pLength);
       at = strat->posInL(strat->L,strat->Ll,h,strat);
       if (at <= strat->Ll)
@@ -373 +371 @@
       }
     }
-    else if (d != reddeg)
+    if (d != reddeg)
     {
       if (d >= strat->tailRing->bitmask)
       {
-        if (h->pTotalDeg() >= strat->tailRing->bitmask)
-        {
-          strat->overflow=TRUE;
+        if (h->pTotalDeg() >= strat->tailRing->bitmask)
+        {
+          strat->overflow=TRUE;
           //Print("OVERFLOW in redRing d=%ld, max=%ld\n",d,strat->tailRing->bitmask);
-          h->GetP();
-          at = strat->posInL(strat->L,strat->Ll,h,strat);
-          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
-          h->Clear();
+          h->GetP();
+          at = strat->posInL(strat->L,strat->Ll,h,strat);
+          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
+          h->Clear();
           return -1;
         }
@@ -653 +651 @@
       if (d>=strat->tailRing->bitmask)
       {
-        if (h->pTotalDeg() >= strat->tailRing->bitmask)
-        {
-          strat->overflow=TRUE;
+        if (h->pTotalDeg() >= strat->tailRing->bitmask)
+        {
+          strat->overflow=TRUE;
           //Print("OVERFLOW in redLazy d=%ld, max=%ld\n",d,strat->tailRing->bitmask);
-          h->GetP();
-          at = strat->posInL(strat->L,strat->Ll,h,strat);
-          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
-          h->Clear();
+          h->GetP();
+          at = strat->posInL(strat->L,strat->Ll,h,strat);
+          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
+          h->Clear();
           return -1;
         }
@@ -831 +829 @@
       if (d>=strat->tailRing->bitmask)
       {
-        if (h->pTotalDeg()+h->ecart >= strat->tailRing->bitmask)
-        {
-          strat->overflow=TRUE;
+        if (h->pTotalDeg()+h->ecart >= strat->tailRing->bitmask)
+        {
+          strat->overflow=TRUE;
           //Print("OVERFLOW in redHoney d=%ld, max=%ld\n",d,strat->tailRing->bitmask);
-          h->GetP();
-          at = strat->posInL(strat->L,strat->Ll,h,strat);
-          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
-          h->Clear();
+          h->GetP();
+          at = strat->posInL(strat->L,strat->Ll,h,strat);
+          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
+          h->Clear();
           return -1;
         }
@@ -1003 +1001 @@
 #if MYTEST
   if (TEST_OPT_DEBUG)
-  {  
+  {
     PrintS("bba start GB: currRing: ");
     // rWrite(currRing);PrintLn();
@@ -1030 +1028 @@
 
 
+#ifdef KDEBUG
+  //kDebugPrint(strat);
+#endif
   /* compute------------------------------------------------------- */
   while (strat->Ll >= 0)
@@ -1082 +1083 @@
         if (!kStratChangeTailRing(strat))
         {
-          WerrorS("OVERFLOW..."); 
+          WerrorS("OVERFLOW...");
           break;
         }