Changeset abf7a5 in git

Timestamp:

Feb 2, 2015, 3:50:37 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5861b1f57747f96f2119b414f9879eaf0f9f4925

Parents:

71e0a96366b62fc28f5a9790c3f67a0c68bbe2d6

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-02-02 15:50:37+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-02-02 15:54:32+01:00

Message:

fix: nIsUnit,  pGetCoeff, etc. ring-cf handling in kutil.cc

File:

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

kernel/GBEngine/kutil.cc

@@ -336 +336 @@
 #ifdef HAVE_RINGS
     if (rField_is_Ring(r) /*&& (rHasLocalOrMixedOrdering(r))*/)
-      lc = p_GetCoeff(p,r);
+      lc = pGetCoeff(p);
 #endif
 
 #ifdef HAVE_RINGS
   // Leading coef have to be a unit
-  if ( !(nIsUnit(p_GetCoeff(p, r))) ) return;
+  if ( !(n_IsUnit(pGetCoeff(p), r->cf)) ) return;
 #endif
 
@@ -399 +399 @@
       //       domains), no zerodivisor test needed  CAUTION
       if (rField_is_Ring(r) /*&&(rHasLocalOrMixedOrdering(r)) */)
-        if(n_DivBy(p_GetCoeff(h,r->cf),lc,r->cf) == 0)
+        if(n_DivBy(pGetCoeff(h),lc,r->cf) == 0)
           return;
       #endif
@@ -547 +547 @@
 {
   assume((*L)!=NULL);
-  assume((length+incr)>0);
+  assume(((*length)+incr)>0);
 
   *L = (LSet)omReallocSize((*L),(*length)*sizeof(LObject),
@@ -907 +907 @@
       if (strat->L[i].i_r2 < 0 ||
           strat->L[i].i_r2 > strat->tl ||
-          strat->L[i].T_2(strat)->p != strat->L[i].p2);
+          strat->L[i].T_2(strat)->p != strat->L[i].p2)
+        return dReportError("L[%d].i_r2 out of sync", i);
     }
     else
@@ -1440 +1441 @@
     wrp(gcd);
     PrintS("\n--- create strong gcd poly: ");
-    Print("\n p: ", i);
+    Print("\n p: %d", i);
     wrp(p);
     Print("\n strat->S[%d]: ", i);
@@ -3337 +3338 @@
   }
   step[1] = 500000;
-  habsind = ind2((long) p_GetCoeff(p, currRing));
+  habsind = ind2(n_Int(pGetCoeff(p), currRing->cf);
   long bound = currRing->ch - habsind;
 #ifdef OLI_DEBUG
@@ -6544 +6545 @@
 #ifdef HAVE_RINGS
     // Leading coef have to be a unit
-    if ( !(nIsUnit(p_GetCoeff((*p).p, r))) ) return;
+    if ( !(n_IsUnit(pGetCoeff((*p).p), currRing->cf)) ) return;
 #endif
     k = 0;