diff options
| author | Patrick Simianer <p@simianer.de> | 2015-01-19 14:39:14 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2015-01-19 14:39:14 +0100 |
| commit | 0673fb55c6af8bc94c9f3e577c514160faf736d3 (patch) | |
| tree | ff4edd0e1e816f4d412601689ab510b2d0aaccf7 /python | |
| parent | cb9fb7088dde35881516c088db402abe747d49fa (diff) | |
| parent | 1bce604809399a0adc581fb0102bff11decf3436 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'python')
| -rw-r--r-- | python/cdec/hypergraph.pxd | 3 | ||||
| -rw-r--r-- | python/cdec/sa/compile.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/python/cdec/hypergraph.pxd b/python/cdec/hypergraph.pxd index 1e150bbc..9780cf8b 100644 --- a/python/cdec/hypergraph.pxd +++ b/python/cdec/hypergraph.pxd @@ -63,7 +63,8 @@ cdef extern from "decoder/viterbi.h": cdef extern from "decoder/hg_io.h" namespace "HypergraphIO": # Hypergraph JSON I/O bint ReadFromJSON(istream* inp, Hypergraph* out) - bint WriteToJSON(Hypergraph& hg, bint remove_rules, ostream* out) + bint ReadFromBinary(istream* inp, Hypergraph* out) + bint WriteToBinary(Hypergraph& hg, ostream* out) # Hypergraph PLF I/O void ReadFromPLF(string& inp, Hypergraph* out) string AsPLF(Hypergraph& hg, bint include_global_parentheses) diff --git a/python/cdec/sa/compile.py b/python/cdec/sa/compile.py index a5bd0699..78ab729d 100644 --- a/python/cdec/sa/compile.py +++ b/python/cdec/sa/compile.py @@ -119,7 +119,7 @@ def main(): a = cdec.sa.Alignment(from_text=args.alignment) a.write_binary(a_bin) stop_time = monitor_cpu() - logger.info('Compiling alignment took %f seonds', stop_time - start_time) + logger.info('Compiling alignment took %f seconds', stop_time - start_time) start_time = monitor_cpu() logger.info('Compiling bilexical dictionary') |