diff options
| author | Chris Dyer <redpony@gmail.com> | 2014-05-08 20:23:42 -0400 |
|---|---|---|
| committer | Chris Dyer <redpony@gmail.com> | 2014-05-08 20:23:42 -0400 |
| commit | 6d3490279cace80e202f277f9f3214edd09da8ad (patch) | |
| tree | 7ada55543a45ea3b52b3dc3405db12b64555fc03 | |
| parent | aa9d5d402c01e45835878c02777442950a0f6c0a (diff) | |
| parent | 3cec93d6df6190c486fc57dfe25661b24d9fa75e (diff) | |
Merge branch 'master' of https://github.com/redpony/cdec
| -rw-r--r-- | decoder/hg_intersect.cc | 2 | ||||
| -rw-r--r-- | decoder/tree2string_translator.cc | 6 | ||||
| -rwxr-xr-x | realtime/mkconfig.py | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/decoder/hg_intersect.cc b/decoder/hg_intersect.cc index 31a9a1ce..02f5a401 100644 --- a/decoder/hg_intersect.cc +++ b/decoder/hg_intersect.cc @@ -92,7 +92,7 @@ bool Intersect(const Lattice& target, Hypergraph* hg) { return FastLinearIntersect(target, hg); vector<bool> rem(hg->edges_.size(), false); - const RuleFilter filter(target, 15); // TODO make configurable + const RuleFilter filter(target, 9999); // TODO make configurable for (unsigned i = 0; i < rem.size(); ++i) rem[i] = filter(*hg->edges_[i].rule_); hg->PruneEdges(rem, true); diff --git a/decoder/tree2string_translator.cc b/decoder/tree2string_translator.cc index c353f7ca..fafb0d97 100644 --- a/decoder/tree2string_translator.cc +++ b/decoder/tree2string_translator.cc @@ -128,12 +128,14 @@ namespace std { void AddDummyGoalNode(Hypergraph* hg) { static const int kGOAL = -TD::Convert("Goal"); - static TRulePtr kGOAL_RULE(new TRule("[Goal] ||| [X] ||| [1]")); unsigned old_goal_node_idx = hg->nodes_.size() - 1; + int old_goal_cat = hg->nodes_[old_goal_node_idx].cat_; + TRulePtr goal_rule(new TRule("[Goal] ||| [X] ||| [1]")); + goal_rule->f_[0] = old_goal_cat; HG::Node* goal_node = hg->AddNode(kGOAL); goal_node->node_hash = 1; TailNodeVector tail(1, old_goal_node_idx); - HG::Edge* new_edge = hg->AddEdge(kGOAL_RULE, tail); + HG::Edge* new_edge = hg->AddEdge(goal_rule, tail); hg->ConnectEdgeToHeadNode(new_edge, goal_node); } diff --git a/realtime/mkconfig.py b/realtime/mkconfig.py index 71944080..f9938051 100755 --- a/realtime/mkconfig.py +++ b/realtime/mkconfig.py @@ -59,9 +59,14 @@ def main(): shutil.copy(weights_final, os.path.join(output_d, 'weights.final')) # other options - # TODO: automatically set some things here - with open(os.path.join(output_d, 'rt.ini'), 'w') as rt_ini: - pass + rt_ini = os.path.join(output_d, 'rt.ini') + with open(rt_ini, 'w') as out: + if libcdec_ff_hpyplm_so and corpus_hpyplm: + out.write('hpyplm=true\n') + else: + out.write('hpyplm=false\n') + out.write('metric=ibm_bleu\n') + sys.stderr.write('IMPORTANT: add any additional options such as metric=meteor to {}\n'.format(rt_ini)) if __name__ == '__main__': main() |