Changeset 109e385 in git

Timestamp:

Jul 7, 2015, 11:15:36 AM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

ae0188e380f485df33ffbd07d75eaca52206add7

Parents:

3ffb5ca871047be87892fe8263ef80dbf59f2f04

Message:

fix: redMoraNF

File:

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

kernel/GBEngine/kstd1.cc

@@ -743 +743 @@
       if (H.p==NULL) return NULL;
     }
-    if (p_LmShortDivisibleBy(strat->T[j].GetLmTailRing(), strat->sevT[j], H.GetLmTailRing(), not_sev, strat->tailRing))
+    #if ADIDEBUG_NF
+    printf("\nSearching for a reducer...\n");
+    #endif
+    if (p_LmShortDivisibleBy(strat->T[j].GetLmTailRing(), strat->sevT[j], H.GetLmTailRing(), not_sev, strat->tailRing)
+        #ifdef HAVE_RINGS
+        && (!rField_is_Ring(strat->tailRing) ||
+            n_DivBy(H.p->coef, strat->T[j].p->coef,strat->tailRing))
+        #endif
+        )
     {
       /*- remember the found T-poly -*/
@@ -750 +758 @@
       int li = strat->T[j].length;
       int ii = j;
+      #if ADIDEBUG_NF
+      printf("\nFound: j = %i, ecart = %i\nTrying to find a better one...\n",j,ei);pWrite(strat->T[j].p);
+      #endif
       /*
       * the polynomial to reduce with (up to the moment) is;
@@ -762 +773 @@
         if (ei <= H.ecart) break;
         if (((strat->T[j].ecart < ei)
-          || ((strat->T[j].ecart == ei) && (strat->T[j].length < li)))
-        && pLmShortDivisibleBy(strat->T[j].p,strat->sevT[j], H.p, not_sev))
+          || ((strat->T[j].ecart == ei)
+        && (strat->T[j].length < li)))
+        && pLmShortDivisibleBy(strat->T[j].p,strat->sevT[j], H.p, not_sev) 
+        #ifdef HAVE_RINGS
+        && (!rField_is_Ring(strat->tailRing) ||
+            n_DivBy(H.p->coef, strat->T[j].p->coef,strat->tailRing))
+        #endif
+        )
         {
           /*
@@ -772 +789 @@
           li = strat->T[j].length;
           ii = j;
+          #if ADIDEBUG_NF
+          printf("\nFound a better one: j = %i, ecart = %i\nTrying to find a better one...\n",j,ei);
+          pWrite(strat->T[j].p);
+          #endif
         }
       }
@@ -802 +823 @@
           return NULL;
       }
+      #if ADIDEBUG_NF
+      printf("\nAfter the small reduction it looks like this:\n");pWrite(H.p);
+      getchar();
+      #endif
       /*- try to reduce the s-polynomial -*/
       o = H.SetpFDeg();