summaryrefslogtreecommitdiff
path: root/decoder
diff options
context:
space:
mode:
authorgraehl <graehl@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-07-05 15:40:39 +0000
committergraehl <graehl@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-07-05 15:40:39 +0000
commitd9d370c66ccf3e16b2428021bf9e8cb42538990c (patch)
treec2b3794727916979195a00e421588adc80610070 /decoder
parent33994330b8395c4c44ad0ddc1e678372404c3566 (diff)
exhaustive --prelm_weights
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@127 ec762483-ff6d-05da-a07a-a48fb63a330f
Diffstat (limited to 'decoder')
-rw-r--r--decoder/apply_models.h3
-rw-r--r--decoder/cdec.cc3
2 files changed, 5 insertions, 1 deletions
diff --git a/decoder/apply_models.h b/decoder/apply_models.h
index d6d8b34a..5c220afd 100644
--- a/decoder/apply_models.h
+++ b/decoder/apply_models.h
@@ -5,10 +5,13 @@ struct ModelSet;
struct Hypergraph;
struct SentenceMetadata;
+struct exhaustive_t {};
+
struct IntersectionConfiguration {
const int algorithm; // 0 = full intersection, 1 = cube pruning
const int pop_limit; // max number of pops off the heap at each node
IntersectionConfiguration(int alg, int k) : algorithm(alg), pop_limit(k) {}
+ IntersectionConfiguration(exhaustive_t t) : algorithm(0), pop_limit() {(void)t;}
};
void ApplyModelSet(const Hypergraph& in,
diff --git a/decoder/cdec.cc b/decoder/cdec.cc
index 0aa46be5..62e28bbc 100644
--- a/decoder/cdec.cc
+++ b/decoder/cdec.cc
@@ -456,7 +456,8 @@ int main(int argc, char** argv) {
ApplyModelSet(forest,
smeta,
prelm_models,
- inter_conf,
+ IntersectionConfiguration(exhaustive_t()),
+// avoid overhead of best-first
&prelm_forest);
forest.swap(prelm_forest);
forest.Reweight(prelm_feature_weights);