Changeset afa93a in git

Timestamp:

Apr 27, 2011, 1:56:45 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

5c97e10bb44ba586b18c55984cb4187d64f2d618

Parents:

b5b9dc3fbf31410fce6496f383303df8ed1e5461

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-27 13:56:45+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:30+01:00

Message:

FIX: p_?GetCoeff must test the input

Location:

libpolys/polys/monomials

Files:

• p_polys.h (modified) (1 diff)
• ring.cc (modified) (1 diff)

libpolys/polys/monomials/p_polys.h

@@ -52 +52 @@
 
 // coeff
-#define pGetCoeff(p)        ((p)->coef)
-// deletes old coeff before setting the new one
+// #define pGetCoeff(p)        ((p)->coef)
+static inline number& pGetCoeff(poly p)
+{
+  assume(p != NULL);
+  return p->coef;
+}
+
+// #define p_GetCoeff(p,r)     pGetCoeff(p)
+static inline number& p_GetCoeff(poly p, const ring r)
+{
+  assume(p != NULL);
+  assume(r != NULL);
+  return p->coef;
+}
+
+
+
+// 
+// deletes old coeff before setting the new one???
 #define pSetCoeff0(p,n)     (p)->coef=(n)
-#define p_GetCoeff(p,r)     pGetCoeff(p)
+
 #define p_SetCoeff0(p,n,r)  pSetCoeff0(p,n)
 

libpolys/polys/monomials/ring.cc

@@ -395 +395 @@
       for (j = i+1; j<=r->N; j++)
       {
-        nl = n_IsOne(p_GetCoeff(MATELEM(r->GetNC()->C,i,j),r->GetNC()->basering), r->cf);
+        nl = n_IsOne(p_GetCoeff(MATELEM(r->GetNC()->C,i,j),r), r->cf);
         if ( (MATELEM(r->GetNC()->D,i,j)!=NULL) || (!nl) )
         {