Changeset 07b3e1 in git for kernel/ideals.cc

Timestamp:

Nov 27, 2006, 1:55:57 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

cd8ee422bc0a3224af995a6be9e3b136c80507cc

Parents:

1d138cc219f68b925aa7c15df754cc1eaf1da469

Message:

*hannes: bug fix


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

File:

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

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.25 2006-11-24 15:54:54 Singular Exp $ */
+/* $Id: ideals.cc,v 1.26 2006-11-27 12:55:57 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -3570 +3570 @@
   res->rank=si_max(res->rank,idRankFreeModule(res));
 
-  intvec *wtmp=NULL;
+  int del=0;
   loop
   {
     next_gen = idReadOutUnits(res,&next_comp);
     if (next_gen<0) break;
+    del++;
     syGaussForOne(res,next_gen,next_comp,0,IDELEMS(res));
     idDeleteComp(res,next_comp);
     if ((w !=NULL)&&(*w!=NULL))
     {
-      if (wtmp==NULL)
-      {
-        if ((*w)->length()==1)
-        {
-          wtmp=new intvec(1);
-          // (*wtmp)[0]=0;
-        }
-        else
-        {
-          wtmp=new intvec((*w)->length()-1);
-          for(i=0;i<wtmp->length();i++) (*wtmp)[i]=(**w)[i];
-        }
-      }
-      for(i=next_comp;i<(*w)->length();i++) (*wtmp)[i-1]=(*wtmp)[i];
-    }
-  }
-  if ((w !=NULL)&&(*w!=NULL)&&(wtmp!=NULL))
-  {
+      for(i=next_comp;i<(*w)->length();i++) (**w)[i-1]=(**w)[i];
+    }
+  }
+  if ((w !=NULL)&&(*w!=NULL) &&(del>0))
+  {
+    intvec *wtmp=new intvec((*w)->length()-del);
+    for(i=0;i<res->rank;i++) (*wtmp)[i]=(**w)[i];
     delete *w;
     *w=wtmp;
-    if (wtmp->length()>1)
-    { 
-      wtmp=new intvec(res->rank);
-      for(i=0;i<res->rank;i++) (*wtmp)[i]=(**w)[i];
-      delete *w;
-      *w=wtmp;
-    }
   }
   idSkipZeroes(res);