Optimierungen eingefügt (Kantenerkennung, zufälliges zeichnen)

This commit is contained in:
Florian Schlegel 2016-09-03 17:10:43 +02:00
parent 55afa971c2
commit ba77f8143b
2 changed files with 22 additions and 4 deletions

View File

@ -1,10 +1,27 @@
#! /bin/bash
INPUT=$1
export OW=$2
export OH=$3
W=$4
OUTPUT=$2
export OW=$3
export OH=$4
W=$5
if [ "$OW" == "" ]; then OW=0; fi
if [ "$OH" == "" ]; then OH=0; fi
convert-im6 -resize $W $INPUT txt:- | awk -v ow=$OW -v oh=$OH -F "[,: #]+" 'BEGIN {} NR>1 { print "PX " $1+ow " " $2+oh " " $7 } END {}'
#initial conversion
convert-im6 -resize $W $INPUT txt:- | awk -v ow=$OW -v oh=$OH 'match($0, /^(.*),(.*):.*#(.{6})/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " arr[3] }' > $OUTPUT
echo optimizing >&2
# edge detection
#convert-im6 -resize $W $INPUT -negate -edge 6 -negate txt:- | awk -v ow=$OW -v oh=$OH 'match($0, /^(.*),(.*):.*#000000/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " }' > /tmp/px6_optimize
convert-im6 -resize $W $INPUT -edge 6 -negate txt:- | awk -v ow=$OW -v oh=$OH 'match($0, /^(.*),(.*):.*#000000/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " }' > /tmp/px6_optimize
grep -Ff /tmp/px6_optimize $OUTPUT > ${OUTPUT}.tmp
grep -Ff /tmp/px6_optimize $OUTPUT >> ${OUTPUT}.tmp
grep -Ff /tmp/px6_optimize $OUTPUT >> ${OUTPUT}.tmp
grep -Ff /tmp/px6_optimize $OUTPUT >> ${OUTPUT}.tmp
cat ${OUTPUT}.tmp >> $OUTPUT
cat $OUTPUT | shuf > ${OUTPUT}.tmp
mv ${OUTPUT}.tmp $OUTPUT
rm /tmp/px6_optimize

View File

@ -27,6 +27,7 @@ for i in $(seq 0 $(($PROCS-1))); do
) >/dev/null 2>&1
done
) &
sleep 1
sleep $(echo "scale=2; $PROCMAXTIME/$PROCS" | bc)
done
while true; do sleep 9999999; done