Author: jonnyjd
Date: Thu May 8 18:42:52 2014
New Revision: 9388
URL: http://svn.gna.org/viewcvs/service-tech?rev=9388&view=rev
Log:
delain: put Chloe in first column in benchmark
So this works we now parse the number of labels and nodes
from the dot ourselves now.
Modified:
trunk/delain/benchmark/parse2tex_parse.sh
trunk/delain/benchmark/parsing.sh
Modified: trunk/delain/benchmark/parse2tex_parse.sh
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/delain/benchmark/parse2tex_parse.sh?rev=9388&r1=9387&r2=9388&view=diff
==============================================================================
--- trunk/delain/benchmark/parse2tex_parse.sh (original)
+++ trunk/delain/benchmark/parse2tex_parse.sh Thu May 8 18:42:52 2014
@@ -9,12 +9,16 @@
# parse transparently
echo $line
- if [ $run -eq 1 ]; then
- echo $line | grep -q "system has"
+ if [ $run -eq 0 ]; then
+ echo $line | grep -q "#labels (total):"
if [ $? -eq 0 ]; then
- nodes=`echo $line | awk '{ print $4; }'`
- labels=`echo $line | awk '{ print $7; }'`
+ labels=`echo $line | awk '{ print $3; }'`
fi
+ echo $line | grep -q "#nodes:"
+ if [ $? -eq 0 ]; then
+ nodes=`echo $line | awk '{ print $2; }'`
+ fi
+ elif [ $run -eq 1 ]; then
# currently not displayed in the table
echo $line | grep -q "parsing done"
if [ $? -eq 0 ]; then
@@ -54,22 +58,22 @@
fi
done
-if [ $run -eq 1 ]; then
+if [ $run -eq 0 ]; then
echo -ne '\t&' $nodes '\t&' $labels >> $outfile
- echo -ne '\t&' $memory1 >> $outfile
- echo -ne '\t&' $runtime1 >> $outfile
- #echo -ne '\t&' $runtime1 '&' $parse_time '&' $check_time >> $outfile
+elif [ $run -eq 1 ]; then
+ # chloe/bsd (3rd run) can't be run for all cases
+ if [ -z "$memory1" ]; then
+ echo -ne '\t& -' >> $outfile
+ echo -ne '\t& -' >> $outfile
+ else
+ echo -ne '\t&' $memory1 >> $outfile
+ echo -ne '\t&' $runtime1 >> $outfile
+ fi
elif [ $run -eq 2 ]; then
echo -ne '\t&' $memory2 >> $outfile
echo -ne '\t&' $runtime2 >> $outfile
elif [ $run -eq 3 ]; then
- # chloe/bsd (3rd run) can't be run for all cases
- if [ -z "$memory3" ]; then
- echo -ne '\t& -' >> $outfile
- echo -ne '\t& -' >> $outfile
- else
- echo -ne '\t&' $memory3 >> $outfile
- echo -ne '\t&' $runtime3 >> $outfile
- fi
+ echo -ne '\t&' $memory3 >> $outfile
+ echo -ne '\t&' $runtime3 >> $outfile
echo '\\' >> $outfile
fi
Modified: trunk/delain/benchmark/parsing.sh
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/delain/benchmark/parsing.sh?rev=9388&r1=9387&r2=9388&view=diff
==============================================================================
--- trunk/delain/benchmark/parsing.sh (original)
+++ trunk/delain/benchmark/parsing.sh Thu May 8 18:42:52 2014
@@ -25,44 +25,46 @@
rm -f $tmpfile
show_run $binary --CSD -s $1 -l $2 --output=$tmpfile
echo -n "(random)" >> $tex_file
+ head -n 15 $tmpfile | $parser $tex_file 0 > /dev/null
- cache $tmpfile
- echo \$ $binary --stats --confCheck $tmpfile $tmpfile
- $binary --stats --confCheck $tmpfile $tmpfile 2>&1 | $parser $tex_file 1
+ if [ $1 -le 70000 ]; then
+ cache $tmpfile
+ echo \$ $oldbinary --stats --confCheck $tmpfile $tmpfile
+ $oldbinary --stats --confCheck $tmpfile $tmpfile 2>&1 \
+ | $parser $tex_file 1
+ else
+ echo "$oldbinary not checked due to a stack overflow" \
+ | $parser $tex_file 1
+ # calling the parser parser finishes the line
+ fi
cache $tmpfile
echo \$ $binary --stats --confCheck --checkDOT $tmpfile $tmpfile
$binary --stats --confCheck --checkDOT $tmpfile $tmpfile 2>&1 \
| $parser $tex_file 2
- if [ $1 -le 70000 ]; then
- cache $tmpfile
- echo \$ $oldbinary --stats --confCheck $tmpfile $tmpfile
- $oldbinary --stats --confCheck $tmpfile $tmpfile 2>&1 \
- | $parser $tex_file 3
- else
- echo "$oldbinary not checked due to a stack overflow" \
- | $parser $tex_file 3
- # calling the parser parser finishes the line
- fi
+ cache $tmpfile
+ echo \$ $binary --stats --confCheck $tmpfile $tmpfile
+ $binary --stats --confCheck $tmpfile $tmpfile 2>&1 | $parser $tex_file 3
rm -f $tmpfile
}
function check_file {
echo -n `echo -n $1 | sed -e 's|.*/CSD_1_||' -e 's|.dot||'` >> $tex_file
+ head -n 15 $1 | $parser $tex_file 0 > /dev/null
cache $tmpfile
- echo \$ $binary --stats --confCheck $1 $1';'
- $binary --stats --confCheck $1 $1 2>&1 | $parser $tex_file 1
+ echo \$ $oldbinary --stats --confCheck $1 $1
+ $oldbinary --stats --confCheck $1 $1 2>&1 | $parser $tex_file 1
cache $tmpfile
echo \$ $binary --stats --confCheck --checkDOT $1 $1';'
$binary --stats --confCheck --checkDOT $1 $1 2>&1 | $parser $tex_file 2
cache $tmpfile
- echo \$ $oldbinary --stats --confCheck $1 $1
- $oldbinary --stats --confCheck $1 $1 2>&1 | $parser $tex_file 3
+ echo \$ $binary --stats --confCheck $1 $1';'
+ $binary --stats --confCheck $1 $1 2>&1 | $parser $tex_file 3
}
@@ -74,9 +76,9 @@
echo '\toprule' >> $tex_file
echo -n '\multicolumn{3}{c}{}' >> $tex_file
+echo -n ' & \multicolumn{2}{c}{Chloe}' >> $tex_file
echo -n ' & \multicolumn{2}{c}{Delain}' >> $tex_file
echo -n ' & \multicolumn{2}{c}{Delain}' >> $tex_file
-echo -n ' & \multicolumn{2}{c}{Chloe}' >> $tex_file
echo '\\' >> $tex_file
echo -n '\multicolumn{3}{c}{}' >> $tex_file
echo -n ' & \multicolumn{2}{c}{}' >> $tex_file
--
You received this e-mail, because you subscribed the mailing list
"service-tech-commits" which will forward you any e-mail addressed to
[email protected]. If you want to unsubscribe or make any changes to
your subscription, please go to
https://mail.gna.org/listinfo/service-tech-commits.
