fuckwit/aoc2022
1
0
Fork 0
Code Releases Activity

fix timsort implementation

Browse Source
This commit is contained in:
Patrick Michl 2022-12-02 21:03:35 +01:00
parent ca600eb280
commit c2954ea720
No known key found for this signature in database
GPG Key ID: BFE0ACEE21CD5EB0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/day_1.sh
View File

@ -13,7 +13,7 @@ cals_per_elf() {
((tmp+=i)) ((tmp+=i))
done done
cals+=("$tmp") cals+=("$tmp")
utils.insertion_sort cals utils.timsort cals
echo "${cals[@]}" echo "${cals[@]}"
} }

12
utils.sh
View File

@ -3,10 +3,11 @@
_int.insertion_sort() { _int.insertion_sort() {
local -n _int_isort_arr="$1" local -n _int_isort_arr="$1"
local left="$2" right="$3" local left="$2" right="$3"
local i=0 j=0
for (( i=left+1; i<=right; i+=1 )) do for (( i=left+1; i<=right; i+=1 )) do
local value="${_int_isort_arr["$i"]}" j=$((i-1)) local value="${_int_isort_arr["$i"]}" j=$((i-1))
while (( j>=left && "${_int_isort_arr["$j"]}" > value )); do while (( j>=left && _int_isort_arr[j] > value )); do
_int_isort_arr[$((j+1))]="${_int_isort_arr["$j"]}" _int_isort_arr[$((j+1))]="${_int_isort_arr["$j"]}"
((j-=1)) ((j-=1))
done done
@ -66,17 +67,16 @@ utils.timsort() {
local -n _utils_timsort_arr="$1" local -n _utils_timsort_arr="$1"
local len="${#_utils_timsort_arr[@]}" local len="${#_utils_timsort_arr[@]}"
local min_run="$(_int.min_run "$len")" local min_run="$(_int.min_run "$len")"
echo >&2 $len local i=0 j=0 size=0 left=0 mid=0 right=0
for (( i=0; i < len; i+=min_run )); do for (( i=0; i < len; i+=min_run )); do
echo >&2 _int.insertion_sort _utils_timsort_arr "$i" "$(utils.min2 "$((i+min_run-1))" "$((len-1))")"
_int.insertion_sort _utils_timsort_arr "$i" "$(utils.min2 "$((i+min_run-1))" "$((len-1))")" _int.insertion_sort _utils_timsort_arr "$i" "$(utils.min2 "$((i+min_run-1))" "$((len-1))")"
done done
for (( size=min_run; size < len; size=2*size )); do for (( size=min_run; size < len; size*=2 )); do
for (( left=0; left < len; left+=2*size )); do for (( left=0; left < len; left+=2*size )); do
local mid=$((left+size-1)) mid=$((left+size-1))
local right=$(utils.min2 "$((left+2*size-1))" "$((len-1))") right=$(utils.min2 "$((left+2*size-1))" "$((len-1))")
if (( mid < right )); then if (( mid < right )); then
_int.merge _utils_timsort_arr "$left" "$mid" "$right" _int.merge _utils_timsort_arr "$left" "$mid" "$right"
fi fi