Changeset 3c0498 in git for libpolys/polys/ext_fields

Timestamp:

Mar 21, 2012, 8:29:49 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

1f49983e2c0b18b90d6918660ec7a49d584e535e8c8dba7f7269572699622a97ae531f403418954a

Parents:

2d2c99cd52253e2a0a953a1aa32a55546c4a67cc

Message:

fix: minpoly in ringlist (Manaul/elimRing.tst)

File:

• libpolys/polys/ext_fields/algext.cc (modified) (28 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -76 +76 @@
 
 /// forward declarations
-BOOLEAN  naGreaterZero(number a, const coeffs cf); 
+BOOLEAN  naGreaterZero(number a, const coeffs cf);
 BOOLEAN  naGreater(number a, number b, const coeffs cf);
 BOOLEAN  naEqual(number a, number b, const coeffs cf);
@@ -114 +114 @@
   if (a == NULL) return TRUE;
   p_Test((poly)a, naRing);
-  if(p_Totaldegree((poly)a, naRing) >= p_Totaldegree(naMinpoly, naRing))
+  if((((poly)a)!=naMinpoly)
+  && p_Totaldegree((poly)a, naRing) >= p_Totaldegree(naMinpoly, naRing))
   {
     Print("deg >= deg(minpoly) in %s:%d\n",f,l);
@@ -153 +154 @@
 {
   if (*a == NULL) return;
+  if (((poly)*a)==naMinpoly) { *a=NULL;return;}
   poly aAsPoly = (poly)(*a);
   p_Delete(&aAsPoly, naRing);
@@ -161 +163 @@
 {
   naTest(a); naTest(b);
-  
+
   /// simple tests
   if (a == b) return TRUE;
@@ -173 +175 @@
   if (b != NULL) bDeg = p_Totaldegree((poly)b, naRing);
   if (aDeg != bDeg) return FALSE;
-  
+
   /// subtraction test
   number c = naSub(a, b, cf);
@@ -185 +187 @@
   naTest(a);
   if (a == NULL) return NULL;
+  if (((poly)a)==naMinpoly) return a;
   return (number)p_Copy((poly)a, naRing);
 }
@@ -248 +251 @@
     return NULL;
   }
-  
+
   return (number)p_NSet(n, A);
 }
@@ -298 +301 @@
 {
   assume( cf != NULL );
-  
+
   const ring A = cf->extRing;
-  
+
   assume( A != NULL );
   assume( A->cf != NULL );
-   
+
   n_CoeffWrite(A->cf, details);
- 
+
 //  rWrite(A);
-  
+
   const int P = rVar(A);
   assume( P > 0 );
-  
+
   Print("//   %d parameter    : ", P);
-  
+
   for (int nop=0; nop < P; nop ++)
     Print("%s ", rRingVar(nop, A));
-  
+
   PrintLn();
-  
+
   const ideal I = A->minideal;
 
   assume( I != NULL );
   assume( IDELEMS(I) == 1 );
-  
+
 
   if ( details )
@@ -332 +335 @@
   else
     PrintS("//   minpoly        : ...");
-  
+
   PrintLn();
-  
+
 /*
   char *x = rRingVar(0, A);
@@ -400 +403 @@
 {
   naTest(a);
-  
+
   /* special cases first */
   if (a == NULL)
@@ -410 +413 @@
   else if (exp ==  1) { *b = naCopy(a, cf); return; }
   else if (exp == -1) { *b = naInvers(a, cf); return; }
-  
+
   int expAbs = exp; if (expAbs < 0) expAbs = -expAbs;
-  
+
   /* now compute a^expAbs */
   poly pow; poly aAsPoly = (poly)a;
@@ -446 +449 @@
     definiteReduce(pow, naMinpoly, cf);
   }
-  
+
   /* invert if original exponent was negative */
   number n = (number)pow;
@@ -552 +555 @@
   if( rEqual(naRing, e->r, TRUE) )
   {
-    const ideal mi = naRing->minideal; 
+    const ideal mi = naRing->minideal;
     assume( IDELEMS(mi) == 1 );
     ideal ii = e->i;
@@ -566 +569 @@
   }
 
-  return FALSE;  
-  
+  return FALSE;
+
 }
 
