alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bin: use common_aoutput in ltl2tgba

Browse source 
* src/bin/common_aoutput.hh, src/bin/common_aoutput.cc: Adjust to
support three kind of statistics printer, depending on whether the
tool input formulas, automata, or nothing.
* src/bin/randaut.cc, src/bin/autfilt.cc: Adjust.
* src/bin/ltl2tgba.cc: Use the common_aoutput printers.  The
--csv-escape option disappeared along the way, but it was not honored
anyway...
This commit is contained in:
Alexandre Duret-Lutz 2015-01-02 21:47:18 +01:00
parent 72737dfefc
commit 40fb80ea2c
5 changed files with 45 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/bin/common_aoutput.hh
View file

@ -65,6 +65,9 @@ extern const struct argp aoutput_o_format_argp;
// Parse output options
int parse_opt_aoutput(int key, char* arg, struct argp_state* state);
enum stat_style { no_input, aut_input, ltl_input };
/// \brief prints various statistics about a TGBA
///
/// This object can be configured to display various statistics
@ -74,10 +77,10 @@ class hoa_stat_printer: protected spot::stat_printer
{
public:
hoa_stat_printer(std::ostream& os, const char* format,
bool has_input = false)
stat_style input = no_input)
: spot::stat_printer(os, format)
{
if (has_input)
if (input == aut_input)
{
declare('A', &haut_acc_);
declare('C', &haut_scc_);
@ -88,7 +91,8 @@ public:
}
declare('F', &filename_);
declare('L', &location_);
declare('f', &filename_); // Override the formula printer.
if (input != ltl_input)
declare('f', &filename_); // Override the formula printer.
declare('m', &aut_name_);
declare('w', &aut_word_);
}
@ -100,6 +104,7 @@ public:
std::ostream&
print(const spot::const_hoa_aut_ptr& haut,
const spot::const_tgba_digraph_ptr& aut,
const spot::ltl::formula* f,
const char* filename, int loc, double run_time)
{
filename_ = filename;
@ -177,7 +182,7 @@ public:
}
}
return this->spot::stat_printer::print(aut, 0, run_time);
return this->spot::stat_printer::print(aut, f, run_time);
}
private:
@ -202,10 +207,11 @@ class automaton_printer
public:
automaton_printer(bool has_input = false);
automaton_printer(stat_style input = no_input);
void
print(const spot::tgba_digraph_ptr& aut,
const spot::ltl::formula* f = nullptr,
// Input location for errors and statistics.
const char* filename = nullptr,
int loc = -1,