Changeset 959263 in git

Timestamp:

Jul 6, 2010, 1:56:10 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

83bde7677e30b29c0175c6ded6bfb22ed67a40ec

Parents:

92080408874be46b8fb117a4d03d6a4bc4f8d921

Message:

removed pIncrComp,pDecrComp

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

Location:

kernel

Files:

• ideals.cc (modified) (1 diff)
• pInline2.h (modified) (1 diff)
• p_polys.h (modified) (1 diff)
• polys.cc (modified) (4 diffs)
• polys.h (modified) (1 diff)

kernel/ideals.cc

@@ -961 +961 @@
     if ((pGetComp(qp1)+i > 0) || ((j == -i) && (j == k)))
     {
-      pSetComp(qp1,pGetComp(qp1)+i);
+      pAddComp(qp1,i);
       pSetmComp(qp1);
       qp2 = qp1;

kernel/pInline2.h

@@ -77 +77 @@
   return c;
 }
-PINLINE2 unsigned long p_IncrComp(poly p, ring r)
-{
-  p_LmCheckPolyRing2(p, r);
-  pAssume2(rRing_has_Comp(r));
-  return ++(__p_GetComp(p,r));
-}
-PINLINE2 unsigned long p_DecrComp(poly p, ring r)
-{
-  p_LmCheckPolyRing2(p, r);
-  pAssume2(rRing_has_Comp(r));
-  pPolyAssume2(__p_GetComp(p,r) > 0,p,r);
-  return --(__p_GetComp(p,r));
-}
 PINLINE2 unsigned long p_AddComp(poly p, unsigned long v, ring r)
 {

kernel/p_polys.h

@@ -72 +72 @@
 #define p_GetComp(p, r)     _p_GetComp(p, r)
 PINLINE2 unsigned long p_SetComp(poly p, unsigned long c, ring r);
-PINLINE2 unsigned long p_IncrComp(poly p, ring r);
-PINLINE2 unsigned long p_DecrComp(poly p, ring r);
 PINLINE2 unsigned long p_AddComp(poly p, unsigned long v, ring r);
 PINLINE2 unsigned long p_SubComp(poly p, unsigned long v, ring r);

kernel/polys.cc

@@ -494 +494 @@
   if (pGetComp(q) > k)
   {
-    pDecrComp(q);
+    pSubComp(q,1);
     if (use_setmcomp) pSetmComp(q);
   }
@@ -522 +522 @@
       if (pGetComp(q) > k)
       {
-        pDecrComp(q);
+        pSubComp(q,1);
         if (use_setmcomp) pSetmComp(q);
       }
@@ -696 +696 @@
   if (pGetComp(q)>k)
   {
-    pDecrComp(q);
+    pSubComp(q,1);
     pSetmComp(q);
   }
@@ -708 +708 @@
       if (pGetComp(q)>k)
       {
-        pDecrComp(q);
+        pSubComp(q,1);
         pSetmComp(q);
       }

kernel/polys.h

@@ -63 +63 @@
 #define pGetComp(p)         _p_GetComp(p, currRing)
 #define pSetComp(p,v)       p_SetComp(p,v, currRing)
-#define pIncrComp(p)        p_IncrComp(p,currRing)
-#define pDecrComp(p)        p_DecrComp(p,currRing)
 #define pAddComp(p,v)       p_AddComp(p,v,currRing)
 #define pSubComp(p,v)       p_SubComp(p,v,currRing)