Changeset 67d4b5 in git

Timestamp:

Jul 20, 2011, 1:34:49 PM (12 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

9d4b8cd59b57658f59577acd8fb7501642b875a8

Parents:

64606013a8ec045f8331f1c67fea0078d7e5148b

git-author:

Burcin Erocal <burcin@erocal.org>2011-07-20 13:34:49+02:00

git-committer:

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

Message:

Convert kernel/kpolys.cc to use libpolys, some pGetComp calls remaining.

File:

• kernel/kpolys.cc (modified) (6 diffs)

kernel/kpolys.cc

@@ -8 +8 @@
          * LE(p2, j) != LE(lcm, j)   ==> LCM(p2, p) != lcm
 */
-BOOLEAN pCompareChain (poly p,poly p1,poly p2,poly lcm)
+BOOLEAN pCompareChain (poly p,poly p1,poly p2,poly lcm, const ring R = currRing)
 {
   int k, j;
@@ -14 +14 @@
   if (lcm==NULL) return FALSE;
 
-  for (j=(currRing->N); j; j--)
-    if ( pGetExp(p,j) >  pGetExp(lcm,j)) return FALSE;
+  for (j=(R->N); j; j--)
+    if ( p_GetExp(p,j, R) >  p_GetExp(lcm,j, R)) return FALSE;
   if ( pGetComp(p) !=  pGetComp(lcm)) return FALSE;
-  for (j=(currRing->N); j; j--)
+  for (j=(R->N); j; j--)
   {
-    if (pGetExp(p1,j)!=pGetExp(lcm,j))
+    if (p_GetExp(p1,j, R)!=p_GetExp(lcm,j, R))
     {
-      if (pGetExp(p,j)!=pGetExp(lcm,j))
+      if (p_GetExp(p,j, R)!=p_GetExp(lcm,j, R))
       {
-        for (k=(currRing->N); k>j; k--)
+        for (k=(R->N); k>j; k--)
         {
-          if ((pGetExp(p,k)!=pGetExp(lcm,k))
-          && (pGetExp(p2,k)!=pGetExp(lcm,k)))
+          if ((p_GetExp(p,k, R)!=p_GetExp(lcm,k, R))
+          && (p_GetExp(p2,k, R)!=p_GetExp(lcm,k, R)))
             return TRUE;
         }
         for (k=j-1; k; k--)
         {
-          if ((pGetExp(p,k)!=pGetExp(lcm,k))
-          && (pGetExp(p2,k)!=pGetExp(lcm,k)))
+          if ((p_GetExp(p,k, R)!=p_GetExp(lcm,k, R))
+          && (p_GetExp(p2,k, R)!=p_GetExp(lcm,k, R)))
             return TRUE;
         }
@@ -38 +38 @@
       }
     }
-    else if (pGetExp(p2,j)!=pGetExp(lcm,j))
+    else if (p_GetExp(p2,j, R)!=p_GetExp(lcm,j, R))
     {
-      if (pGetExp(p,j)!=pGetExp(lcm,j))
+      if (p_GetExp(p,j, R)!=p_GetExp(lcm,j, R))
       {
-        for (k=(currRing->N); k>j; k--)
+        for (k=(R->N); k>j; k--)
         {
-          if ((pGetExp(p,k)!=pGetExp(lcm,k))
-          && (pGetExp(p1,k)!=pGetExp(lcm,k)))
+          if ((p_GetExp(p,k, R)!=p_GetExp(lcm,k, R))
+          && (p_GetExp(p1,k, R)!=p_GetExp(lcm,k, R)))
             return TRUE;
         }
         for (k=j-1; k!=0 ; k--)
         {
-          if ((pGetExp(p,k)!=pGetExp(lcm,k))
-          && (pGetExp(p1,k)!=pGetExp(lcm,k)))
+          if ((p_GetExp(p,k, R)!=p_GetExp(lcm,k, R))
+          && (p_GetExp(p1,k, R)!=p_GetExp(lcm,k, R)))
             return TRUE;
         }
@@ -61 +61 @@
 }
 #ifdef HAVE_RATGRING
-BOOLEAN pCompareChainPart (poly p,poly p1,poly p2,poly lcm)
+BOOLEAN pCompareChainPart (poly p,poly p1,poly p2,poly lcm,
+                const ring R = currRing)
 {
   int k, j;
@@ -67 +68 @@
   if (lcm==NULL) return FALSE;
 
-  for (j=currRing->real_var_end; j>=currRing->real_var_start; j--)
-    if ( pGetExp(p,j) >  pGetExp(lcm,j)) return FALSE;
+  for (j=R->real_var_end; j>=R->real_var_start; j--)
+    if ( p_GetExp(p,j, R) >  p_GetExp(lcm,j, R)) return FALSE;
   if ( pGetComp(p) !=  pGetComp(lcm)) return FALSE;
-  for (j=currRing->real_var_end; j>=currRing->real_var_start; j--)
+  for (j=R->real_var_end; j>=R->real_var_start; j--)
   {
-    if (pGetExp(p1,j)!=pGetExp(lcm,j))
+    if (p_GetExp(p1,j, R)!=p_GetExp(lcm,j, R))
     {
-      if (pGetExp(p,j)!=pGetExp(lcm,j))
+      if (p_GetExp(p,j, R)!=p_GetExp(lcm,j, R))
       {
-        for (k=(currRing->N); k>j; k--)
-        for (k=currRing->real_var_end; k>j; k--)
+        for (k=(R->N); k>j; k--)
+        for (k=R->real_var_end; k>j; k--)
         {
-          if ((pGetExp(p,k)!=pGetExp(lcm,k))
-          && (pGetExp(p2,k)!=pGetExp(lcm,k)))
+          if ((p_GetExp(p,k, R)!=p_GetExp(lcm,k, R))
+          && (p_GetExp(p2,k, R)!=p_GetExp(lcm,k, R)))
             return TRUE;
         }
-        for (k=j-1; k>=currRing->real_var_start; k--)
+        for (k=j-1; k>=R->real_var_start; k--)
         {
-          if ((pGetExp(p,k)!=pGetExp(lcm,k))
-          && (pGetExp(p2,k)!=pGetExp(lcm,k)))
+          if ((p_GetExp(p,k, R)!=p_GetExp(lcm,k, R))
+          && (p_GetExp(p2,k, R)!=p_GetExp(lcm,k, R)))
             return TRUE;
         }
@@ -92 +93 @@
       }
     }
-    else if (pGetExp(p2,j)!=pGetExp(lcm,j))
+    else if (p_GetExp(p2,j, R)!=p_GetExp(lcm,j, R))
     {
-      if (pGetExp(p,j)!=pGetExp(lcm,j))
+      if (p_GetExp(p,j, R)!=p_GetExp(lcm,j, R))
       {
-        for (k=currRing->real_var_end; k>j; k--)
+        for (k=R->real_var_end; k>j; k--)
         {
-          if ((pGetExp(p,k)!=pGetExp(lcm,k))
-          && (pGetExp(p1,k)!=pGetExp(lcm,k)))
+          if ((p_GetExp(p,k, R)!=p_GetExp(lcm,k, R))
+          && (p_GetExp(p1,k, R)!=p_GetExp(lcm,k, R)))
             return TRUE;
         }
-        for (k=j-1; k>=currRing->real_var_start; k--)
+        for (k=j-1; k>=R->real_var_start; k--)
         {
-          if ((pGetExp(p,k)!=pGetExp(lcm,k))
-          && (pGetExp(p1,k)!=pGetExp(lcm,k)))
+          if ((p_GetExp(p,k, R)!=p_GetExp(lcm,k, R))
+          && (p_GetExp(p1,k, R)!=p_GetExp(lcm,k, R)))
             return TRUE;
         }