Changeset 7ac29f in git for kernel/ideals.cc

Timestamp:

Jan 24, 2007, 11:00:55 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b6ca8ae4fabb1c109fc245bbb05828e092dec7cf

Parents:

b830620f6c1ad152684c50f2ff60c291a91f7054

Message:

*hannes: simplify


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

File:

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

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.36 2007-01-23 19:00:39 Singular Exp $ */
+/* $Id: ideals.cc,v 1.37 2007-01-24 10:00:55 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -221 +221 @@
 void idDelEquals(ideal id)
 {
-  int i, j, t;
-  int k = IDELEMS(id), l = k;
-  for (i=k-1; i>=0; i--)
-  {
-    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]);
+  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)
+        && (pEqualPolys(id->m[i], id->m[j])))
+        {
+          pDelete(&id->m[j]);
+        }
       }
     }
@@ -242 +244 @@
 void idDelLmEquals(ideal id)
 {
-  int i, j, t;
-  int k = IDELEMS(id), l = k;
-  for (i=k-1; i>=0; i--)
+  int i, j;
+  int k = IDELEMS(id)-1;
+  for (i=k; i>=0; i--)
   {
     if (id->m[i] != NULL)
     {
-      for (j=l-1; j>=0; j--)
-      {
-        if ((i!=j)
-        && (id->m[j] != NULL)
+      for (j=k; j>i; j--)
+      {
+        if ((id->m[j] != NULL)
         && pLmEqual(id->m[i], id->m[j]))
         {
@@ -263 +264 @@
 void idDelDiv(ideal id)
 {
-  int i, j, t;
-  int k = IDELEMS(id), l = k;
-  for (i=k-1; i>=0; i--)
+  int i, j;
+  int k = IDELEMS(id)-1;
+  for (i=k; i>=0; i--)
   {
     if (id->m[i] != NULL)
     {
-      for (j=k-1; j>=0; j--)
-      {
-        if ((i!=j)
-        && (id->m[j]!=NULL)
-        && pDivisibleBy(id->m[i], id->m[j]))
+      for (j=k; j>i; j--)
+      {
+        if (id->m[j]!=NULL)
         {
-          pDelete(&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]);
+            break;
+          }
         }
       }