Changeset 2c872b in git

Timestamp:

Oct 11, 2010, 12:20:08 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

aea40759739b334553cb320189732f1de02b87cd

Parents:

0b6a83add40d1bd5dc62559eddd3e9d6b4586af6

Message:

improve sortvec/idSort

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

File:

• kernel/ideals.cc (modified) (1 diff)

kernel/ideals.cc

@@ -413 +413 @@
   if (a==NULL) return -1;
 
-  if (nolex) return pLmCmp(a,b);
+  if (nolex) 
+  {
+    int r=pLmCmp(a,b);
+    if (r!=0) return r;
+    number h=nSub(pGetCoeff(a),pGetCoeff(b));
+    r = -1+nIsZero(h)+2*nGreaterZero(h); /* -1: <, 0:==, 1: > */
+    nDelete(&h);
+    return r;
+  }
   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))
+    {
+      int r;
+      number h=nSub(pGetCoeff(a),pGetCoeff(b));
+      r = -1+nIsZero(h)+2*nGreaterZero(h); /* -1: <, 0:==, 1: > */
+      nDelete(&h);
+      return r;
+    }
     if (pGetComp(a)>pGetComp(b)) return 1;
   }