Changeset 19ae652 in git for polys

Timestamp:

Aug 3, 2010, 7:37:49 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

95d8df55a21531eb094a8fef44b9cea7d414e633

Parents:

686d0c90b76fecd3c9f122c4ec9f911b250d96b8

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-08-03 19:37:49+02:00

git-committer:

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

Message:

p_WTotaldegree, p_WFirstTotalDegree

Location:

polys/monomials

Files:

• p_polys.cc (modified) (9 diffs)
• p_polys.h (modified) (1 diff)
• ring.cc (modified) (4 diffs)

polys/monomials/p_polys.cc

@@ -383 +383 @@
 {
   p_LmCheckPolyRing(p, r);
-  p->exp[r->pOrdIndex] = pWFirstTotalDegree(p, r);
+  p->exp[r->pOrdIndex] = p_WFirstTotalDegree(p, r);
 }
 
@@ -416 +416 @@
 {
   p_LmCheckPolyRing(a, r);
+  assume(p_GetOrder(a, r) == p_WTotaldegree(a, r));
   return p_GetOrder(a, r);
 }
 
-// pWTotalDegree for weighted orderings
+// p_WTotalDegree for weighted orderings
 // whose first block covers all variables
-static inline long _pWFirstTotalDegree(poly p, const ring r)
+long p_WFirstTotalDegree(poly p, const ring r)
 {
   int i;
@@ -431 +432 @@
   }
   return sum;
-}
-
-long pWFirstTotalDegree(poly p, const ring r)
-{
-  return (long) _pWFirstTotalDegree(p, r);
 }
 
@@ -443 +439 @@
 * the ordering is not compatible with degree so do not use p->Order
 */
-long pWTotaldegree(poly p, const ring r)
+long p_WTotaldegree(poly p, const ring r)
 {
   p_LmCheckPolyRing(p, r);
@@ -512 +508 @@
 #ifndef NDEBUG
       default:
-        Print("missing order %d in pWTotaldegree\n",r->order[i]);
+        Print("missing order %d in p_WTotaldegree\n",r->order[i]);
         break;
 #endif
@@ -856 +852 @@
 }
 
-// like pLDeg1, only pFDeg == pWFirstTotalDegree
+// like pLDeg1, only pFDeg == p_WFirstTotalDegree
 long pLDeg1_WFirstTotalDegree(poly p,int *l, const ring r)
 {
@@ -864 +860 @@
   long  t,max;
 
-  max=_pWFirstTotalDegree(p, r);
+  max=p_WFirstTotalDegree(p, r);
   if (k > 0)
   {
     while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
     {
-      t=_pWFirstTotalDegree(p, r);
+      t=p_WFirstTotalDegree(p, r);
       if (t>max) max=t;
       ll++;
@@ -878 +874 @@
     while ((p=pNext(p))!=NULL)
     {
-      t=_pWFirstTotalDegree(p, r);
+      t=p_WFirstTotalDegree(p, r);
       if (t>max) max=t;
       ll++;
@@ -893 +889 @@
   long  t,max;
 
-  max=_pWFirstTotalDegree(p, r);
+  max=p_WFirstTotalDegree(p, r);
   if (rIsSyzIndexRing(r))
   {

polys/monomials/p_polys.h

@@ -378 +378 @@
 int  pWeight(int i, ring r);
 long pDeg(poly p, ring r);
-long pWFirstTotalDegree(poly p, ring r);
-long pWTotaldegree(poly p, ring r);
+long p_WFirstTotalDegree(poly p, ring r);
+long p_WTotaldegree(poly p, const ring r);
 long pWDegree(poly p, ring r);
 long pLDeg0(poly p,int *l, ring r);

polys/monomials/ring.cc

@@ -2899 +2899 @@
     res->firstwv = r->firstwv;
     res->firstBlockEnds = r->firstBlockEnds;
-    res->pFDeg = res->pFDegOrig = pWFirstTotalDegree;
+    res->pFDeg = res->pFDegOrig = p_WFirstTotalDegree;
   }
   if (omitted_degree)
@@ -3265 +3265 @@
       r->pLDeg = pLDeg1c_Totaldegree;
   }
-  else if (r->pFDeg == pWFirstTotalDegree)
+  else if (r->pFDeg == p_WFirstTotalDegree)
   {
     if (r->pLDeg == pLDeg1)
@@ -3324 +3324 @@
     || (order[0] == ringorder_ws)
     || (order[0] == ringorder_Ws))
-      r->pFDeg = pWFirstTotalDegree;
+      r->pFDeg = p_WFirstTotalDegree;
     r->firstBlockEnds=block1[0];
     r->firstwv = wvhdl[0];
@@ -3355 +3355 @@
     || (order[1] == ringorder_ws)
     || (order[1] == ringorder_Ws))
-      r->pFDeg = pWFirstTotalDegree;
+      r->pFDeg = p_WFirstTotalDegree;
   }
   /*------- more than one block ----------------------*/