Author: niels
Date: Thu Jun 12 15:33:44 2014
New Revision: 9568
URL: http://svn.gna.org/viewcvs/service-tech?rev=9568&view=rev
Log:
* applied astyle
* RC3
Modified:
trunk/lola2/NEWS
trunk/lola2/configure.ac
trunk/lola2/src/Exploration/LTLExploration.cc
trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc
trunk/lola2/src/Exploration/TSCCExplorationEGAGEF.cc
trunk/lola2/src/Formula/CTL/AUFormula.cc
trunk/lola2/src/Formula/StatePredicate/DeadlockPredicate.cc
trunk/lola2/src/InputOutput/CompressedIO.cc
trunk/lola2/src/InputOutput/CompressedIO.h
trunk/lola2/src/InputOutput/Socket.cc
trunk/lola2/src/Stores/CycleStore.h
trunk/lola2/src/Symmetry/Constraints.cc
Modified: trunk/lola2/NEWS
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/NEWS?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/NEWS (original)
+++ trunk/lola2/NEWS Thu Jun 12 15:33:44 2014
@@ -1 +1 @@
-LoLA 2.0-RC2
+LoLA 2.0-RC3
Modified: trunk/lola2/configure.ac
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/configure.ac?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/configure.ac (original)
+++ trunk/lola2/configure.ac Thu Jun 12 15:33:44 2014
@@ -1,4 +1,4 @@
-AC_INIT([LoLA], 2.0-RC2, [email protected], lola,
http://service-technology.org/lola)
+AC_INIT([LoLA], 2.0-RC3, [email protected], lola,
http://service-technology.org/lola)
AC_MSG_NOTICE([ _ _ _ ])
AC_MSG_NOTICE([| | ___ | | / \ ])
Modified: trunk/lola2/src/Exploration/LTLExploration.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Exploration/LTLExploration.cc?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/Exploration/LTLExploration.cc (original)
+++ trunk/lola2/src/Exploration/LTLExploration.cc Thu Jun 12 15:33:44 2014
@@ -591,7 +591,7 @@
get_next_transition(automata, ns, ¤tStateListEntry,
¤tFirelistEntry, currentFirelist,
currentStateListLength, currentAutomataState);
- if (currentFirelistEntry != (uint32_t) -1 && currentStateListEntry !=
(uint32_t) - 1)
+ if (currentFirelistEntry != (uint32_t) - 1 && currentStateListEntry !=
(uint32_t) - 1)
{
// there is a next transition that needs to be explored in current
marking
Modified: trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc (original)
+++ trunk/lola2/src/Exploration/TSCCExplorationAGEF.cc Thu Jun 12 15:33:44 2014
@@ -128,7 +128,7 @@
{
//for the current tscc "add" one more true
//just for clarification of the code...
- property.value=true;
+ property.value = true;
//return property.value;
}
else
Modified: trunk/lola2/src/Exploration/TSCCExplorationEGAGEF.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Exploration/TSCCExplorationEGAGEF.cc?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/Exploration/TSCCExplorationEGAGEF.cc (original)
+++ trunk/lola2/src/Exploration/TSCCExplorationEGAGEF.cc Thu Jun 12
15:33:44 2014
@@ -129,7 +129,7 @@
{
//valid for egagef :)
- if( lasttrue >= stackentry.lowlink )
+ if ( lasttrue >= stackentry.lowlink )
{
//for the current tscc "add" one more true
//just for clarification of the code...
Modified: trunk/lola2/src/Formula/CTL/AUFormula.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Formula/CTL/AUFormula.cc?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/Formula/CTL/AUFormula.cc (original)
+++ trunk/lola2/src/Formula/CTL/AUFormula.cc Thu Jun 12 15:33:44 2014
@@ -480,7 +480,7 @@
// check for strong fairness enabledness
for (size_t t = 0; t < currentFirelistIndex; t++)
{
- if (fairness.strong_backlist[currentFirelist[t]] != (uint32_t)-1)
+ if (fairness.strong_backlist[currentFirelist[t]] != (uint32_t) - 1)
{
enabled_strong[fairness.strong_backlist[currentFirelist[t]]] =
true;
}
@@ -515,13 +515,13 @@
nonTrivial = true;
// check if used transition is needed for weak fairness
- if (fairness.weak_backlist[currentFirelist[currentFirelistIndex]]
!= (uint32_t) -1)
+ if (fairness.weak_backlist[currentFirelist[currentFirelistIndex]]
!= (uint32_t) - 1)
{
fulfilled_weak[fairness.weak_backlist[currentFirelist[currentFirelistIndex]]] =
true;
}
// check if used transition is needed for strong fairness
- if
(fairness.strong_backlist[currentFirelist[currentFirelistIndex]] != (uint32_t)
-1)
+ if
(fairness.strong_backlist[currentFirelist[currentFirelistIndex]] != (uint32_t)
- 1)
{
fulfilled_strong[fairness.strong_backlist[currentFirelist[currentFirelistIndex]]]
= true;
}
@@ -558,7 +558,7 @@
// check for strong fairness enabledness
for (index_t t = 0; t < currentFirelistIndex; t++)
{
- if (fairness.strong_backlist[currentFirelist[t]] != (uint32_t)
-1)
+ if (fairness.strong_backlist[currentFirelist[t]] != (uint32_t)
- 1)
{
enabled_strong[fairness.strong_backlist[currentFirelist[t]]] = true;
}
@@ -725,7 +725,7 @@
}
// check if used transition is needed for weak fairness
- if (fairness.weak_backlist[currentFirelist[currentFirelistIndex]]
!= (uint32_t) -1
+ if (fairness.weak_backlist[currentFirelist[currentFirelistIndex]]
!= (uint32_t) - 1
&&
!fulfilled_weak[fairness.weak_backlist[currentFirelist[currentFirelistIndex]]])
{
fulfilled_weak[fairness.weak_backlist[currentFirelist[currentFirelistIndex]]] =
true;
@@ -733,7 +733,7 @@
}
// check if used transition is needed for strong fairness
- if
(fairness.strong_backlist[currentFirelist[currentFirelistIndex]] != (uint32_t)
-1
+ if
(fairness.strong_backlist[currentFirelist[currentFirelistIndex]] != (uint32_t)
- 1
&&
!fulfilled_strong[fairness.strong_backlist[currentFirelist[currentFirelistIndex]]])
{
fulfilled_strong[fairness.strong_backlist[currentFirelist[currentFirelistIndex]]]
= true;
Modified: trunk/lola2/src/Formula/StatePredicate/DeadlockPredicate.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Formula/StatePredicate/DeadlockPredicate.cc?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/Formula/StatePredicate/DeadlockPredicate.cc (original)
+++ trunk/lola2/src/Formula/StatePredicate/DeadlockPredicate.cc Thu Jun 12
15:33:44 2014
@@ -29,7 +29,7 @@
\param need_enabled reference parameter that signals that final up-set needs
to contain an enabled transition
\return number of elements on stack
*/
-index_t DeadlockPredicate::getUpSet(index_t *, bool *, bool * need_enabled)
const
+index_t DeadlockPredicate::getUpSet(index_t *, bool *, bool *need_enabled)
const
{
if (sign)
{
Modified: trunk/lola2/src/InputOutput/CompressedIO.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/InputOutput/CompressedIO.cc?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/InputOutput/CompressedIO.cc (original)
+++ trunk/lola2/src/InputOutput/CompressedIO.cc Thu Jun 12 15:33:44 2014
@@ -44,7 +44,7 @@
\pre File f is already open to write.
\post Names are written to file f, but f is not yet closed.
*/
-void WriteNameFile(FILE * const f)
+void WriteNameFile(FILE *const f)
{
assert(f);
@@ -84,7 +84,7 @@
that is, wrapped into the insert function. This simplifies this code and makes
memory allocation local to the SymbolTable class.
*/
-void ReadNameFile(FILE * const f, ParserPTNet * const symboltables)
+void ReadNameFile(FILE *const f, ParserPTNet *const symboltables)
{
assert(f);
assert(symboltables);
@@ -145,7 +145,7 @@
\pre File f is already open to write.
\post The net xstructure is written to file f, but f is not yet closed.
*/
-void WriteNetFile(FILE * const f)
+void WriteNetFile(FILE *const f)
{
assert(f);
@@ -218,7 +218,7 @@
format, this function may leave the symbol tables in an undefined state.
*/
-void ReadNetFile(FILE * const f)
+void ReadNetFile(FILE *const f)
{
assert(f);
Modified: trunk/lola2/src/InputOutput/CompressedIO.h
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/InputOutput/CompressedIO.h?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/InputOutput/CompressedIO.h (original)
+++ trunk/lola2/src/InputOutput/CompressedIO.h Thu Jun 12 15:33:44 2014
@@ -20,13 +20,13 @@
class ParserPTNet;
/// write names to file
-void WriteNameFile(FILE * const);
+void WriteNameFile(FILE *const);
/// write compressed net structure to file
-void WriteNetFile(FILE * const);
+void WriteNetFile(FILE *const);
/// read names from file and annotated parsed net
-void ReadNameFile(FILE * const, ParserPTNet * const);
+void ReadNameFile(FILE *const, ParserPTNet *const);
/// read compressed net structure from file
-void ReadNetFile(FILE * const);
+void ReadNetFile(FILE *const);
Modified: trunk/lola2/src/InputOutput/Socket.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/InputOutput/Socket.cc?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/InputOutput/Socket.cc (original)
+++ trunk/lola2/src/InputOutput/Socket.cc Thu Jun 12 15:33:44 2014
@@ -147,7 +147,7 @@
// length UDP_BUFFER_SIZE, sets no flags, receives from address
// specified in sa with length fromlen
const ssize_t recsize = recvfrom(sock, reinterpret_cast<void
*>(buffer), UDP_BUFFER_SIZE, 0,
- reinterpret_cast<struct sockaddr
*>(const_cast<sockaddr_in*>(&address)), &addressLength);
+ reinterpret_cast<struct sockaddr
*>(const_cast<sockaddr_in *>(&address)), &addressLength);
// LCOV_EXCL_START
if (UNLIKELY(recsize < 0))
@@ -231,7 +231,7 @@
// length UDP_BUFFER_SIZE, sets no flags, receives from address
// specified in sa with length fromlen
const ssize_t recsize = recvfrom(sock, reinterpret_cast<void
*>(buffer), UDP_BUFFER_SIZE, 0,
- reinterpret_cast<struct sockaddr
*>(const_cast<sockaddr_in*>(&address)), &addressLength);
+ reinterpret_cast<struct sockaddr
*>(const_cast<sockaddr_in *>(&address)), &addressLength);
// LCOV_EXCL_START
if (UNLIKELY(recsize < 0))
Modified: trunk/lola2/src/Stores/CycleStore.h
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Stores/CycleStore.h?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/Stores/CycleStore.h (original)
+++ trunk/lola2/src/Stores/CycleStore.h Thu Jun 12 15:33:44 2014
@@ -77,10 +77,10 @@
{
// count calls
++(this->calls[thread]);
-
+
// check whether state should be saved
noinsert = true;
-
+
for (index_t t = 0; t < Net::Card[TR]; ++t)
{
if (u[t] and ns.Enabled[t])
Modified: trunk/lola2/src/Symmetry/Constraints.cc
URL:
http://svn.gna.org/viewcvs/service-tech/trunk/lola2/src/Symmetry/Constraints.cc?rev=9568&r1=9567&r2=9568&view=diff
==============================================================================
--- trunk/lola2/src/Symmetry/Constraints.cc (original)
+++ trunk/lola2/src/Symmetry/Constraints.cc Thu Jun 12 15:33:44 2014
@@ -613,10 +613,10 @@
cardConstraints[0];
}
cardConstraints[0]++;
- for(int i = 0; i < sizeFormula; i++)
- {
- delete info[i];
- }
+ for (int i = 0; i < sizeFormula; i++)
+ {
+ delete info[i];
+ }
delete [] info;
}
}
--
You received this e-mail, because you subscribed the mailing list
"service-tech-commits" which will forward you any e-mail addressed to
[email protected]. If you want to unsubscribe or make any changes to
your subscription, please go to
https://mail.gna.org/listinfo/service-tech-commits.
