Changeset dc32d42 in git for Singular/ideals.cc

Timestamp:

May 21, 1997, 3:05:36 PM (27 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2b3f238c740deb3d586dc1d5b379ddadb848cbaa

Parents:

670667a17a4a8423dbd6c8e3749cc652102fb28a

Message:

Merged fixes from 1-0 branch


git-svn-id: file:///usr/local/Singular/svn/trunk@311 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ideals.cc (modified) (3 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.6 1997-05-02 15:10:13 Singular Exp $ */
+/* $Id: ideals.cc,v 1.7 1997-05-21 13:05:12 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2920 +2920 @@
   if (idIs0(arg)) return idInit(1,arg->rank);
 
-  int i,j,k=0,pC;
+  int i,j,k,pC;
   poly p,q;
   int rg=arg->rank;
-  ideal res = idInit(IDELEMS(arg),rg);
+  ideal res = idCopy(arg);
   intvec *indexMap=new intvec(rg+1);
   intvec *toKill=new intvec(rg+1);
 
-  for (i=indexMap->length()-1;i>0;i--)
-    (*indexMap)[i] = i;
-  for (j=IDELEMS(arg)-1;j>=0;j--)
-  {
-    if (arg->m[j]!=NULL)
-    {
-      if ((pIsConstantComp(arg->m[j])) && (pNext(arg->m[j])==NULL))
-      {
-        pC = pGetComp(arg->m[j]);
+  loop
+  {
+    k = 0;
+    for (i=indexMap->length()-1;i>0;i--)
+    {
+      (*indexMap)[i] = i;
+      (*toKill)[i] = 0;
+    }
+    for (j=IDELEMS(res)-1;j>=0;j--)
+    {
+      if ((res->m[j]!=NULL) && (pIsConstantComp(res->m[j])) && 
+           (pNext(res->m[j])==NULL))
+      {
+        pC = pGetComp(res->m[j]);
         if ((*toKill)[pC]==0)
         {
@@ -2943 +2948 @@
             (*indexMap)[i]--;
         }
-      }
-      else
-      {
-        res->m[k] = pCopy(arg->m[j]);
+        pDelete(&(res->m[j]));
         k++;
       }
     }
-  }
-  if (rg>0)
-  {
-    res->rank=rg;
-    for (j=IDELEMS(res)-1;j>=0;j--)
-    {
-      while ((res->m[j]!=NULL) && ((*toKill)[pGetComp(res->m[j])]==1))
-        pDelete1(&res->m[j]);
-      p = res->m[j];
-      while ((p!=NULL) && (pNext(p)!=NULL))
-      {
-        pSetComp(p,(*indexMap)[pGetComp(p)]);
-        while ((pNext(p)!=NULL) && ((*toKill)[pGetComp(pNext(p))]==1))
-          pDelete1(&pNext(p));
-        pIter(p);
-      }
-      if (p!=NULL) pSetComp(p,(*indexMap)[pGetComp(p)]);
-    }
     idSkipZeroes(res);
-  }
-  else
-  {
-    idDelete(&res);
-    res=idFreeModule(1);
+    if (k==0) break;
+    if (rg>0)
+    {
+      res->rank=rg;
+      for (j=IDELEMS(res)-1;j>=0;j--)
+      {
+        while ((res->m[j]!=NULL) && ((*toKill)[pGetComp(res->m[j])]==1))
+          pDelete1(&res->m[j]);
+        p = res->m[j];
+        while ((p!=NULL) && (pNext(p)!=NULL))
+        {
+          pSetComp(p,(*indexMap)[pGetComp(p)]);
+          while ((pNext(p)!=NULL) && ((*toKill)[pGetComp(pNext(p))]==1))
+            pDelete1(&pNext(p));
+          pIter(p);
+        }
+        if (p!=NULL) pSetComp(p,(*indexMap)[pGetComp(p)]);
+      }
+      idSkipZeroes(res);
+    }
+    else
+    {
+      idDelete(&res);
+      res=idFreeModule(1);
+      break;
+    }
   }
   delete toKill;