From 5cfad07c92ff198065157c792147be3d91f325b8 Mon Sep 17 00:00:00 2001 From: vsc Date: Tue, 1 Nov 2005 18:19:44 +0000 Subject: [PATCH] update documentation. git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1434 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- CLPBN/clpbn/utils.yap | 29 +- CLPBN/clpbn/vel.yap | 2 +- Makefile.in | 11 +- changes-5.1.html | 2 + docs/chr.tex | 597 +++++++ docs/clpr.tex | 180 +++ docs/swi.tex | 495 ++++++ docs/yap.tex | 3492 +---------------------------------------- 8 files changed, 1361 insertions(+), 3447 deletions(-) create mode 100644 docs/chr.tex create mode 100644 docs/clpr.tex create mode 100644 docs/swi.tex diff --git a/CLPBN/clpbn/utils.yap b/CLPBN/clpbn/utils.yap index 7f4b607c0..d0f942233 100644 --- a/CLPBN/clpbn/utils.yap +++ b/CLPBN/clpbn/utils.yap @@ -37,10 +37,10 @@ clpbn_not_var_member([V1|Vs], V) :- V1 \== V, clpbn_not_var_member(Vs, V). -sort_vars_by_key(AVars, SortedAVars, Keys) :- +sort_vars_by_key(AVars, SortedAVars, UnifiableVars) :- get_keys(AVars, KeysVars), keysort(KeysVars, KVars), - merge_same_key(KVars, SortedAVars, Keys). + merge_same_key(KVars, SortedAVars, [], UnifiableVars). get_keys([], []). get_keys([V|AVars], [K-V|KeysVars]) :- @@ -49,15 +49,24 @@ get_keys([V|AVars], [K-V|KeysVars]) :- get_keys([_|AVars], KeysVars) :- % may be non-CLPBN vars. get_keys(AVars, KeysVars). -merge_same_key([], [], []). -merge_same_key([K1-V1|KVs], [V1|Vs], [K1|Ks]) :- - eat_same_key(KVs,K1,V1,RKVs), - merge_same_key(RKVs, Vs, Ks). - -eat_same_key([K-V|KVs],K,V,RKVs) :- !, - eat_same_key(KVs,K,V,RKVs). -eat_same_key(KVs,_,_,KVs). +merge_same_key([], [], _, []). +merge_same_key([K1-V1,K2-V2|Vs], SortedAVars, Ks, UnifiableVars) :- + K1 == K2, !, V1 = V2, + merge_same_key([K1-V1|Vs], SortedAVars, Ks, UnifiableVars). +merge_same_key([K1-V1,K2-V2|Vs], [V1|SortedAVars], Ks, [K1|UnifiableVars]) :- + (in_keys(K1, Ks) ; \+ \+ K1 == K2), !, + add_to_keys(K1, Ks, NKs), + merge_same_key([K2-V2|Vs], SortedAVars, NKs, UnifiableVars). +merge_same_key([K-V|Vs], [V|SortedAVars], Ks, UnifiableVars) :- + add_to_keys(K, Ks, NKs), + merge_same_key(Vs, SortedAVars, NKs, UnifiableVars). +in_keys(K1,[K|_]) :- \+ \+ K1 = K, !. +in_keys(K1,[_|Ks]) :- + in_keys(K1,Ks). + +add_to_keys(K1, Ks, Ks) :- ground(K1), !. +add_to_keys(K1, Ks, [K1|Ks]). sort_vars_by_key_and_parents(AVars, SortedAVars, UnifiableVars) :- get_keys_and_parents(AVars, KeysVars), diff --git a/CLPBN/clpbn/vel.yap b/CLPBN/clpbn/vel.yap index 2bd337d9b..d9a42efdd 100644 --- a/CLPBN/clpbn/vel.yap +++ b/CLPBN/clpbn/vel.yap @@ -297,7 +297,7 @@ divide_by_sum([P|Ps0],Sum,[PN|Ps]) :- % what is actually output % attribute_goal(V, G) :- - get_atts(V, [posterior(Vs,Vals,Ps,AllDiffs)]), !, + get_atts(V, [posterior(Vs,Vals,Ps,AllDiffs)]), massage_out(Vs, Vals, Ps, G, AllDiffs, V). massage_out([], Ev, _, V=Ev, _, V) :- !. diff --git a/Makefile.in b/Makefile.in index 6d64dc2f9..6140f0ec8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -184,6 +184,9 @@ PL_SOURCES= \ $(srcdir)/pl/utils.yap \ $(srcdir)/pl/yapor.yap $(srcdir)/pl/yio.yap +YAPDOCS=$(srcdir)/docs/yap.tex $(srcdir)/docs/chr.tex \ + $(srcdir)/docs/clpr.tex $(srcdir)/docs/swi.tex + ENGINE_OBJECTS = \ agc.o absmi.o adtdefs.o alloc.o amasm.o analyst.o arrays.o \ arith0.o arith1.o arith2.o attvar.o bb.o \ @@ -616,7 +619,7 @@ install_info: info: yap.info -yap.info: $(srcdir)/docs/yap.tex +yap.info: $(YAPDOCS) $(MAKEINFO) $(srcdir)/docs/yap.tex html: yap.html @@ -626,17 +629,17 @@ yap.html: $(srcdir)/docs/yap.tex dvi: yap.dvi -yap.dvi: $(srcdir)/docs/yap.tex +yap.dvi: $(YAPDOCS) $(TEXI2DVI) $(srcdir)/docs/yap.tex ps: yap.ps -yap.ps: $(srcdir)/docs/yap.dvi +yap.ps: $(YAPDOCS) dvips -o yap.ps $(srcdir)/docs/yap pdf: yap.pdf -yap.pdf: $(srcdir)/docs/yap.tex +yap.pdf: $(YAPDOCS) $(TEXI2PDF) $(srcdir)/docs/yap.tex clean_docs: diff --git a/changes-5.1.html b/changes-5.1.html index c8a8f5177..92732a06b 100644 --- a/changes-5.1.html +++ b/changes-5.1.html @@ -16,6 +16,8 @@

Yap-5.1.0: