Changeset b5d4d1 in git

Timestamp:

Jun 10, 2009, 5:34:50 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

351764983bd71ea77010993df1b11657f12eda1d

Parents:

f3f82b18075080a5de27a36d453e93e4980b08d0

Message:

*hannesd: code cleanup


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

File:

• kernel/p_polys.cc (modified) (17 diffs)

kernel/p_polys.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_polys.cc,v 1.16 2009-06-04 08:32:59 Singular Exp $
+ *  Version: $Id: p_polys.cc,v 1.17 2009-06-10 15:34:50 Singular Exp $
  *******************************************************************/
 
@@ -89 +89 @@
           int64 ei,wi,ai;
           for(int i=a;i<=e;i++)
-          {
+          {
             //Print("exp %d w %d \n",p_GetExp(p,i,r),(int)w[i-a]);
             //ord+=((int64)p_GetExp(p,i,r))*w[i-a];
@@ -96 +96 @@
             ai=ei*wi;
             if(ei!=0 && ai/ei!=wi)
-            {
+            {
               pSetm_error=TRUE;
-              #if SIZEOF_LONG == 4
+              #if SIZEOF_LONG == 4
               Print("ai %lld, wi %lld\n",ai,wi);
-              #else
+              #else
               Print("ai %ld, wi %ld\n",ai,wi);
-              #endif
+              #endif
             }
             ord+=ai;
             if (ord<ai)
-            {
+            {
               pSetm_error=TRUE;
-              #if SIZEOF_LONG == 4
+              #if SIZEOF_LONG == 4
               Print("ai %lld, ord %lld\n",ai,ord);
-              #else
+              #else
               Print("ai %ld, ord %ld\n",ai,ord);
-              #endif
+              #endif
             }
           }
@@ -237 +237 @@
 /* -------------------------------------------------------------------*/
 /* several possibilities for pFDeg: the degree of the head term       */
-/*2
-* compute the degree of the leading monomial of p
-* the ordering is compatible with degree, use a->order
-*/
-inline long _pDeg(poly a, const ring r)
+
+/* comptible with ordering */
+long pDeg(poly a, const ring r)
 {
   p_LmCheckPolyRing(a, r);
   assume(p_GetOrder(a, r) == pWTotaldegree(a, r));
   return p_GetOrder(a, r);
-}
-
-long pDeg(poly a, const ring r)
-{
-  return _pDeg(a, r);
 }
 
@@ -259 +252 @@
 * the ordering is not compatible with degree so do not use p->Order
 */
-inline long _pTotaldegree(poly p, const ring r)
+long pTotaldegree(poly p, const ring r)
 {
   p_LmCheckPolyRing(p, r);
   return (long) p_ExpVectorQuerSum(p, r);
-}
-long pTotaldegree(poly p, const ring r)
-{
-  return (long) _pTotaldegree(p, r);
 }
 
@@ -585 +574 @@
   long  t,max;
 
-  max=_pDeg(p, r);
+  max=p_GetOrder(p, r);
   if (k > 0)
   {
     while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
     {
-      t=_pDeg(p, r);
+      t=p_GetOrder(p, r);
       if (t>max) max=t;
       ll++;
@@ -599 +588 @@
     while ((p=pNext(p))!=NULL)
     {
-      t=_pDeg(p, r);
+      t=p_GetOrder(p, r);
       if (t>max) max=t;
       ll++;
@@ -615 +604 @@
   long  t,max;
 
-  max=_pDeg(p, r);
+  max=p_GetOrder(p, r);
   if (rIsSyzIndexRing(r))
   {
@@ -623 +612 @@
       if (p_GetComp(p, r)<=limit)
       {
-        if ((t=_pDeg(p, r))>max) max=t;
+        if ((t=p_GetOrder(p, r))>max) max=t;
         ll++;
       }
@@ -633 +622 @@
     while ((p=pNext(p))!=NULL)
     {
-      if ((t=_pDeg(p, r))>max) max=t;
+      if ((t=p_GetOrder(p, r))>max) max=t;
       ll++;
     }
@@ -649 +638 @@
   long  t,max;
 
-  max=_pTotaldegree(p, r);
+  max=p_ExpVectorQuerSum(p, r);
   if (k > 0)
   {
     while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
     {
-      t=_pTotaldegree(p, r);
+      t=p_ExpVectorQuerSum(p, r);
       if (t>max) max=t;
       ll++;
@@ -663 +652 @@
     while ((p=pNext(p))!=NULL)
     {
-      t=_pTotaldegree(p, r);
+      t=p_ExpVectorQuerSum(p, r);
       if (t>max) max=t;
       ll++;
@@ -678 +667 @@
   long  t,max;
 
-  max=_pTotaldegree(p, r);
+  max=p_ExpVectorQuerSum(p, r);
   if (rIsSyzIndexRing(r))
   {
@@ -686 +675 @@
       if (p_GetComp(p, r)<=limit)
       {
-        if ((t=_pTotaldegree(p, r))>max) max=t;
+        if ((t=p_ExpVectorQuerSum(p, r))>max) max=t;
         ll++;
       }
@@ -696 +685 @@
     while ((p=pNext(p))!=NULL)
     {
-      if ((t=_pTotaldegree(p, r))>max) max=t;
+      if ((t=p_ExpVectorQuerSum(p, r))>max) max=t;
       ll++;
     }
@@ -749 +738 @@
       if (p_GetComp(p, r)<=limit)
       {
-        if ((t=_pTotaldegree(p, r))>max) max=t;
+        if ((t=p_ExpVectorQuerSum(p, r))>max) max=t;
         ll++;
       }
@@ -759 +748 @@
     while ((p=pNext(p))!=NULL)
     {
-      if ((t=_pTotaldegree(p, r))>max) max=t;
+      if ((t=p_ExpVectorQuerSum(p, r))>max) max=t;
       ll++;
     }