mirror of
https://dicksdeathabove.xyz/~mia/psh-fractional
synced 2024-09-07 18:56:28 +00:00
fix bug in add where 0.* causes $(()) to break; fix bugs with subtraction; find bug in division with numbers < 1
This commit is contained in:
parent
0207f421f4
commit
e8124ffad9
2
README
2
README
|
@ -31,6 +31,8 @@ Current Status
|
||||||
------ correct: 0.01495808335252129864
|
------ correct: 0.01495808335252129864
|
||||||
---- Some odd edge case with $dp is causing this...
|
---- Some odd edge case with $dp is causing this...
|
||||||
---- debugging ongoing
|
---- debugging ongoing
|
||||||
|
---- has issue with dividing by numbers <1 (eg 0.5)
|
||||||
|
---- I may fix this... idk tbh
|
||||||
---
|
---
|
||||||
Outer Usage
|
Outer Usage
|
||||||
-- it is recommended to use this library with psh-fc
|
-- it is recommended to use this library with psh-fc
|
||||||
|
|
|
@ -32,7 +32,8 @@
|
||||||
w2="${w2#0}"
|
w2="${w2#0}"
|
||||||
done # dash has issues when numbers have leading 0's
|
done # dash has issues when numbers have leading 0's
|
||||||
# zsh,bash,etc don't need this at all
|
# zsh,bash,etc don't need this at all
|
||||||
wo="$((${w1#0}+${w2#0}))" # whole digit, this is preset and not redeclared
|
w1="${w1#0}"; w2="${w2#0}"
|
||||||
|
wo="$((${w1:-0}+${w2:-0}))" # whole digit, this is preset and not redeclared
|
||||||
# this is because we may need to carry
|
# this is because we may need to carry
|
||||||
while [ "$f1" ]; do
|
while [ "$f1" ]; do
|
||||||
while [ "$f2" ]; do
|
while [ "$f2" ]; do
|
||||||
|
|
|
@ -7,7 +7,8 @@ rad(){ # add decimal to $1 based on $2
|
||||||
e="${e}${m%$next}"
|
e="${e}${m%$next}"
|
||||||
m="$next"; : $((n+=1))
|
m="$next"; : $((n+=1))
|
||||||
done
|
done
|
||||||
w="${1#$e}"; echo "${3}${e}.${w:-0}"
|
w="${1#$e}"; o="${3}${e:-0}${w+.$w}"
|
||||||
|
echo "${o%.}"
|
||||||
}
|
}
|
||||||
fd() {
|
fd() {
|
||||||
m="$1"; n=1; while [ "$m" ]; do
|
m="$1"; n=1; while [ "$m" ]; do
|
||||||
|
@ -37,7 +38,10 @@ elif [ ! -z "${2##*.*}" ]; then
|
||||||
done
|
done
|
||||||
fi # if $1/$2 is not a float; convert to float
|
fi # if $1/$2 is not a float; convert to float
|
||||||
m1="${1%.*}${1#*.}"; m2="${2%.*}${2#*.}"
|
m1="${1%.*}${1#*.}"; m2="${2%.*}${2#*.}"
|
||||||
dn=$((${1%.*}-${2%.*})); # dn == dp
|
dn=$(((${1%.*}-${2%.*}))); # dn == dp
|
||||||
|
#until [ ! "$dn" -lt "0" ]; do
|
||||||
|
# : $((dn+=1))
|
||||||
|
#done
|
||||||
# dn can also be checked to see if the wrong whole number result produced is correct
|
# dn can also be checked to see if the wrong whole number result produced is correct
|
||||||
dn="${dn#-}"; dn="${#dn}"
|
dn="${dn#-}"; dn="${#dn}"
|
||||||
# decimal place is determined by the length of $1-$2
|
# decimal place is determined by the length of $1-$2
|
||||||
|
@ -49,16 +53,18 @@ dn="${dn#-}"; dn="${#dn}"
|
||||||
}
|
}
|
||||||
#echo "$m1 $m2 $dn"
|
#echo "$m1 $m2 $dn"
|
||||||
until [ "${m1#0}" = "$m1" ]; do
|
until [ "${m1#0}" = "$m1" ]; do
|
||||||
m1="${m1#0}"
|
m1="${m1#0}"; rz1=0
|
||||||
done
|
done
|
||||||
until [ "${m2#0}" = "$m2" ]; do
|
until [ "${m2#0}" = "$m2" ]; do
|
||||||
m2="${m2#0}"
|
m2="${m2#0}"; rz2=0
|
||||||
done # dash has issues when numbers have leading 0's
|
done # dash has issues when numbers have leading 0's
|
||||||
# zsh,bash,etc don't need this at all
|
# zsh,bash,etc don't need this at all
|
||||||
# and really dash shouldn't either but /shrug
|
# and really dash shouldn't either but /shrug
|
||||||
##
|
##
|
||||||
# if $m1 is longer than $m2 it may cause it to produce wrong results
|
[ -z "${2##*.*}" -a ! "$rz2" ] && until [ "${#m2}" -eq "${#m1}" ]; do
|
||||||
[ -z "${2##*.*}" ] && until [ "${#m2}" -eq "${#m1}" ]; do
|
|
||||||
m2="${m2}0"
|
m2="${m2}0"
|
||||||
done
|
done
|
||||||
|
[ -z "${2##*.*}" -a "$rz2" ] && : $((dn+=1))
|
||||||
|
nd="$((${1%.*}${1#*.}-${2%.*}${2#*.}))"; [ "${#nd}" -lt "$((${#m1}+1))" ] && : $((dn-=1))
|
||||||
|
#echo "$m1 $m2 | $dn ${nr:-+} | ${dn} ${#m1} ${#m2} | $((${1%.*}-${2%.*})) | $((${1%.*}${1#*.}-${2%.*}${2#*.}))"
|
||||||
rad "$((m1-m2))" "$dn" "${nr}"
|
rad "$((m1-m2))" "$dn" "${nr}"
|
||||||
|
|
Loading…
Reference in a new issue