diff options
| author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-08-01 17:32:37 +0200 |
|---|---|---|
| committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-08-01 17:32:37 +0200 |
| commit | 3f8e33cfe481a09c121a410e66a6074b5d05683e (patch) | |
| tree | a41ecaf0bbb69fa91a581623abe89d41219c04f8 /python/src/decoder.pxd | |
| parent | c139ce495861bb341e1b86a85ad4559f9ad53c14 (diff) | |
| parent | 9fe0219562e5db25171cce8776381600ff9a5649 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'python/src/decoder.pxd')
| -rw-r--r-- | python/src/decoder.pxd | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/python/src/decoder.pxd b/python/src/decoder.pxd index e2678151..a66166a2 100644 --- a/python/src/decoder.pxd +++ b/python/src/decoder.pxd @@ -1,7 +1,8 @@ from libcpp.string cimport string from libcpp.vector cimport vector from hypergraph cimport Hypergraph -from utils cimport istream, weight_t +from grammar cimport Grammar +from utils cimport * cdef extern from "decoder/ff_register.h": void register_feature_functions() @@ -23,13 +24,11 @@ cdef extern from "decoder/decoder.h": vector[weight_t]& CurrentWeightVector() # void SetId(int id) - # const boost::program_options::variables_map& GetConf() const { return conf } + variables_map& GetConf() # add grammar rules (currently only supported by SCFG decoders) - # that will be used on subsequent calls to Decode. rules should be in standard - # text format. This function does NOT read from a file. - void SetSupplementalGrammar(string& grammar) - void SetSentenceGrammarFromString(string& grammar_str) + void AddSupplementalGrammarFromString(string& grammar_str) + void AddSupplementalGrammar(shared_ptr[Grammar] grammar) cdef extern from "observer.h": cdef cppclass BasicObserver(DecoderObserver): |