Merge BuDDy 2.3.

* examples/calculator/, examples/internal/: Were renamed as ...
* examples/bddcalc/, examples/bddtest/: ... these.
* configure.ac: Adjust version and output Makefiles.
* examples/Makefile.am (SUBDIRS): Adjust subdir renaming.
* examples/cmilner/milner.c, examples/fdd/statespace.cxx: Were
renamed as ...
* examples/cmilner/cmilner.c, examples/fdd/fdd.cxx: ... these.
* examples/cmilner/Makefile.am, examples/fdd/Makefile.am: Adjust
accordingly.
* src/Makefile.am (AM_CPPFLAGS): Define VERSION.
This commit is contained in:
Alexandre Duret-Lutz 2004-06-28 15:22:11 +00:00
parent 805b6fb70b
commit aa4a582f1b
27 changed files with 130 additions and 796 deletions

View file

@ -1,5 +1,4 @@
#include <math.h>
#include <time.h>
#include <unistd.h>
#include <stdlib.h>
#include <iostream>
@ -121,6 +120,7 @@ bdd make_move(int src, int tmp, int dst)
void make_transition_relation(void)
{
using namespace std ;
T = bddfalse;
for (int n=0 ; moves[n][0]!=moves[n][1] ; n++)
@ -160,9 +160,9 @@ void iterate(void)
next = bdd_replace(next, pair);
reachable |= next;
cout << cou << ": " << bdd_nodecount(reachable)
std::cout << cou << ": " << bdd_nodecount(reachable)
<< " nodes, " << bdd_satcount(reachable)/dummyStateNum
<< " states\n" << flush;
<< " states\n" << std::endl ;
cou++;
}
while (tmp != reachable);
@ -186,10 +186,10 @@ void iterate_front(void)
front = next - reachable;
reachable |= front;
cout << cou << ": " << bdd_nodecount(reachable)
<< " , " << bdd_satcount(reachable)/dummyStateNum << endl;
cout << cou << ": " << bdd_nodecount(front)
<< " , " << bdd_satcount(front)/dummyStateNum << endl;
std::cout << cou << ": " << bdd_nodecount(reachable)
<< " , " << bdd_satcount(reachable)/dummyStateNum << std::endl;
std::cout << cou << ": " << bdd_nodecount(front)
<< " , " << bdd_satcount(front)/dummyStateNum << std::endl;
cou++;
}
while (tmp != reachable);
@ -212,15 +212,9 @@ void setup(void)
int main(void)
{
long c1, c2;
c1 = clock();
setup();
iterate();
c2 = clock();
printf("Time: %.1f sec.\n", ((float)(c2-c1))/CLOCKS_PER_SEC);
system("ps aux | grep \"./solitare\" | grep -v \"grep\"");
}