From 1342d2dab252a9d53defa6a2a886f2c0b6a625e8 Mon Sep 17 00:00:00 2001 From: Theofrastos Mantadelis Date: Wed, 6 Oct 2010 13:24:25 +0200 Subject: [PATCH] SimpleCUDD versioning --- packages/ProbLog/simplecudd/general.c | 2 ++ packages/ProbLog/simplecudd/general.h | 2 ++ packages/ProbLog/simplecudd/problogbdd.c | 2 ++ packages/ProbLog/simplecudd/problogmath.c | 2 ++ packages/ProbLog/simplecudd/problogmath.h | 4 ++-- packages/ProbLog/simplecudd/simplecudd.c | 13 ++++++++++++- packages/ProbLog/simplecudd/simplecudd.h | 2 ++ 7 files changed, 24 insertions(+), 3 deletions(-) diff --git a/packages/ProbLog/simplecudd/general.c b/packages/ProbLog/simplecudd/general.c index e13bf5cae..b34b7dd5b 100644 --- a/packages/ProbLog/simplecudd/general.c +++ b/packages/ProbLog/simplecudd/general.c @@ -7,6 +7,8 @@ * * * Author: Theofrastos Mantadelis * * File: general.c * +* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * +* $Revision:: 4880 $ * * * ******************************************************************************** * * diff --git a/packages/ProbLog/simplecudd/general.h b/packages/ProbLog/simplecudd/general.h index a872cc386..4b22bef5d 100644 --- a/packages/ProbLog/simplecudd/general.h +++ b/packages/ProbLog/simplecudd/general.h @@ -7,6 +7,8 @@ * * * Author: Theofrastos Mantadelis * * File: general.h * +* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * +* $Revision:: 4880 $ * * * ******************************************************************************** * * diff --git a/packages/ProbLog/simplecudd/problogbdd.c b/packages/ProbLog/simplecudd/problogbdd.c index 1370b21b4..12a435d4b 100644 --- a/packages/ProbLog/simplecudd/problogbdd.c +++ b/packages/ProbLog/simplecudd/problogbdd.c @@ -7,6 +7,8 @@ * * * Author: Theofrastos Mantadelis, Angelika Kimmig, Bernd Gutmann * * File: problogbdd.c * +* $Date:: 2010-10-06 13:22:55 +0200 (Wed, 06 Oct 2010) $ * +* $Revision:: 4881 $ * * * ******************************************************************************** * * diff --git a/packages/ProbLog/simplecudd/problogmath.c b/packages/ProbLog/simplecudd/problogmath.c index cdeb9bbaa..d768fb790 100644 --- a/packages/ProbLog/simplecudd/problogmath.c +++ b/packages/ProbLog/simplecudd/problogmath.c @@ -7,6 +7,8 @@ * * * Author: Bernd Gutmann * * File: problogmath.c * +* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * +* $Revision:: 4880 $ * * * ******************************************************************************** * * diff --git a/packages/ProbLog/simplecudd/problogmath.h b/packages/ProbLog/simplecudd/problogmath.h index 8734d6f88..2df38c626 100644 --- a/packages/ProbLog/simplecudd/problogmath.h +++ b/packages/ProbLog/simplecudd/problogmath.h @@ -7,8 +7,8 @@ * * * Author: Bernd Gutmann * * File: problogmath.h * -* $Date:: 2010-02-18 18:04:54 +0100 (Thu, 18 Feb 2010) $ * -* $Revision:: 3623 $ * +* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * +* $Revision:: 4880 $ * * * ******************************************************************************** * * diff --git a/packages/ProbLog/simplecudd/simplecudd.c b/packages/ProbLog/simplecudd/simplecudd.c index caa67134b..07698b2f8 100644 --- a/packages/ProbLog/simplecudd/simplecudd.c +++ b/packages/ProbLog/simplecudd/simplecudd.c @@ -7,6 +7,8 @@ * * * Author: Theofrastos Mantadelis * * File: simplecudd.c * +* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * +* $Revision:: 4880 $ * * * ******************************************************************************** * * @@ -1710,7 +1712,16 @@ void onlinetraverse(DdManager *manager, namedvars varmap, hisqueue *HisQueue, Dd switch(inputline[1]) { case '?': printf("Available instructions:\n\t@c : current node\n\t@n,[BFS, DFS] : expand and go to next node\n\t@t,[BFS, DFS] : throw and go to next node\n"); - printf("\t@h : high node of current\n\t@l : low node of current\n\t@v,[variable] : variable values\n\t@e terminates\n"); + printf("\t@h : high node of current\n\t@l : low node of current\n\t@v,[variable] : variable values\n\t@r restart traverse from parent node\n\t@e terminates\n"); + break; + case 'r': + curnode = bdd; + iQsize = 0; + iRoot = 1; + free(Q); + Q = (DdNode **) malloc(sizeof(DdNode *) * iQsize); + Q2 = NULL; + ReInitHistory(his, varmap.varcnt); break; case 'c': if (iRoot) { diff --git a/packages/ProbLog/simplecudd/simplecudd.h b/packages/ProbLog/simplecudd/simplecudd.h index 688e80d1e..577e79d83 100644 --- a/packages/ProbLog/simplecudd/simplecudd.h +++ b/packages/ProbLog/simplecudd/simplecudd.h @@ -7,6 +7,8 @@ * * * Author: Theofrastos Mantadelis * * File: simplecudd.h * +* $Date:: 2010-10-06 13:20:59 +0200 (Wed, 06 Oct 2010) $ * +* $Revision:: 4880 $ * * * ******************************************************************************** * *