Changeset 2e4757c in git

Timestamp:

Apr 13, 2011, 3:39:30 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

ee33a7ced725d6bd7bcfb344c937981897a8a06a

Parents:

91a72fa06f22b35afc357574afa7c13204ff616e

git-author:

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

git-committer:

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

Message:

syntax fix

File:

• libpolys/polys/simpleideals.cc (modified) (2 diffs)

libpolys/polys/simpleideals.cc

@@ -430 +430 @@
 * for idSort: compare a and b revlex inclusive module comp.
 */
-static int p_Comp_RevLex(poly a, poly b,BOOLEAN nolex, const ring r)
+static int p_Comp_RevLex(poly a, poly b,BOOLEAN nolex, const ring R)
 {
   if (b==NULL) return 1;
@@ -437 +437 @@
   if (nolex)
   {
-    int r=p_LmCmp(a,b,r);
+    int r=p_LmCmp(a,b,R);
     if (r!=0) return r;
-    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);
+    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) && (p_GetExp(a,l,r)==pGetExp(b,l,r))) l--;
+  int l=rVar(R);
+  while ((l>0) && (p_GetExp(a,l,R)==p_GetExp(b,l,R))) l--;
   if (l==0)
   {
-    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);
+    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 (p_GetComp(a,r)>p_GetComp(b,r)) return 1;
-  }
-  else if (p_GetExp(a,l,r)>p_GetExp(b,l,r))
+    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;