reporting

relaxng/xpath-efo-extra.rnc

@@ -19,7 +19,7 @@
 default namespace = "http://www.w3.org/2005/XQueryX"
 namespace xqx = "http://www.w3.org/2005/XQueryX"
 
-include "xpath-1.0-efo-basic.rnc"
+include "xpath-efo-basic.rnc"
 
 include "expr/extra.rnc"
 

tools/tex/bench-basic.sh

@@ -4,7 +4,7 @@
 path=$1
 full=$2
 xmlarray=(docbook teixsl htmlbook existdb histei xquerydoc marklogic xqjson guidomatic)
-names=(DocBook TEI HTMLBook eXist-db HisTEI xquerydoc MarkLogic XQJSON guid-o-matic)
+names=(DocBook TEIXSL HTMLBook eXist-db HisTEI xquerydoc MarkLogic XQJSON guid-o-matic)
 
 echo "\\toprule"
 echo "Source & \\textsf{Positive} &  \\textsf{Core~1.0} & \\textsf{Core~2.0} & \\textsf{Downward} & \\textsf{Vertical} & \\textsf{Forward} & \\textsf{EMSO\$^\\textsf 2\$} & \\textsf{NonMixing}\\\\"
@@ -12,8 +12,8 @@ echo "\\midrule"
 
 for ((i = 0; i < ${#xmlarray[@]}; ++i))
 do
-    printf "${names[$i]} "
-    echo "`./numbers.sh $path/${xmlarray[$i]}$2.xml '<schema>' 'xpath-efo-basic.rnc.*yes' 'xpath-1.0-core-basic.rnc.*yes' 'xpath-2.0-core-basic.rnc.*yes' 'xpath-1.0-downward-basic.rnc.*yes' 'xpath-1.0-vertical-basic.rnc.*yes' 'xpath-1.0-forward-basic.rnc.*yes' 'xpath-emso2-basic.rnc.*yes' 'xpath-non-mixing-basic.rnc.*yes'`\\\\"
+    printf "${names[$i]}  \t"
+    echo "`./numbers.sh $path/${xmlarray[$i]}$2.xml '<schemas>' 'xpath-efo-basic.rnc.*yes' 'xpath-1.0-core-basic.rnc.*yes' 'xpath-2.0-core-basic.rnc.*yes' 'xpath-1.0-downward-basic.rnc.*yes' 'xpath-1.0-vertical-basic.rnc.*yes' 'xpath-1.0-forward-basic.rnc.*yes' 'xpath-emso2-basic.rnc.*yes' 'xpath-non-mixing-basic.rnc.*yes'`\\\\"
 done
 echo "\\bottomrule"
 

tools/tex/bench-full.sh

@@ -4,7 +4,7 @@
 path=$1
 full=$2
 xmlarray=(docbook teixsl htmlbook existdb histei xquerydoc marklogic xqjson guidomatic)
-names=(DocBook TEI HTMLBook eXist-db HisTEI xquerydoc MarkLogic XQJSON guid-o-matic)
+names=(DocBook TEIXSL HTMLBook eXist-db HisTEI xquerydoc MarkLogic XQJSON guid-o-matic)
 #xmlarray=(docbook htmlbook existdb histei marklogic xqjson)
 #names=(DocBook HTMLBook eXist-db HisTEI MarkLogic XQJSON)
 
@@ -14,7 +14,7 @@ echo "\\midrule"
 
 for ((i = 0; i < ${#xmlarray[@]}; ++i))
 do
-    printf "${names[$i]} "
+    printf "${names[$i]}  \t"
     echo "`./numbers.sh $path/${xmlarray[$i]}$2.xml '<schemas>' 'xpath-efo-basic.rnc.*yes' 'xpath-efo-extra.rnc.*yes' 'xpath-1.0-core-full.rnc.*yes' 'xpath-1.0-core-extra.rnc.*yes' 'xpath-2.0-core-join.rnc.*yes' 'xpath-1.0-downward-last.rnc.*yes' 'xpath-1.0-vertical-full.rnc.*yes' 'xpath-1.0-forward-last.rnc.*yes' 'xpath-emso2-full.rnc.*yes' 'xpath-non-mixing-basic.rnc.*yes'`\\\\"
 done
 echo "\\bottomrule"

tools/tex/bench-orig.sh

@@ -4,7 +4,7 @@
 path=$1
 full=$2
 xmlarray=(docbook teixsl htmlbook existdb histei xquerydoc marklogic xqjson guidomatic)
-names=(DocBook TEI HTMLBook eXist-db HisTEI xquerydoc MarkLogic XQJSON guid-o-matic)
+names=(DocBook TEIXSL HTMLBook eXist-db HisTEI xquerydoc MarkLogic XQJSON guid-o-matic)
 
 echo "\\toprule"
 echo "Source & \\textsf{Positive} & \\textsf{Core~1.0} & \\textsf{Core~2.0} & \\textsf{Downward} & \\textsf{Vertical} & \\textsf{Forward} & \\textsf{EMSO\$^\\textsf 2\$} & \\textsf{NonMixing}\\\\"
@@ -12,8 +12,8 @@ echo "\\midrule"
 
 for ((i = 0; i < ${#xmlarray[@]}; ++i))
 do
-    printf "${names[$i]} "
-    echo "`./numbers.sh $path/${xmlarray[$i]}$2.xml '<schema>' 'xpath-efo-orig.rnc.*yes' 'xpath-1.0-core-orig.rnc.*yes' 'xpath-2.0-core-orig.rnc.*yes' 'xpath-1.0-downward-orig.rnc.*yes' 'xpath-1.0-vertical-orig.rnc.*yes' 'xpath-1.0-forward-orig.rnc.*yes' 'xpath-emso2-orig.rnc.*yes' 'xpath-non-mixing-orig.rnc.*yes'`\\\\"
+    printf "${names[$i]}  \t"
+    echo "`./numbers.sh $path/${xmlarray[$i]}$2.xml '<schemas>' 'xpath-efo-orig.rnc.*yes' 'xpath-1.0-core-orig.rnc.*yes' 'xpath-2.0-core-orig.rnc.*yes' 'xpath-1.0-downward-orig.rnc.*yes' 'xpath-1.0-vertical-orig.rnc.*yes' 'xpath-1.0-forward-orig.rnc.*yes' 'xpath-emso2-orig.rnc.*yes' 'xpath-non-mixing-orig.rnc.*yes'`\\\\"
 done
 echo "\\bottomrule"
 

tools/tex/numbers.sh

@@ -11,7 +11,12 @@ while test ${#} -gt 0
 do
     count=`grep "$1" $file | wc -l`
     percent=`bc <<< "100*$count/$total"`
-    printf "& $percent\\%% "
+    if [ $percent -lt 10 ]
+    then
+       printf "&  $percent\\%% "
+    else
+        printf "& $percent\\%% "
+    fi
     #printf "& $count "
     shift
 done