Changeset aa7c1c2 in git for Singular/iparith.cc

Timestamp:

Jun 14, 2018, 1:08:24 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8c73fdea988c87d699605750b3180fa69edf5d10

Parents:

a718906498691a0860e186cfee5db4fc1142ccd6db48f3ea705fcb451c2ea640a2b72f643bae2f22

Message:

Merge branch 'spielwiese' into letterplace_kernel_multiplication

File:

• Singular/iparith.cc (modified) (2 diffs)

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;
 }
@@ -6267 +6244 @@
   }
   return FALSE;
+}
+static BOOLEAN jjSUBST_Bu(leftv res, leftv u, leftv v,leftv w)
+{
+  // generic conversion from polyBucket to poly:
+  // force this to be the first try everytime
+  poly p; int l;
+  sBucket_pt bu=(sBucket_pt)w->CopyD();
+  sBucketDestroyAdd(bu,&p,&l);
+  sleftv tmpw;
+  tmpw.Init();
+  tmpw.rtyp=POLY_CMD;
+  tmpw.data=p;
+  return iiExprArith3(res, iiOp, u, v, &tmpw);
 }
 static BOOLEAN jjSUBST_P(leftv res, leftv u, leftv v,leftv w)