gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bugs in the timsort implementation.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35582 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
thebeing 2012-09-20 14:29:16 +00:00
parent d3dfb39dc9
commit 1cc86b3e67
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-09-20 Niels Grewe <niels.grewe@halbordnung.de>
* Source/GSTimSort.m: Fix bugs in the timsort implementation.
2012-09-20 Richard Frith-Macdonald <rfm@gnu.org> 2012-09-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSQuickSort.m: Fixed this to compile and (apparently) work. * Source/GSQuickSort.m: Fixed this to compile and (apparently) work.

13
Source/GSTimSort.m
View file

@ -606,6 +606,7 @@ descriptorOrComparator: (id)descriptorOrComparator
{ {
runStack[stackSize] = r; runStack[stackSize] = r;
stackSize++; stackSize++;
NSDebugMLLog(@"GSTimSort", @"Pushing run: %@\n", NSStringFromRange(r));
} }
- (void) suggestMerge - (void) suggestMerge
@ -836,6 +837,8 @@ descriptorOrComparator: (id)descriptorOrComparator
id *buf2 = objects + r2.location; id *buf2 = objects + r2.location;
id *base1 = buf1; id *base1 = buf1;
id *base2 = NULL; id *base2 = NULL;
// We are walking backwards, so destination pointer is at the high end
// initially.
id *destination = buf2 + num2 - 1; id *destination = buf2 + num2 - 1;
NSUInteger k = 0; NSUInteger k = 0;
// Local variables for performance // Local variables for performance
@ -857,7 +860,7 @@ descriptorOrComparator: (id)descriptorOrComparator
if (num1 == 0) if (num1 == 0)
{ {
if (0 != num1) if (0 != num2)
{ {
memcpy(destination - (num2-1), base2, num2 * sizeof(id)); memcpy(destination - (num2-1), base2, num2 * sizeof(id));
} }
@ -975,7 +978,7 @@ descriptorOrComparator: (id)descriptorOrComparator
minGallop = localMinGallop; minGallop = localMinGallop;
} }
Success: Success:
if (0 != num1) if (0 != num2)
{ {
memcpy(destination - (num2-1), base2, num2 * sizeof(id)); memcpy(destination - (num2-1), base2, num2 * sizeof(id));
} }
@ -1012,6 +1015,8 @@ descriptorOrComparator: (id)descriptorOrComparator
r1 = runStack[i]; r1 = runStack[i];
r2 = runStack[i+1]; r2 = runStack[i+1];
NSDebugMLLog(@"GSTimSort", @"Merging from stack location %lu of %lu (%@ with %@)\n", i,
stackSize, NSStringFromRange(r1), NSStringFromRange(r2));
/* Do some housekeeping on the stack: We combine the two runs /* Do some housekeeping on the stack: We combine the two runs
* being merged and move around the last run on the stack * being merged and move around the last run on the stack
@ -1029,8 +1034,10 @@ descriptorOrComparator: (id)descriptorOrComparator
// Find an insertion point for the first element in r2 into r1 // Find an insertion point for the first element in r2 into r1
insert = gallopRight(objects[r2.location], objects, r1, 0, insert = gallopRight(objects[r2.location], objects, r1, 0,
sortDescriptorOrComparator, comparisonType, functionContext); sortDescriptorOrComparator, comparisonType, functionContext);
r1.length = insert - r1.location; r1.length = r1.length - (insert - r1.location);
r1.location = insert; r1.location = insert;
NSDebugMLLog(@"GSTimSort", @"Insertion point for r2 in r1: %lu.\nr1 for the merge is now %@.\n",
insert, NSStringFromRange(r1));
if (r1.length == 0) if (r1.length == 0)
{ {
// The entire run r2 lies after r1, just return. // The entire run r2 lies after r1, just return.