* several adjustments after introduction of the depth column

diff --git a/helm/papers/use_case/stats/Makefile b/helm/papers/use_case/stats/Makefile
index 1eb180dce9d11fbdf78cc167fa749363c932773f..6858eb6373082f3041ef1568526507722462a3cd 100644 (file)
--- a/helm/papers/use_case/stats/Makefile
+++ b/helm/papers/use_case/stats/Makefile
@@ -51,11 +51,11 @@ mkdiff: mkdiff.cc
 
 parsing_times_%_candidates.txt: parsing_times.sh stats_candidates.txt
        @echo "Collecting parsing times in CICXML_NOBLANKS_NODTD for $(@:parsing_times_%_candidates.txt=%)..."
-       @./$< CICXML_NOBLANKS_NODTD parsing_time_$(@:parsing_times_%_candidates.txt=%).sh stats_candidates.txt | $(SORT_SIZE) >$@
+       @./$< CICXML_NOBLANKS_NODTD parsing_time_$(@:parsing_times_%_candidates.txt=%).sh stats_candidates.txt | $(SORT_NODES) >$@
 
 parsing_times_%_candidates_c1.txt: parsing_times.sh stats_candidates_c1.txt
        @echo "Collecting parsing times in CONTENTNB for $(@:parsing_times_%_candidates_c1.txt=%)..."
-       @./$< CONTENTNB parsing_time_$(@:parsing_times_%_candidates_c1.txt=%).sh stats_candidates_c1.txt | $(SORT_SIZE) >$@
+       @./$< CONTENTNB parsing_time_$(@:parsing_times_%_candidates_c1.txt=%).sh stats_candidates_c1.txt | $(SORT_NODES) >$@
 
 #parsing_times_%_candidates: parsing_times_%_candidates.sh
 #      sh $< >$@
@@ -111,5 +111,6 @@ validating_times: parsing_validating_times_candidates.ps validating_times_candid
 clean:
        rm -f stats_candidates*.{xml,html,txt} \
          $(PARSING_TIMES_TARGETS_TXT) \
+         $(PARSING_VALIDATING_TIMES_TARGETS_TXT) \
          $(VALIDATING_TIMES_TARGETS_TXT)
 

diff --git a/helm/papers/use_case/stats/extract.xsl b/helm/papers/use_case/stats/extract.xsl
index 74d2865e5c80b8e64b368ce65c6b53386466bd42..3704d92a485d18780703f8f11943bf470b251326 100644 (file)
--- a/helm/papers/use_case/stats/extract.xsl
+++ b/helm/papers/use_case/stats/extract.xsl
@@ -29,8 +29,8 @@
   <xsl:value-of select="size"/>
   <xsl:text> </xsl:text>
   <xsl:value-of select="number(elements/total) + number(text-nodes/total)"/>
-  <!--<xsl:text> </xsl:text>
-  <xsl:value-of select="depth/max"/>-->
+  <xsl:text> </xsl:text>
+  <xsl:value-of select="depth/max"/>
   <xsl:text>
 </xsl:text>
 </xsl:template>

diff --git a/helm/papers/use_case/stats/mkdiff.cc b/helm/papers/use_case/stats/mkdiff.cc
index aed015dca81935b86e105cfbddc2fd1f2db3a6a4..d31bfbfc13d9a8aad9d4ab4bd8db696569e339d0 100644 (file)
--- a/helm/papers/use_case/stats/mkdiff.cc
+++ b/helm/papers/use_case/stats/mkdiff.cc
@@ -7,20 +7,23 @@ main(int argc, char* argv[])
 {
        std::ifstream f(argv[1]);
 
-       int size, nodes, parsing_time;
-       int size1, nodes1, validating_time;
+       int size, nodes, depth, parsing_time;
+       int size1, nodes1, depth1, validating_time;
 
        while (std::cin >> size) {
                std::cin >> nodes;
+               std::cin >> depth;
                std::cin >> parsing_time;
 
                f >> size1;
                f >> nodes1;
+               f >> depth1;
                f >> validating_time;
 
                assert(size == size1);
                assert(nodes == nodes1);
-               std::cout << size << " " << nodes << " " << (validating_time - parsing_time) << std::endl;
+               assert(depth == depth1);
+               std::cout << size << " " << nodes << " " << depth << " " << (validating_time - parsing_time) << std::endl;
        }
 }
 

diff --git a/helm/papers/use_case/stats/parsing_time_expat.sh b/helm/papers/use_case/stats/parsing_time_expat.sh
index 634f2c11dd4f4326211d2400af167fa66495f623..e8c94bc99930ed6f8ae90a152e44d1a522721183 100755 (executable)
--- a/helm/papers/use_case/stats/parsing_time_expat.sh
+++ b/helm/papers/use_case/stats/parsing_time_expat.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 TIME=`zcat $1 | ./parse/parse_expat`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/parsing_time_libxml2_reader.sh b/helm/papers/use_case/stats/parsing_time_libxml2_reader.sh
index 50a2abaae2ff5c22a944e89590682d455377f62f..71b319d76ffcfd6e3dd7e093c230ab9359f37584 100755 (executable)
--- a/helm/papers/use_case/stats/parsing_time_libxml2_reader.sh
+++ b/helm/papers/use_case/stats/parsing_time_libxml2_reader.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 TIME=`zcat $1 | ./parse/parse_xmlreader`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/parsing_time_libxml2_sax2.sh b/helm/papers/use_case/stats/parsing_time_libxml2_sax2.sh
index f6e9a6d7613ddf587a9572ca38ee69c26af472b1..711b92e6a20a8cefd285cc576ceb7e44ed3ade20 100755 (executable)
--- a/helm/papers/use_case/stats/parsing_time_libxml2_sax2.sh
+++ b/helm/papers/use_case/stats/parsing_time_libxml2_sax2.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 TIME=`zcat $1 | ./parse/parse_xmlsax`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/parsing_time_libxml2_tree.sh b/helm/papers/use_case/stats/parsing_time_libxml2_tree.sh
index 9e08b6161c3c188e0b4aed749a75328a901237fd..55d3e211da2d3aab1c46326c21096c30d3da83fb 100755 (executable)
--- a/helm/papers/use_case/stats/parsing_time_libxml2_tree.sh
+++ b/helm/papers/use_case/stats/parsing_time_libxml2_tree.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 zcat $1 >/tmp/a
 TIME=`./parse/parse_xmltree /tmp/a`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/parsing_time_xerces_sax2.sh b/helm/papers/use_case/stats/parsing_time_xerces_sax2.sh
index 64f15132138aaf08c79512fe388991a520ea121e..405fa42a405ee222095ddb9b79c6cda8a53d0a0c 100755 (executable)
--- a/helm/papers/use_case/stats/parsing_time_xerces_sax2.sh
+++ b/helm/papers/use_case/stats/parsing_time_xerces_sax2.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 zcat $1 >/tmp/a
 TIME=`./parse/SAX2Print/SAX2Print -v=never /tmp/a`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/parsing_time_xerces_tree.sh b/helm/papers/use_case/stats/parsing_time_xerces_tree.sh
index 29e55dfb4e3913b3caa65b9c09f814082d9ee6f1..c5457f5a3d87e299a1cf884f70d769f72d0e83c3 100755 (executable)
--- a/helm/papers/use_case/stats/parsing_time_xerces_tree.sh
+++ b/helm/papers/use_case/stats/parsing_time_xerces_tree.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 zcat $1 >/tmp/a
 TIME=`./parse/DOMCount/DOMCount -v=never /tmp/a`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/parsing_times.gpscript b/helm/papers/use_case/stats/parsing_times.gpscript
index 06b799236c48c793c6a491431038bee30bc284e8..677761aa969e20e1a59d8026a60ad9f47890b767 100644 (file)
--- a/helm/papers/use_case/stats/parsing_times.gpscript
+++ b/helm/papers/use_case/stats/parsing_times.gpscript
@@ -3,26 +3,26 @@ set key left box
 set label font "Helvetica,8"
 
 set output "parsing_times_candidates.ps"
-plot "parsing_times_expat_candidates.txt" using 1:3 title "Expat" with lines, \
-     "parsing_times_xerces_sax2_candidates.txt" using 1:3 title "xerces sax2" with lines, \
-     "parsing_times_xerces_tree_candidates.txt" using 1:3 title "xerces tree" with lines, \
-     "parsing_times_libxml2_sax2_candidates.txt" using 1:3 title "libxml2 sax2" with lines, \
-     "parsing_times_libxml2_reader_candidates.txt" using 1:3 title "libxml2 reader" with lines, \
-     "parsing_times_libxml2_tree_candidates.txt" using 1:3 title "libxml2 tree" with lines
+plot "parsing_times_expat_candidates.txt"             using 2:4   title "Expat"          with lines smooth bezier, \
+     "parsing_times_xerces_sax2_candidates.txt"       using 2:4   title "xerces sax2"    with lines smooth bezier, \
+     "parsing_times_xerces_tree_candidates.txt"       using 2:4   title "xerces tree"    with lines smooth bezier, \
+     "parsing_times_libxml2_sax2_candidates.txt"      using 2:4   title "libxml2 sax2"   with lines smooth bezier, \
+     "parsing_times_libxml2_reader_candidates.txt"    using 2:4   title "libxml2 reader" with lines smooth bezier, \
+     "parsing_times_libxml2_tree_candidates.txt"      using 2:4   title "libxml2 tree"   with lines smooth bezier
 
 set output "parsing_times_candidates_c1.ps"
-plot "parsing_times_expat_candidates_c1.txt" using 1:3 title "Expat" with lines, \
-     "parsing_times_xerces_sax2_candidates_c1.txt" using 1:3 title "xerces sax2" with lines, \
-     "parsing_times_xerces_tree_candidates_c1.txt" using 1:3 title "xerces tree" with lines, \
-     "parsing_times_libxml2_sax2_candidates_c1.txt" using 1:3 title "libxml2 sax2" with lines, \
-     "parsing_times_libxml2_reader_candidates_c1.txt" using 1:3 title "libxml2 reader" with lines, \
-     "parsing_times_libxml2_tree_candidates_c1.txt" using 1:3 title "libxml2 tree" with lines
+plot "parsing_times_expat_candidates_c1.txt"          using 2:4   title "Expat"          with lines smooth bezier, \
+     "parsing_times_xerces_sax2_candidates_c1.txt"    using 2:4   title "xerces sax2"    with lines smooth bezier, \
+     "parsing_times_xerces_tree_candidates_c1.txt"    using 2:4   title "xerces tree"    with lines smooth bezier, \
+     "parsing_times_libxml2_sax2_candidates_c1.txt"   using 2:4   title "libxml2 sax2"   with lines smooth bezier, \
+     "parsing_times_libxml2_reader_candidates_c1.txt" using 2:4   title "libxml2 reader" with lines smooth bezier, \
+     "parsing_times_libxml2_tree_candidates_c1.txt"   using 2:4   title "libxml2 tree"   with lines smooth bezier
 
 set output "parsing_times_candidates_3d.ps"
-splot "parsing_times_expat_candidates.txt" title "Expat", \
-      "parsing_times_xerces_sax2_candidates.txt" title "xerces sax2", \
-      "parsing_times_xerces_tree_candidates.txt" title "xerces tree", \
-      "parsing_times_libxml2_sax2_candidates.txt" title "libxml2 sax2", \
-      "parsing_times_libxml2_reader_candidates.txt" title "libxml2 reader", \
-      "parsing_times_libxml2_tree_candidates.txt" title "libxml2 tree"
+splot "parsing_times_expat_candidates.txt"            using 1:2:4 title "Expat", \
+      "parsing_times_xerces_sax2_candidates.txt"      using 1:2:4 title "xerces sax2", \
+      "parsing_times_xerces_tree_candidates.txt"      using 1:2:4 title "xerces tree", \
+      "parsing_times_libxml2_sax2_candidates.txt"     using 1:2:4 title "libxml2 sax2", \
+      "parsing_times_libxml2_reader_candidates.txt"   using 1:2:4 title "libxml2 reader", \
+      "parsing_times_libxml2_tree_candidates.txt"     using 1:2:4 title "libxml2 tree"
 

diff --git a/helm/papers/use_case/stats/validating_time_flea.sh b/helm/papers/use_case/stats/validating_time_flea.sh
index d1cd9d3567591cea099f5d6a879a2ab15d8cffa1..851f5a39cd33acc990f7c005151f275d1750ca9c 100755 (executable)
--- a/helm/papers/use_case/stats/validating_time_flea.sh
+++ b/helm/papers/use_case/stats/validating_time_flea.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 zcat $1 >/tmp/a
 TIME=`~lpadovan/Luca-CVS/Projects/flea/tests/cic /tmp/a`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/validating_time_libxml2_tree.sh b/helm/papers/use_case/stats/validating_time_libxml2_tree.sh
