Changeset 8421b8 in git

Timestamp:

Nov 24, 2006, 10:53:01 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

3705d5c995e721d82fb6dad60d586e998ed821ca

Parents:

33c36dbf5e1e3c1f88f492f3ff653ecb9f38a11c

Message:

*hannes: idReadOutUnits: memory leak fixed, optimized


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

File:

• kernel/ideals.cc (modified) (4 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.22 2006-11-17 17:58:10 Singular Exp $ */
+/* $Id: ideals.cc,v 1.23 2006-11-24 09:53:01 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -3486 +3486 @@
 {
   if (idIs0(arg)) return -1;
-  int i=0,j,rk_arg=idRankFreeModule(arg),generator=-1;
-  intvec * componentIsUsed =new intvec(rk_arg+1);
+  int i=0,j, generator=-1;
+  int rk_arg=arg->rank; //idRankFreeModule(arg);
+  int * componentIsUsed =(int *)omAlloc((rk_arg+1)*sizeof(int));
   poly p,q;
 
-  while ((i<IDELEMS(arg)) && (generator<0))
-  {
-    for (j=rk_arg;j>=0;j--)
-      (*componentIsUsed)[j]=0;
+  while ((generator<0) && (i<IDELEMS(arg)))
+  {
+    memset(componentIsUsed,0,(rk_arg+1)*sizeof(int));
     p = arg->m[i];
     while (p!=NULL)
     {
       j = pGetComp(p);
-      if ((*componentIsUsed)[j]==0)
+      if (componentIsUsed[j]==0)
       {
         if (pLmIsConstantComp(p))
         {
           generator = i;
-          (*componentIsUsed)[j] = 1;
+          componentIsUsed[j] = 1;
         }
         else
         {
-          (*componentIsUsed)[j] = -1;
+          componentIsUsed[j] = -1;
         }
       }
-      else if ((*componentIsUsed)[j]>0)
-      {
-        ((*componentIsUsed)[j])++;
+      else if (componentIsUsed[j]>0)
+      {
+        (componentIsUsed[j])++;
       }
       pIter(p);
@@ -3522 +3522 @@
   for (j=0;j<=rk_arg;j++)
   {
-    if ((*componentIsUsed)[j]>0)
-    {
-      if ((*comp==-1) || ((*componentIsUsed)[j]<i))
+    if (componentIsUsed[j]>0)
+    {
+      if ((*comp==-1) || (componentIsUsed[j]<i))
       {
         *comp = j;
-        i= (*componentIsUsed)[j];
-      }
-    }
-  }
+        i= componentIsUsed[j];
+      }
+    }
+  }
+  omFree(componentIsUsed);
   return generator;
 }
@@ -3567 +3568 @@
 
   if (!inPlace) res = idCopy(arg);
+  res->rank=si_max(res->rank,idRankFreeModule(res));
+
   loop
   {