Changeset e09ceb in git for libpolys/polys

Timestamp:

Nov 16, 2016, 4:46:18 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

addf91114f5b351aa5be1135d03eb6f09c7bfc5a

Parents:

c248d2f567086a9ad995e42d554a335ee1554928

Message:

add: factorization in ZZ[x,..]

Location:

libpolys/polys

Files:

• clapsing.cc (modified) (3 diffs)
• monomials/ring.h (modified) (1 diff)

libpolys/polys/clapsing.cc

@@ -864 +864 @@
 
   Variable a;
-  if (!rField_is_Zp(r) && !rField_is_Zp_a(r)) /* Q, Q(a) */
+  if (!rField_is_Zp(r) && !rField_is_Zp_a(r) && !rField_is_Z(r)) /* Q, Q(a) */
   {
     //if (f!=NULL) // already tested at start of routine
@@ -902 +902 @@
     }
   }
-  if (rField_is_Q(r) || rField_is_Zp(r))
+  if (rField_is_Q(r) || rField_is_Zp(r) || (rField_is_Z(r)))
   {
     setCharacteristic( rChar(r) );
@@ -962 +962 @@
     {
       if (with_exps!=1) (**v)[j] = J.getItem().exp();
-      if (rField_is_Zp(r) || rField_is_Q(r))           /* Q, Fp */
+      if (rField_is_Zp(r) || rField_is_Q(r)||  rField_is_Z(r))           /* Q, Fp, Z */
       {
         //count_Factors(res,*v,f, j, convFactoryPSingP( J.getItem().factor() );

libpolys/polys/monomials/ring.h

@@ -501 +501 @@
 static inline BOOLEAN rField_is_Q(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Q(r->cf); }
+
+static inline BOOLEAN rField_is_Z(const ring r)
+{ assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Z(r->cf); }
 
 static inline BOOLEAN rField_is_numeric(const ring r) /* R, long R, long C */