Changeset aa7c1c2 in git for kernel/GBEngine/kutil.cc

Timestamp:

Jun 14, 2018, 1:08:24 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8c73fdea988c87d699605750b3180fa69edf5d10

Parents:

a718906498691a0860e186cfee5db4fc1142ccd6db48f3ea705fcb451c2ea640a2b72f643bae2f22

Message:

Merge branch 'spielwiese' into letterplace_kernel_multiplication

File:

• kernel/GBEngine/kutil.cc (modified) (3 diffs)

kernel/GBEngine/kutil.cc

@@ -10971 +10971 @@
 void finalReduceByMon(kStrategy strat)
 {
+  assume(strat->tl<0); /* can only be called with no elements in T:
+                          i.e. after exitBuchMora */
+  /* do not use strat->S, strat->sl as they may be out of sync*/
   if(!nCoeff_is_Ring_Z(currRing->cf))
       return;
   poly p,pp;
-  for(int j = 0; j<=strat->sl; j++)
-  {
-    if((strat->S[j]!=NULL)&&(pNext(strat->S[j]) == NULL))
-    {
-      for(int i = 0; i<=strat->sl; i++)
-      {
-        if((i != j) && (strat->S[i] != NULL))
-        {
-          p = strat->S[i];
-          if(pLmDivisibleBy(strat->S[j], p))
+  for(int j = 0; j<IDELEMS(strat->Shdl); j++)
+  {
+    if((strat->Shdl->m[j]!=NULL)&&(pNext(strat->Shdl->m[j]) == NULL))
+    {
+      for(int i = 0; i<IDELEMS(strat->Shdl); i++)
+      {
+        if((i != j) && (strat->Shdl->m[i] != NULL))
+        {
+          p = strat->Shdl->m[i];
+          while((p!=NULL) && pLmDivisibleBy(strat->Shdl->m[j], p))
           {
-            number dummy = n_IntMod(p->coef, strat->S[j]->coef, currRing->cf);
-            p_SetCoeff(p,dummy,currRing);
+            number dummy = n_IntMod(p->coef, strat->Shdl->m[j]->coef, currRing->cf);
+            if (!nEqual(dummy,p->coef))
+            {
+              if (nIsZero(dummy))
+              {
+                nDelete(&dummy);
+                pLmDelete(&strat->Shdl->m[i]);
+                p=strat->Shdl->m[i];
+              }
+              else
+              {
+                p_SetCoeff(p,dummy,currRing);
+                break;
+              }
+            }
+            else
+            {
+              nDelete(&dummy);
+              break;
+            }
           }
-          pp = pNext(p);
-          if((pp == NULL) && (nIsZero(p->coef)))
+          if (p!=NULL)
           {
-            deleteInS(i, strat);
-          }
-          else
-          {
+            pp = pNext(p);
             while(pp != NULL)
             {
-              if(pLmDivisibleBy(strat->S[j], pp))
+              if(pLmDivisibleBy(strat->Shdl->m[j], pp))
               {
-                number dummy = n_IntMod(pp->coef, strat->S[j]->coef, currRing->cf);
-                p_SetCoeff(pp,dummy,currRing);
-                if(nIsZero(pp->coef))
+                number dummy = n_IntMod(pp->coef, strat->Shdl->m[j]->coef, currRing->cf);
+                if (!nEqual(dummy,pp->coef))
                 {
-                  pLmDelete(&pNext(p));
-                  pp = pNext(p);
+                  p_SetCoeff(pp,dummy,currRing);
+                  if(nIsZero(pp->coef))
+                  {
+                    pLmDelete(&pNext(p));
+                    pp = pNext(p);
+                  }
+                  else
+                  {
+                    p = pp;
+                    pp = pNext(p);
+                  }
                 }
                 else
                 {
+                  nDelete(&dummy);
                   p = pp;
                   pp = pNext(p);
@@ -11019 +11045 @@
             }
           }
-          if(strat->S[i]!= NULL && nIsZero(pGetCoeff(strat->S[i])))
-          {
-            if(pNext(strat->S[i]) == NULL)
-              strat->S[i]=NULL;
-            else
-              strat->S[i]=pNext(strat->S[i]);
-          }
         }
       }
@@ -11031 +11050 @@
     }
   }
-  //idSkipZeroes(strat->Shdl);
+  idSkipZeroes(strat->Shdl);
 }
 #endif