Changeset deca086 in git

Timestamp:

Nov 24, 2010, 10:08:24 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

97b5d578e13d4df61dceefad1a56f00844cad0ac

Parents:

9634a6736659317223c0fc1209744322e56f824b

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-11-24 10:08:24+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:42+01:00

Message:

p_PermPoly

Location:

polys

Files:

• monomials/p_polys.cc (modified) (1 diff)
• monomials/p_polys.h (modified) (1 diff)
• polys.h (modified) (2 diffs)
• polys1.cc (modified) (1 diff)

polys/monomials/p_polys.cc

@@ -2974 +2974 @@
 }
 
+/*2
+*returns a re-ordered copy of a polynomial, with permutation of the variables
+*/
+poly p_PermPoly (poly p, int * perm, const ring oldRing, const ring dst,
+       nMapFunc nMap, int *par_perm, int OldPar)
+{
+  int OldpVariables = oldRing->N;
+  poly result = NULL;
+  poly result_last = NULL;
+  poly aq=NULL; /* the map coefficient */
+  poly qq; /* the mapped monomial */
+
+  while (p != NULL)
+  {
+    if ((OldPar==0)||(rField_is_GF(oldRing)))
+    {
+      qq = p_Init(dst);
+      number n=nMap(pGetCoeff(p));
+      if ((dst->minpoly!=NULL)
+      && ((rField_is_Zp_a(dst)) || (rField_is_Q_a(dst))))
+      {
+        n_Normalize(n,dst->cf);
+      }
+      pGetCoeff(qq)=n;
+    // coef may be zero:  pTest(qq);
+    }
+    else
+    {
+      qq=p_One(dst);
+      aq=naPermNumber(pGetCoeff(p),par_perm,OldPar, oldRing);
+      if ((dst->minpoly!=NULL)
+      && ((rField_is_Zp_a(dst)) || (rField_is_Q_a(dst))))
+      {
+        poly tmp=aq;
+        while (tmp!=NULL)
+        {
+          number n=pGetCoeff(tmp);
+          n_Normalize(n,dst->cf);
+          pGetCoeff(tmp)=n;
+          pIter(tmp);
+        }
+      }
+      pTest(aq);
+    }
+    if (rRing_has_Comp(dst)) p_SetComp(qq, p_GetComp(p,oldRing),dst);
+    if (n_IsZero(pGetCoeff(qq),dst->cf))
+    {
+      p_LmDelete(&qq,dst);
+    }
+    else
+    {
+      int i;
+      int mapped_to_par=0;
+      for(i=1; i<=OldpVariables; i++)
+      {
+        int e=p_GetExp(p,i,oldRing);
+        if (e!=0)
+        {
+          if (perm==NULL)
+          {
+            p_SetExp(qq,i, e, dst);
+          }
+          else if (perm[i]>0)
+            p_AddExp(qq,perm[i], e/*p_GetExp( p,i,oldRing)*/, dst);
+          else if (perm[i]<0)
+          {
+            if (rField_is_GF(dst))
+            {
+              number c=pGetCoeff(qq);
+              number ee=nfPar(1);
+              number eee;nfPower(ee,e,&eee); //nfDelete(ee,currRing);
+              ee=nfMult(c,eee);
+              //nfDelete(c,currRing);nfDelete(eee,currRing);
+              pSetCoeff0(qq,ee);
+            }
+            else
+            {
+              lnumber c=(lnumber)pGetCoeff(qq);
+              if (c->z->next==NULL)
+                napAddExp(c->z,-perm[i],e/*p_GetExp( p,i,oldRing)*/);
+              else /* more difficult: we have really to multiply: */
+              {
+                lnumber mmc=(lnumber)naInit(1,currRing);
+                napSetExp(mmc->z,-perm[i],e/*p_GetExp( p,i,oldRing)*/);
+                napSetm(mmc->z);
+                pGetCoeff(qq)=naMult((number)c,(number)mmc);
+                n_Delete((number *)&c,dst->cf);
+                n_Delete((number *)&mmc,dst->cf); 
+              }
+              mapped_to_par=1;
+            }
+          }
+          else
+          {
+            /* this variable maps to 0 !*/
+            p_LmDelete(&qq,dst);
+            break;
+          }
+        }
+      }
+      if (mapped_to_par
+      && (dst->minpoly!=NULL))
+      {
+        number n=pGetCoeff(qq);
+        n_Normalize(n,dst->cf);
+        pGetCoeff(qq)=n;
+      }
+    }
+    pIter(p);
+#if 1
+    if (qq!=NULL)
+    {
+      p_Setm(qq,dst);
+      p_Test(aq,dst);
+      p_Test(qq,dst);
+      if (aq!=NULL) qq=p_Mult(aq,qq,dst);
+      aq = qq;
+      while (pNext(aq) != NULL) pIter(aq);
+      if (result_last==NULL)
+      {
+        result=qq;
+      }
+      else
+      {
+        pNext(result_last)=qq;
+      }
+      result_last=aq;
+      aq = NULL;
+    }
+    else if (aq!=NULL)
+    {
+      p_Delete(&aq,dst);
+    }
+  }
+  result=p_SortAdd(result,dst);
+#else
+  //  if (qq!=NULL)
+  //  {
+  //    pSetm(qq);
+  //    pTest(qq);
+  //    pTest(aq);
+  //    if (aq!=NULL) qq=pMult(aq,qq);
+  //    aq = qq;
+  //    while (pNext(aq) != NULL) pIter(aq);
+  //    pNext(aq) = result;
+  //    aq = NULL;
+  //    result = qq;
+  //  }
+  //  else if (aq!=NULL)
+  //  {
+  //    pDelete(&aq);
+  //  }
+  //}
+  //p = result;
+  //result = NULL;
+  //while (p != NULL)
+  //{
+  //  qq = p;
+  //  pIter(p);
+  //  qq->next = NULL;
+  //  result = pAdd(result, qq);
+  //}
+#endif
+  p_Test(result,dst);
+  return result;
+}
 
 /***************************************************************

polys/monomials/p_polys.h

@@ -1818 +1818 @@
 void p_SetModDeg(intvec *w, ring r);
 
+
+
+poly      p_PermPoly (poly p, int * perm,const ring OldRing, const ring dst,
+                     nMapFunc nMap, int *par_perm=NULL, int OldPar=0);
+
 #endif // P_POLYS_H
 

polys/polys.h

@@ -262 +262 @@
 #define   pMaxComp(p)   p_MaxComp(p, currRing)
 #define   pMinComp(p)   p_MinComp(p, currRing)
-int pMaxCompProc(poly p);
 
 #define   pOneComp(p)       p_OneComp(p, currRing)
@@ -292 +291 @@
 // #define   pDehomogen(p1,p2,n) p_Dehomgen(p1,p2,n,currRing)
 // #define   pIsHomogen(p)       p_IsHomggen(p,currRing)
-
-poly      pPermPoly (poly p, int * perm,const ring OldRing, nMapFunc nMap,
-                     int *par_perm=NULL, int OldPar=0);
 
 /*BOOLEAN   pVectorHasUnitM(poly p, int * k);*/

polys/polys1.cc

@@ -78 +78 @@
   }
   omFreeSize((ADDRESS)bin, h*sizeof(number));
-}
-
-int pMaxCompProc(poly p)
-{
-  return pMaxComp(p);
 }