[Xsb-commits] CVS: mttests/benches/petri benchmark_wf.P, 1.13, 1.14 elemNet.P, 1.7, 1.8

[Terrance S. <ts...@us...>]

Update of /cvsroot/xsb/mttests/benches/petri
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15255

Modified Files:
	benchmark_wf.P elemNet.P 
Log Message:
abolish-> retractall



Index: benchmark_wf.P
===================================================================
RCS file: /cvsroot/xsb/mttests/benches/petri/benchmark_wf.P,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- benchmark_wf.P	2 Jul 2008 20:17:36 -0000	1.13
+++ benchmark_wf.P	9 Jul 2008 18:46:04 -0000	1.14
@@ -145,11 +145,11 @@
 /* Generation of workflows */
 
 gen_private_wf:- 
-	retractall(rule(_,_,_,_,_)),
+	retractall(rule(_,_,_,_)),
         private_gen_wf_1.
 
 private_gen_wf_1 :-
-	abolish(rule/4),
+	retractall(rule(_,_,_,_)),
 	restartplace,
 	nextplace(First1),
 	gen_wf_2(First1,_First2).

Index: elemNet.P
===================================================================
RCS file: /cvsroot/xsb/mttests/benches/petri/elemNet.P,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- elemNet.P	3 Jul 2008 20:13:27 -0000	1.7
+++ elemNet.P	9 Jul 2008 18:46:04 -0000	1.8
@@ -12,6 +12,9 @@
 % have a token in S.
 
 :- import conget/2, conset/2 from machine.
+:- import coninc/1 from gensym.
+
+%:- conset(findall_cnt,0).
 
 :- table reachable/2.
 reachable(InState,NewState):-
@@ -61,6 +64,7 @@
 get_rules_for_state_1([],_State,[]).
 get_rules_for_state_1([H|T],State,[Rules1|RT]):-
 	findall(rule([H|Places],Output,Tran),rule([H|Places],Output,Tran),Rules),
+%	coninc(findall_cnt),
 	check_concession(Rules,State,Rules1),
 	get_rules_for_state_1(T,State,RT).