From: Luca Padovani Date: Tue, 23 Nov 2004 15:15:41 +0000 (+0000) Subject: * several adjustments after introduction of the depth column X-Git-Tag: PRE_UNIVERSES~16 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=81a63235c649302a1a4691ba37e30282c9c0ef5a;p=helm.git * 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 1eb180dce..6858eb637 100644 --- 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 74d2865e5..3704d92a4 100644 --- a/helm/papers/use_case/stats/extract.xsl +++ b/helm/papers/use_case/stats/extract.xsl @@ -29,8 +29,8 @@ - + + diff --git a/helm/papers/use_case/stats/mkdiff.cc b/helm/papers/use_case/stats/mkdiff.cc index aed015dca..d31bfbfc1 100644 --- 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 634f2c11d..e8c94bc99 100755 --- 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 50a2abaae..71b319d76 100755 --- 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 f6e9a6d76..711b92e6a 100755 --- 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 9e08b6161..55d3e211d 100755 --- 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 64f151321..405fa42a4 100755 --- 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 29e55dfb4..c5457f5a3 100755 --- 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 06b799236..677761aa9 100644 --- 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 d1cd9d356..851f5a39c 100755 --- 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 aa63eec3e..0249c1e5c 100755 --- 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 caf0cc614..7d7ea2405 100755 --- 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 96b9475a0..acb1666ae 100755 --- 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 57301dd9b..74cbbebea 100644 --- 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