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

fix modules.y

Browse Source
This commit is contained in:
Vitor Santos Costa
2011-03-24 21:26:01 +00:00
parent 0ffe3fa6a5
commit f3debd2f49
5 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.gitmodules vendored
View File

@@ -9,28 +9,28 @@
url = git://yap.dcc.fc.up.pt/jpl
[submodule "packages/zlib"]
path = packages/zlib
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/zlib
url = git://yap.git.sourceforge.net/gitroot/yap/zlib
[submodule "packages/http"]
path = packages/http
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/http
url = git://yap.git.sourceforge.net/gitroot/yap/http
[submodule "packages/clib"]
path = packages/clib
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/clib
url = git://yap.git.sourceforge.net/gitroot/yap/clib
[submodule "packages/sgml"]
path = packages/sgml
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/sgml
url = git://yap.git.sourceforge.net/gitroot/yap/sgml
[submodule "packages/RDF"]
path = packages/RDF
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/RDF
url = git://yap.git.sourceforge.net/gitroot/yap/RDF
[submodule "packages/semweb"]
path = packages/semweb
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/semweb
url = git://yap.git.sourceforge.net/gitroot/yap/semweb
[submodule "packages/plunit"]
path = packages/plunit
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/plunit
url = git://yap.git.sourceforge.net/gitroot/yap/plunit
[submodule "packages/R"]
path = packages/R
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/R
url = git://yap.git.sourceforge.net/gitroot/yap/R
[submodule "packages/YapR"]
path = packages/YapR
url = ssh://vsc@yap.git.sourceforge.net/gitroot/yap/YapR
url = git://yap.git.sourceforge.net/gitroot/yap/YapR

6
packages/CLPBN/clpbn/aggregates.yap
View File

@@ -55,8 +55,7 @@ cpt_average(AllVars, Key, Els0, Tab, Vs, NewVs) :-
cpt_average([Ev|Vars], Key, Els0, Softness, p(Els0, CPT, NewParents), Vs, NewVs) :-
find_evidence(Vars, 0, TotEvidence, RVars),
build_avg_table(RVars, Vars, Els0, Key, TotEvidence, Softness, MAT0, NewParents0, Vs, IVs),
include_qevidence(Ev, MAT0, MAT, NewParents0, NewParents, Vs, IVs, NewVs),
matrix_to_list(MAT, CPT), writeln(NewParents: Vs: NewVs: CPT).
include_qevidence(Ev, MAT0, MAT, NewParents0, NewParents, Vs, IVs, NewVs).
% find all fixed kids, this simplifies significantly the function.
find_evidence([], TotEvidence, TotEvidence, []).
@@ -177,16 +176,13 @@ check_consistency(L1, Ev, MAT0, MAT1, L1, MAT, NewParents0, NewParents, Vs, IVs,
sumlist(L1, Tot),
nth0(Ev, L1, Val),
(Val == Tot ->
writeln(Ev:L1:Val:1),
MAT1 = MAT,
NewParents = [],
Vs = NewVs
;
Val == 0.0 ->
writeln(Ev:L1:Val:2),
throw(error(domain_error(incompatible_evidence),evidence(Ev)))
;
writeln(Ev:L1:Val:3),
MAT0 = MAT,
NewParents = NewParents0,
IVs = NewVs

2
packages/R

Submodule packages/R updated: b0fde37bf3...66edc33d2d

2
packages/http

Submodule packages/http updated: dd614178a5...4ec3a70be3

2
packages/plunit

Submodule packages/plunit updated: dcdc7f1292...52469bccc1