diff --git a/ChangeLog b/ChangeLog index a45ff4a83..bdf89b3db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-29 Alexandre Duret-Lutz + + * bench/gspn-ssp/tools/sum: Fix the order of stats in -e4. + If the MAXLINES environment variable is defined, flush the page + as needed. Sort the models only once. + 2008-08-27 Alexandre Duret-Lutz * bench/gspn-ssp/README: New file. diff --git a/bench/gspn-ssp/tools/sum b/bench/gspn-ssp/tools/sum index e23e1cd90..2fe078bd4 100755 --- a/bench/gspn-ssp/tools/sum +++ b/bench/gspn-ssp/tools/sum @@ -26,8 +26,8 @@ my %C = ( "SCC in search stack", "contained map size", "find_state count", - "max. depth", "inclusion count", + "max. depth", "removed components", "states", "transitions", @@ -98,7 +98,7 @@ my %C = ( ], ); -$C{e2a} = $C{e4}; +$C{e2a} = $C{e2}; $C{e45} = $C{e5}; $C{e54} = $C{e5}; $C{e5L} = $C{e5}; @@ -115,6 +115,8 @@ my %P; my %Canon; my %Canons; +my $lines = 0; + if (0 == @ARGV) { @ARGV = glob "results/*.log"; @@ -216,10 +218,15 @@ if (exists $ENV{FORTETABLE}) } +my @models = sort keys %Canons; foreach my $meth (sort keys %H) { - my @models = sort keys %Canons; + if ((exists $ENV{MAXLINES}) + && ($lines + $S{$meth} + 2 > $ENV{MAXLINES})) + { + print " "; $lines=0; + } printf "%21s", ""; foreach my $m (@models) @@ -228,7 +235,7 @@ foreach my $meth (sort keys %H) $n .= " " x ((16-length($n))/2); printf "%18s", $n; } - print "\n"; + print "\n"; ++$lines; printf "%21s", ""; foreach my $n (@models) @@ -241,7 +248,7 @@ foreach my $meth (sort keys %H) } print " " x (9*$x); } - print "\n"; + print "\n"; ++$lines; for (my $i = 0; $i < $S{$meth}; ++$i) { @@ -276,6 +283,6 @@ foreach my $meth (sort keys %H) } print " " x (9*$x); } - print "\n"; + print "\n"; ++$lines; } }