From 416b407faa63d73994fb4ce9334d04882bcdad0c Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Wed, 14 Nov 2012 16:00:35 +0000 Subject: [PATCH 1/2] fixes i r..eal --- packages/real | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/real b/packages/real index 4d3759739..6575e08bd 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit 4d3759739bd256a5a2d0c75ae4921c9147ad5d30 +Subproject commit 6575e08bd063e0d0476a1bdbfe216684b4d5e6e4 From 114a6732f014de8e989fa88b21ea00f785496016 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Thu, 15 Nov 2012 17:28:57 +0000 Subject: [PATCH 2/2] add_factor should succeed if Constraints are satisfied --- packages/CLPBN/clpbn/ground_factors.yap | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/CLPBN/clpbn/ground_factors.yap b/packages/CLPBN/clpbn/ground_factors.yap index 584068019..4454b64b2 100644 --- a/packages/CLPBN/clpbn/ground_factors.yap +++ b/packages/CLPBN/clpbn/ground_factors.yap @@ -142,6 +142,7 @@ add_factor(factor(Type, Id, Ks, _, _Phi, Constraints), NKs) :- %writeln(+Ks), ( Ks = [K,Els], var(Els) -> + % aggregate factor once(run(Constraints)), avg_factors(K, Els, 0.0, NewKeys, NewId), NKs = [K|NewKeys] @@ -150,8 +151,13 @@ add_factor(factor(Type, Id, Ks, _, _Phi, Constraints), NKs) :- NKs = Ks, Id = NewId ), - \+ f(Type, NewId, NKs), - assert(f(Type, NewId, NKs)). + ( + f(Type, NewId, NKs) + -> + true + ; + assert(f(Type, NewId, NKs)) + ). run([Goal|Goals]) :- call(user:Goal),