index aa63eec3ef7d81b0891f136178d212b27a0c08f2..0249c1e5cbd1337d20c84d5fa50bf96269c3d94d 100755 (executable)
--- a/helm/papers/use_case/stats/validating_time_libxml2_tree.sh
+++ b/helm/papers/use_case/stats/validating_time_libxml2_tree.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 TIME=`/usr/bin/xmllint --timing --valid --noout $1 2>&1 | fgrep "Parsing" | cut -d ' ' -f 3`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/validating_time_xerces_sax2.sh b/helm/papers/use_case/stats/validating_time_xerces_sax2.sh
index caf0cc614c9fd270b9e492dd336dbb00ec4cdc0f..7d7ea2405a7b14f6df80590da0381d3e5fe03dde 100755 (executable)
--- a/helm/papers/use_case/stats/validating_time_xerces_sax2.sh
+++ b/helm/papers/use_case/stats/validating_time_xerces_sax2.sh
@@ -2,4 +2,4 @@
 zcat $1 >/tmp/a
 cp /projects/helm/xml/dtd/cic.dtd /tmp
 TIME=`./parse/SAX2Print/SAX2Print -v=always /tmp/a`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/validating_time_xerces_tree.sh b/helm/papers/use_case/stats/validating_time_xerces_tree.sh
index 96b9475a049c898f2829b0f45310fa0fb2dd7852..acb1666ae38cb2ab948f91033115a34a9c4e4d52 100755 (executable)
--- a/helm/papers/use_case/stats/validating_time_xerces_tree.sh
+++ b/helm/papers/use_case/stats/validating_time_xerces_tree.sh
@@ -2,4 +2,4 @@
 zcat $1 >/tmp/a
 cp /projects/helm/xml/dtd/cic.dtd /tmp
 TIME=`./parse/DOMCount/DOMCount -v=always /tmp/a`
-echo `fgrep $1 $2 | cut -d ' ' -f 2,3`" "$TIME
+echo `fgrep $1 $2 | cut -d ' ' -f 2,3,4`" "$TIME

diff --git a/helm/papers/use_case/stats/validating_times.gpscript b/helm/papers/use_case/stats/validating_times.gpscript
index 57301dd9b09c08bca192220ed969612af27f11cd..74cbbebeaa76bba57c8734afe429fbc3a7f39024 100644 (file)
--- a/helm/papers/use_case/stats/validating_times.gpscript
+++ b/helm/papers/use_case/stats/validating_times.gpscript
@@ -3,14 +3,14 @@ set key left box
 set label font "Helvetica,8"
 
 set output "parsing_validating_times_candidates.ps"
-plot "parsing_validating_times_xerces_sax2_candidates.txt" using 2:3 title "xerces sax2 parse+validate" with lines smooth bezier, \
-     "parsing_validating_times_xerces_tree_candidates.txt" using 2:3 title "xerces tree parse+validate" with lines smooth bezier, \
-     "parsing_validating_times_libxml2_tree_candidates.txt" using 2:3 title "libxml2 tree parse+validate" with lines smooth bezier, \
-     "parsing_validating_times_flea_candidates.txt" using 2:3 title "flea parse+validate" with lines smooth bezier
+plot "parsing_validating_times_xerces_sax2_candidates.txt"  using 2:4 title "xerces sax2 parse+validate"  with lines smooth bezier, \
+     "parsing_validating_times_xerces_tree_candidates.txt"  using 2:4 title "xerces tree parse+validate"  with lines smooth bezier, \
+     "parsing_validating_times_libxml2_tree_candidates.txt" using 2:4 title "libxml2 tree parse+validate" with lines smooth bezier, \
+     "parsing_validating_times_flea_candidates.txt"         using 2:4 title "flea parse+validate"         with lines smooth bezier
 
 set output "validating_times_candidates.ps"
-plot "validating_times_xerces_sax2_candidates.txt" using 2:3 title "xerces sax2 validate" with lines smooth bezier, \
-     "validating_times_xerces_tree_candidates.txt" using 2:3 title "xerces tree validate" with lines smooth bezier, \
-     "validating_times_libxml2_tree_candidates.txt" using 2:3 title "libxml2 tree validate" with lines smooth bezier, \
-     "validating_times_flea_candidates.txt" using 2:3 title "flea validate" with lines smooth bezier
+plot "validating_times_xerces_sax2_candidates.txt"          using 2:4 title "xerces sax2 validate"        with lines smooth bezier, \
+     "validating_times_xerces_tree_candidates.txt"          using 2:4 title "xerces tree validate"        with lines smooth bezier, \
+     "validating_times_libxml2_tree_candidates.txt"         using 2:4 title "libxml2 tree validate"       with lines smooth bezier, \
+     "validating_times_flea_candidates.txt"                 using 2:4 title "flea validate"               with lines smooth bezier