Changeset 4c852a in git

Timestamp:

May 9, 2000, 4:34:11 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

87a8156a442b896f42878bb29b9c2a183cd30a18

Parents:

72c1b94aa91b5685f167d11c0420e61bbe7253e5

Message:

*hannes: optimizations


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

File:

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

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.93 2000-03-07 15:49:13 Singular Exp $ */
+/* $Id: ideals.cc,v 1.94 2000-05-09 14:34:11 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -388 +388 @@
 static int pComp_RevLex(poly a, poly b,BOOLEAN nolex)
 {
- if (nolex) return pComp0(a,b);
- int l=pVariables;
- while ((l>0) && (pGetExp(a,l)==pGetExp(b,l))) l--;
- if (l==0)
- {
-   if (pGetComp(a)==pGetComp(b)) return 0;
-   if (pGetComp(a)>pGetComp(b)) return 1;
- }
- else if (pGetExp(a,l)>pGetExp(b,l))
-   return 1;
- return -1;
+  if (b==NULL) return 1;
+  if (a==NULL) return -1;
+
+  if (nolex) return pComp0(a,b);
+  int l=pVariables;
+  while ((l>0) && (pGetExp(a,l)==pGetExp(b,l))) l--;
+  if (l==0)
+  {
+    if (pGetComp(a)==pGetComp(b)) return 0;
+    if (pGetComp(a)>pGetComp(b)) return 1;
+  }
+  else if (pGetExp(a,l)>pGetExp(b,l))
+    return 1;
+  return -1;
 }
 
@@ -434 +437 @@
         notFound = FALSE;
       }
-      while ((newpos>=0) && (newpos<actpos) && (notFound))
+      //while ((newpos>=0) && (newpos<actpos) && (notFound))
+      while (notFound && (newpos>=0) && (newpos<actpos))
       {
         newcomp = pComp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex);
@@ -1688 +1692 @@
         pSetComp(p,1+j+k);
         pSetmComp(p);
-        p = pNeg(p);
+        p = pNeg(p);
       }
     }
@@ -2431 +2435 @@
   {
     ideal result=idCopy(id);
-    for (i=1;i<IDELEMS(result);i++)
-    {
-      if (result->m[i]!=NULL)
-      {
-        for (j=0;j<i;j++)
+    //if (IDELEMS(result) < 1)
+    {
+      for (i=1;i<IDELEMS(result);i++)
+      {
+        if (result->m[i]!=NULL)
         {
-          if ((result->m[j]!=NULL)
-          && (pComparePolys(result->m[i],result->m[j])))
+          for (j=0;j<i;j++)
           {
-            pDelete(&(result->m[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;