Changeset 3504d7 in git

Timestamp:

Nov 24, 2006, 2:44:38 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

1d138cc219f68b925aa7c15df754cc1eaf1da469

Parents:

0ef842f27dd9647ae9abc8375147f2c17ec4e0c8

Message:

*hannes: idMinEmbed and weights: opt.


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

File:

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

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.23 2006-11-24 09:53:01 Singular Exp $ */
+/* $Id: ideals.cc,v 1.24 2006-11-24 13:44:38 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -3485 +3485 @@
 static int idReadOutUnits(ideal arg,int* comp)
 {
-  if (idIs0(arg)) return -1;
+  assume(!idIs0(arg));
   int i=0,j, generator=-1;
   int rk_arg=arg->rank; //idRankFreeModule(arg);
@@ -3564 +3564 @@
 {
   if (idIs0(arg)) return idInit(1,arg->rank);
-  int next_gen,next_comp;
+  int i,next_gen,next_comp;
   ideal res=arg;
 
@@ -3570 +3570 @@
   res->rank=si_max(res->rank,idRankFreeModule(res));
 
+  intvec *wtmp=NULL;
   loop
   {
@@ -3578 +3579 @@
     if ((w !=NULL)&&(*w!=NULL))
     {
-      intvec *wtmp;
-      if ((*w)->length()==1)
-      {
-        wtmp=new intvec(1);
-        // (*wtmp)[0]=0;
-      }
-      else
-      {
-        wtmp=new intvec((*w)->length()-1);
-        int i;
-        for(i=0;i<next_comp-1;i++) (*wtmp)[i]=(**w)[i];
-        for(i=next_comp;i<(*w)->length();i++) (*wtmp)[i-1]=(**w)[i];
-      }
+      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))
+  {
+    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;