Changeset a13807a in git for Singular

Timestamp:

Sep 15, 2022, 3:17:58 PM (19 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

579253660d6640785b2a43171e9c80480929e4df

Parents:

2229707f741b0ae4fd0a2f393ff9931d9d1cf9cc

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-09-15 15:17:58+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-09-15 15:20:08+02:00

Message:

add: lDeleletIV

Location:

Singular

Files:

• lists.cc (modified) (3 diffs)
• lists.h (modified) (1 diff)

Singular/lists.cc

@@ -34 +34 @@
   lists N=(lists)omAlloc0Bin(slists_bin);
   int n=L->nr;
-  if (L->nr>=0)
+  if (n>=0)
     N->Init(n+1);
   else
@@ -172 +172 @@
     l->Init(EndIndex+(VIndex>EndIndex));
 
-    for(i=j=0;i<=EndIndex;i++,j++)
-    {
-      if (i!=VIndex)
-      {
-        l->m[j]=ul->m[i];
-        memset(&ul->m[i],0,sizeof(ul->m[i]));
-      }
-      else
-      {
-        j--;
-        ul->m[i].CleanUp();
-      }
+    ul->m[VIndex].CleanUp();
+    for(i=0;i<VIndex;i++)
+    {
+      l->m[i]=ul->m[i];
+    }
+    for(i=VIndex+1;i<=ul->nr;i++)
+    {
+      l->m[i-1]=ul->m[i];
     }
     omFreeSize((ADDRESS)ul->m,(ul->nr+1)*sizeof(sleftv));
@@ -192 +188 @@
   Werror("wrong index %d in list(%d)",VIndex+1,ul->nr+1);
   return TRUE;
+}
+
+BOOLEAN lDeleteIV(leftv res, leftv u, leftv v)
+{
+  lists ul=(lists)u->CopyD();
+  intvec* vl=(intvec*)v->Data();
+  int i,j,cnt;
+  cnt=0;
+  for(i=vl->length()-1;i>=0;i--)
+  {
+    j=(*vl)[i];
+    if ((j>0)&&(j<=ul->nr))
+    {
+      cnt++;
+      ul->m[j-1].CleanUp();
+      memcpy(&(ul->m[j-1]),&(ul->m[j]),(ul->nr-j+1)*sizeof(sleftv));
+      ul->m[ul->nr].rtyp=DEF_CMD;
+      ul->m[ul->nr].data=NULL;
+    }
+  }
+  if ((cnt*2>=ul->nr)||(cnt*sizeof(sleftv)>=1024))
+  {
+    ul->m=(leftv)omReallocSize(ul->m,(ul->nr+1)*sizeof(sleftv),(ul->nr-cnt+1)*sizeof(sleftv));
+    ul->nr -= cnt;
+  }
+  res->data = (char *)ul;
+  return FALSE;
 }
 

Singular/lists.h

@@ -56 +56 @@
 BOOLEAN lAppend(leftv res, leftv u, leftv v);
 BOOLEAN lDelete(leftv res, leftv u, leftv v);
+BOOLEAN lDeleteIV(leftv res, leftv u, leftv v);
 BOOLEAN lAdd(leftv res, leftv u, leftv v);
 BOOLEAN lRingDependend(lists L);