Changeset 955025 in git

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

b2c236a6179ecdae1034b600ce9d1490f7eca0f9

Parents:

1eaa1dc3ce472107c471d84ea116e5ad1fede744

Message:

*hannes: idMinEmbedding optimized


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

File:

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

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.26 2006-11-27 12:55:57 Singular Exp $ */
+/* $Id: ideals.cc,v 1.27 2006-11-27 13:44:44 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -3535 +3535 @@
 }
 
+#if 0
 static void idDeleteComp(ideal arg,int red_comp)
 {
@@ -3555 +3556 @@
   }
   (arg->rank)--;
+}
+#endif
+
+static void idDeleteComps(ideal arg,int* red_comp,int del)
+// red_comp is an array [0..args->rank]
+{
+  int i,j;
+  poly p;
+
+  for (i=IDELEMS(arg)-1;i>=0;i--)
+  {
+    p = arg->m[i];
+    while (p!=NULL)
+    {
+      j = pGetComp(p);
+      if (red_comp[j]!=j)
+      {
+        pSetComp(p,red_comp[j]);
+        pSetmComp(p);
+      }
+      pIter(p);
+    }
+  }
+  (arg->rank) -= del;
 }
 
@@ -3569 +3594 @@
   if (!inPlace) res = idCopy(arg);
   res->rank=si_max(res->rank,idRankFreeModule(res));
+  int *red_comp=(int*)omAlloc((res->rank+1)*sizeof(int));
+  for (i=res->rank;i>=0;i--) red_comp[i]=i;
 
   int del=0;
@@ -3577 +3604 @@
     del++;
     syGaussForOne(res,next_gen,next_comp,0,IDELEMS(res));
-    idDeleteComp(res,next_comp);
+    for(i=next_comp+1;i<=arg->rank;i++) red_comp[i]--;
     if ((w !=NULL)&&(*w!=NULL))
     {
@@ -3583 +3610 @@
     }
   }
+
+  idDeleteComps(res,red_comp,del);
+  idSkipZeroes(res);
+  omFree(red_comp);
+
   if ((w !=NULL)&&(*w!=NULL) &&(del>0))
   {
@@ -3590 +3622 @@
     *w=wtmp;
   }
-  idSkipZeroes(res);
   return res;
 }