Changeset 74021a in git

Timestamp:

Nov 10, 2010, 5:52:40 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

cc336ab2c31ee68cf38ff3e276930dbbc62d1b69

Parents:

cd246b32ff1d71ef365e9ae2dd3c16bc4a01a36e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-11-10 17:52:40+01:00

git-committer:

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

Message:

p_TakeOutComp etc for syzygies

Location:

polys

Files:

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

polys/monomials/p_polys.cc

@@ -2707 +2707 @@
   return result;
 }
+
+poly p_TakeOutComp(poly * p, int k, const ring r)
+{
+  poly q = *p,qq=NULL,result = NULL;
+
+  if (q==NULL) return NULL;
+  BOOLEAN use_setmcomp=rOrd_SetCompRequiresSetm(r);
+  if (p_GetComp(q,r)==k)
+  {
+    result = q;
+    do
+    {
+      p_SetComp(q,0,r);
+      if (use_setmcomp) p_SetmComp(q,r);
+      qq = q;
+      pIter(q);
+    }
+    while ((q!=NULL) && (p_GetComp(q,r)==k));
+    *p = q;
+    pNext(qq) = NULL;
+  }
+  if (q==NULL) return result;
+  if (p_GetComp(q,r) > k)
+  {
+    p_SubComp(q,1,r);
+    if (use_setmcomp) p_SetmComp(q,r);
+  }
+  poly pNext_q;
+  while ((pNext_q=pNext(q))!=NULL)
+  {
+    if (p_GetComp(pNext_q,r)==k)
+    {
+      if (result==NULL)
+      {
+        result = pNext_q;
+        qq = result;
+      }
+      else
+      {
+        pNext(qq) = pNext_q;
+        pIter(qq);
+      }
+      pNext(q) = pNext(pNext_q);
+      pNext(qq) =NULL;
+      p_SetComp(qq,0,r);
+      if (use_setmcomp) p_SetmComp(qq,r);
+    }
+    else
+    {
+      /*pIter(q);*/ q=pNext_q;
+      if (p_GetComp(q,r) > k)
+      {
+        p_SubComp(q,1,r);
+        if (use_setmcomp) p_SetmComp(q,r);
+      }
+    }
+  }
+  return result;
+}
+
+// Splits *p into two polys: *q which consists of all monoms with
+// component == comp and *p of all other monoms *lq == pLength(*q)
+void p_TakeOutComp(poly *r_p, long comp, poly *r_q, int *lq, const ring r)
+{
+  spolyrec pp, qq;
+  poly p, q, p_prev;
+  int l = 0;
+
+#ifdef HAVE_ASSUME
+  int lp = pLength(*r_p);
+#endif
+
+  pNext(&pp) = *r_p;
+  p = *r_p;
+  p_prev = &pp;
+  q = &qq;
+
+  while(p != NULL)
+  {
+    while (p_GetComp(p,r) == comp)
+    {
+      pNext(q) = p;
+      pIter(q);
+      p_SetComp(p, 0,r);
+      p_SetmComp(p,r);
+      pIter(p);
+      l++;
+      if (p == NULL)
+      {
+        pNext(p_prev) = NULL;
+        goto Finish;
+      }
+    }
+    pNext(p_prev) = p;
+    p_prev = p;
+    pIter(p);
+  }
+
+  Finish:
+  pNext(q) = NULL;
+  *r_p = pNext(&pp);
+  *r_q = pNext(&qq);
+  *lq = l;
+#ifdef HAVE_ASSUME
+  assume(pLength(*r_p) + pLength(*r_q) == lp);
+#endif
+  p_Test(*r_p,r);
+  p_Test(*r_q,r);
+}
+
+void p_DecrOrdTakeOutComp(poly *r_p, long comp, long order,
+                         poly *r_q, int *lq, const ring r)
+{
+  spolyrec pp, qq;
+  poly p, q, p_prev;
+  int l = 0;
+
+  pNext(&pp) = *r_p;
+  p = *r_p;
+  p_prev = &pp;
+  q = &qq;
+
+#ifdef HAVE_ASSUME
+  if (p != NULL)
+  {
+    while (pNext(p) != NULL)
+    {
+      assume(p_GetOrder(p,r) >= p_GetOrder(pNext(p),r));
+      pIter(p);
+    }
+  }
+  p = *r_p;
+#endif
+
+  while (p != NULL && p_GetOrder(p,r) > order) pIter(p);
+
+  while(p != NULL && p_GetOrder(p,r) == order)
+  {
+    while (p_GetComp(p,r) == comp)
+    {
+      pNext(q) = p;
+      pIter(q);
+      pIter(p);
+      p_SetComp(p, 0,r);
+      p_SetmComp(p,r);
+      l++;
+      if (p == NULL || p_GetOrder(p,r) != order)
+      {
+        pNext(p_prev) = p;
+        goto Finish;
+      }
+    }
+    pNext(p_prev) = p;
+    p_prev = p;
+    pIter(p);
+  }
+
+  Finish:
+  pNext(q) = NULL;
+  *r_p = pNext(&pp);
+  *r_q = pNext(&qq);
+  *lq = l;
+}
+
+void p_DeleteComp(poly * p,int k, const ring r)
+{
+  poly q;
+
+  while ((*p!=NULL) && (p_GetComp(*p,r)==k)) p_LmDelete(p,r);
+  if (*p==NULL) return;
+  q = *p;
+  if (p_GetComp(q,r)>k)
+  {
+    p_SubComp(q,1,r);
+    p_SetmComp(q,r);
+  }
+  while (pNext(q)!=NULL)
+  {
+    if (p_GetComp(pNext(q),r)==k)
+      p_LmDelete(&(pNext(q)),r);
+    else
+    {
+      pIter(q);
+      if (p_GetComp(q,r)>k)
+      {
+        p_SubComp(q,1,r);
+        p_SetmComp(q,r);
+      }
+    }
+  }
+}
 /***************************************************************
  *

polys/monomials/p_polys.h

@@ -1785 +1785 @@
 void      p_VectorHasUnit(poly p, int * k, int * len, const ring r);
 poly      p_TakeOutComp1(poly * p, int k, const ring r);
+// Splits *p into two polys: *q which consists of all monoms with
+// component == comp and *p of all other monoms *lq == pLength(*q)
+// On return all components pf *q == 0
+void p_TakeOutComp(poly *p, long comp, poly *q, int *lq, const ring r);
+
+// Similar to pTakeOutComp, except that only those components are
+// taken out whose Order == order
+// ASSUME: monomial ordering is Order compatible, i.e., if m1, m2 Monoms then
+//         m1 >= m2 ==> pGetOrder(m1) >= pGetOrder(m2)
+void p_DecrOrdTakeOutComp(poly *r_p, long comp, long order,
+                         poly *r_q, int *lq, const ring r)
+
+// This is something weird -- Don't use it, unless you know what you are doing
+poly      p_TakeOutComp(poly * p, int k);
+
+void      p_DeleteComp(poly * p,int k, const ring r);
+
 #endif // P_POLYS_H
 

polys/polys.h

@@ -331 +331 @@
 // This is something weird -- Don't use it, unless you know what you are doing
 poly      pTakeOutComp(poly * p, int k);
+/* old spielwiese
+#define   pTakeOutComp(p,k,q,lq)    p_TakeOutComp(p,k,q,lq,currRing)
+
+// Similar to pTakeOutComp, except that only those components are
+// taken out whose Order == order
+// ASSUME: monomial ordering is Order compatible, i.e., if m1, m2 Monoms then
+//         m1 >= m2 ==> pGetOrder(m1) >= pGetOrder(m2)
+#define   pDecrOrdTakeOutComp(p,c,o,q,lq) p_DecrOrdTakeOutComp(p,c,o,q,lq,currRing)
+*/
 void      pSetPolyComp(poly p, int comp);
-void      pDeleteComp(poly * p,int k);
+#define   pDeleteComp(p,k) p_DeleteComp(p,k,currRing)
 void      pNorm(poly p);
 poly      pSubst(poly p, int n, poly e);