Changeset bca341 in git

Timestamp:

Jun 7, 2012, 5:43:32 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

f0b795a3ce2b873e7524b0af7df2ccd84a3fc628

Parents:

6284186fbb128f1c5a0c99ff170cec4bb5afd5a3

Message:

fix: naIsOne, naIsMOne

improved: algext.cc::definiteReduce

Files:

• kernel/ideals.cc (modified) (9 diffs)
• libpolys/coeffs/bigintmat.cc (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (3 diffs)

kernel/ideals.cc

@@ -49 +49 @@
 /* #define WITH_OLD_MINOR */
 #define pCopy_noCheck(p) pCopy(p)
-
-static poly * idpower;
-/*collects the monomials in makemonoms, must be allocated befor*/
-static int idpowerpoint;
-/*index of the actual monomial in idpower*/
-static poly * givenideal;
-/*the ideal from which a power is computed*/
 
 /*0 implementation*/
@@ -546 +539 @@
   ideal   h2, h3;
   int     i;
-  int     j,jj=0,k;
+  int     j,k;
   poly    p,q;
 
@@ -641 +634 @@
 {
   ideal s_h1;
-  poly  p;
   int   j, k, length=0,reg;
   BOOLEAN isMonomial=TRUE;
@@ -789 +781 @@
 {
   ideal s_h1;
-  int j;
   intvec *w=NULL;
 
@@ -837 +828 @@
 {
   int   i, j, k, t, inputIsIdeal=id_RankFreeModule(h1,currRing);
-  poly  p=NULL, q, qq;
+  poly  p=NULL, q;
   intvec *w=NULL;
 
@@ -1252 +1243 @@
           p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
         pNormalize(p);
-        if((w==NULL)&&(p_Deg(p0,currRing)>n)||(w!=NULL)&&(pDegW(p0,w)>n))
+        if(((w==NULL)&&(p_Deg(p0,currRing)>n))||((w!=NULL)&&(pDegW(p0,w)>n)))
           p_Delete(&p0,currRing);
         else
@@ -1408 +1399 @@
   }
   BITSET old_test=test;
-  int i,l,ll,k,kkk,kmax;
+  int i, kmax;
   BOOLEAN  addOnlyOne=TRUE;
   tHomog   hom=isNotHomog;
@@ -1976 +1967 @@
   {
     p=P[i];
-    poly q=p;
     if (p!=NULL)
     {
@@ -2107 +2097 @@
   intvec *wtmp=NULL;
 
-  int i,j,k,rk,flength=0,slength,length;
+  int i,k,rk,flength=0,slength,length;
   poly p,q;
 

libpolys/coeffs/bigintmat.cc

@@ -15 +15 @@
 #include <string.h>
 
-#define BIMATELEM(M,I,J) (M)[ (M).index(I,J) ]
+//#define BIMATELEM(M,I,J) (M)[ (M).index(I,J) ]
 
 bigintmat * bigintmat::transpose()

libpolys/polys/ext_fields/algext.cc

@@ -206 +206 @@
   naTest(a);
   poly aAsPoly = (poly)a;
-  if (!p_IsConstant(aAsPoly, naRing)) return FALSE;
+  if ((a==NULL) || (!p_IsConstant(aAsPoly, naRing))) return FALSE;
   return n_IsOne(p_GetCoeff(aAsPoly, naRing), naCoeffs);
 }
@@ -214 +214 @@
   naTest(a);
   poly aAsPoly = (poly)a;
-  if (!p_IsConstant(aAsPoly, naRing)) return FALSE;
+  if ((a==NULL) || (!p_IsConstant(aAsPoly, naRing))) return FALSE;
   return n_IsMOne(p_GetCoeff(aAsPoly, naRing), naCoeffs);
 }
@@ -600 +600 @@
   p_Test((poly)reducer, naRing);
   #endif
-  p_PolyDiv(p, reducer, FALSE, naRing);
+  if ((p!=NULL) && (p_GetExp(p,1,naRing)>=p_GetExp(reducer,1,naRing)))
+  {
+    p_PolyDiv(p, reducer, FALSE, naRing);
+  }
 }