Changeset 99bdcf in git for kernel/p_polys.cc
 Timestamp:
 Aug 3, 2010, 7:25:10 PM (13 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
 Children:
 9053a74f3bbb046a786d061474c8bd82302c42c3
 Parents:
 11ca48d1c9122a424d601a3ee5e6544661d36ee2
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

kernel/p_polys.cc
r11ca48 r99bdcf 356 356 { 357 357 p_LmCheckPolyRing(p, r); 358 p>exp[r>pOrdIndex] = p_ ExpVectorQuerSum(p, r);358 p>exp[r>pOrdIndex] = p_Totaldegree(p, r); 359 359 } 360 360 … … 398 398 assume(p_GetOrder(a, r) == pWTotaldegree(a, r)); 399 399 return p_GetOrder(a, r); 400 }401 402 /*2403 * compute the degree of the leading monomial of p404 * with respect to weigths 1405 * (all are 1 so save multiplications or they are of different signs)406 * the ordering is not compatible with degree so do not use p>Order407 */408 long pTotaldegree(poly p, const ring r)409 {410 p_LmCheckPolyRing(p, r);411 return (long)p_ExpVectorQuerSum(p, r);412 400 } 413 401 … … 524 512 long pWDegree(poly p, const ring r) 525 513 { 526 if (r>firstwv==NULL) return p Totaldegree(p, r);514 if (r>firstwv==NULL) return p_Totaldegree(p, r); 527 515 p_LmCheckPolyRing(p, r); 528 516 int i, k; … … 794 782 long t,max; 795 783 796 max=p_ ExpVectorQuerSum(p, r);784 max=p_Totaldegree(p, r); 797 785 if (k > 0) 798 786 { 799 787 while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k)) 800 788 { 801 t=p_ ExpVectorQuerSum(p, r);789 t=p_Totaldegree(p, r); 802 790 if (t>max) max=t; 803 791 ll++; … … 808 796 while ((p=pNext(p))!=NULL) 809 797 { 810 t=p_ ExpVectorQuerSum(p, r);798 t=p_Totaldegree(p, r); 811 799 if (t>max) max=t; 812 800 ll++; … … 823 811 long t,max; 824 812 825 max=p_ ExpVectorQuerSum(p, r);813 max=p_Totaldegree(p, r); 826 814 if (rIsSyzIndexRing(r)) 827 815 { … … 831 819 if (p_GetComp(p, r)<=limit) 832 820 { 833 if ((t=p_ ExpVectorQuerSum(p, r))>max) max=t;821 if ((t=p_Totaldegree(p, r))>max) max=t; 834 822 ll++; 835 823 } … … 841 829 while ((p=pNext(p))!=NULL) 842 830 { 843 if ((t=p_ ExpVectorQuerSum(p, r))>max) max=t;831 if ((t=p_Totaldegree(p, r))>max) max=t; 844 832 ll++; 845 833 } … … 894 882 if (p_GetComp(p, r)<=limit) 895 883 { 896 if ((t=p_ ExpVectorQuerSum(p, r))>max) max=t;884 if ((t=p_Totaldegree(p, r))>max) max=t; 897 885 ll++; 898 886 } … … 904 892 while ((p=pNext(p))!=NULL) 905 893 { 906 if ((t=p_ ExpVectorQuerSum(p, r))>max) max=t;894 if ((t=p_Totaldegree(p, r))>max) max=t; 907 895 ll++; 908 896 }
Note: See TracChangeset
for help on using the changeset viewer.