-
Notifications
You must be signed in to change notification settings - Fork 520
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Areas and station areas work (#20195)
Refactored sorting. Added test to verify all horizon areas (outside exceptions) are marked as station areas. Added test to verify shuttle areas are not marked as station areas. Refactored how the area sorting var is made and used. Added a global list of all areas.
- Loading branch information
1 parent
916df7c
commit 3894663
Showing
44 changed files
with
483 additions
and
229 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/// Helper for the sorting procs. Prevents some code duplication. Creates /datum/sort_instance/sorter | ||
#define CREATE_SORT_INSTANCE(to_sort, cmp, associative, fromIndex, toIndex) \ | ||
if(length(to_sort) < 2) { \ | ||
return to_sort; \ | ||
} \ | ||
fromIndex = fromIndex % length(to_sort); \ | ||
toIndex = toIndex % (length(to_sort) + 1); \ | ||
if (fromIndex <= 0) { \ | ||
fromIndex += length(to_sort); \ | ||
} \ | ||
if (toIndex <= 0) { \ | ||
toIndex += length(to_sort) + 1; \ | ||
} \ | ||
var/datum/sort_instance/sorter = GLOB.sortInstance; \ | ||
if (isnull(sorter)) { \ | ||
sorter = new; \ | ||
} \ | ||
sorter.L = to_sort; \ | ||
sorter.cmp = cmp; \ | ||
sorter.associative = associative; | ||
|
||
/** | ||
* ## Tim Sort | ||
* Hybrid sorting algorithm derived from merge sort and insertion sort. | ||
* | ||
* **Sorts in place**. | ||
* You might not need to get the return value. | ||
* | ||
* @see | ||
* https://en.wikipedia.org/wiki/Timsort | ||
* | ||
* @param {list} to_sort - The list to sort. | ||
* | ||
* @param {proc} cmp - The comparison proc to use. Default: Numeric ascending. | ||
* | ||
* @param {boolean} associative - Whether the list is associative. Default: FALSE. | ||
* | ||
* @param {int} fromIndex - The index to start sorting from. Default: 1. | ||
* | ||
* @param {int} toIndex - The index to stop sorting at. Default: 0. | ||
*/ | ||
/proc/sortTim(list/to_sort, cmp = GLOBAL_PROC_REF(cmp_numeric_asc), associative = FALSE, fromIndex = 1, toIndex = 0) as /list | ||
CREATE_SORT_INSTANCE(to_sort, cmp, associative, fromIndex, toIndex) | ||
|
||
sorter.timSort(fromIndex, toIndex) | ||
|
||
return to_sort | ||
|
||
#undef CREATE_SORT_INSTANCE |
Oops, something went wrong.