Changeset dd693a in git

Timestamp:

Apr 20, 2011, 5:53:00 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

13366d2378411800abb16557d58c0777dd923739

Parents:

9765f3b4f33f8fae7a5ca4ed7831d01d8ca37a06

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-20 17:53:00+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:21+01:00

Message:

fix p_TakeOutComp
add p_Vec2Polys

Location:

libpolys/polys

Files:

• kbuckets.cc (modified) (3 diffs)
• monomials/p_polys.cc (modified) (1 diff)
• monomials/p_polys.h (modified) (1 diff)

libpolys/polys/kbuckets.cc

@@ -1012 +1012 @@
 // Hmm... for now I'm too lazy to implement those independent of currRing
 // But better declare it extern than including polys.h
-extern void pTakeOutComp(poly *p, long comp, poly *q, int *lq);
+extern void p_TakeOutComp(poly *p, long comp, poly *q, int *lq, const ring r);
 
 void kBucketTakeOutComp(kBucket_pt bucket,
@@ -1028 +1028 @@
     {
       MULTIPLY_BUCKET(bucket,i);
-      pTakeOutComp(&(bucket->buckets[i]), comp, &q, &lq);
+      p_TakeOutComp(&(bucket->buckets[i]), comp, &q, &lq, bucket->bucket_ring);
       if (q != NULL)
       {
@@ -1040 +1040 @@
   kBucketAdjustBucketsUsed(bucket);
 #else
-  pTakeOutComp(&(bucket->p), comp, &p, &lp);
+  p_TakeOutComp(&(bucket->p), comp, &p, &lp,bucket->bucket_ring);
   (bucket->l) -= lp;
 #endif

libpolys/polys/monomials/p_polys.cc

@@ -2848 +2848 @@
   }
 }
+
+/*2
+* convert a vector to a set of polys,
+* allocates the polyset, (entries 0..(*len)-1)
+* the vector will not be changed
+*/
+void  p_Vec2Polys(poly v, poly* *p, int *len, const ring r)
+{
+  poly h;
+  int k;
+
+  *len=p_MaxComp(v,r);
+  if (*len==0) *len=1;
+  *p=(poly*)omAlloc0((*len)*sizeof(poly));
+  while (v!=NULL)
+  {
+    h=p_Head(v,r);
+    k=p_GetComp(h,r);
+    p_SetComp(h,0,r);
+    (*p)[k-1]=p_Add_q((*p)[k-1],h,r);
+    pIter(v);
+  }
+}
+
 /* -------------------------------------------------------- */
 /*2

libpolys/polys/monomials/p_polys.h

@@ -108 +108 @@
 poly      p_NSet(number n, const ring r);
 
-/// TODO: the following procedure got lost... and is not defined anywhere!
 void  p_Vec2Polys(poly v, poly**p, int *len, const ring r);