Changeset 3ffb5ca in git

Timestamp:

Jul 7, 2015, 10:55:00 AM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

109e3852c9d0639f602e39af1b0a257f9a8ca393

Parents:

f7db368ef3daa8460f1028b27a4fdeb1735ae164

Message:

fix: redRiloc (red for local and mixed ord rings)

File:

• kernel/GBEngine/kstd1.cc (modified) (4 diffs)

kernel/GBEngine/kstd1.cc

@@ -369 +369 @@
   PrintS("    The actual reducer T is: ");
   if(strat->tl<0)
-    {PrintS(" Empty.\n");
+    {PrintS(" Empty.\n");}
   else
-  for (iii=0;iii<=strat->tl;iii++)
-  {
-    PrintLn();
-    Print("      T[%i] = ",iii);p_Write(strat->T[iii].p,strat->tailRing);
-    PrintLn();
+  {
+    for (iii=0;iii<=strat->tl;iii++)
+    {
+      PrintLn();
+      Print("      T[%i] = ",iii);p_Write(strat->T[iii].p,strat->tailRing);
+      PrintLn();
+    }
   }
 #endif /* ADIDEBUG_NF */
@@ -404 +406 @@
     {
       if (strat->honey) h->SetLength(strat->length_pLength);
+      // over ZZ: cleanup coefficients by complete reduction with monomials
+      postReduceByMon(h, strat);
+      if(nIsZero(pGetCoeff(h->p)) || h->p == NULL) return 2;
+      if(strat->tl >= 0)
+          h->i_r1 = strat->tl;
+      else
+          h->i_r1 = -1;
+      if (h->GetLmTailRing() == NULL)
+      {
+        if (h->lcm!=NULL) pLmDelete(h->lcm);
+        h->Clear();
+        return 0;
+      }
       return 1;
     }
@@ -428 +443 @@
                                         strat->T[i].length < li))
             &&
-            p_LmShortDivisibleBy(strat->T[i].GetLmTailRing(), strat->sevT[i], h->GetLmTailRing(), ~h->sev, strat->tailRing))
+            p_LmShortDivisibleBy(strat->T[i].GetLmTailRing(), strat->sevT[i], h->GetLmTailRing(), ~h->sev, strat->tailRing) && n_DivBy(h->p->coef,strat->T[i].p->coef,strat->tailRing))
 #else
           j = kFindDivisibleByInT(strat, h, i);
@@ -473 +488 @@
         assume(h->FDeg == h->pFDeg());
         at = strat->posInL(strat->L,strat->Ll,h,strat);
-        if (at <= strat->Ll)
+        if (at <= strat->Ll && pLmCmp(h->p, strat->L[strat->Ll].p) != 0 && !nEqual(h->p->coef, strat->L[strat->Ll].p->coef))
         {
           /*- h will not become the next element to reduce -*/