From 5b6dc79427b8f7eeb6a7ff68034ab8548ce670ea Mon Sep 17 00:00:00 2001 From: Alexander Gutkin Date: Thu, 28 Feb 2013 00:24:20 +0000 Subject: Bumped OpenFST implementation to openfst-1.3.3-CL41851770. Updated OpenFST implementation to the most recent version used by Greco3 (corresponds to nlp::fst exported at Perforce CL 41851770). In particular this version has an improved PDT support. Change-Id: I5aadfc962297eef73922c67e7d57866f11ee7d81 --- src/include/fst/compose.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/include/fst/compose.h') diff --git a/src/include/fst/compose.h b/src/include/fst/compose.h index dfdff0a..db5ea3a 100644 --- a/src/include/fst/compose.h +++ b/src/include/fst/compose.h @@ -122,7 +122,7 @@ class ComposeFstImplBase : public CacheImpl { ComposeFstImplBase(const Fst &fst1, const Fst &fst2, const CacheOptions &opts) - :CacheImpl(opts) { + : CacheImpl(opts) { VLOG(2) << "ComposeFst(" << this << "): Begin"; SetType("compose"); @@ -137,7 +137,7 @@ class ComposeFstImplBase : public CacheImpl { } ComposeFstImplBase(const ComposeFstImplBase &impl) - : CacheImpl(impl) { + : CacheImpl(impl, true) { SetProperties(impl.Properties(), kCopyProperties); SetInputSymbols(impl.InputSymbols()); SetOutputSymbols(impl.OutputSymbols()); @@ -275,6 +275,13 @@ class ComposeFstImpl : public ComposeFstImplBase { OrderedExpand(s, fst2_, s2, fst1_, s1, matcher2_, true); } + const FST1 &GetFst1() { return fst1_; } + const FST2 &GetFst2() { return fst2_; } + M1 *GetMatcher1() { return matcher1_; } + M2 *GetMatcher2() { return matcher2_; } + F *GetFilter() { return filter_; } + T *GetStateTable() { return state_table_; } + private: // This does that actual matching of labels in the composition. The // arguments are ordered so matching is called on state 'sa' of -- cgit v1.2.3