FIX: moved P/minpoly/parameters from ring to coeff

Author: Oleksandr Motsak

libpolys/coeffs/coeffs.h

@@ -153,9 +153,10 @@ struct n_Procs_s
    int     char_flag;
    int     ref;
    n_coeffType type;
-////-----------------------------------------
-  char**     parameter; /* names of parameters, rInit */
-  number     minpoly;  /* for Q_a/Zp_a, rInit */
+//-------------------------------------------
+  char**     parameter; //< names of parameters, rInit
+  short      P;      //< number of pars, rInit
+  number     minpoly;  //< for Q_a/Zp_a, rInit
 
 #ifdef HAVE_RINGS
   /* The following members are for representing the ring Z/n,

libpolys/polys/OBSOLETE_pInitContent.cc

@@ -42,7 +42,7 @@ void p_Content(poly ph, const ring r)
       p=ph;
     }
     else if ((rField_is_Extension(r))
-    && ((rPar(r)>1)||(r->minpoly==NULL)))
+    && ((rPar(r)>1)||(r->cf->minpoly==NULL)))
     {
       h=pInitContent_a(ph);
       p=ph;
@@ -750,7 +750,7 @@ poly pPermPoly (poly p, int * perm, const ring oldRing, nMapFunc nMap,
     {
       qq = pInit();
       number n=nMap(pGetCoeff(p));
-      if ((currRing->minpoly!=NULL)
+      if ((currRing->cf->minpoly!=NULL)
       && ((rField_is_Zp_a()) || (rField_is_Q_a())))
       {
         nNormalize(n);
@@ -762,7 +762,7 @@ poly pPermPoly (poly p, int * perm, const ring oldRing, nMapFunc nMap,
     {
       qq=pOne();
       aq=napPermNumber(pGetCoeff(p),par_perm,OldPar, oldRing);
-      if ((aq!=NULL) && (currRing->minpoly!=NULL)
+      if ((aq!=NULL) && (currRing->cf->minpoly!=NULL)
       && ((rField_is_Zp_a()) || (rField_is_Q_a())))
       {
         pNormalize(aq);
@@ -828,7 +828,7 @@ poly pPermPoly (poly p, int * perm, const ring oldRing, nMapFunc nMap,
         }
       }
       if (mapped_to_par
-      && (currRing->minpoly!=NULL))
+      && (currRing->cf->minpoly!=NULL))
       {
         number n=pGetCoeff(qq);
         nNormalize(n);

libpolys/polys/kbuckets.cc

@@ -1154,7 +1154,7 @@ static BOOLEAN nIsPseudoUnit(number n, ring r)
 {
   if (rField_is_Zp(r))
     return TRUE;
-  if (r->parameter==NULL)
+  if (r->cf->parameter==NULL)
   {
     return (r->cf->cfSize(n,r->cf)==1);
   }

libpolys/polys/monomials/maps.cc

@@ -154,7 +154,7 @@ poly maEval(map theMap, poly p,ring preimage_r,nMapFunc nMap, ideal s, const rin
       }
       omFreeSize((ADDRESS)monoms,l*sizeof(poly));
     }
-    if (dst_r->minpoly!=NULL) result=p_MinPolyNormalize(result, dst_r);
+    if (dst_r->cf->minpoly!=NULL) result=p_MinPolyNormalize(result, dst_r);
   }
   return result;
 }
@@ -269,9 +269,9 @@ poly maIMap(ring r, poly p, const ring dst_r)
   nMapFunc nMap=n_SetMap(r->cf,dst_r->cf);
   int *perm=(int *)omAlloc0((r->N+1)*sizeof(int));
   //int *par_perm=(int *)omAlloc0(rPar(r)*sizeof(int));
-  maFindPerm(r->names,r->N, r->parameter, r->P,
-             dst_r->names,dst_r->N,dst_r->parameter, dst_r->P,
-             perm,NULL, dst_r->ch);
+  maFindPerm(r->names, rVar(r), r->cf->parameter, rPar(r),
+             dst_r->names, rVar(dst_r),dst_r->cf->parameter, rPar(dst_r),
+             perm,NULL, dst_r->cf->ch);
   poly res=p_PermPoly(p,perm,r,dst_r, nMap /*,par_perm,rPar(r)*/);
   omFreeSize((ADDRESS)perm,(r->N+1)*sizeof(int));
   //omFreeSize((ADDRESS)par_perm,rPar(r)*sizeof(int));

libpolys/polys/monomials/p_polys.cc

@@ -1856,7 +1856,7 @@ void p_Content(poly ph, const ring r)
       p=ph;
     }
     else if ((rField_is_Extension(r))
-    && ((rPar(r)>1)||(r->minpoly==NULL)))
+    && ((rPar(r)>1)||(r->cf->minpoly==NULL)))
     {
       h=p_InitContent_a(ph,r);
       p=ph;
@@ -3239,7 +3239,7 @@ poly p_PermPoly (poly p, int * perm, const ring oldRing, const ring dst,
     {
       qq = p_Init(dst);
       number n=nMap(pGetCoeff(p),oldRing->cf,dst->cf);
-      if ((dst->minpoly!=NULL)
+      if ((dst->cf->minpoly!=NULL)
       && ((rField_is_Zp_a(dst)) || (rField_is_Q_a(dst))))
       {
         n_Normalize(n,dst->cf);
@@ -3253,7 +3253,7 @@ poly p_PermPoly (poly p, int * perm, const ring oldRing, const ring dst,
       WerrorS("longalg missing");
       #if 0
       aq=naPermNumber(pGetCoeff(p),par_perm,OldPar, oldRing);
-      if ((dst->minpoly!=NULL)
+      if ((dst->cf->minpoly!=NULL)
       && ((rField_is_Zp_a(dst)) || (rField_is_Q_a(dst))))
       {
         poly tmp=aq;
@@ -3328,7 +3328,7 @@ poly p_PermPoly (poly p, int * perm, const ring oldRing, const ring dst,
         }
       }
       if (mapped_to_par
-      && (dst->minpoly!=NULL))
+      && (dst->cf->minpoly!=NULL))
       {
         number n=pGetCoeff(qq);
         n_Normalize(n,dst->cf);