@@ -604 +607 @@
 {
   poly aa=(poly)a;
-  definiteReduce(aa,naMinpoly,cf); 
+  if (aa!=naMinpoly)
+    definiteReduce(aa,naMinpoly,cf);
   a=(number)aa;
 }
@@ -646 +650 @@
   naTest((number)theGcd); naTest((number)aFactor); naTest((number)mFactor);
   /* the gcd must be 1 since naMinpoly is irreducible and a != NULL: */
-  assume(naIsOne((number)theGcd, cf));      
+  assume(naIsOne((number)theGcd, cf));
   p_Delete(&theGcd, naRing);
   p_Delete(&mFactor, naRing);
@@ -698 +702 @@
 
   poly result = p_NSet(q, dst->extRing);
-  
+
   return (number)result;
 }
@@ -730 +734 @@
 
   if( src == dst ) return ndCopyMap;
-  
+
   int h = 0; /* the height of the extension tower given by dst */
   coeffs bDst = nCoeff_bottom(dst, h); /* the bottom field in the tower dst */
   coeffs bSrc = nCoeff_bottom(src, h); /* the bottom field in the tower src */
-  
+
   /* for the time being, we only provide maps if h = 1 and if b is Q or
      some field Z/pZ: */
@@ -754 +758 @@
   if ((!nCoeff_is_Zp(bDst)) && (!nCoeff_is_Q(bDst))) return NULL;
   if ((!nCoeff_is_Zp(bSrc)) && (!nCoeff_is_Q(bSrc))) return NULL;
-  
+
   if (nCoeff_is_Q(bSrc) && nCoeff_is_Q(bDst))
   {
@@ -768 +772 @@
       return NULL;                               /// Q(b)   --> Q(a)
   }
-  
+
   if (nCoeff_is_Zp(bSrc) && nCoeff_is_Zp(bDst))
   {
@@ -781 +785 @@
       return NULL;                               /// Z/p(b) --> Z/p(a)
   }
-  
+
   return NULL;                                           /// default
 }
@@ -798 +802 @@
 
   const ring R = cf->extRing;
-  assume( R != NULL );  
+  assume( R != NULL );
   assume( 0 < iParameter && iParameter <= rVar(R) );
 
   poly p = p_One(R); p_SetExp(p, iParameter, 1, R); p_Setm(p, R);
 
-  return (number) p; 
-}
-
-
-/// if m == var(i)/1 => return i, 
+  return (number) p;
+}
+
+
+/// if m == var(i)/1 => return i,
 int naIsParam(number m, const coeffs cf)
 {
@@ -813 +817 @@
 
   const ring R = cf->extRing;
-  assume( R != NULL );  
-
-  return p_Var( (poly)m, R ); 
+  assume( R != NULL );
+
+  return p_Var( (poly)m, R );
 }
 
 BOOLEAN naInitChar(coeffs cf, void * infoStruct)
-{  
+{
   assume( infoStruct != NULL );
 
@@ -837 +841 @@
 
   ring R = e->r;
-  assume(R != NULL);
-  
+
   R->ref ++; // increase the ref.counter for the ground poly. ring!
 
-  R->minideal = e->i; // make a copy? 
+  R->minideal = e->i; // make a copy?
 
   cf->extRing           = R;
@@ -852 +855 @@
   p_Test((poly)naMinpoly, naRing);
   #endif
-  
+
   cf->cfGreaterZero  = naGreaterZero;
   cf->cfGreater      = naGreater;
@@ -860 +863 @@
   cf->cfIsMOne       = naIsMOne;
   cf->cfInit         = naInit;
-  cf->cfInit_bigint  = naInit_bigint;  
+  cf->cfInit_bigint  = naInit_bigint;
   cf->cfInt          = naInt;
   cf->cfNeg          = naNeg;
@@ -877 +880 @@
   else
     cf->cfWriteShort = naWriteLong;
-    
+
   cf->cfRead         = naRead;
   cf->cfDelete       = naDelete;
@@ -901 +904 @@
 #endif
   cf->cfParDeg = naParDeg;
-  
+
   cf->iNumberOfParameters = rVar(R);
   cf->pParameterNames = R->names;
   cf->cfParameter = naParameter;
-  
+
   return FALSE;
 }