Changeset 99bdcf in git for kernel/p_polys.cc

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

9053a74f3bbb046a786d061474c8bd82302c42c3

Parents:

11ca48d1c9122a424d601a3ee5e6544661d36ee2

Message:

pTotaldegree/p_Totaldegree

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

File:

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

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++;
     }