Changeset 10ea45f in git for kernel/ideals.cc

Timestamp:

Jan 10, 2007, 6:17:27 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ba3e3ef698fa0b7c5867199959cc83330073d3cb')

Children:

fdd5604bedc8353dc8e4d0431a01159bbb48053b

Parents:

97208806ca1fe3113b822ea4faecba0684b69601

Message:

*hannes: idCompatify changed


git-svn-id: file:///usr/local/Singular/svn/trunk@9679 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.30 2007-01-10 10:42:00 Singular Exp $ */
+/* $Id: ideals.cc,v 1.31 2007-01-10 17:17:27 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -523 +523 @@
 {
   ideal result = idSimpleAdd(h1,h2);
-  ideal tmp = idCompactify(result);
-
-  idDelete(&result);
+  idCompactify(result);
   return tmp;
 }
@@ -567 +565 @@
   }
   {
-    ideal tmp = idCompactify(hh);
-    idDelete(&hh);
-    return tmp;
-    //return hh;
+    idCompactify(hh);
+    return hh;
   }
 }
@@ -2571 +2567 @@
 *skips all zeroes and double elements, searches also for units
 */
-ideal idCompactify(ideal id)
+void idCompactify(ideal id)
 {
   int i,j;
@@ -2584 +2580 @@
   if (b)
   {
-    ideal result=idInit(1,id->rank);
-    result->m[0]=pOne();
-    return result;
+    for(i=IDELEMS(id)-1;i>=0;i--) pDelete(&id->m[i]);
+    id->m[0]=pOne();
   }
   else
   {
-    ideal result=idCopy(id);
-    //if (IDELEMS(result) < 1)
-    {
-      for (i=1;i<IDELEMS(result);i++)
-      {
-        if (result->m[i]!=NULL)
-        {
-          for (j=0;j<i;j++)
-          {
-            if ((result->m[j]!=NULL)
-            && (pComparePolys(result->m[i],result->m[j])))
-            {
-              pDelete(&(result->m[j]));
-            }
-          }
-        }
-      }
-    }
-//    else
-//    {
-//      intvec *v=idSort(result,TRUE);
-//      for(i=0;i<IDELEMS(result);i++)
-//        (*v)[i]--;
-//      for (i=0;i<IDELEMS(result)-1;i++)
-//      {
-//        if (((*v)[i]>=0)
-//        && (result->m[(*v)[i]]!=NULL))
-//        {
-//          j=i+1;
-//          while ((j<IDELEMS(result))
-//          && ((*v)[j]>=0)
-//          && (result->m[(*v)[j]]!=NULL)
-//          && (pComparePolys(result->m[(*v)[i]],result->m[(*v)[j]])))
-//          {
-//            pDelete(&(result->m[(*v)[j]]));
-//            j++;
-//          }
-//        }
-//      }
-//      delete v;
-//    }
-    idSkipZeroes(result);
-    return result;
+    idDelMultiples(id);
+    idSkipZeroes(id);
   }
 }