comparison crp.pl @ 3:974d7be8eec4 tip

Update to pack-based dcg utilities

 
 */
 :- meta_predicate seqmap_classes(4,+,?,?).
 
 :-	use_foreign_library(foreign(crp)).
-:- use_module(library(dcgu)).
+:- use_module(library(dcg_core)).
+:- use_module(library(dcg_pair)).
+:- use_module(library(dcg_macros)).
 :- use_module(library(math)).
 :- use_module(library(eval)).
 :- use_module(library(lazy)).
 :- use_module(library(randpred)).
 :- use_module(library(apply_macros)).

 %------------------------------------------------------------------
 % Get posterior distribution at node using stick-breaking
 % construction.
 
 lazy_dp(A,H,P0,Vals,Probs) -->
-	spawn(S0), { lazy_unfold(unfold_dp(A,H),Vals,Probs,(P0,S0),_) }.
+	spawn(S0), { lazy_unfold(unfold_dp(A,H),Vals,Probs,P0-S0,_) }.
 
 lazy_dp_paired(A,H,P0,ValsProbs) -->
-	spawn(S0), { lazy_unfold(unfold_dp(A,H),ValsProbs,(P0,S0),_) }.
+	spawn(S0), { lazy_unfold(unfold_dp(A,H),ValsProbs,P0-S0,_) }.
 
 unfold_dp(A,H,V,X) --> \> call(H,V), unfold_gem(A,X).
 unfold_dp(A,H,V:X) --> \> call(H,V), unfold_gem(A,X).
 
 % lazy_gem(A,Probs) --> spawn(S0), { lazy_unfold(unfold_gem(A),Probs,(1,S0),_) }.