diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://yap.git.sourceforge.net/gitroot/yap/yap-6.3

Browse Source
This commit is contained in:
Joao 2011-09-20 11:38:10 +01:00
commit 9e50de9efc
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/attvar.c
View File

@ -897,7 +897,7 @@ AllAttVars( USES_REGS1 ) {
CELL *pt = H0; CELL *pt = H0;
CELL *myH = H; CELL *myH = H;
while (pt < H) { while (pt < myH) {
switch(*pt) { switch(*pt) {
case (CELL)FunctorAttVar: case (CELL)FunctorAttVar:
if (IsUnboundVar(pt+1)) { if (IsUnboundVar(pt+1)) {

5
C/heapgc.c
View File

@ -3696,6 +3696,11 @@ compaction_phase(tr_fr_ptr old_TR, CELL *current_env, yamop *curp USES_REGS)
} }
if (CurrentH0) { if (CurrentH0) {
H0 = CurrentH0; H0 = CurrentH0;
#ifdef TABLING
/* make sure that we have the correct H_FZ if we're not tabling */
if (B_FZ == (choiceptr)LCL0)
H_FZ = H0;
#endif /* TABLING */
} }
} }

3
packages/CLPBN/clpbn.yap
View File

@ -166,7 +166,8 @@ clpbn_flag(parameter_softening,Before,After) :-
% we use a mutable variable to avoid unnecessary trailing. % we use a mutable variable to avoid unnecessary trailing.
% %
store_var(El) :- store_var(El) :-
nb_current(clpbn_qvars, Mutable), !, nb_current(clpbn_qvars, Mutable),
nonvar(Mutable), !,
get_mutable(Tail, Mutable), get_mutable(Tail, Mutable),
update_mutable(El.Tail, Mutable). update_mutable(El.Tail, Mutable).
store_var(El) :- store_var(El) :-

3
packages/CLPBN/learning/aleph_params.yap
View File

@ -128,9 +128,12 @@ store_cl(Cl) :-
add_new_clause(_,(_ :- true),_,_) :- !. add_new_clause(_,(_ :- true),_,_) :- !.
add_new_clause(_,(H :- B),_,_) :- add_new_clause(_,(H :- B),_,_) :-
%trace,
% user:db_usage, % user:db_usage,
% user:db_dynamic, % user:db_dynamic,
domain(H, K, V, D), domain(H, K, V, D),
user:cost((H :- B), _, Cost),
format(user_error,'Current Cost: ~w.~n', [Cost]),
rewrite_body(B, IB, Vs, _, ( !, { V = K with p(D, CPTList, Vs) })), rewrite_body(B, IB, Vs, _, ( !, { V = K with p(D, CPTList, Vs) })),
% need to remember which CPT we want % need to remember which CPT we want
get_dist_key(Id, K), get_dist_key(Id, K),