diff options
author | Chris Dyer <cdyer@cs.cmu.edu> | 2011-07-26 15:39:26 +0100 |
---|---|---|
committer | Chris Dyer <cdyer@cs.cmu.edu> | 2011-07-26 15:39:26 +0100 |
commit | 004d7447341b938efdec9223f899cf67f6b0dd86 (patch) | |
tree | 3b6da42ae9f5158b7c7e366aa1051e3277d937e6 /decoder/apply_models.h | |
parent | c3828b0a2deb42de5c7378e93f93f5e69efb304c (diff) | |
parent | f80150140b5273fd1eb0dfb34bdd789c4cbd35e6 (diff) |
Merge remote branch 'agesmundo/master'
Diffstat (limited to 'decoder/apply_models.h')
-rw-r--r-- | decoder/apply_models.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/decoder/apply_models.h b/decoder/apply_models.h index a85694aa..19a4c7be 100644 --- a/decoder/apply_models.h +++ b/decoder/apply_models.h @@ -13,6 +13,8 @@ struct IntersectionConfiguration { enum { FULL, CUBE, + FAST_CUBE_PRUNING, + FAST_CUBE_PRUNING_2, N_ALGORITHMS }; @@ -25,7 +27,9 @@ enum { inline std::ostream& operator<<(std::ostream& os, const IntersectionConfiguration& c) { if (c.algorithm == 0) { os << "FULL"; } else if (c.algorithm == 1) { os << "CUBE:k=" << c.pop_limit; } - else if (c.algorithm == 2) { os << "N_ALGORITHMS"; } + else if (c.algorithm == 2) { os << "FAST_CUBE_PRUNING"; } + else if (c.algorithm == 3) { os << "FAST_CUBE_PRUNING_2"; } + else if (c.algorithm == 4) { os << "N_ALGORITHMS"; } else os << "OTHER"; return os; } |