summaryrefslogtreecommitdiff
path: root/gi/pf
diff options
context:
space:
mode:
authorPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-05-13 03:35:30 +0200
committerPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-05-13 03:35:30 +0200
commit670a8f984fc6d8342180c59ae9e96b0b76f34d3d (patch)
tree9f2ce7eec1a77e56b3bb1ad0ad40f212d7a996b0 /gi/pf
parenteb3ee28dc0eb1d3e5ed01ba0df843be329ae450d (diff)
parent2f64af3e06a518b93f7ca2c30a9d0aeb2c947031 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'gi/pf')
-rw-r--r--gi/pf/transliterations.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gi/pf/transliterations.cc b/gi/pf/transliterations.cc
index 2200715e..b2996f65 100644
--- a/gi/pf/transliterations.cc
+++ b/gi/pf/transliterations.cc
@@ -118,7 +118,7 @@ struct TransliterationChunkConditionalModel {
//double llh = Md::log_beta_density(dd, 10, 3) + Md::log_gamma_density(aa, 1, 1);
double llh = //Md::log_beta_density(dd, 1, 1) +
Md::log_gamma_density(dd + aa, 1, 1);
- typename std::tr1::unordered_map<std::vector<WordID>, CCRP_NoTable<TRule>, boost::hash<std::vector<WordID> > >::const_iterator it;
+ std::tr1::unordered_map<std::vector<WordID>, CCRP_NoTable<TRule>, boost::hash<std::vector<WordID> > >::const_iterator it;
for (it = r.begin(); it != r.end(); ++it)
llh += it->second.log_crp_prob(aa);
return llh;
@@ -133,7 +133,7 @@ struct TransliterationChunkConditionalModel {
};
void ResampleHyperparameters(MT19937* rng) {
- typename std::tr1::unordered_map<std::vector<WordID>, CCRP_NoTable<TRule>, boost::hash<std::vector<WordID> > >::iterator it;
+ std::tr1::unordered_map<std::vector<WordID>, CCRP_NoTable<TRule>, boost::hash<std::vector<WordID> > >::iterator it;
//const unsigned nloop = 5;
const unsigned niterations = 10;
//DiscountResampler dr(*this);