Commit 4ff875f4 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

Replace spot::ltl_file by a rewritten spot::ltl::ltl_file.

* src/tgba/tgbafromfile.cc, src/tgba/tgbafromfile.hh: Delete these
files.
* src/tgba/Makefile.am: Remove them.
* src/ltl/ltlparse/ltlfile.hh, src/ltl/ltlparse/ltlfile.cc: New
files.
* src/ltl/ltlparse/Makefile.am: Add them.
* bench/scc-stats/stats.cc, bench/split-product/cutscc.cc: Rewrite
using the new class.
parent dd3ac6b4
2010-01-30 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Replace spot::ltl_file by a rewritten spot::ltl::ltl_file.
* src/tgba/tgbafromfile.cc, src/tgba/tgbafromfile.hh: Delete these
files.
* src/tgba/Makefile.am: Remove them.
* src/ltl/ltlparse/ltlfile.hh, src/ltl/ltlparse/ltlfile.cc: New
files.
* src/ltl/ltlparse/Makefile.am: Add them.
* bench/scc-stats/stats.cc, bench/split-product/cutscc.cc: Rewrite
using the new class.
2010-01-30 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Check for missing Copyright blurbs, and add them.
......
// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Laboratoire
// d'Informatique de Paris 6 (LIP6), dpartement Systmes Rpartis
// Coopratifs (SRC), Universit Pierre et Marie Curie.
// Copyright (C) 2009, 2010 Laboratoire de Recherche et Dveloppement
// de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
......@@ -23,7 +22,8 @@
#include <math.h>
#include "tgbaalgos/scc.hh"
#include "tgbaalgos/cutscc.hh"
#include "tgba/tgbafromfile.hh"
#include "ltlparse/ltlfile.hh"
#include "tgbaalgos/ltl2tgba_fm.hh"
namespace spot
{
......@@ -121,14 +121,15 @@ int main (int argc, char* argv[])
std::vector<double> dead_paths;
std::vector<double> spanning_paths;
std::vector<double> self_loops;
// Get each LTL formula.
spot::ltl_file* formulae = new spot::ltl_file (argv[1], dict);
formulae->begin();
unsigned k = 0;
do
// Get each LTL formula.
spot::ltl::ltl_file formulae(argv[1]);
spot::ltl::formula* f;
while((f = formulae.next()))
{
++k;
spot::tgba* a = formulae->current_automaton();
spot::tgba* a = ltl_to_tgba_fm(f, dict, /* exprop */ true);
f->destroy();
// Get number of spanning paths.
spot::scc_map m (a);
m.build_map();
......@@ -156,9 +157,13 @@ int main (int argc, char* argv[])
for (j = 0; j < (*paths)[i].size(); ++j)
delete (*paths)[i][j];
delete paths;
formulae->next();
} while (!formulae->done());
delete formulae;
}
if (count == 0)
{
std::cerr << "Nothing read." << std::endl;
exit(1);
}
// We could have inserted at the right place instead of
// sorting at the end.
......
// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Laboratoire
// d'Informatique de Paris 6 (LIP6), dpartement Systmes Rpartis
// Coopratifs (SRC), Universit Pierre et Marie Curie.
// Copyright (C) 2009, 2010 Laboratoire de Recherche et Dveloppement
// de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
......@@ -23,7 +22,8 @@
#include <limits>
#include <sys/time.h>
#include "tgbaalgos/scc.hh"
#include "tgba/tgbafromfile.hh"
#include "ltlparse/ltlfile.hh"
#include "ltlvisit/tostring.hh"
#include "tgbaalgos/dotty.hh"
#include "tgbaalgos/randomgraph.hh"
#include "tgbaalgos/emptiness.hh"
......@@ -33,6 +33,7 @@
#include "ltlvisit/apcollect.hh"
#include "tgbaparse/public.hh"
#include "tgbaalgos/cutscc.hh"
#include "tgbaalgos/ltl2tgba_fm.hh"
namespace spot
{
......@@ -162,18 +163,19 @@ int main(int argc, char* argv[])
unsigned iter_count = 1;
std::cout << "Each operation is repeated " << iter_count
<< " times to improve precision." << std::endl << std::endl;
spot::ltl_file* formulae = new spot::ltl_file (argv[1], dict);
formulae->begin();
do
spot::ltl::ltl_file formulae(argv[1]);
spot::ltl::formula* f;
while((f = formulae.next()))
{
spot::tgba* a = ltl_to_tgba_fm(f, dict, /* exprop */ true);
++i;
spot::tgba* a = formulae->current_automaton();
std::cout << "Formula " << i << std::endl;
std::cout << formulae->current_formula_string() << std::endl << std::endl;
std::cout << spot::ltl::to_string(f) << std::endl << std::endl;
if (argc != 4)
{
spot::ltl::atomic_prop_set* s;
s = spot::ltl::atomic_prop_collect(formulae->current_formula(), 0);
s = spot::ltl::atomic_prop_collect(f, 0);
spot::ltl::atomic_prop_set::iterator sit;
delete r;
r = spot::random_graph(10000, 0.0001, s, dict, 0, 0.15, 0.5);
......@@ -332,14 +334,13 @@ int main(int argc, char* argv[])
split_sum += (accepting_vector[i]) ? min:max;
delete a;
f->destroy();
std::string next = "----------------------------------------";
std::cout << next << next << std::endl;
std::cout << std::endl;
formulae->next();
} while (!formulae->done());
}
delete r;
delete dict;
delete formulae;
std::cout << "Full " << full_sum << "s" << std::endl
<< "Cutting " << cut_sum << "s" << std::endl
<< "Split " << split_sum << "s" << std::endl;
......
## Copyright (C) 2008, 2009 Laboratoire de Recherche et Développement
## Copyright (C) 2008, 2009, 2010 Laboratoire de Recherche et Développement
## de l'Epita (LRDE).
## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris
## 6 (LIP6), dpartement Systmes Rpartis Coopratifs (SRC),
......@@ -56,10 +56,12 @@ EXTRA_DIST = $(LTLPARSE_YY)
libltlparse_la_SOURCES = \
fmterror.cc \
$(FROM_LTLPARSE_YY) \
ltlfile.cc \
ltlscan.ll \
parsedecl.hh
ltlparse_HEADERS = \
public.hh \
ltlfile.hh \
location.hh \
public.hh \
position.hh
// Copyright (C) 2009, 2010 Laboratoire de Recherche et Dveloppement
// Copyright (C) 2010 Laboratoire de Recherche et Dveloppement
// de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
......@@ -18,76 +18,54 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
#include "tgba/public.hh"
#include "tgbafromfile.hh"
#include "ltlfile.hh"
#include "public.hh"
namespace spot
{
ltl_file::ltl_file(const char* filename, bdd_dict* dict)
namespace ltl
{
input_file_.open(filename);
assert(input_file_.is_open());
done_ = false;
env_ = &(ltl::default_environment::instance());
dict_ = dict;
f_ = 0;
fm_exprop_opt_ = false;
fm_symb_merge_opt_ = true;
post_branching_ = false;
fair_loop_approx_ = false;
unobservables_ = 0;
fm_red_ = ltl::Reduce_None;
}
ltl_file::~ltl_file()
{
input_file_.close();
}
bool ltl_file::done()
{
return(input_file_.eof());
}
ltl_file::ltl_file(const std::string& filename)
: in(filename.c_str())
{
if (!in)
{
std::cerr << "Cannot open " << filename << std::endl;
exit(2);
}
}
void ltl_file::next()
{
if (f_)
ltl_file::ltl_file(const char* filename)
: in(filename)
{
f_->destroy();
f_ = 0;
if (!in)
{
std::cerr << "Cannot open " << filename << std::endl;
exit(2);
}
}
std::string line = "";
while (line == "" && !input_file_.eof())
getline(input_file_, line);
formula_ = line;
}
void ltl_file::begin()
{
next();
}
formula* ltl_file::next()
{
if (!in.good())
return 0;
tgba* ltl_file::current_automaton()
{
spot::tgba* a = 0;
f_ = spot::ltl::parse(formula_, pel_, *env_, false);
if (spot::ltl::format_parse_errors(std::cerr, formula_, pel_))
return 0;
// Generate the automaton corresponding to the formula
a = spot::ltl_to_tgba_fm(f_, dict_, fm_exprop_opt_,
fm_symb_merge_opt_, post_branching_,
fair_loop_approx_, unobservables_,
fm_red_);
return a;
}
std::string input;
do
{
if (!std::getline(in, input))
return 0;
}
while (input == "");
ltl::formula* ltl_file::current_formula()
{
return f_;
}
spot::ltl::parse_error_list pel;
formula* f = parse(input, pel);
int ret = spot::ltl::format_parse_errors(std::cerr, input, pel);
if (ret)
exit(ret);
return f;
}
std::string ltl_file::current_formula_string()
{
return formula_;
}
}
// Copyright (C) 2009, 2010 Laboratoire de Recherche et Dveloppement
// Copyright (C) 2010 Laboratoire de Recherche et Dveloppement
// de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
......@@ -18,44 +18,31 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
#ifndef SPOT_TGBA_TGBAFROMFILE_HH
# define SPOT_TGBA_TGBAFROMFILE_HH
#include <iosfwd>
#ifndef SPOT_LTLPARSE_LTLFILE_HH
# define SPOT_LTLPARSE_LTLFILE_HH
#include <fstream>
#include "tgba/public.hh"
#include "tgbaalgos/ltl2tgba_fm.hh"
#include "tgbaalgos/save.hh"
#include "ltlparse/public.hh"
#include "ltlast/formula.hh"
namespace spot
{
class ltl_file
namespace ltl
{
public:
ltl_file(const char* filename, bdd_dict* dict);
~ltl_file();
bool done();
void next();
void begin();
tgba* current_automaton();
std::string current_formula_string();
ltl::formula* current_formula();
private:
bool done_;
std::string formula_;
ltl::formula* f_;
std::ifstream input_file_;
ltl::parse_error_list pel_;
ltl::environment* env_;
bdd_dict* dict_;
bool fm_exprop_opt_;
bool fm_symb_merge_opt_;
bool post_branching_;
bool fair_loop_approx_;
ltl::atomic_prop_set* unobservables_;
int fm_red_;
};
}
/// \brief Read LTL formulae from a file, one by one
/// \ingroup ltl_io
class ltl_file
{
public:
ltl_file(const std::string& filename);
ltl_file(const char* filename);
/// Return the next parsed LTL formula, and 0 at end of file.
formula* next();
private:
std::ifstream in;
};
}
}
#endif // SPOT_TGBA_TGBAFROMFILE_HH
#endif
......@@ -44,7 +44,6 @@ tgba_HEADERS = \
tgbabddcoredata.hh \
tgbabddfactory.hh \
tgbaexplicit.hh \
tgbafromfile.hh \
tgbakvcomplement.hh \
tgbascc.hh \
tgbaproduct.hh \
......@@ -69,7 +68,6 @@ libtgba_la_SOURCES = \
tgbabddconcreteproduct.cc \
tgbabddcoredata.cc \
tgbaexplicit.cc \
tgbafromfile.cc \
tgbakvcomplement.cc \
tgbaproduct.cc \
tgbareduc.cc \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment