Changeset 91a72f in git

Timestamp:

Apr 13, 2011, 3:35:36 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

2e4757cb3bb4e3e260951de51923af15aff13d29

Parents:

2e7dee867c4d33510424b140e95164e94fb8ef8b

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-13 15:35:36+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:12:31+01:00

Message:

fix intvec *id_Sort(ideal id,BOOLEAN nolex, const ring r)

Location:

libpolys/polys

Files:

• simpleideals.cc (modified) (7 diffs)
• simpleideals.h (modified) (2 diffs)

libpolys/polys/simpleideals.cc

@@ -403 +403 @@
 
 #ifdef PDEBUG
-void idDBTest(ideal h1, int level, const char *f,const int l)
+void id_DBTest(ideal h1, int level, const char *f,const int l, const ring r)
 {
   int i;
@@ -414 +414 @@
     /* to be able to test matrices: */
     for (i=(h1->ncols*h1->nrows)-1; i>=0; i--)
-      _p_Test(h1->m[i], currRing, level);
-    int new_rk=idRankFreeModule(h1);
+      _p_Test(h1->m[i], r, level);
+    int new_rk=id_RankFreeModule(h1,r);
     if(new_rk > h1->rank)
     {
@@ -437 +437 @@
   if (nolex)
   {
-    int r=pLmCmp(a,b);
+    int r=p_LmCmp(a,b,r);
     if (r!=0) return r;
-    number h=nSub(pGetCoeff(a),pGetCoeff(b));
-    r = -1+nIsZero(h)+2*nGreaterZero(h); /* -1: <, 0:==, 1: > */
-    nDelete(&h);
+    number h=n_Sub(pGetCoeff(a),pGetCoeff(b),r->cf);
+    r = -1+n_IsZero(h,r->cf)+2*n_GreaterZero(h,r->cf); /* -1: <, 0:==, 1: > */
+    n_Delete(&h, r->cf);
     return r;
   }
   int l=rVar(r);
-  while ((l>0) && (pGetExp(a,l)==pGetExp(b,l))) l--;
+  while ((l>0) && (p_GetExp(a,l,r)==pGetExp(b,l,r))) l--;
   if (l==0)
   {
-    if (pGetComp(a)==pGetComp(b))
-    {
-      number h=nSub(pGetCoeff(a),pGetCoeff(b));
-      int r = -1+nIsZero(h)+2*nGreaterZero(h); /* -1: <, 0:==, 1: > */
-      nDelete(&h);
+    if (p_GetComp(a,r)==p_GetComp(b,r))
+    {
+      number h=n_Sub(pGetCoeff(a),pGetCoeff(b),r->cf);
+      int r = -1+n_IsZero(h,r->cf)+2*n_GreaterZero(h,r->cf); /* -1: <, 0:==, 1: > */
+      n_Delete(&h,r->cf);
       return r;
     }
-    if (pGetComp(a)>pGetComp(b)) return 1;
-  }
-  else if (pGetExp(a,l)>pGetExp(b,l))
+    if (p_GetComp(a,r)>p_GetComp(b,r)) return 1;
+  }
+  else if (p_GetExp(a,l,r)>p_GetExp(b,l,r))
     return 1;
   return -1;
@@ -466 +466 @@
 *uses lex-ordering when nolex = FALSE
 */
-intvec *idSort(ideal id,BOOLEAN nolex)
+intvec *id_Sort(ideal id,BOOLEAN nolex, const ring r)
 {
   poly p,q;
@@ -482 +482 @@
       diff = (actpos+1) / 2;
       diff = (diff+1) / 2;
-      lastcomp = pComp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex);
+      lastcomp = p_Comp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex,r);
       if (lastcomp<0)
       {
@@ -498 +498 @@
       while (notFound && (newpos>=0) && (newpos<actpos))
       {
-        newcomp = pComp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex);
+        newcomp = p_Comp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex,r);
         olddiff = diff;
         if (diff>1)
@@ -545 +545 @@
       if (newpos<0) newpos = 0;
       if (newpos>actpos) newpos = actpos;
-      while ((newpos<actpos) && (pComp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex)==0))
+      while ((newpos<actpos) && (p_Comp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex,r)==0))
         newpos++;
       for (j=actpos;j>newpos;j--)

libpolys/polys/simpleideals.h

@@ -71 +71 @@
 #endif
 
-ideal id_Copy (ideal h1,const ring r);
 #ifdef PDEBUG
 ideal id_DBCopy(ideal h1,const char *f,int l, const ring r);
 #define id_Copy(A,R) id_DBCopy(A,__FILE__,__LINE__,R)
+#else
+ideal id_Copy (ideal h1,const ring r);
 #endif
   /*adds two ideals without simplifying the result*/
@@ -99 +100 @@
 void id_DelDiv(ideal id, const ring r);
 BOOLEAN id_IsConstant(ideal id, const ring r);
+intvec *id_Sort(ideal id,BOOLEAN nolex, const ring r);
 
 #endif