fixed predicates for measuring time
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2228 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
parent
5575cdbd4f
commit
45a05e9206
@ -43,7 +43,7 @@ solve(GoalsList,Prob):-
|
|||||||
compute_prob(NewVar,Formula,Prob,0)
|
compute_prob(NewVar,Formula,Prob,0)
|
||||||
).
|
).
|
||||||
|
|
||||||
solve(GoalsList,0):-
|
solve(GoalsList,0.0):-
|
||||||
\+ find_deriv(GoalsList,_Deriv).
|
\+ find_deriv(GoalsList,_Deriv).
|
||||||
|
|
||||||
/* s(GoalsList,Prob,CPUTime1,CPUTime2,WallTime1,WallTime2) compute the probability of a list of goals
|
/* s(GoalsList,Prob,CPUTime1,CPUTime2,WallTime1,WallTime2) compute the probability of a list of goals
|
||||||
@ -62,24 +62,34 @@ s(GoalsList,Prob,CPUTime1,CPUTime2,WallTime1,WallTime2):-
|
|||||||
solve(GoalsList,Prob,CPUTime1,CPUTime2,WallTime1,WallTime2):-
|
solve(GoalsList,Prob,CPUTime1,CPUTime2,WallTime1,WallTime2):-
|
||||||
statistics(cputime,[_,_]),
|
statistics(cputime,[_,_]),
|
||||||
statistics(walltime,[_,_]),
|
statistics(walltime,[_,_]),
|
||||||
setof(Deriv,find_deriv(GoalsList,Deriv),LDup),
|
(setof(Deriv,find_deriv(GoalsList,Deriv),LDup)->
|
||||||
rem_dup_lists(LDup,[],L),
|
rem_dup_lists(LDup,[],L),
|
||||||
statistics(cputime,[_,CT1]),
|
statistics(cputime,[_,CT1]),
|
||||||
CPUTime1 is CT1/1000,
|
CPUTime1 is CT1/1000,
|
||||||
statistics(walltime,[_,WT1]),
|
statistics(walltime,[_,WT1]),
|
||||||
WallTime1 is WT1/1000,
|
WallTime1 is WT1/1000,
|
||||||
build_formula(L,Formula,[],Var),
|
build_formula(L,Formula,[],Var),
|
||||||
var2numbers(Var,0,NewVar),
|
var2numbers(Var,0,NewVar),
|
||||||
(setting(save_dot,true)->
|
(setting(save_dot,true)->
|
||||||
format("Variables: ~p~n",[Var]),
|
format("Variables: ~p~n",[Var]),
|
||||||
compute_prob(NewVar,Formula,Prob,1)
|
compute_prob(NewVar,Formula,Prob,1)
|
||||||
|
;
|
||||||
|
compute_prob(NewVar,Formula,Prob,0)
|
||||||
|
),
|
||||||
|
statistics(cputime,[_,CT2]),
|
||||||
|
CPUTime2 is CT2/1000,
|
||||||
|
statistics(walltime,[_,WT2]),
|
||||||
|
WallTime2 is WT2/1000
|
||||||
;
|
;
|
||||||
compute_prob(NewVar,Formula,Prob,0)
|
Prob=0.0,
|
||||||
),
|
statistics(cputime,[_,CT1]),
|
||||||
statistics(cputime,[_,CT2]),
|
CPUTime1 is CT1/1000,
|
||||||
CPUTime2 is CT2/1000,
|
statistics(walltime,[_,WT1]),
|
||||||
statistics(walltime,[_,WT2]),
|
WallTime1 is WT1/1000,
|
||||||
WallTime2 is WT2/1000,!.
|
CPUTime2 =0.0,
|
||||||
|
statistics(walltime,[_,WT2]),
|
||||||
|
WallTime2 =0.0
|
||||||
|
),!.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user