lbtt 1.0.2
This commit is contained in:
Alexandre Duret-Lutz
parent
8128d92b36
commit
06226f3227
65 changed files with 222 additions and 138 deletions
|
|
@ -1 +1 @@
|
|||
lbtt was written by Heikki Tauriainen <heikki.tauriainen@hut.fi>
|
||||
Heikki Tauriainen <heikki.tauriainen@hut.fi>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,35 @@
|
|||
2003-07-18 Heikki Tauriainen <heikki.tauriainen@hut.fi>
|
||||
|
||||
* UserCommands.cc (printAutomatonAnalysisResults): Ensure that
|
||||
the states in a witness for the nonemptiness of two Bûchi
|
||||
automata are distinct to prevent the truth valuation for the
|
||||
atomic propositions from being defined multiple times in any
|
||||
state of the witness.
|
||||
|
||||
* Version 1.0.2 released.
|
||||
|
||||
2003-07-17 Heikki Tauriainen <heikki.tauriainen@hut.fi>
|
||||
|
||||
* NeverClaimAutomaton.cc (ParseErrorException::ParseErrorException):
|
||||
Fix a string buffer overflow.
|
||||
|
||||
* ProductAutomaton.cc (findAcceptingExecution): Concatenate
|
||||
fragments of an accepting cycle in the correct order. (Thanks to
|
||||
Joachim Klein for pointing out an example uncovering the bug
|
||||
in previous releases.)
|
||||
|
||||
2002-11-04 Heikki Tauriainen <heikki.tauriainen@hut.fi>
|
||||
|
||||
* StatDisplay.cc (printCollectiveStats): If using more than five
|
||||
formula operators (but the total number of operators is not
|
||||
a multiple of 5), insert an empty line in the output before the
|
||||
last row of the operator distribution table.
|
||||
|
||||
2002-10-21 Heikki Tauriainen <heikki.tauriainen@hut.fi>
|
||||
|
||||
* BitArray.cc (BitArray::find): Fix bug in testing whether
|
||||
all accessed bytes were zero.
|
||||
|
||||
2002-10-01 Heikki Tauriainen <heikki.tauriainen@hut.fi>
|
||||
|
||||
* Version 1.0.1 released.
|
||||
|
|
|
|||
14
lbtt/NEWS
14
lbtt/NEWS
|
|
@ -1,5 +1,5 @@
|
|||
lbtt NEWS -- history of user-visible changes. 01 Oct 2002
|
||||
Copyright (C) 2002 Heikki Tauriainen
|
||||
lbtt NEWS -- history of user-visible changes. 18 Jul 2003
|
||||
Copyright (C) 2003 Heikki Tauriainen
|
||||
|
||||
Permission is granted to anyone to make or distribute verbatim copies
|
||||
of this document as received, in any medium, provided that the
|
||||
|
|
@ -12,6 +12,16 @@ Copyright (C) 2002 Heikki Tauriainen
|
|||
|
||||
Please send bug reports to <heikki.tauriainen@hut.fi>.
|
||||
|
||||
Version 1.0.2
|
||||
|
||||
* Bug fix release.
|
||||
|
||||
* The official WWW home page of the tool is now located at
|
||||
<http://www.tcs.hut.fi/Software/lbtt/>. From there you can also
|
||||
access the FormulaOptions block generator for lbtt configuration
|
||||
files. The generator has limited support for specifying relative
|
||||
(instead of absolute) priorities for the LTL operators.
|
||||
|
||||
Version 1.0.1
|
||||
|
||||
* This release does not add new functionality to the program apart from
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
lbtt version 1.0.1
|
||||
lbtt version 1.0.2
|
||||
------------------
|
||||
|
||||
lbtt is a tool for testing programs which translate formulas
|
||||
lbtt is a tool for testing programs that translate formulas
|
||||
expressed in propositional linear temporal logic (LTL) into
|
||||
Büchi automata. The goal of the tool is to assist in the
|
||||
correct implementation of LTL-to-Büchi translation algorithms
|
||||
|
|
@ -11,7 +11,7 @@ for very basic profiling of different LTL-to-B
|
|||
to evaluate their performance.
|
||||
|
||||
The latest version of the program is available at
|
||||
<http://www.tcs.hut.fi/%7Ehtauriai/lbtt/>.
|
||||
<http://www.tcs.hut.fi/Software/lbtt/>.
|
||||
|
||||
lbtt is free software, you may change and redistribute it under
|
||||
the terms of the GNU General Public License. lbtt comes with
|
||||
|
|
@ -82,4 +82,4 @@ Documentation:
|
|||
|
||||
The documentation is also available in various formats
|
||||
at the program's home page at
|
||||
<http://www.tcs.hut.fi/%7Ehtauriai/lbtt/>.
|
||||
<http://www.tcs.hut.fi/Software/lbtt/>.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ([2.53])
|
||||
AC_INIT([lbtt], [1.0.1], [heikki.tauriainen@hut.fi])
|
||||
AC_REVISION([Revision: 1.1])
|
||||
AC_INIT([lbtt], [1.0.2], [heikki.tauriainen@hut.fi])
|
||||
AC_REVISION([Revision: 1.2])
|
||||
AC_CONFIG_SRCDIR([src/main.cc])
|
||||
AM_INIT_AUTOMAKE
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
|
|
|
|||
|
|
@ -14,12 +14,14 @@
|
|||
This file documents how to use the LTL-to-B@"uchi
|
||||
translator testbench @command{lbtt}.
|
||||
|
||||
Copyright @copyright{} 2001 Heikki Tauriainen
|
||||
Copyright @copyright{} 2003 Heikki Tauriainen
|
||||
@ifinfo
|
||||
@email{heikki.tauriainen@@hut.fi}
|
||||
@end ifinfo
|
||||
@ifnotinfo
|
||||
@ifnothtml
|
||||
<@email{heikki.tauriainen@@hut.fi}>
|
||||
@end ifnothtml
|
||||
@end ifnotinfo
|
||||
|
||||
@ifhtml
|
||||
|
|
@ -66,11 +68,11 @@ under the above conditions for modified versions.
|
|||
@author Heikki Tauriainen <@email{heikki.tauriainen@@hut.fi}>
|
||||
@page
|
||||
@vskip 0pt plus 1filll
|
||||
Copyright @copyright{} 2001 Heikki Tauriainen
|
||||
Copyright @copyright{} 2003 Heikki Tauriainen
|
||||
<@email{heikki.tauriainen@@hut.fi}>
|
||||
|
||||
The latest version of this manual can be obtained from@*
|
||||
<@url{http://www.tcs.hut.fi/%7Ehtauriai/lbtt/}>.
|
||||
<@url{http://www.tcs.hut.fi/Software/lbtt/}>.
|
||||
|
||||
Permission is granted to make and distribute verbatim
|
||||
copies of this manual provided the copyright notice and
|
||||
|
|
@ -101,7 +103,7 @@ under the above conditions for modified versions.
|
|||
for translating propositional linear temporal logic formulas into
|
||||
B@"uchi automata.
|
||||
|
||||
This is edition 1.0.0 of the @command{lbtt} documentation. This edition
|
||||
This is edition 1.0.1 of the @command{lbtt} documentation. This edition
|
||||
applies to @command{lbtt} versions 1.0.x.
|
||||
|
||||
@command{lbtt} is free software, you may change and redistribute it
|
||||
|
|
@ -203,12 +205,12 @@ formulas as input and then performing simple consistency checks on the
|
|||
resulting automata to test whether the translators seem to operate correctly
|
||||
in practice. (See
|
||||
@ifnottex
|
||||
@ref{[Tau00]}
|
||||
@ref{[TH02]}
|
||||
@end ifnottex
|
||||
@iftex
|
||||
[Tau00]
|
||||
[TH02]
|
||||
@end iftex
|
||||
for a description of the theory behind the testing methods.) If the tests
|
||||
for more information on the theory behind the testing methods.) If the tests
|
||||
suggest an implementation
|
||||
error in a translator, @command{lbtt} can generate sample data which causes
|
||||
a test failure and which may also be useful for debugging the
|
||||
|
|
@ -240,6 +242,13 @@ together with the outline of @command{lbtt}'s testing procedure. However, the
|
|||
chapter is not intended to be a thorough introduction to the theoretical
|
||||
background of the different tests; see, for example,
|
||||
@ifnottex
|
||||
@ref{[TH02]}
|
||||
@end ifnottex
|
||||
@iftex
|
||||
[TH02]
|
||||
@end iftex
|
||||
or
|
||||
@ifnottex
|
||||
@ref{[Tau00]}
|
||||
@end ifnottex
|
||||
@iftex
|
||||
|
|
@ -3821,10 +3830,10 @@ originally based on the algorithm presented in
|
|||
@end iftex
|
||||
See
|
||||
@ifinfo
|
||||
@url{http://netlib.bell-labs.com/netlib/spin/whatispin.html}
|
||||
@url{http://spinroot.com/spin/whatispin.html}
|
||||
@end ifinfo
|
||||
@ifnotinfo
|
||||
<@uref{http://netlib.bell-labs.com/netlib/spin/whatispin.html}>
|
||||
<@uref{http://spinroot.com/spin/whatispin.html}>
|
||||
@end ifnotinfo
|
||||
for more information.
|
||||
|
||||
|
|
@ -3947,19 +3956,25 @@ pages 247---263. Springer-Verlag, 2000.
|
|||
|
||||
@item @anchor{[Tau00]} [Tau00]
|
||||
H. Tauriainen. Automated testing of B@"uchi automata translators
|
||||
for linear temporal logic. Technical report A66, Laboratory for Theoretical
|
||||
for linear temporal logic. Research report A66, Laboratory for Theoretical
|
||||
Computer Science, Helsinki University of Technology, Espoo, Finland,
|
||||
2000. Available on the WWW at
|
||||
@ifinfo
|
||||
@url{http://www.tcs.hut.fi/Publications/reports/A66abstract.html}
|
||||
@url{http://www.tcs.hut.fi/Publications/info/bibdb.HUT-TCS-A66.shtml}
|
||||
@end ifinfo
|
||||
@ifhtml
|
||||
<@uref{http://www.tcs.hut.fi/Publications/reports/A66abstract.html}>.
|
||||
<@uref{http://www.tcs.hut.fi/Publications/info/bibdb.HUT-TCS-A66.shtml}>.
|
||||
@end ifhtml
|
||||
@iftex
|
||||
<@url{http://www.tcs.hut.fi/Publications/reports/ A66abstract.html}>.
|
||||
<@url{http://www.tcs.hut.fi/Publications/info/ bibdb.HUT-TCS-A66.shtml}>.
|
||||
@end iftex
|
||||
|
||||
@item @anchor{[TH02]} [TH02]
|
||||
H. Tauriainen and K. Heljanko. Testing LTL formula translation into B@"uchi
|
||||
automata.
|
||||
@i{International Journal on Software Tools for Technology Transfer (STTT)}
|
||||
4(1):57---70, 2002.
|
||||
|
||||
@item @anchor{[Var96]} [Var96]
|
||||
M.@: Y.@: Vardi. An automata-theoretic approach to linear temporal logic.
|
||||
In @i{Logics for Concurrency: Structure versus Automata}, volume 1043 of
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
@ -378,7 +378,7 @@ unsigned long int BitArray::find(const unsigned long int max_count) const
|
|||
for (i = 0; i < bsize && bits[i] == 0; ++i)
|
||||
;
|
||||
|
||||
if (i == max_count)
|
||||
if (i == bsize)
|
||||
return max_count;
|
||||
|
||||
unsigned char c = bits[i];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
@ -312,7 +312,7 @@ ParseErrorException::ParseErrorException
|
|||
else
|
||||
{
|
||||
string space_string(msg.substr(0, error_pos));
|
||||
for (string::size_type c = 0; c < msg.length(); c++)
|
||||
for (string::size_type c = 0; c < space_string.length(); c++)
|
||||
if (space_string[c] != ' ' && space_string[c] != '\t')
|
||||
space_string[c] = ' ';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
@ -864,12 +864,15 @@ void ProductAutomaton::findAcceptingExecution
|
|||
all_acceptance_sets_on_path = false;
|
||||
}
|
||||
|
||||
deque<StateIdPair, ALLOC(StateIdPair) > cycle_fragment;
|
||||
while (state != bfs_root)
|
||||
{
|
||||
cycle.push_back(make_pair(buchiState(state),
|
||||
systemState(state)));
|
||||
cycle_fragment.push_back(make_pair(buchiState(state),
|
||||
systemState(state)));
|
||||
state = shortest_path_predecessor[state];
|
||||
}
|
||||
cycle.insert(cycle.begin(), cycle_fragment.begin(),
|
||||
cycle_fragment.end());
|
||||
|
||||
bfs_root = (*predecessor)->targetNode();
|
||||
visited.clear(nodes.size());
|
||||
|
|
@ -887,13 +890,16 @@ void ProductAutomaton::findAcceptingExecution
|
|||
backward_search_queue.pop_front();
|
||||
}
|
||||
|
||||
deque<StateIdPair, ALLOC(StateIdPair) > cycle_fragment;
|
||||
while (state != bfs_root)
|
||||
{
|
||||
cycle.push_back(make_pair(buchiState(state),
|
||||
systemState(state)));
|
||||
cycle_fragment.push_back(make_pair(buchiState(state),
|
||||
systemState(state)));
|
||||
state = shortest_path_predecessor[state];
|
||||
}
|
||||
|
||||
cycle.insert(cycle.begin(), cycle_fragment.begin(),
|
||||
cycle_fragment.end());
|
||||
cycle.push_back(make_pair(buchiState(search_start_state),
|
||||
systemState(search_start_state)));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
@ -912,6 +912,8 @@ void printCollectiveStats(ostream& stream, int indent)
|
|||
|
||||
if (number_of_symbols_printed % 5 != 0)
|
||||
{
|
||||
if (number_of_symbols_printed > 5)
|
||||
estream << '\n';
|
||||
estream << ind + " operator " + symbol_name_string + '\n'
|
||||
+ ind + " # " + symbol_number_string + '\n'
|
||||
+ ind + " #/formula " + symbol_distribution_string
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
@ -965,53 +965,73 @@ void printAutomatonAnalysisResults
|
|||
* intersection automaton from the result.
|
||||
*/
|
||||
|
||||
deque<BuchiAutomaton::size_type, ALLOC(BuchiAutomaton::size_type) > prefix;
|
||||
deque<BuchiAutomaton::size_type, ALLOC(BuchiAutomaton::size_type) > cycle;
|
||||
vector<StateSpace::size_type, ALLOC(StateSpace::size_type) > path;
|
||||
|
||||
while (!execution.first.empty())
|
||||
{
|
||||
prefix.push_back(execution.first.front().first);
|
||||
path.push_back(execution.first.front().first);
|
||||
execution.first.pop_front();
|
||||
}
|
||||
for (deque<BuchiAutomaton::StateIdPair,
|
||||
ALLOC(BuchiAutomaton::StateIdPair) >::const_iterator
|
||||
state = execution.first.begin();
|
||||
state != execution.first.end();
|
||||
++state)
|
||||
path.push_back(state->first);
|
||||
|
||||
while (!execution.second.empty())
|
||||
{
|
||||
cycle.push_back(execution.second.front().first);
|
||||
path.push_back(execution.second.front().first);
|
||||
execution.second.pop_front();
|
||||
}
|
||||
const vector<StateSpace::size_type, ALLOC(StateSpace::size_type) >
|
||||
::size_type loop_pos = path.size();
|
||||
|
||||
for (deque<BuchiAutomaton::StateIdPair,
|
||||
ALLOC(BuchiAutomaton::StateIdPair) >::const_iterator
|
||||
state = execution.second.begin();
|
||||
state != execution.second.end();
|
||||
++state)
|
||||
path.push_back(state->first);
|
||||
|
||||
/*
|
||||
* Construct an execution accepted by both of the automata. This is done
|
||||
* by giving suitable truth assignments for the atomic propositions in
|
||||
* selected states of the state space to which the intersection automaton
|
||||
* was converted.
|
||||
* 'path.size()' states, where `path' corresponds to an accepting run of
|
||||
* the intersection automaton. (The state space representing the
|
||||
* intersection automaton is reused for this purpose, since it is not
|
||||
* needed any longer.) In addition, `prefix' and `cycle' (required for
|
||||
* displaying the execution) are built to refer to the reused states.
|
||||
*/
|
||||
|
||||
GraphEdgeContainer::const_iterator transition;
|
||||
deque<StateSpace::size_type, ALLOC(StateSpace::size_type) > prefix, cycle;
|
||||
|
||||
path.push_back(cycle.front());
|
||||
/*
|
||||
* Ensure that the state space is large enough to contain the execution
|
||||
* (the execution may pass several times through a state in the
|
||||
* intersection automaton).
|
||||
*/
|
||||
|
||||
if (automaton_as_statespace.size() < path.size())
|
||||
automaton_as_statespace.expand
|
||||
(path.size() - automaton_as_statespace.size());
|
||||
|
||||
path.push_back(path[loop_pos]); /* use the first state of the cycle as a
|
||||
* temporary sentinel element
|
||||
*/
|
||||
|
||||
for (vector<StateSpace::size_type, ALLOC(StateSpace::size_type) >
|
||||
::size_type state = 0;
|
||||
state + 1 < path.size();
|
||||
state++)
|
||||
++state)
|
||||
{
|
||||
GraphEdgeContainer::const_iterator transition;
|
||||
|
||||
for (transition = (*a)[path[state]].edges().begin();
|
||||
(*transition)->targetNode() != path[state + 1];
|
||||
++transition)
|
||||
;
|
||||
|
||||
automaton_as_statespace[path[state]].positiveAtoms()
|
||||
automaton_as_statespace[state].positiveAtoms()
|
||||
= static_cast<BuchiAutomaton::BuchiTransition*>(*transition)
|
||||
->guard().findPropositionalModel
|
||||
(configuration.formula_options.formula_generator.
|
||||
number_of_available_variables);
|
||||
|
||||
(state < loop_pos ? prefix : cycle).push_back(state);
|
||||
}
|
||||
|
||||
path.pop_back();
|
||||
path.pop_back(); /* remove the sentinel element */
|
||||
|
||||
delete a;
|
||||
a = 0;
|
||||
|
|
@ -1038,40 +1058,25 @@ void printAutomatonAnalysisResults
|
|||
deque<BuchiAutomaton::size_type, ALLOC(BuchiAutomaton::size_type) >
|
||||
aut_cycle;
|
||||
|
||||
const deque<BuchiAutomaton::size_type, ALLOC(BuchiAutomaton::size_type) >*
|
||||
original_execution_states;
|
||||
deque<BuchiAutomaton::size_type, ALLOC(BuchiAutomaton::size_type) >*
|
||||
new_execution_states;
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
aut_prefix.clear();
|
||||
aut_cycle.clear();
|
||||
|
||||
for (int j = 0; j < 2; j++)
|
||||
{
|
||||
if (j == 0)
|
||||
{
|
||||
original_execution_states = &prefix;
|
||||
new_execution_states = &aut_prefix;
|
||||
}
|
||||
else
|
||||
{
|
||||
original_execution_states = &cycle;
|
||||
new_execution_states = &aut_cycle;
|
||||
}
|
||||
deque<BuchiAutomaton::size_type, ALLOC(BuchiAutomaton::size_type) >*
|
||||
new_execution_states = &aut_prefix;
|
||||
|
||||
for (deque<BuchiAutomaton::size_type,
|
||||
ALLOC(BuchiAutomaton::size_type) >::const_iterator
|
||||
execution_state = original_execution_states->begin();
|
||||
execution_state != original_execution_states->end();
|
||||
++execution_state)
|
||||
{
|
||||
new_execution_states->push_back
|
||||
(i == 0
|
||||
? intersection_state_mapping[*execution_state].first
|
||||
: intersection_state_mapping[*execution_state].second);
|
||||
}
|
||||
for (vector<StateSpace::size_type, ALLOC(StateSpace::size_type) >
|
||||
::size_type state_id = 0;
|
||||
state_id < path.size();
|
||||
++state_id)
|
||||
{
|
||||
if (state_id == loop_pos)
|
||||
new_execution_states = &aut_cycle;
|
||||
new_execution_states->push_back
|
||||
(i == 0
|
||||
? intersection_state_mapping[path[state_id]].first
|
||||
: intersection_state_mapping[path[state_id]].second);
|
||||
}
|
||||
|
||||
synchronizePrefixAndCycle(aut_prefix, aut_cycle);
|
||||
|
|
@ -1083,13 +1088,27 @@ void printAutomatonAnalysisResults
|
|||
automaton_stats[i].buchi_automaton));
|
||||
}
|
||||
|
||||
/*
|
||||
* Normalize the state identifiers in `path' to refer to the states that
|
||||
* give the valuations for atomic propositions along the execution.
|
||||
*/
|
||||
|
||||
for (vector<StateSpace::size_type, ALLOC(StateSpace::size_type) >
|
||||
::size_type state = 0;
|
||||
state < path.size();
|
||||
++state)
|
||||
path[state] = state;
|
||||
|
||||
/*
|
||||
* Display a proof or a refutation for the formula in the execution.
|
||||
*/
|
||||
|
||||
estream << string(indent + 2, ' ')
|
||||
+ "Analysis of the positive formula in the execution M:\n";
|
||||
|
||||
Ltl::PathEvaluator path_evaluator;
|
||||
bool result = path_evaluator.evaluate
|
||||
(*round_info.formulae[formula], automaton_as_statespace, path,
|
||||
prefix.size());
|
||||
(*round_info.formulae[formula], automaton_as_statespace, path, loop_pos);
|
||||
|
||||
path_evaluator.print(stream, indent + 4);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000, 2001, 2002
|
||||
* Copyright (C) 1999, 2000, 2001, 2002, 2003
|
||||
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue