c766f58d5d
* spot/priv/satcommon.cc, spot/priv/satcommon.hh: Make it possible to set the log file without setting the environment variable. Adjust print_log to take the input state and print it as a new column. * spot/twaalgos/dtbasat.cc, spot/twaalgos/dtwasat.cc: Adjust all calls to print_log. Fix log output for incremental approaches. Prefer purge_unreachable_states() over stats_reachable(). Do not call scc_filter() on colored automata. * spot/twaalgos/dtwasat.hh: Document the new "log" option. * NEWS: Mention the changes. * tests/python/satmin.ipynb: New file. * tests/Makefile.am: Add it. * doc/org/satmin.org, doc/org/tut.org: Link to it. * doc/org/satmin.org, bin/man/spot-x.x: Adjust description of CSV files. * bench/dtgbasat/gen.py, bench/dtgbasat/tabl.pl, bench/dtgbasat/tabl1.pl, bench/dtgbasat/tabl2.pl, bench/dtgbasat/tabl3.pl, bench/dtgbasat/tabl4.pl: Adjust for the new column. * spot/misc/satsolver.cc, spot/misc/satsolver.hh (stats): Make it const. * python/spot/__init__.py (sat_minimize): Add display_log and return_log options. * tests/python/ipnbdoctest.py: Adjust to not compare SAT-minimization logs as they contain timings.
268 lines
6.8 KiB
Perl
Executable file
268 lines
6.8 KiB
Perl
Executable file
#!/usr/bin/perl -w
|
|
|
|
use strict;
|
|
|
|
my $num = 0;
|
|
my @v = ();
|
|
while (<>)
|
|
{
|
|
# G(a | Fb), 1, trad, 2, 4, 8, 1, 1, 1, 1, 0.00165238, DBA, 2, 4, 8, 1, 1, 1, 1, 0.00197852, minDBA, 2, 4, 8, 1, 1, 1, 1, 0.00821457, minDTGBA, 2, 4, 8, 1, 1, 1, 1, 0.0081701
|
|
chomp;
|
|
next if /.*realizable.*/;
|
|
next unless /^[^,]*,[^,]*, DRA,/;
|
|
my $t = [split /,/];
|
|
next if $t->[12] >= 40;
|
|
$v[$num] = $t;
|
|
# print $v[$num]->[48], " ", $#{$v[$num]}, "\n";
|
|
# if ($#{$v[$num]} != 49)
|
|
# {
|
|
# pop $v[$num];
|
|
# push $v[$num], '-', '-';
|
|
# }
|
|
# print $v[$num]->[48], " ", $#{$v[$num]}, "\n";
|
|
|
|
++$num;
|
|
}
|
|
|
|
sub dratcong($$)
|
|
{
|
|
my ($a, $b) = @_;
|
|
return 0 if ($a =~ /.*CONG/ && $b =~ /.*CONG/);
|
|
return $a cmp $b;
|
|
}
|
|
|
|
sub mycmp()
|
|
{
|
|
my $v = dratcong($b->[2], $a->[2]);
|
|
return $v if $v;
|
|
my $n1 = lc $a->[0];
|
|
$n1 =~ s/\W//g;
|
|
my $n2 = lc $b->[0];
|
|
$n2 =~ s/\W//g;
|
|
return $n1 cmp $n2 || $a->[0] cmp $b->[0] || $b->[2] cmp $a->[2];;
|
|
}
|
|
|
|
my @w = sort mycmp @v;
|
|
|
|
print "\\documentclass{standalone}\n
|
|
\\usepackage{amsmath}
|
|
\\usepackage{colortbl}
|
|
\\usepackage{booktabs}
|
|
\\definecolor{mygray}{gray}{0.75} % 1 = white, 0 = black
|
|
\\definecolor{lightgray}{gray}{0.7} % 1 = white, 0 = black
|
|
\\def\\E{\\cellcolor{mygray}}
|
|
\\def\\P{\\cellcolor{red}}
|
|
\\def\\PP{\\cellcolor{yellow}}
|
|
\\def\\F{\\mathsf{F}} % in future
|
|
\\def\\G{\\mathsf{G}} % globally
|
|
\\def\\X{\\mathsf{X}} % next
|
|
\\newcommand{\\CF}{\\ensuremath{\\mathcal{F}}}
|
|
\\DeclareMathOperator{\\W}{\\mathbin{\\mathsf{W}}} % weak until
|
|
\\DeclareMathOperator{\\M}{\\mathbin{\\mathsf{M}}} % strong release
|
|
\\DeclareMathOperator{\\U}{\\mathbin{\\mathsf{U}}} % until
|
|
\\DeclareMathOperator{\\R}{\\mathbin{\\mathsf{R}}} % release
|
|
\\usepackage{adjustbox}
|
|
\\usepackage{array}
|
|
\\def\\clap#1{\\hbox to 0pt{\\hss#1\\hss}}
|
|
|
|
\\newcolumntype{R}[2]{%
|
|
>{\\adjustbox{angle=#1,lap=\\width-(#2)}\\bgroup}%
|
|
l%
|
|
<{\\egroup}%
|
|
}
|
|
\\newcommand*\\rot{\\multicolumn{1}{R{90}{0em}}}%
|
|
";
|
|
|
|
print "\\begin{document}\n";
|
|
print "\\begin{tabular}{lcc|r|r|rr|rr|rr|rrr}";
|
|
print "&&&\\multicolumn{1}{R{25}{0em}}{{DRA}}& \\multicolumn{1}{R{25}{0em}}{{DBA}} & \\multicolumn{2}{R{25}{0em}}{DBA\\footnotesize m..zer} &\\multicolumn{2}{R{25}{0em}}{minDBA} & \\multicolumn{2}{R{25}{0em}}{{minDTBA}} & \\multicolumn{3}{R{25}{0em}}{minDTGBA}\\\\\n";
|
|
print "& \$m\$ & C. & \$|Q|\$ & \$|Q|\$ & \$|Q|\$ & time & \$|Q|\$ & time & \$|Q|\$ & time & \$|Q|\$ & \$|\\CF|\$ & time \\\\\n";
|
|
print "\\midrule\n";
|
|
|
|
sub nonnull($)
|
|
{
|
|
return 1 if $_[0] == 0;
|
|
return $_[0];
|
|
}
|
|
|
|
sub getlastsuccesful($$)
|
|
{
|
|
my ($n,$type) = @_;
|
|
open LOG, "<$n.$type.satlog" or return "";
|
|
my $min = "";
|
|
while (my $line = <LOG>)
|
|
{
|
|
my @f = split(/,/, $line);
|
|
$min = $f[2] if $f[2] ne '';
|
|
}
|
|
$min = ", \$\\le\$$min" if $min ne "";
|
|
return $min;
|
|
}
|
|
|
|
|
|
|
|
my $lasttype = '';
|
|
my $linenum = 0;
|
|
foreach my $tab (@w)
|
|
{
|
|
sub val($)
|
|
{
|
|
my ($n) = @_;
|
|
my $v = $tab->[$n];
|
|
return 0+'inf' if !defined($v) || $v =~ /\s*-\s*/;
|
|
return $v;
|
|
}
|
|
|
|
if (dratcong($lasttype, $tab->[2]))
|
|
{
|
|
# print "\\hline\n";
|
|
$linenum = 0;
|
|
}
|
|
$lasttype = $tab->[2];
|
|
if ($linenum++ % 4 == 0)
|
|
{
|
|
# print "\\arrayrulecolor{lightgray}\\hline\\arrayrulecolor{black}";
|
|
}
|
|
|
|
my $n = $tab->[52];
|
|
my $f = $tab->[0];
|
|
$f =~ s/\&/\\land /g;
|
|
$f =~ s/\|/\\lor /g;
|
|
$f =~ s/!/\\bar /g;
|
|
$f =~ s/<->/\\leftrightarrow /g;
|
|
$f =~ s/->/\\rightarrow /g;
|
|
$f =~ s/[XRWMGFU]/\\$& /g;
|
|
print "\$$f\$\t& ";
|
|
print "$tab->[1] & ";
|
|
# If one of the automata is not deterministic highlight the "Complete" column.
|
|
print "{\\P}" if val(8) == 0 || val(17) == 0 || val(26) == 0 || val(35) == 0 || val(44) == 0;
|
|
print "$tab->[9] & ";
|
|
|
|
if ($tab->[51] =~ m:\s*n/a\s*:) # DRA
|
|
{
|
|
print "&";
|
|
$tab->[51] = 0+'inf';
|
|
}
|
|
else
|
|
{
|
|
# Remove sink state if not complete.
|
|
my $st = $tab->[51] - 1 + $tab->[9] || 1;
|
|
print "$st & ";
|
|
}
|
|
|
|
#TGBA
|
|
#print "$tab->[3] & "; # states
|
|
#print "$tab->[5] & "; # transitions
|
|
#print "$tab->[6] & "; # acc
|
|
#printf("%.2f &", $tab->[10]); # time
|
|
|
|
if ($tab->[12] =~ /\s*-\s*/) # DBA
|
|
{
|
|
print "- & - &";
|
|
$tab->[12] = 0+'inf';
|
|
}
|
|
elsif ($tab->[12] =~ /\s*!\s*/) # DBA
|
|
{
|
|
print "! & ! &";
|
|
$tab->[12] = 0+'inf';
|
|
}
|
|
else
|
|
{
|
|
print "$tab->[12] & "; # states
|
|
#print "$tab->[14] & "; # transitions
|
|
#printf("%.0f &", $tab->[19]);
|
|
}
|
|
|
|
if ($tab->[48] =~ /\s*-\s*/) # DBAminimizer
|
|
{
|
|
print "\\multicolumn{2}{c|}{(killed)}&";
|
|
$tab->[48] = 0+'inf';
|
|
}
|
|
elsif ($tab->[48] =~ m:\s*n/a\s*:) # DBAminimizer
|
|
{
|
|
print " &";
|
|
$tab->[48] = 0+'inf';
|
|
}
|
|
else
|
|
{
|
|
# Remove sink state if not complete.
|
|
my $st = $tab->[48] - 1 + $tab->[9] || 1;
|
|
print "{\\E}" if ($st < $tab->[12]);
|
|
print "{\\P}" if ($st > $tab->[12]);
|
|
print "$st & "; # states
|
|
printf("%.0f &", $tab->[49]);
|
|
}
|
|
|
|
if ($tab->[21] =~ /\s*-\s*/) # minDBA
|
|
{
|
|
my $s = getlastsuccesful($n, "DBA");
|
|
print "\\multicolumn{2}{c|}{(killed$s)}&";
|
|
$tab->[21] = 0+'inf';
|
|
}
|
|
elsif ($tab->[21] =~ /\s*!\s*/) # minDBA
|
|
{
|
|
my $s = getlastsuccesful($n, "DBA");
|
|
print "\\multicolumn{2}{c|}{(intmax$s)}&";
|
|
$tab->[21] = 0+'inf';
|
|
}
|
|
else
|
|
{
|
|
print "{\\E}" if ($tab->[21] < $tab->[12]);
|
|
print "{\\P}" if ($tab->[21] > $tab->[12]);
|
|
print "$tab->[21] & "; # states
|
|
#print "$tab->[23] & "; # transitions
|
|
printf("%.0f &", $tab->[28]);
|
|
}
|
|
|
|
|
|
if ($tab->[39] =~ /\s*-\s*/) # min DTBA
|
|
{
|
|
my $s = getlastsuccesful($n, "DTBA");
|
|
print "\\multicolumn{2}{c|}{(killed$s)}&";
|
|
$tab->[39] = 0+'inf';
|
|
}
|
|
elsif ($tab->[39] =~ /\s*!\s*/) # min DTBA
|
|
{
|
|
my $s = getlastsuccesful($n, "DTBA");
|
|
print "\\multicolumn{2}{c|}{(intmax$s)}&";
|
|
$tab->[39] = 0+'inf';
|
|
}
|
|
else
|
|
{
|
|
print "{\\E}" if ($tab->[39] < $tab->[3]);
|
|
print "{\\P}" if ($tab->[39] > $tab->[3] * nonnull($tab->[6])) or ($tab->[39] > $tab->[12]);
|
|
print "\\textbf" if ($tab->[39] < $tab->[21]);
|
|
print "{$tab->[39]} & "; # states
|
|
#print "$tab->[41] & "; # transitions
|
|
printf("%.0f &", $tab->[46]);
|
|
}
|
|
|
|
if ($tab->[30] =~ /\s*-\s*/) # minTGBA
|
|
{
|
|
my $s = getlastsuccesful($n, "DTGBA");
|
|
print "\\multicolumn{3}{c}{(killed$s)}";
|
|
$tab->[30] = 0+'inf';
|
|
}
|
|
elsif ($tab->[30] =~ /\s*!\s*/) # minTGBA
|
|
{
|
|
my $s = getlastsuccesful($n, "DTGBA");
|
|
print "\\multicolumn{3}{c}{(intmax$s)}";
|
|
$tab->[30] = 0+'inf';
|
|
}
|
|
else
|
|
{
|
|
print "{\\E}" if ($tab->[30] < $tab->[3]);
|
|
print "{\\P}" if ($tab->[30] > $tab->[3]) or ($tab->[30] > $tab->[12]) or ($tab->[30] > $tab->[21]) or ($tab->[30] > $tab->[39]);
|
|
print "{\\PP}" if ($tab->[21] ne 'inf' && $tab->[30] * ($tab->[33] + 1) < $tab->[21]);
|
|
print "\\textbf" if ($tab->[30] < $tab->[39]);
|
|
print "{$tab->[30]} & "; # states
|
|
#print "$tab->[32] & "; # transitions
|
|
print "\\textbf" if ($tab->[33] > $tab->[6]);
|
|
print "{$tab->[33]} & "; # acc
|
|
printf("%.0f ", $tab->[37]);
|
|
}
|
|
|
|
print "\\\\\n";
|
|
}
|
|
print "\\end{tabular}\n";
|
|
print "\\end{document}\n";
|