jomu/osm-scripts
1
0
Fork 0
Code Issues Pull Requests Releases Activity

improved calculation

Browse Source
This commit is contained in:
Joern Muehlencord
2017-08-17 10:38:51 +02:00
parent 09ac489f34
commit ac913d3702
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/calculateProgress.sh
View File

@ -6,6 +6,10 @@ function printUsage() {
exit 1 exit 1
} }
min_number() {
printf "%s\n" "$@" | sort -g | head -n1
}
level=$1 level=$1
if [ -z "$1" ]; then if [ -z "$1" ]; then
@ -39,12 +43,14 @@ read levelTiles fileName <<< $(wc -l /tmp/files.txt)
#echo levelTiles=$levelTiles #echo levelTiles=$levelTiles
# calculate progress # calculate progress
percentageRequired=$(echo "scale=8;$previousLevelTiles / $previousLevel100" | bc) percentageRequired=$(echo "scale=5;$previousLevelTiles / $previousLevel100" | bc)
#echo percentageRequired=$percentageRequired
percentageRequired="$(min_number $percentageRequired 1)"
#echo percentageRequired=$percentageRequired #echo percentageRequired=$percentageRequired
levelTarget=$(echo "$level100 * $percentageRequired" | bc) levelTarget=$(echo "$level100 * $percentageRequired" | bc)
#echo levelTarget=$levelTarget #echo levelTarget=$levelTarget
levelCalculated=$(echo "scale=4;($levelTiles / $levelTarget)" | bc) levelCalculated=$(echo "scale=4;($levelTiles / $levelTarget)" | bc)
#echo levelCalculated=$levelCalculated #echo levelCalculated=$levelCalculated
progress=$(echo "scale=2;($levelCalculated*100)/1" | bc) progress=$(echo "scale=2;($levelCalculated*100)/1" | bc)
progress="$(min_number $progress 100)"
echo progress=$progress% echo progress=$progress%