Changeset 99bdcf in git

Timestamp:

Aug 3, 2010, 7:25:10 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

9053a74f3bbb046a786d061474c8bd82302c42c3

Parents:

11ca48d1c9122a424d601a3ee5e6544661d36ee2

Message:

pTotaldegree/p_Totaldegree

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

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/janet.cc (modified) (1 diff)
• doc/C-STYLEGUIDE (modified) (1 diff)
• kernel/clapsing.cc (modified) (1 diff)
• kernel/fast_maps.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (1 diff)
• kernel/kInline.cc (modified) (1 diff)
• kernel/khstd.cc (modified) (1 diff)
• kernel/longalg.cc (modified) (1 diff)
• kernel/pInline1.h (modified) (2 diffs)
• kernel/p_polys.cc (modified) (10 diffs)
• kernel/p_polys.h (modified) (2 diffs)
• kernel/polys.cc (modified) (1 diff)
• kernel/polys.h (modified) (2 diffs)
• kernel/polys1.cc (modified) (3 diffs)
• kernel/ring.cc (modified) (5 diffs)
• kernel/tgb_internal.h (modified) (1 diff)
• kernel/walkSupport.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -2456 +2456 @@
   pFDegProc deg;
   if (pLexOrder && (currRing->order[0]==ringorder_lp))
-    deg=pTotaldegree;
+    deg=p_Totaldegree;
    else
     deg=pFDeg;

Singular/janet.cc

@@ -955 +955 @@
   {
     degree_compatible=0;
-    jDeg=pTotaldegree;
+    jDeg=p_Totaldegree;
     ListGreatMove=ListGreatMoveOrder;
   }

doc/C-STYLEGUIDE

@@ -134 +134 @@
     if you really need C++ extensions, use "class".
   - "and"/"or"/"not" are not recognized by all compilers, use &&, &, ||, |, !
-  - TODO: What about namespaces!?
-
-  ? Classes - with starts capital letter (better no "C" at the beginning) 
-    and Camel style further (no "_")
-  ? member Methods - small letters with "_" 
-  ? member Variables - start with "m_" or "_" and Camel style further 

kernel/clapsing.cc

@@ -710 +710 @@
   pTest(f);
 #ifdef FACTORIZE2_DEBUG
-  printf("singclap_factorize, degree %d\n",pTotaldegree(f));
+  printf("singclap_factorize, degree %ld\n",pTotaldegree(f));
 #endif
   // with_exps: 3,1 return only true factors, no exponents

kernel/fast_maps.cc

