Changeset 699567 in git for kernel/ideals.cc

Timestamp:

Jan 23, 2007, 8:00:39 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

aa64d1c4ff9ddcd00665c3dacabbc270080c66da

Parents:

804d684c0c2adffa869264248e5f91ceac4b2508

Message:

*hannes: simplify


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

File:

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

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.35 2007-01-18 13:22:14 Singular Exp $ */
+/* $Id: ideals.cc,v 1.36 2007-01-23 19:00:39 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -182 +182 @@
 void idNorm(ideal id)
 {
-  for (int i=IDELEMS(id)-1; i>-0; i--)
+  for (int i=IDELEMS(id)-1; i>=0; i--)
   {
     if (id->m[i] != NULL)
@@ -196 +196 @@
 */
 void idDelMultiples(ideal id)
+{
+  int i, j;
+  int k = IDELEMS(id)-1;
+  for (i=k; i>=0; i--)
+  {
+    if (id->m[i]!=NULL)
+    {
+      for (j=k; j>i; j--)
+      {
+        if ((id->m[j]!=NULL)
+        && (pComparePolys(id->m[i], id->m[j])))
+        {
+          pDelete(&id->m[j]);
+        }
+      }
+    }
+  }
+}
+
+/*2
+* ideal id = (id[i])
+* if id[i] = id[j] then id[j] is deleted for j > i
+*/
+void idDelEquals(ideal id)
 {
   int i, j, t;
@@ -201 +225 @@
   for (i=k-1; i>=0; i--)
   {
-    if (id->m[i]!=NULL)
-    {
-      for (j=k-1; j>i; j--)
-      {
-        if (id->m[j]!=NULL)
-        {
-          if(pComparePolys(id->m[i], id->m[j]))
-          {
-            pDelete(&id->m[j]);
-          }
-        }
-      }
-    }
-  }
-}
-
-/*2
-* ideal id = (id[i])
-* if id[i] = id[j] then id[j] is deleted for j > i
-*/
-void idDelEquals(ideal id)
-{
-  int i, j, t;
-  int k = IDELEMS(id), l = k;
-  for (i=k-1; i>=0; i--)
-  {
-    if (id->m[i]!=NULL)
-    {
-      for (j=k-1; j>i; j--)
-      {
-        if ((id->m[j]!=NULL)
-        && (pEqualPolys(id->m[i], id->m[j])))
-        {
-          pDelete(&id->m[j]);
-        }
+    for (j=k-1; j>i; j--)
+    {
+      if ((i!=j)
+      && (id->m[i]!=NULL) && (id->m[j]!=NULL)
+      && (pEqualPolys(id->m[i], id->m[j])))
+      {
+        pDelete(&id->m[j]);
       }
     }
@@ -247 +243 @@
 {
   int i, j, t;
-  int k = IDELEMS(id);
+  int k = IDELEMS(id), l = k;
   for (i=k-1; i>=0; i--)
   {
     if (id->m[i] != NULL)
     {
-      for (j=k-1; j>i; j--)
-      {
-        if ((id->m[j] != NULL)
+      for (j=l-1; j>=0; j--)
+      {
+        if ((i!=j)
+        && (id->m[j] != NULL)
         && pLmEqual(id->m[i], id->m[j]))
         {
@@ -272 +269 @@
     if (id->m[i] != NULL)
     {
-      for (j=k-1; j>i; j--)
-      {
-        if (id->m[j]!=NULL)
+      for (j=k-1; j>=0; j--)
+      {
+        if ((i!=j)
+        && (id->m[j]!=NULL)
+        && pDivisibleBy(id->m[i], id->m[j]))
         {
-          if(pDivisibleBy(id->m[i], id->m[j]))
-          {
-            pDelete(&id->m[j]);
-          }
-          else if(pDivisibleBy(id->m[j], id->m[i]))
-          {
-            pDelete(&id->m[i]);
-          }
+          pDelete(&id->m[j]);
         }
       }