summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorChris Dyer <cdyer@cs.cmu.edu>2012-03-04 21:41:07 -0500
committerChris Dyer <cdyer@cs.cmu.edu>2012-03-04 21:41:07 -0500
commit6e7ebece83010363eeacd6eba0a54f8056634cb9 (patch)
tree12f9663a3fd67c88221eee619c4c525b6d1db688 /utils
parent0cbee59a05742a6be79d9f5e417918893dc6129c (diff)
clean up crp
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile.am2
-rw-r--r--utils/ccrp.h10
-rw-r--r--utils/fdict.h6
3 files changed, 10 insertions, 8 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 5153ae20..3ea21835 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -51,7 +51,7 @@ mfcr_test_SOURCES = mfcr_test.cc
mfcr_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
weights_test_SOURCES = weights_test.cc
weights_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
-crp_test_SOURCES = weights_test.cc
+crp_test_SOURCES = crp_test.cc
crp_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
logval_test_SOURCES = logval_test.cc
logval_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS)
diff --git a/utils/ccrp.h b/utils/ccrp.h
index 61ab5576..68769635 100644
--- a/utils/ccrp.h
+++ b/utils/ccrp.h
@@ -242,10 +242,10 @@ class CCRP {
void resample_hyperparameters(MT19937* rng, const unsigned nloop = 5, const unsigned niterations = 10) {
assert(has_discount_prior() || has_alpha_prior());
DiscountResampler dr(*this);
- ConcentrationResampler cr(*this);
+ StrengthResampler sr(*this);
for (int iter = 0; iter < nloop; ++iter) {
if (has_alpha_prior()) {
- alpha_ = slice_sampler1d(cr, alpha_, *rng, 0.0,
+ alpha_ = slice_sampler1d(sr, alpha_, *rng, 0.0,
std::numeric_limits<double>::infinity(), 0.0, niterations, 100*niterations);
}
if (has_discount_prior()) {
@@ -253,7 +253,7 @@ class CCRP {
1.0, 0.0, niterations, 100*niterations);
}
}
- alpha_ = slice_sampler1d(cr, alpha_, *rng, 0.0,
+ alpha_ = slice_sampler1d(sr, alpha_, *rng, 0.0,
std::numeric_limits<double>::infinity(), 0.0, niterations, 100*niterations);
}
@@ -265,8 +265,8 @@ class CCRP {
}
};
- struct ConcentrationResampler {
- ConcentrationResampler(const CCRP& crp) : crp_(crp) {}
+ struct StrengthResampler {
+ StrengthResampler(const CCRP& crp) : crp_(crp) {}
const CCRP& crp_;
double operator()(const double& proposed_alpha) const {
return crp_.log_crp_prob(crp_.discount_, proposed_alpha);
diff --git a/utils/fdict.h b/utils/fdict.h
index f0871b9a..0a2a9456 100644
--- a/utils/fdict.h
+++ b/utils/fdict.h
@@ -10,7 +10,7 @@
#ifdef HAVE_CMPH
#include "perfect_hash.h"
-#include "string_to.h"
+#include <sstream>
#endif
struct FD {
@@ -49,7 +49,9 @@ struct FD {
#ifdef HAVE_CMPH
if (hash_) {
static std::string tls;
- tls = to_string(w);
+ std::ostringstream os;
+ os << w;
+ tls = os.str();
return tls;
}
#endif