Changeset 1dc0f49 in git

Timestamp:

May 31, 2018, 4:30:44 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

7312369f3415a88e192b1196dbe81096e7eb9072

Parents:

1e468c8d0783ef37e36459cb18d23a428c67173c

Message:

add: p_Vec2Poly to get i-th component of a vector

Files:

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

Singular/iparith.cc

@@ -1469 +1469 @@
 static BOOLEAN jjINDEX_V(leftv res, leftv u, leftv v)
 {
-  poly p=(poly)u->CopyD(VECTOR_CMD);
-  poly r=p; // pointer to the beginning of component i
-  poly o=NULL;
+  poly p=(poly)u->Data();
   int i=(int)(long)v->Data();
-  while (p!=NULL)
-  {
-    if (pGetComp(p)!=i)
-    {
-      if (r==p) r=pNext(p);
-      if (o!=NULL)
-      {
-        if (pNext(o)!=NULL) pLmDelete(&pNext(o));
-        p=pNext(o);
-      }
-      else
-        pLmDelete(&p);
-    }
-    else
-    {
-      pSetComp(p, 0);
-      p_SetmComp(p, currRing);
-      o=p;
-      p=pNext(o);
-    }
-  }
-  res->data=(char *)r;
+  res->data=(char *)p_Vec2Poly(p,i,currRing);
   return FALSE;
 }

libpolys/polys/monomials/p_polys.cc

@@ -3547 +3547 @@
 }
 
+poly p_Vec2Poly(poly v, int k, const ring r)
+{
+  poly h;
+  poly res=NULL;
+
+  while (v!=NULL)
+  {
+    if (__p_GetComp(v,r)==k)
+    {
+      h=p_Head(v,r);
+      p_SetComp(h,0,r);
+      pNext(h)=res;res=h;
+    }
+    pIter(v);
+  }
+  if (res!=NULL) res=pReverse(res);
+  return res;
+}
+
 /// julia: vector to already allocated array (len=p_MaxComp(v,r))
 void  p_Vec2Array(poly v, poly *p, int len, const ring r)

libpolys/polys/monomials/p_polys.h

@@ -97 +97 @@
 
 void  p_Vec2Polys(poly v, poly**p, int *len, const ring r);
+poly  p_Vec2Poly(poly v, int k, const ring r);
 
 /// julia: vector to already allocated array (len=p_MaxComp(v,r))