Changeset 3ed0a6 in git

Timestamp:

Dec 2, 2010, 5:34:19 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

815d74c712bea6b3c721aa0284a36bc1adaad7e4

Parents:

0885fd647459512277b7845bd58e1dc03b19d502

Message:

code cleanup: pOrdPolyMerge, pOrdPolyInsertSetm, p_PermPoly

git-svn-id: file:///usr/local/Singular/svn/trunk@13707 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/polys1.cc (modified) (2 diffs)

kernel/polys1.cc

@@ -1208 +1208 @@
 }
 
-// orders monoms of poly using merge sort (ususally faster than
-// insertion sort). ASSUMES that pSetm was performed on monoms
-poly pOrdPolyMerge(poly p)
-{
-  poly qq,pp,result=NULL;
-
-  if (p == NULL) return NULL;
-
-  loop
-  {
-    qq = p;
-    loop
-    {
-      if (pNext(p) == NULL)
-      {
-        result=pAdd(result, qq);
-        pTest(result);
-        return result;
-      }
-      if (pLmCmp(p,pNext(p)) != 1)
-      {
-        pp = p;
-        pIter(p);
-        pNext(pp) = NULL;
-        result = pAdd(result, qq);
-        break;
-      }
-      pIter(p);
-    }
-  }
-}
-
-// orders monoms of poly using insertion sort, performs pSetm on each monom
-poly pOrdPolyInsertSetm(poly p)
-{
-  poly qq,result = NULL;
-
-#if 0
-  while (p != NULL)
-  {
-    qq = p;
-    pIter(p);
-    qq->next = NULL;
-    pSetm(qq);
-    result = pAdd(result,qq);
-    pTest(result);
-  }
-#else
-  while (p != NULL)
-  {
-    qq = p;
-    pIter(p);
-    qq->next = result;
-    result = qq;
-    pSetm(qq);
-  }
-  p = result;
-  result = NULL;
-  while (p != NULL)
-  {
-    qq = p;
-    pIter(p);
-    qq->next = NULL;
-    result = pAdd(result, qq);
-  }
-  pTest(result);
-#endif
-  return result;
-}
-
 /*2
 *returns a re-ordered copy of a polynomial, with permutation of the variables
@@ -1445 +1375 @@
 }
 
-#if 0
-/*2
-*returns a re-ordered copy of a polynomial, with permutation of the variables
-*/
-poly p_PermPoly (poly p, int * perm, ring oldRing,
-   int *par_perm, int OldPar, ring newRing)
-{
-  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)
-    {
-      qq = pInit();
-      number n=newRing->cf->nMap(pGetCoeff(p));
-      if ((newRing->minpoly!=NULL)
-      && ((rField_is_Zp_a(newRing)) || (rField_is_Q_a(newRing))))
-      {
-        newRing->cf->nNormalize(n);
-      }
-      pGetCoeff(qq)=n;
-    // coef may be zero:  pTest(qq);
-    }
-    else
-    {
-      qq=p_ISet(1, newRing);
-      aq=naPermNumber(pGetCoeff(p),par_perm,OldPar, oldRing);
-      if ((newRing->minpoly!=NULL)
-      && ((rField_is_Zp_a(newRing)) || (rField_is_Q_a(newRing))))
-      {
-        poly tmp=aq;
-        while (tmp!=NULL)
-        {
-          number n=pGetCoeff(tmp);
-          newRing->cf->nNormalize(n);
-          pGetCoeff(tmp)=n;
-          pIter(tmp);
-        }
-      }
-      //pTest(aq);
-    }
-    p_SetComp(qq, p_GetComp(p,oldRing), newRing);
-    if (newRing->cf->nIsZero(pGetCoeff(qq)))
-    {
-      p_DeleteLm(&qq, newRing);
-    }
-    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, newRing);
-          }
-          else if (perm[i]>0)
-            p_AddExp(qq,perm[i], e/*p_GetExp( p,i,oldRing)*/, newRing);
-          else if (perm[i]<0)
-          {
-            lnumber c=(lnumber)pGetCoeff(qq);
-            napAddExp(c->z,-perm[i],e/*p_GetExp( p,i,oldRing)*/);
-            mapped_to_par=1;
-          }
-          else
-          {
-            /* this variable maps to 0 !*/
-            p_DeleteLm(&qq, newRing);
-            break;
-          }
-        }
-      }
-      if (mapped_to_par
-      && (newRing->minpoly!=NULL))
-      {
-        number n=pGetCoeff(qq);
-        newRing->cf->nNormalize(n);
-        pGetCoeff(qq)=n;
-      }
-    }
-    pIter(p);
-    if (qq!=NULL)
-    {
-      p_Setm(qq, newRing);
-      //pTest(aq);
-      //pTest(qq);
-      if (aq!=NULL) qq=pMult(aq,qq);
-      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, newRing);
-    }
-  }
-  result=pOrdPolyMerge(result);
-  //pTest(result);
-  return result;
-}
-#endif
-
 poly ppJet(poly p, int m)
 {