Changeset 1ca2af in git for kernel

Timestamp:

Sep 9, 2016, 3:32:25 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

43fbe81b86fe54b355223a6f9816365e92f73b93551a9120fd6fbba9a370f8ea17855840e2bafafd

Parents:

dd930e594c1cd299f2e2b78fe5444de64aede28a

Message:

use p_Compare

Location:

kernel

Files:

• ideals.cc (modified) (2 diffs)
• ideals.h (modified) (1 diff)

kernel/ideals.cc

@@ -2541 +2541 @@
 }
 
-/*
-* compare the leading terms of a and b
-*/
-static int tCompare(const poly a, const poly b)
-{
-  if (b == NULL) return(a != NULL);
-  if (a == NULL) return(-1);
-
-  /* a != NULL && b != NULL */
-  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);
-}
-
-/*
-* compare a and b (rev-lex on terms)
-*/
-static int pCompare(const poly a, const poly b)
-{
-  int r = tCompare(a, b);
-  if (r != 0) return(r);
-
-  poly aa = a;
-  poly bb = b;
-  while (r == 0 && aa != NULL && bb != NULL)
-  {
-    pIter(aa);
-    pIter(bb);
-    r = tCompare(aa, bb);
-  }
-  return(r);
-}
-
 typedef struct
 {
@@ -2585 +2549 @@
 int pCompare_qsort(const void *a, const void *b)
 {
-  int res = pCompare(((poly_sort *)a)->p, ((poly_sort *)b)->p);
+  int res = p_Compare(((poly_sort *)a)->p, ((poly_sort *)b)->p,currRing);
   return(res);
 }

kernel/ideals.h

@@ -187 +187 @@
 ideal id_TensorModuleMult(const int m, const ideal M, const ring rRing); // image of certain map for BGG
 
-
 #endif