Changeset b50590 in git
 Timestamp:
 Aug 3, 2011, 2:54:34 PM (12 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
 Children:
 f5a3a23a65b47ad6cd71830252c8a914980e436f
 Parents:
 0a175571d14442df414738e8fca26cdc4adb8dc6
 gitauthor:
 Oleksandr Motsak <motsak@mathematik.unikl.de>20110803 14:54:34+02:00
 gitcommitter:
 Mohamed Barakat <mohamed.barakat@rwthaachen.de>20111109 13:01:23+01:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

kernel/syz.cc
r0a1755 rb50590 52 52 if (arg>m[imaxxx]!=NULL) 53 53 { 54 (*w1)[i] = p FDeg(arg>m[imaxxx],currRing);54 (*w1)[i] = p_FDeg(arg>m[imaxxx],currRing); 55 55 if (pGetComp(arg>m[imaxxx])!=0) 56 56 { … … 120 120 * in the module below*/ 121 121 searchUnit = TRUE; 122 int curr_syz_limit = rGetCurrSyzLimit( );122 int curr_syz_limit = rGetCurrSyzLimit(currRing); 123 123 while (searchUnit) 124 124 { … … 478 478 if (j<IDELEMS(res[0])) 479 479 { 480 if (p FDeg(res[0]>m[j],currRing)!=pTotaldegree(res[0]>m[j]))480 if (p_FDeg(res[0]>m[j],currRing)!=pTotaldegree(res[0]>m[j])) 481 481 setRegularity = FALSE; 482 482 } … … 556 556 //PrintLn(); 557 557 int max_comp = id_RankFreeModule(res[syzIndex],currRing); 558 k = max_comp  rGetCurrSyzLimit( );558 k = max_comp  rGetCurrSyzLimit(currRing); 559 559 assume(w != NULL); 560 560 if (w != NULL) … … 567 567 if (res[syzIndex1]>m[i]!=NULL) // hs 568 568 { 569 (*w)[i + rGetCurrSyzLimit( )] = pFDeg(res[syzIndex1]>m[i],currRing);569 (*w)[i + rGetCurrSyzLimit(currRing)] = p_FDeg(res[syzIndex1]>m[i],currRing); 570 570 if (pGetComp(res[syzIndex1]>m[i])>0) 571 (*w)[i + rGetCurrSyzLimit( )]571 (*w)[i + rGetCurrSyzLimit(currRing)] 572 572 += (*w)[pGetComp(res[syzIndex1]>m[i])1]; 573 (*((*weights)[syzIndex]))[i] = (*w)[i+rGetCurrSyzLimit( )];573 (*((*weights)[syzIndex]))[i] = (*w)[i+rGetCurrSyzLimit(currRing)]; 574 574 } 575 575 } … … 577 577 { 578 578 if (res[syzIndex]>m[ik]!=NULL) 579 (*w)[i+rGetCurrSyzLimit( )] = pFDeg(res[syzIndex]>m[ik],currRing)579 (*w)[i+rGetCurrSyzLimit(currRing)] = p_FDeg(res[syzIndex]>m[ik],currRing) 580 580 +(*w)[pGetComp(res[syzIndex]>m[ik])1]; 581 581 } … … 746 746 if (homog) 747 747 { 748 if (index==0) k = p FDeg(temp>m[j],currRing)+degrees[pGetComp(temp>m[j])];748 if (index==0) k = p_FDeg(temp>m[j],currRing)+degrees[pGetComp(temp>m[j])]; 749 749 else k = degrees[pGetComp(temp>m[j])]; 750 750 if (k>=index) tocancel[kindex]++; … … 872 872 return NULL; 873 873 } 874 temp2[j+1] = p FDeg(res[i]>m[j],currRing)+temp1[pGetComp(res[i]>m[j])];874 temp2[j+1] = p_FDeg(res[i]>m[j],currRing)+temp1[pGetComp(res[i]>m[j])]; 875 875 if (temp2[j+1]i>rows) rows = temp2[j+1]i; 876 876 if (temp2[j+1]i<mr) mr = temp2[j+1]i; … … 935 935 if (res[i]>m[j]!=NULL) 936 936 { 937 temp2[j+1] = p FDeg(res[i]>m[j],currRing)+temp1[pGetComp(res[i]>m[j])];937 temp2[j+1] = p_FDeg(res[i]>m[j],currRing)+temp1[pGetComp(res[i]>m[j])]; 938 938 //(*result)[i+1+(temp2[j+1]i1)*cols]++; 939 939 //if (temp2[j+1]>i) IMATELEM((*result),temp2[j+1]imr,i+2)++; … … 1082 1082 if (res[i]>m[j]!=NULL) 1083 1083 { 1084 k = p FDeg(res[i]>m[j],currRing)+(*(weights[i]))[pGetComp(res[i]>m[j])]i1;1084 k = p_FDeg(res[i]>m[j],currRing)+(*(weights[i]))[pGetComp(res[i]>m[j])]i1; 1085 1085 if (k>rsmax) rsmax = k; 1086 1086 if (k<rsmin) rsmin = k; … … 1121 1121 if (res[i]>m[j]!=NULL) 1122 1122 { 1123 k = p FDeg(res[i]>m[j],currRing)+(*(weights[i]))[pGetComp(res[i]>m[j])]i;1123 k = p_FDeg(res[i]>m[j],currRing)+(*(weights[i]))[pGetComp(res[i]>m[j])]i; 1124 1124 IMATELEM(*result,krsmin,i+2)++; 1125 1125 }
Note: See TracChangeset
for help on using the changeset viewer.