Changeset c1d8f3e in git
 Timestamp:
 Aug 25, 2016, 6:01:32 PM (8 years ago)
 Branches:
 (u'fiekerDuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
 Children:
 a7e3139c235d2ec2c8be9bb6baef444e4df65332
 Parents:
 4c6e9d4ea46ef519f4c5e60541f5dbd83e8cc656
 gitauthor:
 Andreas Steenpass <steenpass@mathematik.unikl.de>20160825 18:01:32+02:00
 gitcommitter:
 Andreas Steenpass <steenpass@mathematik.unikl.de>20171215 12:17:07+01:00
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

Singular/iparith.cc
r4c6e9d4 rc1d8f3e 2209 2209 return TRUE; 2210 2210 } 2211 maxl; 2212 if (maxl == 1) { 2213 maxl = currRing>N; 2211 if (maxl == 0) { 2212 maxl = currRing>N+1; 2214 2213 if (currRing>qideal != NULL) { 2215 2214 Warn("full resolution in a qring may be infinite, " 2216 "setting max length to %d", maxl +1);2215 "setting max length to %d", maxl); 2217 2216 } 2218 2217 } … … 2226 2225 syStrategy r; 2227 2226 r = syFrank(id, maxl, method); 2228 r>list_length = maxl +1;2227 r>list_length = maxl; 2229 2228 if (r == NULL) return TRUE; 2230 2229 assume( (r>minres != NULL)  (r>fullres != NULL) ); 
kernel/GBEngine/syz4.cc
r4c6e9d4 rc1d8f3e 673 673 const syzHeadFunction *syzHead) 674 674 { 675 int max_index = length1; 675 676 int index = 0; 676 if (!idIs0(res[index]) && index < length) {677 if (!idIs0(res[index]) && index < max_index) { 677 678 index++; 678 679 res[index] = computeFrame(res[index1], syzM_i_unsorted, syzHead); 679 } 680 while (!idIs0(res[index]) && index < length) { 680 while (!idIs0(res[index])) { 681 681 #if 1 682 computeLiftings(res, index);683 sortPolysTails(res, index);682 computeLiftings(res, index); 683 sortPolysTails(res, index); 684 684 #endif // LIFT 685 index++; 686 res[index] = computeFrame(res[index1], syzM_i_sorted, syzHead); 687 } 688 if (index < length) { 685 if (index < max_index) { 686 index++; 687 res[index] = computeFrame(res[index1], syzM_i_sorted, 688 syzHead); 689 } 690 else { 691 break; 692 } 693 } 694 } 695 max_index = index+1; 696 if (max_index < length) { 689 697 res = (resolvente)omReallocSize(res, (length+1)*sizeof(ideal), 690 ( index+1)*sizeof(ideal));691 } 692 return index;698 (max_index+1)*sizeof(ideal)); 699 } 700 return max_index; 693 701 } 694 702 … … 696 704 { 697 705 const ring r = currRing; 698 for (int i = length ; i > 0; i) {706 for (int i = length1; i > 0; i) { 699 707 for (int j = res[i]>ncols1; j >= 0; j) { 700 708 res[i]>m[j] = p_SortAdd(res[i]>m[j], r, TRUE); … … 731 739 732 740 result>fullres = res; 733 result>length = length +1;741 result>length = length; 734 742 return result; 735 743 }
Note: See TracChangeset
for help on using the changeset viewer.