diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2013-03-04 11:30:34 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2013-03-04 11:30:34 +0000 |
| commit | 5bf56ba7027cd5f22ff52d0138893f7a585135fb (patch) | |
| tree | 19e17fc79b8873e66f211276d4dd169c480cede1 /src/extensions/pdt/pdtcompose.cc | |
| parent | 3da1eb108d36da35333b2d655202791af854996b (diff) | |
| parent | 5b6dc79427b8f7eeb6a7ff68034ab8548ce670ea (diff) | |
| download | openfst-kitkat-mr2.2-release.tar.gz | |
Merge remote-tracking branch 'goog/ics-ub-google-tts' into jb-mr2-devandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devidea133-weekly-releaseidea133
Diffstat (limited to 'src/extensions/pdt/pdtcompose.cc')
| -rw-r--r-- | src/extensions/pdt/pdtcompose.cc | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/extensions/pdt/pdtcompose.cc b/src/extensions/pdt/pdtcompose.cc index 0076e1d..b33862f 100644 --- a/src/extensions/pdt/pdtcompose.cc +++ b/src/extensions/pdt/pdtcompose.cc @@ -31,6 +31,9 @@ using std::pair; using std::make_pair; DEFINE_string(pdt_parentheses, "", "PDT parenthesis label pairs."); DEFINE_bool(left_pdt, true, "1st arg is PDT (o.w. 2nd arg)."); DEFINE_bool(connect, true, "Trim output"); +DEFINE_string(compose_filter, "paren", + "Composition filter, one of: \"expand\", \"expand_paren\", " + "\"paren\""); int main(int argc, char **argv) { namespace s = fst::script; @@ -70,7 +73,22 @@ int main(int argc, char **argv) { fst::ReadLabelPairs(FLAGS_pdt_parentheses, &parens, false); s::VectorFstClass ofst(ifst1->ArcType()); - fst::ComposeOptions copts(false); + + fst::PdtComposeFilter compose_filter; + + if (FLAGS_compose_filter == "expand") { + compose_filter = fst::EXPAND_FILTER; + } else if (FLAGS_compose_filter == "expand_paren") { + compose_filter = fst::EXPAND_PAREN_FILTER; + } else if (FLAGS_compose_filter == "paren") { + compose_filter = fst::PAREN_FILTER; + } else { + LOG(ERROR) << argv[0] << "Unknown compose filter type: " + << FLAGS_compose_filter; + return 1; + } + + fst::PdtComposeOptions copts(false, compose_filter); s::PdtCompose(*ifst1, *ifst2, parens, &ofst, copts, FLAGS_left_pdt); |