@@ -673 +673 @@
   if(ggT!=NULL)
   {
-    int dq =pTotaldegree(fq_p,r);
+    int dq =p_Totaldegree(fq_p,r);
     if (dq!=0)
     {

kernel/ideals.cc

@@ -3158 +3158 @@
   pFDegProc d;
   if (pLexOrder && (currRing->order[0]==ringorder_lp))
-     d=pTotaldegree;
+     d=p_Totaldegree;
   else
      d=pFDeg;

kernel/kInline.cc

@@ -392 +392 @@
 KINLINE long sTObject::pTotalDeg() const
 {
-  if (p != NULL) return pTotaldegree(p, currRing);
-  return pTotaldegree(t_p,tailRing);
+  if (p != NULL) return p_Totaldegree(p, currRing);
+  return p_Totaldegree(t_p,tailRing);
 }
 KINLINE long sTObject::SetpFDeg()

kernel/khstd.cc

@@ -70 +70 @@
     // if weights for variables were given to std computations,
     // then pFDeg == degp == kHomModDeg (see kStd)
-    if ((degp!=kModDeg) && (degp!=kHomModDeg)) degp=pTotaldegree;
+    if ((degp!=kModDeg) && (degp!=kHomModDeg)) degp=p_Totaldegree;
     // degp = pWDegree;
     l = hilb->length()-1;

kernel/longalg.cc

@@ -178 +178 @@
 #define napComp(p,q)     p_LmCmp((poly)p,(poly)q, nacRing)
 #define napMultT(A,E)    A=(napoly)p_Mult_mm((poly)A,(poly)E,nacRing)
-#define napDeg(p)        (int)p_ExpVectorQuerSum(p, nacRing)
+#define napDeg(p)        (int)p_Totaldegree(p, nacRing)
 
 /*3

kernel/pInline1.h

@@ -290 +290 @@
 }
 
-PINLINE1 unsigned long p_ExpVectorQuerSum(poly p, const ring r)
+PINLINE1 long p_Totaldegree(poly p, const ring r)
 {
   p_LmCheckPolyRing1(p, r);
@@ -300 +300 @@
     s += p_GetTotalDegree(p->exp[r->VarL_Offset[i]], r);
   }
-  return s;
+  return (long)s;
 }
 

kernel/p_polys.cc

@@ -356 +356 @@
 {
   p_LmCheckPolyRing(p, r);
-  p->exp[r->pOrdIndex] = p_ExpVectorQuerSum(p, r);
+  p->exp[r->pOrdIndex] = p_Totaldegree(p, r);
 }
 
@@ -398 +398 @@
   assume(p_GetOrder(a, r) == pWTotaldegree(a, r));
   return p_GetOrder(a, r);
-}
-
-/*2
-* compute the degree of the leading monomial of p
-* with respect to weigths 1
-* (all are 1 so save multiplications or they are of different signs)
-* the ordering is not compatible with degree so do not use p->Order
-*/
-long pTotaldegree(poly p, const ring r)
-{
-  p_LmCheckPolyRing(p, r);
-  return (long)p_ExpVectorQuerSum(p, r);
 }
 
@@ -524 +512 @@
 long pWDegree(poly p, const ring r)
 {
-  if (r->firstwv==NULL) return pTotaldegree(p, r);
+  if (r->firstwv==NULL) return p_Totaldegree(p, r);
   p_LmCheckPolyRing(p, r);
   int i, k;
@@ -794 +782 @@
   long  t,max;
 
-  max=p_ExpVectorQuerSum(p, r);
+  max=p_Totaldegree(p, r);
   if (k > 0)
   {
     while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
     {
-      t=p_ExpVectorQuerSum(p, r);
+      t=p_Totaldegree(p, r);
       if (t>max) max=t;
       ll++;
@@ -808 +796 @@
     while ((p=pNext(p))!=NULL)
     {
-      t=p_ExpVectorQuerSum(p, r);
+      t=p_Totaldegree(p, r);
       if (t>max) max=t;
       ll++;
@@ -823 +811 @@
   long  t,max;
 
-  max=p_ExpVectorQuerSum(p, r);
+  max=p_Totaldegree(p, r);
   if (rIsSyzIndexRing(r))
   {
@@ -831 +819 @@
       if (p_GetComp(p, r)<=limit)
       {
-        if ((t=p_ExpVectorQuerSum(p, r))>max) max=t;
+        if ((t=p_Totaldegree(p, r))>max) max=t;
         ll++;
       }
@@ -841 +829 @@
     while ((p=pNext(p))!=NULL)
     {
-      if ((t=p_ExpVectorQuerSum(p, r))>max) max=t;
+      if ((t=p_Totaldegree(p, r))>max) max=t;
       ll++;
     }
@@ -894 +882 @@
       if (p_GetComp(p, r)<=limit)
       {
-        if ((t=p_ExpVectorQuerSum(p, r))>max) max=t;
+        if ((t=p_Totaldegree(p, r))>max) max=t;
         ll++;
       }
@@ -904 +892 @@
     while ((p=pNext(p))!=NULL)
     {
-      if ((t=p_ExpVectorQuerSum(p, r))>max) max=t;
+      if ((t=p_Totaldegree(p, r))>max) max=t;
       ll++;
     }

kernel/p_polys.h

@@ -130 +130 @@
 PINLINE1 BOOLEAN p_ExpVectorEqual(poly p1, poly p2, ring r);
 // returns sum of all exponents of p
-PINLINE1 unsigned long p_ExpVectorQuerSum(poly p, ring r);
+PINLINE1 long p_Totaldegree(poly p, ring r);
 
 PINLINE1 void p_GetExpV(poly p, int *ev, ring r);
@@ -378 +378 @@
 int  pWeight(int i, ring r);
 long pDeg(poly p, ring r);
-long pTotaldegree(poly p, ring r);
 long pWFirstTotalDegree(poly p, ring r);
 long pWTotaldegree(poly p, ring r);

kernel/polys.cc

@@ -312 +312 @@
   pFDegProc deg;
   if (pLexOrder && (currRing->order[0]==ringorder_lp))
-    deg=pTotaldegree;
+    deg=p_Totaldegree;
   else
     deg=pFDeg;

kernel/polys.h

@@ -120 +120 @@
 #define pExpVectorDiff(pr, p1, p2)  p_ExpVectorDiff(pr, p1, p2, currRing)
 #define pExpVectorEqual(p1, p2)     p_ExpVectorEqual(p1, p2, currRing)
-#define pExpVectorQuerSum(p)        p_ExpVectorQuerSum(p, currRing)
 
 // Gets a copy of (resp. set) the exponent vector, where e is assumed
@@ -291 +290 @@
 int  pWeight(int c, const ring r = currRing);
 long pDeg(poly p,const ring r = currRing);
-long pTotaldegree(poly p,const ring r = currRing);
+static inline long pTotaldegree(poly p) { return p_Totaldegree(p,currRing); }
 long pWTotaldegree(poly p,const ring r = currRing);
 long pWDegree(poly p,const ring r = currRing);

kernel/polys1.cc

@@ -1194 +1194 @@
   pFDegProc d;
   if (pLexOrder && (currRing->order[0]==ringorder_lp))
-    d=pTotaldegree;
+    d=p_Totaldegree;
   else 
     d=pFDeg;
@@ -1569 +1569 @@
   while (p!=NULL)
   {
-    if (pTotaldegree(p)<=m)
+    if (p_Totaldegree(p,currRing)<=m)
     {
       if (r==NULL)
@@ -1594 +1594 @@
   poly t=NULL;
 
-  while((p!=NULL) && (pTotaldegree(p)>m)) pLmDelete(&p);
+  while((p!=NULL) && (p_Totaldegree(p,currRing)>m)) pLmDelete(&p);
   if (p==NULL) return NULL;
   poly r=p;
   while (pNext(p)!=NULL)
   {
-    if (pTotaldegree(pNext(p))>m)
+    if (p_Totaldegree(pNext(p),currRing)>m)
     {
       pLmDelete(&pNext(p));

kernel/ring.cc

@@ -3217 +3217 @@
       r->pLDeg = pLDeg1c_Deg;
   }
-  else if (r->pFDeg == pTotaldegree)
+  else if (r->pFDeg == p_Totaldegree)
   {
     if (r->pLDeg == pLDeg1)
@@ -3251 +3251 @@
   r->MixedOrder = FALSE;
   r->ComponentOrder = 1;
-  r->pFDeg = pTotaldegree;
+  r->pFDeg = p_Totaldegree;
   r->pLDeg = (r->OrdSgn == 1 ? pLDegb : pLDeg0);
 
@@ -3276 +3276 @@
       r->LexOrder=TRUE;
       r->pLDeg = pLDeg1c;
-      r->pFDeg = pTotaldegree;
+      r->pFDeg = p_Totaldegree;
     }
     if ((order[0] == ringorder_a)
@@ -3305 +3305 @@
       r->LexOrder=TRUE;
       r->pLDeg = pLDeg1c;
-      r->pFDeg = pTotaldegree;
+      r->pFDeg = p_Totaldegree;
     }
     r->firstBlockEnds=block1[1];
@@ -3347 +3347 @@
       r->pLDeg = pLDeg1;
     }
-    r->pFDeg = pWTotaldegree; // may be improved: pTotaldegree for lp/dp/ls/.. blocks
+    r->pFDeg = pWTotaldegree; // may be improved: p_Totaldegree for lp/dp/ls/.. blocks
   }
   if (rOrd_is_Totaldegree_Ordering(r) || rOrd_is_WeightedDegree_Ordering(r))

kernel/tgb_internal.h

@@ -273 +273 @@
   {
       pTest(p);
-      //assume(pDeg(p,r)==::pTotaldegree(p,r));
-      assume(((unsigned long)::pTotaldegree(p,r))==p->exp[deg_pos]);
+      //assume(pDeg(p,r)==::p_Totaldegree(p,r));
+      assume(((unsigned long)::p_Totaldegree(p,r))==p->exp[deg_pos]);
       return p->exp[deg_pos];
       //return ::pTotaldegree(p,this->r);

kernel/walkSupport.cc

@@ -35 +35 @@
 {
   int res=0;
-  if(p!=NULL) res=pTotaldegree(p, currRing);
+  if(p!=NULL) res=pTotaldegree(p);
   return(res);
 }
@@ -59 +59 @@
     if ((I->m)[j]!=NULL)
     {
-      int temp=pTotaldegree((I->m)[j], currRing);
+      int temp=pTotaldegree((I->m)[j]);
       if(temp>res) {res=temp;}
     }