diff -Nru libpinyin-2.3.0/aclocal.m4 libpinyin-2.6.0/aclocal.m4 --- libpinyin-2.3.0/aclocal.m4 2019-03-05 05:44:46.000000000 +0000 +++ libpinyin-2.6.0/aclocal.m4 2020-12-15 03:49:34.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -364,7 +364,7 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -379,7 +379,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -395,14 +395,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -454,7 +454,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -485,7 +485,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -676,7 +676,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -715,7 +715,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -742,7 +744,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -939,7 +941,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -960,7 +962,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -981,7 +983,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1024,7 +1026,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1063,7 +1065,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1092,7 +1094,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1139,7 +1141,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1158,7 +1160,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1239,7 +1241,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1299,7 +1301,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1327,7 +1329,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1346,7 +1348,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru libpinyin-2.3.0/ChangeLog libpinyin-2.6.0/ChangeLog --- libpinyin-2.3.0/ChangeLog 2019-03-18 05:31:20.000000000 +0000 +++ libpinyin-2.6.0/ChangeLog 2020-12-15 03:59:55.000000000 +0000 @@ -1,147 +1,17803 @@ -version 2.3.0 -* update pinyin data +commit 19d8e9a1e577fb0d93dc9fb51ea982d677331755 +Author: Peng Wu +Date: 2020-12-15 11:23:09 +0800 -version 2.2.2 -* minor fixes + Update NEWS -version 2.2.1 -* fixes predicted candidates +M NEWS -version 2.2.0 -* bug fixes +commit 64be96f11386533d1e7184d96fad25f73741d39e +Author: Peng Wu +Date: 2020-12-15 11:19:27 +0800 -version 2.1.91 -* fixes zhuyin parsers; + bump version 2.6.0 -version 2.1.0 -* support sort option in pinyin_guess_candidates function; +M configure.ac -version 2.0.92 -* reduce memory consumption after imported user dictionary; +commit ccf9c76a38c8a784535499d806843445e1ad385e +Author: Weixuan XIAO +Date: 2020-11-22 19:10:02 +0100 -version 2.0.91 -* merge libzhuyin code; + Replace -version-script flag with -exported_symbols_list for LLVM + + Detect whether $CXX is clang with gcc alias. + + Use -exported_symbols_list under Clang/LLVM env -version 2.0.0 -* the first official release of 2.0.x; -* fixes autoconf; +M configure.ac +M src/Makefile.am +A src/libpinyin.exp +A src/libzhuyin.exp -version 1.9.92 -* fixes crash in double pinyin; +commit 76108f9b60e521af2d716b22dd5dd99d62609e72 +Author: Weixuan XIAO +Date: 2020-11-22 19:02:36 +0100 -version 1.9.91 -* multiple sentence candidates; + Fix delimiter for reading table files on macOS + + On macOS under llvm/clang++, the default delimiter for format string is + weird: it cannot read full CJK characters from the table files. + + This patch adds macOS-specified code to make "\t" and " " the implicit + delimiter. + + Ref: + https://stackoverflow.com/questions/12885628/changing-the-scanf-delimiter -version 1.7.0 -* fixes build on FreeBSD; -* update cmake files; +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table2.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_large_table2.cpp +M src/storage/phrase_large_table3.cpp -version 1.6.91 -* change license to GPLv3+; -* import open-gram dictionary and remove pinyin tones; -* add some checks when load data from file; +commit f1e88a707de818277e937fb77d3d9c737e470377 +Author: Peng Wu +Date: 2020-11-24 15:28:53 +0800 -version 1.6.0 -* bug fixes. + Update CMakeLists.txt -version 1.5.91 -* change pinyin/phrase tables to use dbm. -* enhance pinyin key representation and pinyin parsers. +M CMakeLists.txt +M data/CMakeLists.txt -version 1.2.0 -* bug fixes. +commit c47bb8d16597eb025f355d6efd45f16c2f45a730 +Author: Peng Wu +Date: 2020-11-17 10:49:52 +0800 -version 1.1.91 -* support Kyoto Cabinet as alternative to Berkeley DB. -* improve multiple dictionaries support feature. + bump version 2.4.93 -version 1.1.0 -* support to export user phrases. +M configure.ac -version 1.0.0 -* the first official release of 1.0.x. +commit c54a9a340c95b1d781063422bab35ebe14e98fec +Author: Peng Wu +Date: 2020-11-17 10:45:38 +0800 -version 0.9.94 -* bug fixes. + Include database format in libpinyin.pc and libzhuyin.pc -version 0.9.93 -* fixes libpinyin issues from coverity scan report. +M libpinyin.pc.in +M libzhuyin.pc.in -version 0.9.92 -* bug fixes. +commit 2a63eecb918336aa6134c03277d50691cbbee392 +Author: Peng Wu +Date: 2020-11-10 10:29:00 +0800 -version 0.9.91 -* code re-factor. + update special_table.h -version 0.9.0 -* the first official release of 0.9.x. -* fixes import dictionary. +M src/storage/special_table.h -version 0.8.93 -* add back pinyin_clear_constraint. +commit 7f44da7ac05286349e56f862ee21d012ad4e69b5 +Author: Peng Wu +Date: 2020-11-10 10:26:39 +0800 -version 0.8.92 -* fixes model data. + update scripts2 -version 0.8.91 -* multiple dictioniares and user dictionary support. +A scripts2/specials.txt +M scripts2/specialtable.py -version 0.8.1 -* bug fixes. +commit 9bb4577a42da7bea06ce1d9f0771950e326ba6e6 +Author: Peng Wu +Date: 2020-10-28 16:05:57 +0800 -version 0.8.0 -* the first official release of 0.8.x. + Fixes typo again -version 0.7.92 -* re-factor PhraseLookup class. -* all tests passed simple valgrind memory check. +M configure.ac -version 0.7.91 -* simplify PinyinLookup class. +commit d1a47e83f648d987c3cf20e424a63b5384a0861f +Author: Peng Wu +Date: 2020-10-15 13:21:39 +0800 -version 0.7.1 -* add API to lookup pinyin for characters. + Fixes typo -version 0.7.0 -* the first official release of 0.7.x. +M configure.ac -version 0.6.92 -* draft support for multiple professional phrase libraries. +commit 78450c31880245a4f87c83b80ac0fc306a96104e +Author: Peng Wu +Date: 2020-10-14 10:52:04 +0800 -version 0.6.91 -* support ucs4 characters. -* support guess sentence with prefix. -* initially support fuzzy pinyin segment. + Fixes Berkeley DB cursor usage -version 0.6.0 -* the first official release of 0.6.x. +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/flexible_ngram_bdb.h +M src/storage/ngram_bdb.cpp +M src/storage/phrase_large_table3_bdb.cpp -version 0.5.92 -* fixes new parsers and chewing large table. -* improves pinyin_save. +commit 31b73dd2c05d2b258c251251765ade141a1eb3fd +Author: Peng Wu +Date: 2020-10-14 09:57:47 +0800 -version 0.5.91 -* some code re-factor and simplify. -* fixes the self-learning work around. + import table.conf.in -version 0.5.0 -* the first official release of 0.5.x. +A data/table.conf.in -version 0.4.93 -* fixes some bugs in new parsers. +commit b21bfdab7b32375239144899c1666b3ae41ed9c7 +Author: Peng Wu +Date: 2020-10-14 09:53:32 +0800 -version 0.4.92 -* enable parallel make. + Use model19.text.tar.gz -version 0.4.91 -* New parsers for full pinyin/double pinyin/chewing. - * libpinyin now fully supports all pinyin auto corrections of -ibus-pinyin. - * libpinyin now better supports an/ang, en/eng, in/ing fuzzy -pinyin match. +M data/CMakeLists.txt +M data/Makefile.am -version 0.3.0 -* the first official release of 0.3.x. +commit e169b3d22c215ba1485e110a194da904a86751e8 +Author: Peng Wu +Date: 2020-10-10 09:53:04 +0800 -version 0.2.99 -* import from pinyin. + Fixes copy_bdb function + +M src/storage/bdb_utils.h + +commit b0bfcf10a1e03d89061054693b803d199c7506e1 +Author: Peng Wu +Date: 2020-09-27 16:55:36 +0800 + + Update table.conf path in utils + +M utils/storage/gen_binary_files.cpp +M utils/storage/import_interpolation.cpp +M utils/training/gen_unigram.cpp + +commit 8e97484c0bafa2caebf87c775892f3537c89c843 +Author: Peng Wu +Date: 2020-09-27 16:54:38 +0800 + + Update data/Makefile.am + +M data/Makefile.am + +commit 50b8799f78a4bd92c44fb4931eac2afb2a1d1aba +Author: Peng Wu +Date: 2020-09-27 14:34:24 +0800 + + Fixes test_ngram.cpp + +M tests/storage/test_ngram.cpp + +commit 932ff0514256570e75d049d2e5d0881b4421bb05 +Author: Peng Wu +Date: 2020-09-27 14:09:37 +0800 + + Use model18.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit bd53f5a59af5aaafa28a2fe7a9476b825c4c8104 +Author: Peng Wu +Date: 2020-09-27 13:23:59 +0800 + + Update NEWS + +M NEWS + +commit 3674b1df8e170f74a39ec007a096d245c4cbc9d0 +Author: Peng Wu +Date: 2020-09-27 13:20:42 +0800 + + bump version 2.4.92 + +M configure.ac + +commit 51f0c3d5666522c6a2ea83eee46b19afa4d9279d +Author: Peng Wu +Date: 2020-09-27 13:19:32 +0800 + + Update configure.ac + +M configure.ac + +commit 5e6c16f7fe72408fd0a96087f8513ca70732dd93 +Author: Peng Wu +Date: 2020-09-27 13:18:54 +0800 + + support database format in table.conf + +M src/storage/table_info.cpp +M src/storage/table_info.h + +commit 301552bcfae6a3af5721ee98750cd364e0f6d406 +Author: Peng Wu +Date: 2020-09-23 14:09:01 +0800 + + Improve pinyin_save function + +M src/pinyin.cpp + +commit 47305f5203d99089e7a04d797853b09845cfcc49 +Author: Peng Wu +Date: 2020-09-23 13:48:20 +0800 + + Use Kyoto Cabinet snapshot feature + +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/kyotodb_utils.h +M src/storage/ngram_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 7a83a153634428aa14e9baafcb5d585e85769ec3 +Author: Ruei-Yuan Lu +Date: 2020-09-06 13:07:13 +0800 + + Fix missing dynamic symbols in libzhuyin.so + + * zhuyin_get_zhuyin_key + * zhuyin_get_zhuyin_key_rest + +M src/zhuyin.h + +commit 1a42a778a34c23efae8cfdb4b8a1649fe08cf8fd +Author: Peng Wu +Date: 2020-08-25 15:41:03 +0800 + + update NEWS + +M NEWS + +commit bcbddea99ec91f9919551c5e40801094f41e5a62 +Author: Peng Wu +Date: 2020-08-24 13:59:59 +0800 + + CMake: update tests + +M tests/CMakeLists.txt +M tests/include/CMakeLists.txt +M tests/storage/CMakeLists.txt + +commit 079cbf27c96d31ca487f7137cd8262f553b095f0 +Author: Peng Wu +Date: 2020-08-21 20:36:43 +0800 + + improve Kyoto Cabinet usage + +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/ngram_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 89972e4d34331fe199633b10408f0656f7361e32 +Author: Peng Wu +Date: 2020-08-21 15:55:45 +0800 + + fixes merge_single_gram function + +M src/storage/ngram.cpp + +commit 91121b958219e022d3e3f8f55ee1dd14a42113a5 +Author: Bart Ribbers +Date: 2020-08-20 11:33:51 +0200 + + CMake: enable tests + +M tests/CMakeLists.txt + +commit fe75754057ca41ad6ce8541e9eb24b14909d5119 +Author: Peng Wu +Date: 2020-08-20 14:40:18 +0800 + + update CMakeLists.txt + +M data/CMakeLists.txt + +commit c28d06fe68de37284650536bfd1c26edbd9ebcf7 +Author: Peng Wu +Date: 2020-08-19 14:52:26 +0800 + + fixes full pinyin in zhuyin.cpp + +M src/zhuyin.cpp + +commit 15adb1dbe553bc38c5a2a9032dbf6963cc859772 +Author: Weng Xuetian +Date: 2020-08-17 00:41:33 -0700 + + Copy the data when merge into single ngram. + + system and user single ngram might be invalidated later. + +M src/storage/ngram.cpp + +commit 865dd14c83d9ad6fedb523181e2f066ed6b9dff3 +Author: Peng Wu +Date: 2020-08-17 12:35:35 +0800 + + improve full pinyin parser + +M src/storage/pinyin_parser2.cpp + +commit da26b217982ab096f0307e23b652ec5fdd627925 +Author: Peng Wu +Date: 2020-08-03 13:56:16 +0800 + + bump version 2.4.91 + +M configure.ac + +commit 958b212c3ac1750950b050442ec7320ff7a7d1bf +Author: Peng Wu +Date: 2020-07-24 15:04:25 +0800 + + update pinyin.cpp and zhuyin.cpp + +M src/pinyin.cpp +M src/zhuyin.cpp + +commit c3063e071bf6a7888ddccdd75b361dbab2386f5e +Author: Peng Wu +Date: 2020-07-24 15:01:42 +0800 + + improve full pinyin parser auto correction + +M src/storage/pinyin_parser2.cpp + +commit 4d0e7eebec72ed95b4278161b115f78b0550753a +Author: Peng Wu +Date: 2020-07-24 14:59:16 +0800 + + refactor parse_one_key method + +M src/storage/pinyin_parser2.h +M src/storage/zhuyin_parser2.cpp +M src/storage/zhuyin_parser2.h + +commit d9f677af1e3ef0f9abaaf95d511676b0e486fb57 +Author: Peng Wu +Date: 2020-07-24 14:16:24 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit df02c758217f6f7cdb1b1fe60a5d103b0159c111 +Author: Peng Wu +Date: 2020-07-24 14:15:28 +0800 + + update fullpinyintable.py + +M scripts2/fullpinyintable.py + +commit dd4265ce0dc6c6082b935bf5746e961e0e01d41d +Author: Peng Wu +Date: 2020-07-24 10:34:43 +0800 + + update options.py + +M scripts2/options.py + +commit 6098520bd122047dffc3fe629d0d9503d949a9e2 +Author: Peng Wu +Date: 2020-07-23 18:11:04 +0800 + + clean up pinyin.h + +M src/pinyin.h + +commit ec82da0bae97807171f0bef61de7e380a2d7e493 +Author: Peng Wu +Date: 2020-07-20 16:37:10 +0800 + + Fixes typo + +M src/storage/chewing_large_table2.cpp + +commit a6d51d2f7c513393e92105290f488ee3bb4930e8 +Author: Inokinoki +Date: 2020-06-08 08:57:30 +0200 + + Fix include issue with autogenerated config.h + +M CMakeLists.txt + +commit b206de15c32835e58654ba19238e232210df1097 +Author: Inokinoki +Date: 2020-06-07 13:42:28 +0200 + + Fix CMake build: missing ../data/table.conf + + Add data/table.conf as a output target from + downloaded textual model data, so that it + can be found during the build phase. + +M data/CMakeLists.txt + +commit dd349069f9bd37f3e030c9fa4875eed6ccc8f628 +Author: Peng Wu +Date: 2020-02-27 14:09:45 +0800 + + update pinyin_custom2.h for C language compatibility + +M src/storage/pinyin_custom2.h + +commit b2ceacea92f4a811fcf7ef54f25f1b037f96b332 +Author: Peng Wu +Date: 2020-02-27 13:50:38 +0800 + + remove pinyin_custom3.h + +D src/storage/pinyin_custom3.h + +commit 9a2520b19a068ccf86cfda537ef114b7d1ae58a7 +Author: Peng Wu +Date: 2019-12-26 12:06:13 +0800 + + update Makefile.am + +M Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/storage/Makefile.am + +commit c1f5eda1df8cbba3a00269aac35b207eb8eeb5c4 +Author: Peng Wu +Date: 2019-12-26 12:01:27 +0800 + + update ChangeLog + +M ChangeLog +M NEWS + +commit 3cf88c57de20fc04c52a8e6f98e074b83e57b2a5 +Author: Peng Wu +Date: 2019-11-28 16:15:27 +0800 + + use AM_CPPFLAGS instead of INCLUDES in automake + +M tests/Makefile.am +M tests/include/Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/segment/Makefile.am +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 648c5f863a43d3686dbea71a98ccd44a089a65c4 +Author: Peng Wu +Date: 2019-11-28 16:05:48 +0800 + + improve autoconf for libpinyin.la and libzhuyin.la + +M src/Makefile.am +M src/include/Makefile.am +M src/lookup/Makefile.am +M src/storage/Makefile.am + +commit 50a87b3efe0b10a9ae2ce989c0c0172e2984af32 +Author: Peng Wu +Date: 2019-11-28 15:42:26 +0800 + + improve autoconf for libpinyin_internal.a + +M src/Makefile.am +M src/lookup/Makefile.am +M src/storage/Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/segment/Makefile.am +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 51c551dc9a8b264315100a774720373a0e3744e6 +Author: Peng Wu +Date: 2019-03-18 13:31:53 +0800 + + update ChangeLog + +M ChangeLog + +commit 66b6b0c8c050e0ecdfc9fcd5068953b388a9428e +Author: Peng Wu +Date: 2019-03-15 16:52:52 +0800 + + update CMakeLists.txt + +M data/CMakeLists.txt + +commit d67a295ecd01161d3eec5629c2c019b2961fd7cd +Author: Peng Wu +Date: 2019-03-15 16:51:47 +0800 + + update Makefile.am + +M data/Makefile.am + +commit cdf7b5f6eb437e84f095511ff2fd67917dd7dae5 +Author: Peng Wu +Date: 2019-03-06 15:43:41 +0800 + + update CMakeLists.txt + +M data/CMakeLists.txt + +commit b5ea59f799e2f57dcddc4feb485f380c8c32b643 +Author: Peng Wu +Date: 2019-03-06 15:43:11 +0800 + + update Makefile.am + +M data/Makefile.am + +commit f20cb306afd416fbc0a2198b865a05e77afeed71 +Author: Peng Wu +Date: 2019-03-05 13:42:25 +0800 + + bump version 2.3.0 + +M configure.ac + +commit 01790e725a92457cfaa2ef95f2687dafbbfeae56 +Author: Martin Blanchard +Date: 2019-02-17 17:18:13 +0000 + + prefer autoreconf over gnome-common + + The gnome-common package is deprecated: + + https://wiki.gnome.org/Projects/GnomeCommon/Migration + +M autogen.sh + +commit c105c68309d7607a82b29c79b6bbeeb98ef4b3b2 +Author: Peng Wu +Date: 2019-01-17 15:28:53 +0800 + + Revert "update test_ngram.cpp" + + This reverts commit 5190d206dca53d97127f645f3477730d6955a463. + +M tests/storage/test_ngram.cpp + +commit b44bdf7950cfbb445c799f2c7f1c9747c0b24515 +Author: Peng Wu +Date: 2019-01-17 15:27:48 +0800 + + Revert "update pinyin.cpp and zhuyin.cpp" + + This reverts commit 97ca682a1099ae6da6ceacd9b15f654562567013. + +M src/pinyin.cpp +M src/zhuyin.cpp + +commit 35adc8e4fc41dd8c989dc16760e179b63637203a +Author: Peng Wu +Date: 2019-01-17 15:20:32 +0800 + + Revert "not use in-memory DBM in src/storage" + + This reverts commit 5607752c2b989849923676f4a925e5315a3303d4. + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/chewing_large_table2_kyotodb.h +M src/storage/facade_chewing_table2.h +M src/storage/facade_phrase_table3.h +M src/storage/ngram_bdb.cpp +M src/storage/ngram_bdb.h +M src/storage/ngram_kyotodb.cpp +M src/storage/ngram_kyotodb.h +M src/storage/phrase_large_table3_bdb.cpp +M src/storage/phrase_large_table3_bdb.h +M src/storage/phrase_large_table3_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.h + +commit b825ba207cec09f53f100fa48c177c1fddf9949b +Author: Peng Wu +Date: 2019-01-15 11:52:40 +0800 + + update ChangeLog + +M ChangeLog + +commit b708ceefcd64a699d1ef8af774c9bd469bf76174 +Author: Peng Wu +Date: 2018-12-10 15:33:07 +0800 + + update PhoneticLookup usage + +M src/pinyin.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit 5643eb4c61a7c7425311471057c6346668145612 +Author: Peng Wu +Date: 2018-11-15 09:56:14 +0800 + + improve pinyin_guess_predicted_candidates method + +M src/pinyin.cpp + +commit 43dc88ed102142ceeeb89349a1455d0370733073 +Author: Peng Wu +Date: 2018-11-15 09:57:21 +0800 + + bump version 2.2.2 + +M configure.ac + +commit c8417b7b37209ce97daa7c3e27855b5023aa268e +Author: Peng Wu +Date: 2018-09-10 15:17:51 +0800 + + update ChangeLog + +M ChangeLog + +commit f4c2fcd18a91193bc2e3f3d944f04b69f52d4f7f +Author: Peng Wu +Date: 2018-09-10 15:16:39 +0800 + + bump version 2.2.1 + +M configure.ac + +commit 0fadbc2aaf01da5f83fed00238357e8181d4a051 +Author: Peng Wu +Date: 2018-09-10 15:15:36 +0800 + + add safe guard to pinyin_guess_predicted_candidates function + +M src/pinyin.cpp + +commit 9bd208f580e907090037352dc39fbb1f95065eaf +Author: Ting-Wei Lan +Date: 2018-08-19 01:53:47 +0800 + + include config.h to allow using getline on freebsd + +M tests/test_zhuyin.cpp +M utils/storage/gen_zhuyin_table.cpp + +commit d9741044eed56707ba134ebda7a364f1df847699 +Author: Peng Wu +Date: 2018-06-25 14:50:39 +0800 + + fixes filter variable + +M src/pinyin.cpp + +commit 62194b33291e58cbe43484a905b99c79e957ed9d +Author: Peng Wu +Date: 2018-06-21 09:39:09 +0800 + + fixes pinyin_guess_predicted_candidates function + +M src/pinyin.cpp + +commit 86a756c0d888220b6c4e667642e0ee0ddb737d83 +Author: Peng Wu +Date: 2018-04-26 16:44:26 +0800 + + skip libintl.h checks + +M CMakeLists.txt +M configure.ac + +commit 63076e51a67336970973172189b450a7d076b7d9 +Author: Peng Wu +Date: 2018-04-17 11:08:05 +0800 + + update ChangeLog + +M ChangeLog + +commit 41a100f6c8694a53fea5703197ff4a6441a61799 +Author: Peng Wu +Date: 2018-04-17 11:06:42 +0800 + + bump version 2.2.0 + +M configure.ac + +commit dff0311385bfab9fb898ecbef89b386ded5205c1 +Author: Peng Wu +Date: 2018-04-10 13:59:37 +0800 + + improve candidates sorting + +M src/pinyin.cpp + +commit 3a41e1671aa3c71add07fc3dc09de6b71767b64a +Author: Peng Wu +Date: 2018-04-10 13:55:32 +0800 + + reduce memory usage + +M src/pinyin.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit c5b2a03a056032a69564470f39a0b272ac35cbdd +Author: Peng Wu +Date: 2018-04-10 13:53:54 +0800 + + bump version 2.1.92 + +M configure.ac + +commit f4461b1f7687eba6ac95e8c995d0e3509adbb30d +Author: Peng Wu +Date: 2018-01-29 15:00:42 +0800 + + fixes compile + +M src/pinyin.cpp +M src/zhuyin.cpp +M tests/lookup/test_pinyin_lookup.cpp +M utils/training/eval_correction_rate.cpp + +commit 813cedc202276fa6d4127446c4688d8a706c5ff5 +Author: Peng Wu +Date: 2018-01-29 14:50:29 +0800 + + intro nstore parameter + +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit f8c1d027bd98ba452a4cc0210d80a692077e3f47 +Author: Peng Wu +Date: 2018-01-25 14:59:35 +0800 + + update gen_pinyin_table.cpp + +M utils/storage/gen_pinyin_table.cpp + +commit ff713df50634fd5a2d3e5fd64fe5c57eb45b2b7a +Author: Peng Wu +Date: 2018-01-25 12:58:23 +0800 + + fixes fscanf usage + +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table2.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_large_table2.cpp +M src/storage/phrase_large_table3.cpp +M src/storage/table_info.cpp +M utils/storage/gen_pinyin_table.cpp + +commit 011d3bc3f4f956eac98e98aeb284ef9b085eae19 +Author: Peng Wu +Date: 2018-01-02 15:07:06 +0800 + + update ChangeLog + +M ChangeLog + +commit 0f6f371a5b6089d0ac6c5eb457611bd6c6f1b7c4 +Author: Peng Wu +Date: 2018-01-02 15:05:44 +0800 + + bump version 2.1.91 + +M configure.ac + +commit 726b9d8a605c7e81f3a3fc44f1322ce16c5452fc +Author: Peng Wu +Date: 2018-01-02 11:24:34 +0800 + + use model15.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit 9a44d8280120a80d53a240cc63347e0a3dbadbae +Author: Peng Wu +Date: 2017-12-28 11:38:59 +0800 + + write is_valid_zhuyin method + +M src/storage/chewing_key.cpp +M src/storage/chewing_key.h +M src/storage/zhuyin_parser2.cpp + +commit 3eb8b2d5b4afec1da2e2525fe0c383c2e7f07a50 +Author: Peng Wu +Date: 2017-12-28 11:12:51 +0800 + + update zhuyin_table.h + +M src/storage/zhuyin_table.h + +commit c1e1f7f4cd797300acaf9b1e7e7a931515d04ea9 +Author: Peng Wu +Date: 2017-12-28 11:10:08 +0800 + + update special_table.h + +M src/storage/special_table.h + +commit d3767079f2ebb8bd834051ad92e0b88fa7097ce2 +Author: Peng Wu +Date: 2017-12-28 11:03:35 +0800 + + fixes compile + +M scripts2/templates/zhuyin_table.h.in + +commit 1f2bafab941a38307b78fb2236e7aee74b8f0f89 +Author: Peng Wu +Date: 2017-12-28 10:58:56 +0800 + + update scripts2 for valid zhuyin table + +M scripts2/generateheader.py +M scripts2/templates/zhuyin_table.h.in +M scripts2/zhuyin.py + +commit c0f1489a9dc0fba1cb69082b196696c812340613 +Author: Peng Wu +Date: 2017-12-27 17:17:57 +0800 + + write zhuyin.py + +A scripts2/zhuyin.py + +commit 2583889378de8976e74e992fe28d3b08ab1c5276 +Author: Peng Wu +Date: 2017-12-27 17:15:39 +0800 + + refactor code + +M scripts2/chewing.py +M scripts2/fullpinyintable.py + +commit 3e5d3b78c18e7c7d73733af756fb52f483a974d2 +Author: Peng Wu +Date: 2017-12-25 15:17:24 +0800 + + update comment + +M src/lookup/phonetic_lookup.h + +commit 8b618b16fd4cead026fdc48177d6e31fbce5fc49 +Author: Peng Wu +Date: 2017-12-25 15:13:14 +0800 + + fixes get_candidates method + +M src/lookup/phonetic_lookup.h + +commit d4a34f42b9e7c877e7d268b0d2a3b336da5e138c +Author: Peng Wu +Date: 2017-08-31 15:41:53 +0800 + + update cmake files + +M CMakeLists.txt +M src/CMakeLists.txt +M src/lookup/CMakeLists.txt +M tests/CMakeLists.txt +M tests/include/CMakeLists.txt +M tests/lookup/CMakeLists.txt +M tests/storage/CMakeLists.txt +M utils/segment/CMakeLists.txt +M utils/storage/CMakeLists.txt +M utils/training/CMakeLists.txt + +commit e3d59339d78b1af3273e5334fe6dae73f5fef91d +Author: Peng Wu +Date: 2017-08-25 09:57:45 +0800 + + update ChangeLog + +M ChangeLog + +commit 27ba2294e985622ecfbbb5cd8eb1695b3298a388 +Author: Peng Wu +Date: 2017-08-18 13:48:35 +0800 + + update ChangeLog + +M ChangeLog + +commit ee2ab1f0e8b501d4b65bd57b7090bb9abe89dd62 +Author: Peng Wu +Date: 2017-08-18 13:22:33 +0800 + + bump so version + +M configure.ac + +commit d1bdd53619b3eba505a7e8dc6806fb7721944606 +Author: Peng Wu +Date: 2017-08-18 13:22:05 +0800 + + update test_pinyin.cpp + +M tests/test_pinyin.cpp + +commit bc600e1d24e543c82bb6acf35d2195d50dbf5495 +Author: Peng Wu +Date: 2017-08-17 16:32:51 +0800 + + add sort option to pinyin_guess_candidates function + +M src/pinyin.cpp +M src/pinyin.h + +commit de67e9c1a634759b0101c53a6d77fe0b579ce9a6 +Author: Peng Wu +Date: 2017-07-24 12:33:50 +0800 + + bump version 2.1.0 + +M configure.ac + +commit e8524b33e5806cdacf18ff028f9d0d5da4816c7c +Author: Peng Wu +Date: 2017-07-24 12:32:11 +0800 + + update ChangeLog + +M ChangeLog + +commit ae39670e0b7cdf01d8e88ff722191bc769ccb89e +Author: Peng Wu +Date: 2017-07-07 17:40:04 +0800 + + update ChangeLog + +M ChangeLog + +commit 6306190a030db7219fb533d71f6b0d0961c00a4d +Author: Peng Wu +Date: 2017-06-21 12:27:06 +0800 + + bump version 2.0.92 + +M configure.ac + +commit 5190d206dca53d97127f645f3477730d6955a463 +Author: Peng Wu +Date: 2017-06-19 11:23:25 +0800 + + update test_ngram.cpp + +M tests/storage/test_ngram.cpp + +commit 97ca682a1099ae6da6ceacd9b15f654562567013 +Author: Peng Wu +Date: 2017-06-19 11:13:46 +0800 + + update pinyin.cpp and zhuyin.cpp + +M src/pinyin.cpp +M src/zhuyin.cpp + +commit 5607752c2b989849923676f4a925e5315a3303d4 +Author: Peng Wu +Date: 2017-06-19 10:53:55 +0800 + + not use in-memory DBM in src/storage + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/chewing_large_table2_kyotodb.h +M src/storage/facade_chewing_table2.h +M src/storage/facade_phrase_table3.h +M src/storage/ngram_bdb.cpp +M src/storage/ngram_bdb.h +M src/storage/ngram_kyotodb.cpp +M src/storage/ngram_kyotodb.h +M src/storage/phrase_large_table3_bdb.cpp +M src/storage/phrase_large_table3_bdb.h +M src/storage/phrase_large_table3_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.h + +commit 071deb522f26534861c75897db80344f045b1db1 +Author: Felix Yan +Date: 2017-06-12 00:51:37 +0800 + + Fix a typo: omited -> omitted + +M src/storage/tag_utility.h + +commit 4eb4a9d10a8208cbc4a5b23d60d1b2e23f35d288 +Author: Peng Wu +Date: 2017-06-06 16:14:28 +0800 + + update ChangeLog + +M ChangeLog + +commit 2031917f11c7eb27100b2c8e76520504ed20b46f +Author: Peng Wu +Date: 2017-05-27 14:04:57 +0800 + + drop zhuyin_valid_zhuyin_keys function + +M src/zhuyin.h + +commit d70f442d2e645dce99970d3afd903ddf1edb2bff +Author: Peng Wu +Date: 2017-05-27 14:00:13 +0800 + + fixes a bug + +M src/zhuyin.cpp + +commit fea30d2bd41f7b85e2e7014e065dd30ee67b5da9 +Author: Peng Wu +Date: 2017-05-26 14:56:24 +0800 + + update libzhuyin.pc.in + +M libzhuyin.pc.in + +commit cfe42385affbe99c5e4b01d2a8d7ef9d6f72d425 +Author: Peng Wu +Date: 2017-05-25 15:36:40 +0800 + + handle zhuyin table file in tests and utils + +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp +M tests/tests_helper.h +M utils/storage/gen_binary_files.cpp + +commit 0bd9779cfd4be55ec600355c31806279885ba754 +Author: Peng Wu +Date: 2017-05-25 15:23:33 +0800 + + handle zhuyin table file in src/storage + +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table.h +M src/storage/chewing_large_table2.cpp +M src/storage/chewing_large_table2_bdb.h +M src/storage/chewing_large_table2_kyotodb.h +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 132a15bb1da8bc426cb4abf796814f4ec307bccd +Author: Peng Wu +Date: 2017-05-23 17:39:07 +0800 + + update libzhuyin API + +M src/libzhuyin.ver +M src/zhuyin.cpp +M src/zhuyin.h + +commit cfc44f039a0320a2f35d541eb4bfc39e72ad7c48 +Author: Peng Wu +Date: 2017-05-22 15:44:30 +0800 + + fixes a typo + +M src/zhuyin.h + +commit 569b8aff152575be36b791cb86d07ca862892e58 +Author: Peng Wu +Date: 2017-05-22 13:21:46 +0800 + + update Makefile.am + +M Makefile.am +M src/Makefile.am + +commit 7f3d8cd9dd47b3b14bc240276ffd13d7cf39644f +Author: Peng Wu +Date: 2017-05-22 11:46:45 +0800 + + bump version 2.0.91 + +M configure.ac + +commit 7d2dade8b0f15126c754478339fcc0261d791d10 +Author: Peng Wu +Date: 2017-05-19 17:45:56 +0800 + + drop _compute_zhuyin_start function + +M src/zhuyin.cpp + +commit 0e4c1c80a5e94824efa74d4d59352aa16e0a1a7f +Author: Peng Wu +Date: 2017-05-19 14:54:15 +0800 + + write zhuyin.cpp + +M src/zhuyin.cpp + +commit 49be8791712fff09ac422edd0ce411deaff69212 +Author: Peng Wu +Date: 2017-05-16 13:43:38 +0800 + + import libzhuyin.pc.in + +M configure.ac +A libzhuyin.pc.in +M src/Makefile.am +M src/storage/Makefile.am + +commit 80cd413400656838023362ad13638d9aa91daf05 +Author: Peng Wu +Date: 2017-05-16 13:23:09 +0800 + + update autoconf + +M configure.ac +M src/Makefile.am +M tests/Makefile.am + +commit c96110fd976e92b0f8de0a08a5cb278ef66c664b +Author: Peng Wu +Date: 2017-05-15 15:25:40 +0800 + + update Makefile.am + +M tests/Makefile.am +M utils/storage/Makefile.am + +commit ee66af93e3168149a581acc262c3050569f94b72 +Author: Peng Wu +Date: 2017-05-15 15:16:17 +0800 + + import gen_zhuyin_table.cpp and test_zhuyin.cpp + +M src/storage/table_info.cpp +A tests/test_zhuyin.cpp +A utils/storage/gen_zhuyin_table.cpp + +commit 5c396d0332a802382e5b66195c2baba893b1d41f +Author: Peng Wu +Date: 2017-05-12 15:20:37 +0800 + + disable the zhuyin correction options in pinyin.cpp + +M src/pinyin.cpp + +commit 2d22aed76e476d56e9b2f1e0dfda4413ec3b2b28 +Author: Peng Wu +Date: 2017-05-12 15:19:12 +0800 + + write zhuyin.cpp for zhuyin_instance_t in progress + +M src/zhuyin.cpp + +commit dcd10dd3958db7aedaf8e746e4657669ce8fb75d +Author: Peng Wu +Date: 2017-05-11 17:24:55 +0800 + + support zhuyin table in table_info.cpp + +M src/include/novel_types.h +M src/storage/table_info.cpp + +commit 3a3b0ff675a03c8af84fb0062e744084ecf6a6c6 +Author: Peng Wu +Date: 2017-05-10 17:05:18 +0800 + + write zhuyin.cpp for zhuyin_context_t in progress + +M src/zhuyin.cpp + +commit e7bb5f219a4290cae22942330fca11fc2d73f262 +Author: Peng Wu +Date: 2017-05-10 16:03:11 +0800 + + fixes compile + +M src/zhuyin.cpp + +commit 214476b848cc26d25fae113724e87d659045d2d8 +Author: Peng Wu +Date: 2017-05-10 15:12:27 +0800 + + update Makefile.am + +M src/Makefile.am + +commit d9255a6f57b8d380440ed2ceab936d296511a903 +Author: Peng Wu +Date: 2017-05-09 15:14:03 +0800 + + declare data structure in zhuyin.cpp + +A src/zhuyin.cpp + +commit cda705686015c5295f1f231e81e494e3c7476672 +Author: Peng Wu +Date: 2017-04-25 13:37:39 +0800 + + clean zhuyin.h + +M src/libzhuyin.ver +M src/zhuyin.h + +commit 32f157d1d204a1d1c4ad3825b8488572a871c86b +Author: Peng Wu +Date: 2017-04-25 13:28:26 +0800 + + import zhuyin.h + +A src/zhuyin.h + +commit 7fb6cd3c797cc5bea200651db73327dbed6f8899 +Author: Peng Wu +Date: 2017-04-25 13:25:49 +0800 + + import libzhuyin.ver + +A src/libzhuyin.ver + +commit 221a79e076118d3815f775c6ea6fab8529bd2e36 +Author: Peng Wu +Date: 2017-04-24 15:57:53 +0800 + + write zhuyin_custom2.h + +A src/storage/zhuyin_custom2.h + +commit 640e40159fa08140e7571a99138104aab902463e +Author: Peng Wu +Date: 2017-04-20 14:13:55 +0800 + + bump version 2.0.0 + +M ChangeLog +M configure.ac + +commit d999e774f2f7096eaab2068e585d1f9b5be693d6 +Author: Peng Wu +Date: 2017-03-13 11:18:26 +0800 + + import ax_cxx_compile_stdcxx.m4 + +A m4/ax_cxx_compile_stdcxx.m4 + +commit 1e8c9d034689ae9dc556a2f3be37b498cc3d193b +Author: Peng Wu +Date: 2017-03-13 11:15:47 +0800 + + use m4 macros + +M Makefile.am +M configure.ac + +commit 2919d7d4b9facf175d4da33418dfbb9945f4bb15 +Author: Peng Wu +Date: 2017-03-07 12:56:19 +0800 + + fixes crash + +M src/pinyin.cpp + +commit 9fe72f37c17ecdccf4fe38327022fec8cfdc05f4 +Author: Peng Wu +Date: 2017-03-07 11:29:17 +0800 + + bump version 1.9.92 + +M configure.ac + +commit c4051798a11e62fbc3ea53d3efe9ef8ffb11b63f +Author: Peng Wu +Date: 2017-03-07 11:22:55 +0800 + + update ChangeLog + +M ChangeLog + +commit 758c5b312b36f440224cb6cbe4b363322d98b305 +Author: Peng Wu +Date: 2017-02-27 14:09:35 +0800 + + fixes crash + +M src/pinyin.cpp + +commit b9e6a9690f214f525e057194b9eb234d76436eda +Author: Peng Wu +Date: 2017-02-14 14:50:38 +0800 + + fixes warnings + +M src/include/memory_chunk.h + +commit d4372bf3c14617ec9b5187677a58b5db04e01389 +Author: Peng Wu +Date: 2017-02-14 13:46:46 +0800 + + update ChangeLog + +M ChangeLog + +commit 3e2c49c93e302ab6a3b0d4a6e4f8291ede39844a +Author: Peng Wu +Date: 2017-02-13 16:50:10 +0800 + + fixes crash + +M src/pinyin.cpp + +commit 114e9dc802ea243925ce9e19e0ce4e2d83356ac5 +Author: Peng Wu +Date: 2017-02-13 13:14:30 +0800 + + fixes a typo + +M src/lookup/phonetic_lookup.h + +commit bac036fbf602ecf9879b900dffde9f791c9936f0 +Author: Peng Wu +Date: 2017-02-13 11:26:06 +0800 + + update pinyin_custom3.h + +M src/storage/pinyin_custom3.h + +commit 2c2b17198520df203a740044b69fdf636b15af10 +Author: Peng Wu +Date: 2017-02-13 11:18:07 +0800 + + fixes LONG_SENTENCE_PENALTY + +M src/lookup/phonetic_lookup.h + +commit 53fb4a6ce575a634b2267892a6ffc276c1693c43 +Author: Peng Wu +Date: 2017-02-10 15:27:29 +0800 + + bump version 1.9.91 + +M configure.ac + +commit 6f1fe4739fb5875cec915cd14c920173e143bba3 +Author: Peng Wu +Date: 2017-02-10 15:23:40 +0800 + + fixes class ForwardPhoneticConstraints + +M src/lookup/phonetic_lookup.h +M src/pinyin.cpp +M tests/lookup/test_pinyin_lookup.cpp +M utils/training/eval_correction_rate.cpp + +commit 997085b873a2b1395a309bdebf52a3ca702087e5 +Author: Peng Wu +Date: 2017-02-10 14:30:52 +0800 + + fixes a typo + +M src/pinyin.cpp + +commit 012308bb33c81978617d91aef7352c2e5dd966a4 +Author: Peng Wu +Date: 2017-02-10 14:15:12 +0800 + + write pinyin_get_candidate_nbest_index function + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 809efb9334e6b8644c8c5bfb180ab32fe8648825 +Author: Peng Wu +Date: 2017-02-09 16:39:30 +0800 + + update test cases + +M tests/test_chewing.cpp +M tests/test_pinyin.cpp + +commit 89e2f1ef616670cc51a535a80b638479e94e09eb +Author: Peng Wu +Date: 2017-02-09 16:36:59 +0800 + + fixes compile + +M src/lookup/phonetic_lookup.h +M src/pinyin.cpp +M src/pinyin.h +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 2c0463835fd1bdd07530825937677db68464727c +Author: Peng Wu +Date: 2017-02-09 16:12:45 +0800 + + rename variables + +M src/pinyin.cpp + +commit 9f413b389d5a59b01bfe53455e37643d0a15ed6c +Author: Peng Wu +Date: 2017-02-09 16:02:45 +0800 + + update pinyin_get_sentence and pinyin_train function + +M src/lookup/phonetic_lookup.cpp +M src/pinyin.cpp + +commit 915bbf4b2719d4d4829a318e92538fd10e59a395 +Author: Peng Wu +Date: 2017-02-09 15:44:35 +0800 + + use nbest results in pinyin.cpp + +M src/pinyin.cpp +M src/pinyin.h + +commit 419d26da015f4348b758a7b15ec0df66ef251ded +Author: Peng Wu +Date: 2017-02-09 13:58:47 +0800 + + use PhoneticLookup in pinyin.cpp + +M src/pinyin.cpp + +commit 16566496c4a59d474e1c32137a86160e75ac356a +Author: Peng Wu +Date: 2017-02-09 13:02:11 +0800 + + hide pinyin_lookup2.h + +M src/pinyin_internal.cpp +M src/pinyin_internal.h + +commit 69fef8b1a324c07c5268de72e446f3d70f1a015b +Author: Peng Wu +Date: 2017-02-08 16:02:05 +0800 + + update eval_correction_rate.cpp + +M utils/training/eval_correction_rate.cpp + +commit 44e570de46e39b5e1ccc4133414cf8ae19e1868b +Author: Peng Wu +Date: 2017-02-08 12:42:22 +0800 + + rename variables + +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h + +commit dc963b598e14eec42e4fd22223f287253d424c47 +Author: Peng Wu +Date: 2017-02-08 11:12:25 +0800 + + update test_pinyin_lookup.cpp + +M tests/lookup/test_pinyin_lookup.cpp + +commit 24523278fbc44732c58407393f8779a8ec41712c +Author: Peng Wu +Date: 2017-02-08 11:06:00 +0800 + + fixes phonetic_lookup_heap.h again + +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h + +commit 8d404a360f3f5e2515cb8b8c7b3f2ea3b4e65580 +Author: Peng Wu +Date: 2017-02-07 15:02:55 +0800 + + fixes phonetic_lookup_heap.h + +M src/include/stl_lite.h +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit 55d7fed35b663fa4acadc42e24a2175c228f7c37 +Author: Peng Wu +Date: 2017-02-07 13:38:09 +0800 + + fixes compile again + +M src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h +M tests/lookup/test_pinyin_lookup.cpp + +commit 8df49857ef632ab03c290df8ee6abe9f436d1d3c +Author: Peng Wu +Date: 2017-02-06 14:56:08 +0800 + + fixes compile + +M src/lookup/lookup.h +M src/lookup/phonetic_lookup.h +M src/lookup/pinyin_lookup2.h +M src/pinyin_internal.h + +commit 0327c836a2ba39656fb1ec7f7e342a93aac665bb +Author: Peng Wu +Date: 2017-02-06 13:26:01 +0800 + + update PhoneticLookup + +M src/lookup/lookup.h +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit 1e698604f33ece6cbd3ee436aa6b9607003f3150 +Author: Peng Wu +Date: 2017-02-04 15:16:26 +0800 + + rename MatchResults to MatchResult + +M src/include/novel_types.h +M src/lookup/lookup.cpp +M src/lookup/lookup.h +M src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h +M src/pinyin.cpp +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +M utils/segment/ngseg.cpp + +commit 58e14c36cdabbd941a2aa9e6d21c76238d08d178 +Author: Peng Wu +Date: 2017-02-04 14:49:45 +0800 + + write class NBestMatchResults + +M src/lookup/phonetic_lookup.h + +commit ec5a41aac76aed88d14bf653c5c33ecc14e55907 +Author: Peng Wu +Date: 2017-01-22 16:21:34 +0800 + + add const modifiers + +M src/lookup/phonetic_lookup.h +M src/storage/phonetic_key_matrix.h + +commit 07f2e2ed842b500ecd717ce2eff63f08d77a800c +Author: Peng Wu +Date: 2017-01-22 16:07:51 +0800 + + write constructors + +M src/lookup/phonetic_lookup.h + +commit 29ac48475fe23f6f2cf3b3b9677b3902b9cf8f0b +Author: Peng Wu +Date: 2017-01-22 15:55:26 +0800 + + write train_result3 method + +M src/lookup/phonetic_lookup.h + +commit ec83c02c3779a82489829d8284506a88bc73534b +Author: Peng Wu +Date: 2017-01-22 15:32:02 +0800 + + write diff_result method + +M src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h + +commit 70d3d40b972b8b582782d72c05ce2b2d3fcac82c +Author: Peng Wu +Date: 2017-01-21 10:40:41 +0800 + + fixes trellis_value_less_than function + +M src/lookup/phonetic_lookup.h + +commit ccf418653381d6a7973612b88515e63032950a0f +Author: Peng Wu +Date: 2017-01-20 14:56:36 +0800 + + sort tails + +M src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h + +commit c826bc25b9a5f35702db8f0e8a2e2a348ecccaff +Author: Peng Wu +Date: 2017-01-20 14:33:07 +0800 + + write get_best_match method + +M src/lookup/phonetic_lookup.h + +commit 5ae06cef759839aff771b94952a52c25a5502e5e +Author: Peng Wu +Date: 2017-01-20 14:01:44 +0800 + + write save_next_step method + +M src/lookup/phonetic_lookup.h + +commit 8b603e06de3cad13918970175478333cca687bfc +Author: Peng Wu +Date: 2017-01-20 13:54:55 +0800 + + write unigram_gen_next_step and bigram_gen_next_step method + +M src/lookup/phonetic_lookup.h + +commit d6b988a24c1895127b1d95582372cac3fd6b339a +Author: Peng Wu +Date: 2017-01-20 13:45:51 +0800 + + write search_unigram2 and search_bigram2 method + +M src/lookup/phonetic_lookup.h + +commit e862a1001867d71a452119b35ee3726a92c4744f +Author: Peng Wu +Date: 2017-01-20 12:42:00 +0800 + + rename variable name + +M src/lookup/phonetic_lookup.h + +commit c43f884dcb230ff7a29d5b05d53880ef37ecf85e +Author: Peng Wu +Date: 2017-01-20 10:51:13 +0800 + + fixes typos + +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h + +commit 8003335fa85e0061d27779c5070c0336d9a4a1d4 +Author: Peng Wu +Date: 2017-01-19 18:07:27 +0800 + + fixes trellis_value_less_than function + +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit 581156b5e80b3be00131d2338d7dc6424f91af34 +Author: Peng Wu +Date: 2017-01-19 17:24:29 +0800 + + move get_top_results function + +M src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h + +commit 05e009b90626d989349e9cf60e2af45aac4a4ffe +Author: Peng Wu +Date: 2017-01-19 17:20:13 +0800 + + write trellis_value_less_than function + +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit 91de72879019d2461330dbcd16991f1b73d41f82 +Author: Peng Wu +Date: 2017-01-19 15:57:58 +0800 + + drop struct matrix_step + +M src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit e2ca746d4060871f975816d2ba91d42e33627694 +Author: Peng Wu +Date: 2017-01-19 15:51:43 +0800 + + write extract_result function + +M src/lookup/phonetic_lookup.h + +commit 0145f45ff7ab413add71631ba95dc4c6d1cb9e40 +Author: Peng Wu +Date: 2017-01-19 15:35:21 +0800 + + write insert_candidate and get_tails method + +M src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h + +commit ad0987d91b922fa546ff9663a3ca70d4fb39057b +Author: Peng Wu +Date: 2017-01-19 15:14:24 +0800 + + write get_candidate and get_constraint method + +M src/lookup/phonetic_lookup.h + +commit cabb8d9ea34188521fe6aa124136b764041ee958 +Author: Peng Wu +Date: 2017-01-17 17:08:01 +0800 + + fixes compile + +M src/lookup/phonetic_lookup.h + +commit acdefd9af9188ba0de901ca3d3670850d989ced4 +Author: Peng Wu +Date: 2017-01-17 16:57:15 +0800 + + write class ForwardPhoneticTrellis in progress + +M src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit 53948ad9daa5efd0da6e2e01f8e0e4545283fc1e +Author: Peng Wu +Date: 2017-01-17 15:21:10 +0800 + + write clear and prepare methods + +M src/lookup/phonetic_lookup.h + +commit 2a2cd0f9de33b1f92a30cee2b5966f3a7a3eccdb +Author: Peng Wu +Date: 2017-01-16 15:56:34 +0800 + + fixes phonetic_lookup.cpp + +M src/lookup/phonetic_lookup.cpp + +commit 868a9c98d73f4969a55b2c86abf9e575a8cf166c +Author: Peng Wu +Date: 2017-01-16 15:48:02 +0800 + + fixes compile + +M src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit 425a56dc706ee75ecbe4fc538b97f24541077686 +Author: Peng Wu +Date: 2017-01-16 15:40:35 +0800 + + update Makefile.am + +M src/lookup/Makefile.am + +commit 701802a59611283347c690dfb5c475ade45954ef +Author: Peng Wu +Date: 2017-01-16 15:34:28 +0800 + + write class ForwardPhoneticConstraints in progress + +A src/lookup/phonetic_lookup.cpp +M src/lookup/phonetic_lookup.h + +commit 57cca7f3fd9db1aff9ac144c17189187ac7ea263 +Author: Peng Wu +Date: 2017-01-15 12:12:27 +0800 + + update PhoneticLookup + +M src/lookup/phonetic_lookup.h + +commit 7755dff83c109155e2d7eb1cf7411477138a5094 +Author: Peng Wu +Date: 2017-01-12 17:13:33 +0800 + + rename variables + +M src/lookup/phonetic_lookup.h + +commit ab4b8afebf5eba07ebf41c680816ee3d7bcca160 +Author: Peng Wu +Date: 2017-01-11 17:09:50 +0800 + + add comments + +M src/lookup/phonetic_lookup.h +M src/lookup/phonetic_lookup_heap.h + +commit 0e9d2eb31f358089648b22b3976185d35206d006 +Author: Peng Wu +Date: 2017-01-11 16:07:14 +0800 + + fixes typos + +M src/lookup/phonetic_lookup_heap.h + +commit 3d694bdadbfeef1c2c182c96643c3ee6ba0e5dc7 +Author: Peng Wu +Date: 2017-01-11 15:47:21 +0800 + + update phonetic_lookup.h + +M src/lookup/phonetic_lookup.h + +commit afedc8c1cb28505609f7f48fd82f0684f29c207a +Author: Peng Wu +Date: 2017-01-11 15:47:00 +0800 + + write phonetic_lookup_heap.h + +M src/lookup/phonetic_lookup_heap.h + +commit 8907fa4a2e0aeae756bce157b7887850a3a9d3d3 +Author: Peng Wu +Date: 2017-01-11 11:46:30 +0800 + + begin to write phonetic_lookup_heap.h + +A src/lookup/phonetic_lookup_heap.h +M src/lookup/phonetic_lookup_linear.h + +commit 52d19b8fad55df8e539af75bf5552488dd2a53e3 +Author: Peng Wu +Date: 2017-01-11 11:06:06 +0800 + + write phonetic_lookup_linear.h + +M src/lookup/phonetic_lookup.h +A src/lookup/phonetic_lookup_linear.h + +commit fc9efc97091cd0a1b537ca65d4dc161ce3bf5779 +Author: Peng Wu +Date: 2017-01-10 16:27:29 +0800 + + write eval_item method + +M src/lookup/phonetic_lookup.h + +commit 74471d1503578eeba1c4944b78436bd4e1c5ede8 +Author: Peng Wu +Date: 2017-01-09 15:40:12 +0800 + + add varibles + +M src/lookup/phonetic_lookup.h + +commit 5f2490da3f08f6438c17d9559c70ca5da646db48 +Author: Peng Wu +Date: 2017-01-09 14:57:48 +0800 + + declare class PhoneticLookup + +M src/lookup/phonetic_lookup.h + +commit 113a6b659f8395476c74f9df9d23440756df3f8b +Author: Peng Wu +Date: 2017-01-09 11:14:16 +0800 + + add comments + +M src/lookup/pinyin_lookup2.h + +commit 576773072a8cc3018e0e4a43b396c168b3ee051e +Author: Peng Wu +Date: 2017-01-04 15:41:22 +0800 + + add methods declaration + +M src/lookup/phonetic_lookup.h + +commit cea03966e40f0414fb688482672235bd34d1b3d7 +Author: Peng Wu +Date: 2017-01-03 16:08:42 +0800 + + update structs definition + +M src/lookup/phonetic_lookup.h + +commit 23e3d03c75d21d16047023ed34a8a373385237f4 +Author: Peng Wu +Date: 2017-01-03 14:31:44 +0800 + + add variables + +M src/lookup/phonetic_lookup.h + +commit 69e9e0b83e7a9aeb678dd7f564561541be7225ee +Author: Peng Wu +Date: 2017-01-02 11:21:13 +0800 + + begin to write phonetic_lookup.h + +A src/lookup/phonetic_lookup.h + +commit ffddbe0f37fe64f60b943fc7dd8c9500c2f95f80 +Author: Peng Wu +Date: 2016-12-05 14:25:31 +0800 + + clean up autoconf + +M configure.ac +M src/Makefile.am + +commit b739445a808b212c5eec8406265507850d0f9324 +Author: Peng Wu +Date: 2016-11-30 10:11:26 +0800 + + bump version 1.7.0 + +M configure.ac + +commit aeb9628cd3d4ebec3e242cceafab8bfbc95d3bc8 +Author: Peng Wu +Date: 2016-11-30 10:10:20 +0800 + + update ChangeLog + +M ChangeLog + +commit 8696a30979374db704aec8e7251489a821be111e +Author: Peng Wu +Date: 2016-11-29 16:18:41 +0800 + + fixes cmake files + +M CMakeLists.txt +M data/CMakeLists.txt + +commit e71cc7443ff93e00bb34ce01bbd3440531b542ed +Author: Peng Wu +Date: 2016-11-29 15:54:21 +0800 + + update cmake files + +M CMakeLists.txt +M src/CMakeLists.txt +M src/storage/CMakeLists.txt + +commit 01a316ede141e931b871e066c9b87f5af3a3368f +Author: Peng Wu +Date: 2016-11-29 15:36:25 +0800 + + fixes compile + +M CMakeLists.txt +M src/include/memory_chunk.h +M src/storage/flexible_ngram_kyotodb.h +M src/storage/ngram.h + +commit abed0b59cbeb3e129082b40df844bf148b8b96db +Author: Peng Wu +Date: 2016-11-29 15:32:38 +0800 + + update cmake files + +M CMakeLists.txt +A config.h.cmake + +commit 710b68d071ee95a58421acbdfca8154ba56502ac +Author: Peng Wu +Date: 2016-11-29 15:29:13 +0800 + + update cmake sub-directory + +M cmake/FindBerkeleyDB.cmake +A cmake/FindKyotoCabinet.cmake + +commit fecc795f90768a926a28c34636f593440f1af9a9 +Merge: 496f97b 0236b16 +Author: Peng Wu +Date: 2016-11-16 11:27:16 +0800 + + Merge branch 'lantw44-master' + +commit 0236b16114dda5faf3dccabee147dfdd55c256ce +Author: Ting-Wei Lan +Date: 2016-11-16 01:50:48 +0800 + + include config.h to allow using getline on freebsd + + We need _GNU_SOURCE macro defined in config.h to enable the declaration + of getline in FreeBSD stdio.h. + + https://github.com/libpinyin/libpinyin/issues/65 + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +M tests/storage/test_chewing_table.cpp +M tests/storage/test_matrix.cpp +M tests/storage/test_parser2.cpp +M tests/storage/test_phrase_table.cpp +M tests/test_chewing.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp +M utils/segment/mergeseq.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp +M utils/storage/import_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/import_k_mixture_model.cpp +M utils/training/k_mixture_model_to_interpolation.cpp + +commit 3cb39b4f413cd8f456166f6b17ff5030828ecf54 +Author: Ting-Wei Lan +Date: 2016-11-16 01:47:35 +0800 + + enable c++11 to allow using cstdint on freebsd + + https://github.com/libpinyin/libpinyin/issues/65 + +M configure.ac + +commit 496f97bc1f19ec6f1539356573bacfffdf2d9f61 +Author: Peng Wu +Date: 2016-10-31 15:12:37 +0800 + + use model14.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit 6dd995190333f0b2793421f39cb046e684f2ab0b +Author: Peng Wu +Date: 2016-10-31 14:15:30 +0800 + + update Makefile.am + +M Makefile.am +M data/Makefile.am +M doc/Makefile.am +M src/Makefile.am +M src/include/Makefile.am +M src/lookup/Makefile.am +M src/storage/Makefile.am +M tests/Makefile.am +M tests/include/Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/Makefile.am +M utils/segment/Makefile.am +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 62cacd1dc8784f7d3e99503d0e8e66010597eb05 +Author: Peng Wu +Date: 2016-10-31 13:56:38 +0800 + + update code license + +M src/lookup/lookup.cpp +M src/lookup/phrase_lookup.cpp +M src/lookup/pinyin_lookup2.cpp +M src/pinyin.cpp +M src/storage/chewing_key.cpp +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table2.cpp +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/ngram.cpp +M src/storage/ngram_bdb.cpp +M src/storage/ngram_kyotodb.cpp +M src/storage/phonetic_key_matrix.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_large_table2.cpp +M src/storage/phrase_large_table3.cpp +M src/storage/phrase_large_table3_bdb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp +M src/storage/pinyin_parser2.cpp +M src/storage/table_info.cpp +M src/storage/zhuyin_parser2.cpp +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +M tests/storage/test_chewing_table.cpp +M tests/storage/test_flexible_ngram.cpp +M tests/storage/test_matrix.cpp +M tests/storage/test_parser2.cpp +M tests/storage/test_phrase_index_logger.cpp +M tests/storage/test_table_info.cpp +M tests/test_chewing.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp +M utils/segment/mergeseq.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp +M utils/storage/export_interpolation.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp +M utils/storage/import_interpolation.cpp +M utils/training/estimate_interpolation.cpp +M utils/training/estimate_k_mixture_model.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp +M utils/training/import_k_mixture_model.cpp +M utils/training/k_mixture_model_to_interpolation.cpp +M utils/training/merge_k_mixture_model.cpp +M utils/training/prune_k_mixture_model.cpp +M utils/training/validate_k_mixture_model.cpp + +commit 394d215e8ec838bf983a25137fe8a9395b73edb2 +Author: Peng Wu +Date: 2016-10-31 13:55:44 +0800 + + update header license + +M src/include/memory_chunk.h +M src/include/novel_types.h +M src/lookup/lookup.h +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup2.h +M src/pinyin.h +M src/pinyin_internal.h +M src/storage/bdb_utils.h +M src/storage/chewing_key.h +M src/storage/chewing_large_table.h +M src/storage/chewing_large_table2.h +M src/storage/chewing_large_table2_bdb.h +M src/storage/chewing_large_table2_kyotodb.h +M src/storage/facade_chewing_table.h +M src/storage/facade_chewing_table2.h +M src/storage/facade_phrase_table2.h +M src/storage/facade_phrase_table3.h +M src/storage/flexible_ngram.h +M src/storage/flexible_ngram_bdb.h +M src/storage/flexible_ngram_kyotodb.h +M src/storage/flexible_single_gram.h +M src/storage/kyotodb_utils.h +M src/storage/ngram.h +M src/storage/ngram_bdb.h +M src/storage/ngram_kyotodb.h +M src/storage/phonetic_key_matrix.h +M src/storage/phrase_index.h +M src/storage/phrase_index_logger.h +M src/storage/phrase_large_table2.h +M src/storage/phrase_large_table3.h +M src/storage/phrase_large_table3_bdb.h +M src/storage/phrase_large_table3_kyotodb.h +M src/storage/pinyin_custom2.h +M src/storage/pinyin_custom3.h +M src/storage/pinyin_parser2.h +M src/storage/pinyin_phrase2.h +M src/storage/pinyin_phrase3.h +M src/storage/table_info.h +M src/storage/tag_utility.h +M src/storage/zhuyin_parser2.h +M tests/tests_helper.h +M tests/timer.h +M utils/training/k_mixture_model.h +M utils/utils_helper.h + +commit d5fa7956e5eeb8211dd0c11277c4e35243396d54 +Author: Peng Wu +Date: 2016-10-31 13:23:31 +0800 + + update COPYING + +M COPYING + +commit b4de20e2ab53990af679825b9fde549242dd41a8 +Author: Peng Wu +Date: 2016-10-31 13:13:14 +0800 + + update ChangeLog + +M ChangeLog + +commit 0628d47f0f94a70c39fd10621b8e81eca19c76f9 +Author: Peng Wu +Date: 2016-10-28 11:01:23 +0800 + + fixes warnings + +M src/include/memory_chunk.h + +commit 0853688a1f28012b3e9a0ac868a606de6ff3c998 +Author: Peng Wu +Date: 2016-10-26 10:03:27 +0800 + + update test_memory_chunk.cpp + +M tests/include/test_memory_chunk.cpp + +commit 23ab5e13c66a70769c4c0000c3667318ba33c420 +Author: Peng Wu +Date: 2016-10-26 09:38:41 +0800 + + add file length and checksum checks for MemoryChunk + +M src/include/memory_chunk.h + +commit 17784a4a21e223d6d6a9ae77d6f1606584352ca8 +Author: Peng Wu +Date: 2016-10-25 15:25:06 +0800 + + write get_check_sum method + +M src/include/memory_chunk.h + +commit 226dd1d20e55e9b50f1d423a03651044ade13017 +Author: Peng Wu +Date: 2016-10-21 14:04:49 +0800 + + import opengram.license + +A data/opengram.license + +commit dccecb68b3175a0f06b08077fa9bcd7f72123efa +Author: Peng Wu +Date: 2016-10-21 13:43:22 +0800 + + bump version 1.6.91 + +M configure.ac + +commit a2472e6b605dd14f30f3fc18bedeca919a6b1cec +Author: Peng Wu +Date: 2016-10-21 13:13:52 +0800 + + use model13.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit ba972b37f535e9827ad82ff7eba9fa36d7adb7a3 +Author: Peng Wu +Date: 2016-10-21 13:05:52 +0800 + + import opengram.table + +M data/Makefile.am + +commit 2fbe4eda9e2b320e072984cd5c22778e26ac0107 +Author: Peng Wu +Date: 2016-10-08 11:32:12 +0800 + + import open-gram dictionary + +M src/include/novel_types.h +M src/storage/table_info.cpp + +commit 15b6a438c28731497cba02c155a577eb89355adc +Author: Peng Wu +Date: 2016-09-06 15:14:55 +0800 + + bump version 1.6.0 + +M configure.ac + +commit a0f7db4925097f72b23de9210f45fc19b68fec07 +Author: Peng Wu +Date: 2016-09-05 14:43:36 +0800 + + update ChangeLog + +M ChangeLog + +commit 7c8cfebb06e250dd3014d9733130e3d2b36124e1 +Author: Peng Wu +Date: 2016-08-15 17:21:27 +0800 + + fixes compute_pronunciation_possibility function + +M src/storage/phonetic_key_matrix.cpp + +commit 3647a6691f643b6a820518e5021e03baed332da4 +Author: Peng Wu +Date: 2016-08-12 13:02:50 +0800 + + fixes pinyin_get_character_offset function + +M src/pinyin.cpp + +commit 9dbb8e7a8ac2fc5b3ee9b99c235f525233e242e7 +Author: Peng Wu +Date: 2016-08-09 11:08:36 +0800 + + fixes pinyin_remember_user_input function + +M src/pinyin.cpp + +commit e74b6fa5b1ce11feefc10dae63d30785fde1d7b9 +Author: Peng Wu +Date: 2016-08-08 16:48:56 +0800 + + fixes pinyin_get_character_offset function + +M src/pinyin.cpp + +commit a19a56fab5583d9b79bf07a4928ef1342098786e +Author: Peng Wu +Date: 2016-08-08 16:13:04 +0800 + + fixes pinyin_get_character_offset function + +M src/pinyin.cpp + +commit 8956514a2f287f08f0407d8a3e289adda35b38c2 +Author: Peng Wu +Date: 2016-08-08 13:20:55 +0800 + + fixes pinyin_get_character_offset function + +M src/pinyin.cpp + +commit 11bc4b8ba173a24981e70ca3afdf20c708ae0b61 +Author: Peng Wu +Date: 2016-07-27 13:36:07 +0800 + + bump version 1.5.92 + +M configure.ac + +commit dff1089411738f8325ea2a8251a4638bb8aed610 +Author: Peng Wu +Date: 2016-07-22 13:48:20 +0800 + + fixes a typo + +M src/pinyin.cpp + +commit 7a21bf27417e391f748df559ad3a6d124a951e25 +Author: Peng Wu +Date: 2016-07-21 17:24:45 +0800 + + clean up FullPinyinParser2 + +M src/storage/pinyin_parser2.h + +commit cc0fcf86673628e9883a18e191d47623a86f93e1 +Author: Peng Wu +Date: 2016-07-21 15:58:21 +0800 + + fixes fill_matrix function + +M src/storage/phonetic_key_matrix.cpp + +commit bfe12876720e38a720169ef49a575e2f010a3579 +Author: Peng Wu +Date: 2016-07-21 15:23:18 +0800 + + fixes pinyin_get_right_pinyin_offset function + +M src/pinyin.cpp + +commit 0ba361964b810f06839f67ddfbfba39fb75b6a70 +Author: Peng Wu +Date: 2016-07-21 15:13:31 +0800 + + fixes fill_matrix function + +M src/pinyin.cpp +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h +M tests/lookup/test_pinyin_lookup.cpp +M tests/storage/test_matrix.cpp +M utils/training/eval_correction_rate.cpp + +commit eb08ebb49b4823b17c749cde377c0aa1c6fe76ea +Author: Peng Wu +Date: 2016-07-21 14:16:47 +0800 + + fixes _pre_compute_tokens function + +M src/pinyin.cpp + +commit 646bb31f32fbef6fec5eb25fe9a9e86fc03c1276 +Author: Peng Wu +Date: 2016-07-20 12:43:32 +0800 + + fixes _get_char_offset_recur function + +M src/pinyin.cpp + +commit c31c421466a183ac4e207d8cf57850648b954d45 +Author: Peng Wu +Date: 2016-07-20 12:06:11 +0800 + + fixes warnings + +M src/pinyin.cpp +M src/storage/phrase_index_logger.h + +commit 5d6852f3b122676bd15b371a416888392ae6fe09 +Author: Peng Wu +Date: 2016-07-20 11:49:25 +0800 + + code refactor + +M src/pinyin.cpp + +commit cf1ba4b92e432b65c0cad9eecd0a7df6dbb0a716 +Author: Peng Wu +Date: 2016-07-20 11:44:05 +0800 + + fixes pinyin_get_character_offset function + +M src/pinyin.cpp +M src/pinyin.h + +commit 6dd87d04d00246cea8977c47356d2a47d6102512 +Author: Peng Wu +Date: 2016-07-20 10:53:01 +0800 + + fixes a typo + +M src/pinyin.cpp + +commit c931de493502be9ac334ae9ab3be96649017f8be +Author: Peng Wu +Date: 2016-07-12 14:55:52 +0800 + + use model12.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit 39967d2724bfadb25ad380a9c7a8f81d700e6c79 +Author: Peng Wu +Date: 2016-07-12 11:46:18 +0800 + + fixes get_best_match again + +M src/lookup/pinyin_lookup2.cpp + +commit f043223306836ab25dce6526faba4448fe14d060 +Author: Peng Wu +Date: 2016-07-11 15:13:19 +0800 + + fixes mask_out methods with Berkeley DB + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/phrase_large_table3_bdb.cpp + +commit 6a9d8e207d844eb52abe7c9c53341008cddc14db +Author: Peng Wu +Date: 2016-07-11 14:39:59 +0800 + + fixes pinyin_remember_user_input function + +M src/pinyin.cpp + +commit 1847e018aff8c4bfe69e4ac73841ba20fed89999 +Author: Peng Wu +Date: 2016-07-11 13:06:10 +0800 + + add comments + +M src/pinyin.cpp +M src/pinyin_internal.cpp +M src/storage/phonetic_key_matrix.cpp + +commit 3eec489d3c827dc3c7275418fbb0c1f84a5164ad +Author: Peng Wu +Date: 2016-07-08 12:45:51 +0800 + + fixes pinyin_guess_candidates function + +M src/pinyin.cpp + +commit 912add805b79fd9fefd4b5b012983622078f3bb8 +Author: Peng Wu +Date: 2016-07-07 14:18:44 +0800 + + fixes get_best_match method + +M src/lookup/pinyin_lookup2.cpp + +commit 9175eca04bac68fa4be1a6e1ef054ddd7f208e8c +Author: Peng Wu +Date: 2016-07-06 16:34:53 +0800 + + add safe guards + +M src/pinyin.cpp + +commit f7a44387af9407d3d9d3224b5eec5077fe141445 +Author: Peng Wu +Date: 2016-07-06 15:37:55 +0800 + + fixes empty input + +M src/lookup/pinyin_lookup2.cpp +M src/pinyin.cpp +M src/storage/phonetic_key_matrix.cpp + +commit bc906ecfbf52f98fa7174cb991e2ccb67293f2e6 +Author: Peng Wu +Date: 2016-07-06 14:36:54 +0800 + + fixes pinyin_reset function + +M src/pinyin.cpp + +commit e632731d60f614f70a8c63ec2b5ccd4b8dcb1a3b +Author: Peng Wu +Date: 2016-07-05 17:41:22 +0800 + + fixes typos + +M src/pinyin.cpp + +commit e3025d3bfbca1f98c7bec84b2fb50235e1e9c4e1 +Author: Peng Wu +Date: 2016-07-05 15:53:58 +0800 + + update test cases + +M tests/test_chewing.cpp +M tests/test_pinyin.cpp + +commit 4c2ba2e080b4ffd0dc611ba2b899ff7671332a7e +Author: Peng Wu +Date: 2016-07-05 15:52:16 +0800 + + add spaces + +M src/pinyin.cpp + +commit 1673ea2fbc3bc020262d8bbd9e3f8d4cf1168e66 +Author: Peng Wu +Date: 2016-07-05 15:43:58 +0800 + + fixes auxiliary text + +M src/pinyin.cpp + +commit 92b3978e1b98fefbf19a32be7a2a165faa47b4f5 +Author: Peng Wu +Date: 2016-07-04 16:13:18 +0800 + + update test cases + +M tests/test_chewing.cpp +M tests/test_pinyin.cpp + +commit 8bb2978cfe90b179f60bd242434eb397d9fa380a +Author: Peng Wu +Date: 2016-07-04 14:11:03 +0800 + + fixes ChewingKey + +M src/storage/chewing_key.h +M src/storage/pinyin_phrase3.h + +commit acf8ccd78b9abee42a363d6243205539a5a37af7 +Author: Peng Wu +Date: 2016-07-04 11:22:03 +0800 + + drop pinyin_get_n_pinyin function + +M src/libpinyin.ver +M src/pinyin.h + +commit 28445f269c3fc125f72c4523624305e64584639b +Author: Peng Wu +Date: 2016-07-04 11:12:04 +0800 + + clean pinyin_parser2.cpp + +M src/storage/pinyin_parser2.cpp + +commit 27f1c0aff6d3f1961c0d4c0ccefe9aaa25491e7b +Author: Peng Wu +Date: 2016-07-04 11:09:59 +0800 + + clean pinyin.cpp + +M src/pinyin.cpp + +commit 4fdb35ab901e8570a84fe29a59f82123a85a16a8 +Author: Peng Wu +Date: 2016-07-04 11:05:29 +0800 + + update Vistor code + +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 63cca4dd16a7d2156689e28f4027d069ab5ea33b +Author: Peng Wu +Date: 2016-07-01 14:39:28 +0800 + + fixes warnings + +M src/storage/phrase_index.cpp +M src/storage/phrase_index_logger.h + +commit 2dda741858ffdcc6d10b0fa1256beccd7bf06b85 +Author: Peng Wu +Date: 2016-07-01 14:27:14 +0800 + + rename API + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit a6822d0946427c803d5f3952c934224bbb537907 +Author: Peng Wu +Date: 2016-07-01 12:04:23 +0800 + + fixes compile + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/phrase_large_table3_bdb.cpp + +commit b014b923a06a469b4f3e96640e2b4d375e5b6268 +Author: Peng Wu +Date: 2016-07-01 11:58:48 +0800 + + update Kyoto Cabinet mask out methods + +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 6eb0940e07f4b718e6ef395d3239761af4f3ad71 +Author: Peng Wu +Date: 2016-07-01 11:43:04 +0800 + + update Berkeley DB mask out methods + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/phrase_large_table3_bdb.cpp + +commit 918007412250a180b9fa670883471636c9ba9536 +Author: Peng Wu +Date: 2016-07-01 11:35:57 +0800 + + write pinyin_remove_user_candidate function + +M src/pinyin.cpp + +commit 00ee01e6c555b43b11d70d1d5f1ee2609c54264d +Author: Peng Wu +Date: 2016-07-01 11:11:09 +0800 + + write pinyin_is_user_candidate function + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 6ac5b3b39db614be21c633d963575df5e06233bb +Author: Peng Wu +Date: 2016-07-01 10:56:22 +0800 + + fixes warnings + +M src/libpinyin.ver +M src/pinyin.cpp + +commit 43d9edd91bbc0fbe76edccde6451efdfff021a4a +Author: Peng Wu +Date: 2016-06-30 18:09:30 +0800 + + fixes pinyin_remember_user_input function + +M src/pinyin.cpp + +commit b1957ac8f1fe676b34f657eea9394c12d500dc49 +Author: Peng Wu +Date: 2016-06-30 15:41:51 +0800 + + write pinyin_remember_user_input function + +M src/pinyin.cpp + +commit c4f57271683ec7eb98b43ee4aae94cff1b341483 +Author: Peng Wu +Date: 2016-06-30 14:30:46 +0800 + + begin to add pinyin_remember_user_input function + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 60934ae69936452dffeceee9544c0d1016f8d6dd +Author: Peng Wu +Date: 2016-06-30 14:22:33 +0800 + + extract _add_phrase function + +M src/pinyin.cpp + +commit 700bc03da18f37c2f454975a5bf52b7de09c5c6c +Author: Peng Wu +Date: 2016-06-29 10:33:38 +0800 + + fixes middle variables + +M src/pinyin.cpp + +commit 57005ce72cf7609f52e6d24dae172c1422a33455 +Author: Peng Wu +Date: 2016-06-29 10:16:14 +0800 + + fixes typos + +M src/libpinyin.ver +M src/storage/phrase_index.h + +commit f380d0ef8bcb380260a04898ced4eeebe3b3da1b +Author: Peng Wu +Date: 2016-06-28 13:41:26 +0800 + + update pinyin_get_*_auxiliary_text functions + +M src/pinyin.cpp +M src/pinyin.h + +commit 9c2ca38f0b45f3d2937a7ccb05a7a119297107a3 +Author: Peng Wu +Date: 2016-06-28 12:33:33 +0800 + + update pinyin_get_character_offset function + +M src/pinyin.cpp +M src/pinyin.h + +commit 05c2c6e853ce05a0843ae34f1df6a2226e255dc8 +Author: Peng Wu +Date: 2016-06-28 11:06:40 +0800 + + add comments + +M src/pinyin.cpp +M src/pinyin.h + +commit b348cbc5a0cc19ac4f601e9d73b6851768331e5d +Author: Peng Wu +Date: 2016-06-28 10:58:13 +0800 + + fixes pinyin_get_character_offset function + +M src/pinyin.cpp +M src/pinyin.h + +commit eedae34d203bc1a07a1d09f7876661649538462a +Author: Peng Wu +Date: 2016-06-28 10:47:54 +0800 + + fixes compile + +M src/storage/pinyin_phrase3.h + +commit 88c6d1ac5b6a945730554da7a22e2e7716055bcb +Author: Peng Wu +Date: 2016-06-27 17:07:09 +0800 + + update double pinyin + +M scripts2/doublepinyin.py +M src/storage/double_pinyin_table.h + +commit 60b6e979d7f5776a12a6f3ab8f4065d39918d24b +Author: Peng Wu +Date: 2016-06-27 17:03:45 +0800 + + update libpinyin.ver + +M src/libpinyin.ver + +commit 4d7f3c4c876fd8e749161316b53b41ddc8487ee9 +Author: Peng Wu +Date: 2016-06-27 16:26:24 +0800 + + write pinyin_get_chewing_auxiliary_text function + +M src/pinyin.cpp + +commit 52da3dad475f7f84c74cd3eaa3022e690b539749 +Author: Peng Wu +Date: 2016-06-27 16:10:57 +0800 + + write pinyin_get_double_pinyin_auxiliary_text function + +M src/pinyin.cpp + +commit 736eae1046a8ce31b9d3743043a0a9e28d58fb73 +Author: Peng Wu +Date: 2016-06-27 15:56:45 +0800 + + write pinyin_get_full_pinyin_auxiliary_text function + +M src/pinyin.cpp +M src/pinyin.h + +commit 3f4ee7e103cf12ed2aae4c088d0449c4a042b688 +Author: Peng Wu +Date: 2016-06-23 15:08:12 +0800 + + write pinyin_get_character_offset function + +M src/pinyin.cpp +M src/pinyin.h + +commit 6e86a814556844ab5a29f9881ef7a84fdd9cd443 +Author: Peng Wu +Date: 2016-06-22 15:11:55 +0800 + + fixes a typo + +M src/storage/phrase_index.cpp + +commit 43b71c0bb9292c1396d3e58e28f18a0ca2cca703 +Author: Peng Wu +Date: 2016-06-22 11:56:53 +0800 + + update libpinyin.ver + +M src/libpinyin.ver +M src/pinyin.cpp + +commit d9f145f0c22550e2ebb517ad107f9c901f37d165 +Author: Peng Wu +Date: 2016-06-21 15:16:56 +0800 + + fixes pinyin.cpp + +M src/pinyin.cpp + +commit 1ac3ccf02bf12678057ac0c6d89d4d3d41e5bdba +Author: Peng Wu +Date: 2016-06-20 16:03:46 +0800 + + fixes bugs + +M src/pinyin.cpp +M utils/segment/spseg.cpp + +commit 8861bc3da5e49f0c0ae074593a72df3771d57ec6 +Author: Peng Wu +Date: 2016-06-20 10:29:03 +0800 + + rename functions + +M src/pinyin.cpp +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h +M tests/lookup/test_pinyin_lookup.cpp +M tests/storage/test_matrix.cpp +M utils/training/eval_correction_rate.cpp + +commit 6f4dadfa460e59e4dd8dec4e24434c118a0cf1f7 +Author: Peng Wu +Date: 2016-06-16 13:52:08 +0800 + + fixes compile + +M src/storage/phonetic_key_matrix.cpp + +commit d70abfb4ec0a6a79aed34489aa80b3f4c8a775f6 +Author: Peng Wu +Date: 2016-06-16 13:50:25 +0800 + + move code + +M src/storage/phonetic_key_matrix.cpp +M src/storage/pinyin_parser2.cpp + +commit ddbbac009ce6c42930b99e50e2100ccc22dd735a +Author: Peng Wu +Date: 2016-06-16 13:44:17 +0800 + + update Makefile.am + +M src/storage/Makefile.am + +commit 9f5bf8806726d0fecbe7cd0db918d0a7e1b612e8 +Author: Peng Wu +Date: 2016-06-16 13:43:10 +0800 + + update table headers + +M src/storage/pinyin_parser_table.h +A src/storage/special_table.h + +commit 25944fc3a8b4e362d690eae4fe086e8834f9e0c2 +Author: Peng Wu +Date: 2016-06-16 13:40:04 +0800 + + update scripts + +M scripts2/Makefile.data +M scripts2/templates/pinyin_parser_table.h.in +A scripts2/templates/special_table.h.in + +commit 34f6e00b6337b63389b8cca2276a6110468c34c0 +Author: Peng Wu +Date: 2016-06-16 13:26:27 +0800 + + bump version 1.5.91 + +M configure.ac + +commit 3b279b570f7b8e44752247ad7fc0251d8a565ce7 +Author: Peng Wu +Date: 2016-06-14 15:41:39 +0800 + + update eval_correction_rate.cpp + +M utils/training/eval_correction_rate.cpp + +commit 6045023b52f161bb0e6ebd93e5370a6894bb5c11 +Author: Peng Wu +Date: 2016-06-13 15:38:07 +0800 + + update test_pinyin.cpp + +M tests/test_pinyin.cpp + +commit 3b07d6126db7834386bf1aab160a3642340730ef +Author: Peng Wu +Date: 2016-06-13 15:31:54 +0800 + + fixes compile + +M src/pinyin.cpp +M src/pinyin.h +M src/storage/chewing_key.h + +commit 5e45e62467c4d55a724c6c9058653a88fe61f21c +Author: Peng Wu +Date: 2016-06-12 16:14:20 +0800 + + write pinyin_get_*_offset functions + +M src/pinyin.cpp +M src/pinyin.h + +commit 008edeec2e2aba365e1ece63667fb56cab213f97 +Author: Peng Wu +Date: 2016-06-12 15:06:57 +0800 + + update pinyin.h + +M src/pinyin.cpp +M src/pinyin.h + +commit 83f5dac8e36949b7c848b2894f1d9c15ebefec47 +Author: Peng Wu +Date: 2016-06-12 14:34:12 +0800 + + update pinyin.cpp + +M src/lookup/pinyin_lookup2.h +M src/pinyin.cpp + +commit 9bedecb28b9ac1503de0dfda07bcb6d5c7deb002 +Author: Peng Wu +Date: 2016-06-08 17:05:03 +0800 + + fixes code style + +M src/pinyin.cpp + +commit 967e2d308d6e3cf86257e7034e9067b0aee9b705 +Author: Peng Wu +Date: 2016-06-08 16:50:30 +0800 + + fixes a typo + +M src/pinyin.cpp + +commit 6e34fc28308ff301710af6608628857c78ab2cb4 +Author: Peng Wu +Date: 2016-06-08 16:34:53 +0800 + + update pinyin_guess_candidates function + +M src/pinyin.cpp + +commit 3255745103f182bd326d1342e0e28fe7b032973f +Author: Peng Wu +Date: 2016-06-07 18:11:26 +0800 + + update pinyin.h + +M src/pinyin.cpp +M src/pinyin.h + +commit 38e533a34de8b029d784810b61c20cf56219fbe6 +Author: Peng Wu +Date: 2016-06-07 16:07:12 +0800 + + fixes a typo + +M src/pinyin.cpp + +commit cc27c8476a4e2f7ce014d4bb4db10d64fc0c2f64 +Author: Peng Wu +Date: 2016-06-06 15:33:33 +0800 + + update pinyin.cpp in progress + +M src/pinyin.cpp + +commit befc08764559cdc1939463f9dfac5b7a7f97c81a +Author: Peng Wu +Date: 2016-06-06 14:56:45 +0800 + + begin to update pinyin.cpp + +M src/lookup/pinyin_lookup2.cpp +M src/pinyin.cpp +M src/pinyin.h + +commit cee5f04690465d99b05313add946beceed2a31f2 +Author: Peng Wu +Date: 2016-06-03 11:27:06 +0800 + + update *_step functions + +M src/storage/phonetic_key_matrix.cpp +M src/storage/pinyin_parser2.cpp + +commit 1c5bd353c29a3105c63c1f397b819a3b7135db99 +Author: Peng Wu +Date: 2016-06-01 14:33:12 +0800 + + fixes test_pinyin_lookup.cpp + +M tests/lookup/test_pinyin_lookup.cpp + +commit 1efca89293937a502a201bb499f8307dec8e8ff6 +Author: Peng Wu +Date: 2016-06-01 14:27:18 +0800 + + indent pinyin_lookup2.cpp + +M src/lookup/pinyin_lookup2.cpp + +commit 134b406336b467b89fbc6e1723a5e86044d94e68 +Author: Peng Wu +Date: 2016-06-01 14:25:18 +0800 + + update test_pinyin_lookup.cpp + +M tests/lookup/test_pinyin_lookup.cpp + +commit 17bff01510c9c2512af911948fe8307596d02adf +Author: Peng Wu +Date: 2016-06-01 14:04:38 +0800 + + indent test_pinyin_lookup.cpp + +M tests/lookup/test_pinyin_lookup.cpp + +commit e8a0bb2c0e99460542f440a1bc5b1551bffc64bb +Author: Peng Wu +Date: 2016-06-01 13:59:27 +0800 + + fixes compile + +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit 27ec333e65de3fc881f9e62ae9c622353a0b173e +Author: Peng Wu +Date: 2016-06-01 13:50:02 +0800 + + update test_matrix.cpp + +M tests/storage/test_matrix.cpp +M tests/tests_helper.h + +commit b735c7d1074fb8234f555c34739d3979a5e2e3fe +Author: Peng Wu +Date: 2016-05-30 11:09:49 +0800 + + fixes a typo + +M src/storage/phonetic_key_matrix.cpp + +commit 08b469c70f3ec625ce5186bfcb97763c323e1cc5 +Author: Peng Wu +Date: 2016-05-27 15:08:31 +0800 + + fixes train_result2 method + +M src/lookup/pinyin_lookup2.cpp + +commit d19f0972c28cb78804048ada20501681d0074d97 +Author: Peng Wu +Date: 2016-05-27 14:51:43 +0800 + + update comment + +M src/lookup/pinyin_lookup2.cpp + +commit b6f4c32f5e8f40119537986de35d855f117cfc89 +Author: Peng Wu +Date: 2016-05-27 14:46:38 +0800 + + update train_result2 method + +M src/lookup/pinyin_lookup2.cpp + +commit 6aa61303d96d0eba8df4fb5bb853b1584c3a432e +Author: Peng Wu +Date: 2016-05-27 14:06:16 +0800 + + use pinyin_phrase3.h + +M src/pinyin_internal.h +M src/storage/chewing_large_table2.h +M src/storage/pinyin_parser2.cpp +M src/storage/zhuyin_parser2.cpp + +commit 668d9f00f25a658b9bde6a3cdec313899b727083 +Author: Peng Wu +Date: 2016-05-27 14:03:47 +0800 + + update test_phrase_index.cpp + +M tests/storage/test_phrase_index.cpp + +commit e297b8fb61ecd765412574c4fb74351a14bb2f3a +Author: Peng Wu +Date: 2016-05-27 13:58:26 +0800 + + indent phrase_index.* + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit d393fb21d62a46e9faa94deb14227e43c4e44109 +Author: Peng Wu +Date: 2016-05-27 13:48:09 +0800 + + update class PinyinLookup2 + +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit db55283f014cfa5abd35c3be76e655bc1ee677ff +Author: Peng Wu +Date: 2016-05-27 13:43:03 +0800 + + update *_pronunciation_possibility function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 5df16470a5ab0968d482481c42cf255bf222ecee +Author: Peng Wu +Date: 2016-05-27 13:38:26 +0800 + + update class PhraseItem + +M src/lookup/pinyin_lookup2.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 9e098143481cb701af79f31902b200ca548ae27c +Author: Peng Wu +Date: 2016-05-26 15:01:31 +0800 + + fixes compile + +M src/lookup/pinyin_lookup2.cpp + +commit cecd8a63e0cb695fa3da223ba57b88bc103c0729 +Author: Peng Wu +Date: 2016-05-26 14:52:27 +0800 + + update train_result2 method + +M src/lookup/pinyin_lookup2.cpp + +commit fe9dd3a94f281231394ac2141ce586cb1addac3c +Author: Peng Wu +Date: 2016-05-26 14:39:02 +0800 + + update *constraint methods + +M src/lookup/pinyin_lookup2.cpp + +commit f359b1153ec6ab2f3f557515660616fb907835c6 +Author: Peng Wu +Date: 2016-05-26 14:25:41 +0800 + + update validate_constraint method + +M src/lookup/pinyin_lookup2.cpp + +commit 5861b698c95e9b4931389b5a90a2e3b31a84c922 +Author: Peng Wu +Date: 2016-05-26 14:17:45 +0800 + + update pinyin_lookup2.h + +M src/lookup/pinyin_lookup2.h + +commit 5ac8a59499f7e9715b3f82747cc8962c49bc881c +Author: Peng Wu +Date: 2016-05-26 13:59:13 +0800 + + write increase_pronunciation_possibility function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit c57ac3f8e10e8c39053ca614277ee0fa671afef4 +Author: Peng Wu +Date: 2016-05-26 12:04:43 +0800 + + fixes indent + +M src/lookup/pinyin_lookup2.cpp + +commit cba509e211af9432573362825ae66fa8eb41fdd5 +Author: Peng Wu +Date: 2016-05-26 11:57:41 +0800 + + fixes typos + +M src/lookup/pinyin_lookup2.cpp + +commit 41b5974304689488f006d98155d782880a7e1670 +Author: Peng Wu +Date: 2016-05-25 17:04:49 +0800 + + rename m_cache_phrase_item to m_cached_phrase_item + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit 10fd5d0c796f817c5f82bbdb92adbb7fee1095ed +Author: Peng Wu +Date: 2016-05-25 16:59:09 +0800 + + fixes compile + +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit 473d80f6681f0fe7c20bc2008c249563a0f99eee +Author: Peng Wu +Date: 2016-05-25 16:41:44 +0800 + + write compute_pronunciation_possibility function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 5af793480d676a0679d73eb9fa93053ef47aa0ea +Author: Peng Wu +Date: 2016-05-25 16:01:14 +0800 + + update *gen_next_step method + +M src/lookup/pinyin_lookup2.cpp + +commit 955b6ea0f53ce0f8708c08d113ea1c44478d685d +Author: Peng Wu +Date: 2016-05-25 15:50:39 +0800 + + update search_*gram method + +M src/lookup/lookup.h +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit e3b1c578005402c45cc27049fafe4c732f7e493c +Author: Peng Wu +Date: 2016-05-25 15:26:32 +0800 + + update get_best_match method + +M src/lookup/lookup.h +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit b4338a3ea4ff49a2b37887ab2d27c5f6aaba86a9 +Author: Peng Wu +Date: 2016-05-25 11:00:08 +0800 + + fixes search_matrix function + +M src/storage/phonetic_key_matrix.cpp + +commit e2f610a6102f91428e42288e71447a015fd3472b +Author: Peng Wu +Date: 2016-05-24 16:48:51 +0800 + + update test_matrix.cpp + +M tests/storage/test_matrix.cpp + +commit 65494d1d325294deb4f0abea0c18462b9f29b5e7 +Author: Peng Wu +Date: 2016-05-24 16:45:59 +0800 + + fixes some typos + +M src/storage/phonetic_key_matrix.cpp + +commit b92ec5fc578b73479861b7da9e4524fc8998df2d +Author: Peng Wu +Date: 2016-05-24 16:09:40 +0800 + + write dump_ranges function + +M tests/storage/test_chewing_table.cpp +M tests/tests_helper.h + +commit 0d2c765a160775f1b97be83c3bd8a045b7b5600a +Author: Peng Wu +Date: 2016-05-19 17:51:37 +0800 + + refactor search_matrix function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 1d133308fc6bdc47432a379473f3bb199af78f4c +Author: Peng Wu +Date: 2016-05-19 16:55:53 +0800 + + fixes again + +M src/storage/phonetic_key_matrix.cpp + +commit 6fb0d50ded3f1666159bb713d381ab269d11e21d +Author: Peng Wu +Date: 2016-05-19 16:45:44 +0800 + + fixes a typo + +M src/storage/phonetic_key_matrix.cpp + +commit a3d54898d4a86260bcd242bc68f361e7de614a36 +Author: Peng Wu +Date: 2016-05-19 16:15:02 +0800 + + update get_items method + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h +M src/storage/pinyin_parser2.cpp + +commit e3fd3425a8402752f8b3bbef8bf1784e970a8712 +Author: Peng Wu +Date: 2016-05-19 14:49:28 +0800 + + write search_matrix function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 0768d5ca04b4a3b79abf050b8d07709902517139 +Author: Peng Wu +Date: 2016-05-19 10:41:35 +0800 + + update test_matrix.cpp + +M src/storage/pinyin_parser2.cpp +M tests/storage/test_matrix.cpp + +commit 060b98ca0da4ecb939bebdc86b483cc3f5335246 +Author: Peng Wu +Date: 2016-05-19 10:33:05 +0800 + + comment out code + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp + +commit 3fb08cfc9707cf241cb3d782733bf1116a5a474b +Author: Peng Wu +Date: 2016-05-18 14:56:15 +0800 + + write resplit_step function + +M src/storage/phonetic_key_matrix.h +M src/storage/pinyin_parser2.cpp + +commit 166f65c916579eec9ed3004879a71146ecad6443 +Author: Peng Wu +Date: 2016-05-17 17:25:49 +0800 + + write inner_split_step function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h +M src/storage/pinyin_parser2.cpp + +commit 84e1ba97704b4e4cf0185af105c768ae3a693206 +Author: Peng Wu +Date: 2016-05-16 15:19:53 +0800 + + fixes a typo + +M src/storage/pinyin_parser2.cpp + +commit a5ea7448d20d6d3b5cae73bfe5dfda81e4e2cdf7 +Author: Peng Wu +Date: 2016-05-16 15:11:41 +0800 + + update code + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 7bd74b74a471de458ad5563f5f24d59fc28066a4 +Author: Peng Wu +Date: 2016-05-16 14:54:41 +0800 + + update header + +M src/storage/pinyin_parser_table.h + +commit 7b4c05dc1766a2b7698e044b5c393bd321e4e795 +Author: Peng Wu +Date: 2016-05-16 14:40:05 +0800 + + update scripts + +M scripts2/specialtable.py + +commit 5bfc05a8e0223a95c10f688043dbecc444ae7cfa +Author: Peng Wu +Date: 2016-05-13 15:05:54 +0800 + + update test_matrix.cpp + +M src/storage/phonetic_key_matrix.cpp +M tests/storage/test_matrix.cpp + +commit ed191f413f2739982fc737022713cb5226f721de +Author: Peng Wu +Date: 2016-05-13 14:50:55 +0800 + + write fuzzy_syllable_step function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 5b487bd6d66f9a8f43260a9bec978ea8cf692995 +Author: Peng Wu +Date: 2016-05-11 16:38:14 +0800 + + fixes compile + +M src/storage/phonetic_key_matrix.h +M tests/storage/Makefile.am +M tests/storage/test_matrix.cpp + +commit 0d1aaf9cb0f4b53114422618cb61510560f4611d +Author: Peng Wu +Date: 2016-05-11 16:15:01 +0800 + + add test_matrix.cpp + +M src/storage/phonetic_key_matrix.cpp +A tests/storage/test_matrix.cpp +M tests/storage/test_parser2.cpp + +commit f76adc9bdd2235166819494f14d689dbcbc911ae +Author: Peng Wu +Date: 2016-05-11 15:50:01 +0800 + + write dump_phonetic_key_matrix function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 7c43d981edce11bdd17b7e6e43f50af4680554aa +Author: Peng Wu +Date: 2016-05-10 16:01:29 +0800 + + fixes compile + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit ed390141d5517bda56c5e4abacde0cc91bd0af44 +Author: Peng Wu +Date: 2016-05-10 15:59:02 +0800 + + write fill_phonetic_key_matrix_from_chewing_keys function + +M src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 22149d09c7352bb88c1bd291f548c02b0454e7a2 +Author: Peng Wu +Date: 2016-05-10 13:52:04 +0800 + + add phonetic_key_matrix.cpp + +M src/storage/Makefile.am +A src/storage/phonetic_key_matrix.cpp +M src/storage/phonetic_key_matrix.h + +commit 521123fdad1ff3dac8313eaf6630a0ad3bd699b5 +Author: Peng Wu +Date: 2016-05-09 16:10:54 +0800 + + fixes compile + +M src/pinyin_internal.h +M src/storage/Makefile.am +M src/storage/phonetic_key_matrix.h + +commit e0e33b0f6a137f8d358187a27819ba9e0267d55c +Author: Peng Wu +Date: 2016-05-09 16:01:36 +0800 + + write class PhoneticKeyMatrix + +M src/storage/phonetic_key_matrix.h + +commit 1b6ef8cab2bf04c1e29c212f31af8781cf3eb38e +Author: Peng Wu +Date: 2016-05-09 15:57:29 +0800 + + write class PhoneticTable + +M src/storage/phonetic_key_matrix.h + +commit bb539e9cbdc4d5fe951c3ee5c7dc1d8c71f00f77 +Author: Peng Wu +Date: 2016-05-05 14:08:00 +0800 + + update phonetic_key_matrix.h + +M src/storage/phonetic_key_matrix.h + +commit 8a86d87ed0247ea5fd041702c12f2980818cdd98 +Author: Peng Wu +Date: 2016-05-03 14:59:24 +0800 + + add phonetic_key_matrix.h + +A src/storage/phonetic_key_matrix.h + +commit e8c7c29acb9f039d97fff5ca7872564c754f535e +Author: Peng Wu +Date: 2016-03-31 14:28:32 +0800 + + fixes src/lookup + +M src/lookup/phrase_lookup.cpp +M src/lookup/pinyin_lookup2.cpp + +commit 93f272f43dd5cea6d6b96e7569a281736f077c33 +Author: Peng Wu +Date: 2016-03-31 14:10:12 +0800 + + fixes test_phrase + +M src/storage/phrase_large_table3_bdb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit d8a55692370a11440802b81814e026140f41ed9c +Author: Peng Wu +Date: 2016-03-31 14:08:01 +0800 + + fixes test_pinyin + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_kyotodb.cpp + +commit 3e1537b4c456d9f41bbd81f1f9c00d6920a8137e +Author: Peng Wu +Date: 2016-03-31 11:09:37 +0800 + + update pinyin_internal.h + +M src/pinyin_internal.cpp +M src/pinyin_internal.h + +commit 836ea17130bd54b60c0d51ffc656b28106e73d1a +Author: Peng Wu +Date: 2016-03-30 15:25:05 +0800 + + fixes warnings + +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp +M utils/training/estimate_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/prune_k_mixture_model.cpp + +commit 71bfcb74f432e0d2ea067da53cdc765f54c2e36c +Author: Peng Wu +Date: 2016-03-30 15:18:15 +0800 + + update utils + +M utils/storage/gen_binary_files.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/gen_deleted_ngram.cpp + +commit 43360fcb6129e0c27ed7086b600b8699b8bdbd37 +Author: Peng Wu +Date: 2016-03-30 15:12:11 +0800 + + update utils/training in progress + +M utils/storage/gen_binary_files.cpp +M utils/storage/import_interpolation.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/import_k_mixture_model.cpp + +commit 09181e7491bfabbd11ea80633214231404766b22 +Author: Peng Wu +Date: 2016-03-30 14:55:29 +0800 + + update utils/segment + +M utils/segment/mergeseq.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp +M utils/training/gen_deleted_ngram.cpp + +commit 9f79258f900dd9899549fe6e743e090f5ebb8186 +Author: Peng Wu +Date: 2016-03-30 14:43:41 +0800 + + update tests + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_table.cpp +M tests/tests_helper.h + +commit a3eba16fd79e6954de9cbef245307d3d7631aa40 +Author: Peng Wu +Date: 2016-03-30 14:32:19 +0800 + + switch to chewing large table 2 + +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h +M src/pinyin.cpp +M src/pinyin_internal.cpp +M src/pinyin_internal.h + +commit 9217eb5d25faa0bed91c9344fc28ac5b6d57c0ee +Author: Peng Wu +Date: 2016-03-30 14:17:33 +0800 + + switch to phrase large table 3 + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/pinyin.cpp +M src/pinyin_internal.cpp +M src/pinyin_internal.h +M src/storage/tag_utility.cpp +M src/storage/tag_utility.h + +commit 8cd9960d54d50ebb18e6f1b5aedd6e40391be879 +Author: Peng Wu +Date: 2016-03-23 16:45:41 +0800 + + update utils + +M utils/segment/mergeseq.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp +M utils/training/eval_correction_rate.cpp + +commit 8e1e998b18c3e4163b364893c10d3f0dfe2746d5 +Author: Peng Wu +Date: 2016-03-23 16:37:48 +0800 + + update test cases + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit f5ed30dce5af84320a9367400194a267b26ac4a0 +Author: Peng Wu +Date: 2016-03-23 16:29:43 +0800 + + update pinyin.cpp + +M src/pinyin.cpp + +commit 7bdb2e261bd6d783003f3fa3796aeca8777b9ca8 +Author: Peng Wu +Date: 2016-03-23 16:19:14 +0800 + + update class FacadeChewingTable + +M src/storage/facade_chewing_table.h + +commit d563bccd2f70d58ccdf8522d740e72772205c6d7 +Author: Peng Wu +Date: 2016-03-23 13:57:11 +0800 + + update class FacadePhraseTable2 + +M src/storage/facade_phrase_table2.h + +commit 041ed16d24ad87b45db861681be9bce742e974f6 +Author: Peng Wu +Date: 2016-03-22 14:53:48 +0800 + + add comments + +M src/storage/pinyin_phrase3.h + +commit 1610418c03ab615adafa8f9b999eeb6c0939ef61 +Author: Peng Wu +Date: 2016-03-18 11:23:56 +0800 + + fixes indent + +M src/storage/chewing_large_table2.cpp + +commit 8d70d901d992d1b96e69cda401d9880d442816c6 +Author: Peng Wu +Date: 2016-03-18 11:16:35 +0800 + + fixes crashes + +M src/storage/chewing_large_table2.cpp +M src/storage/chewing_large_table2.h +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_kyotodb.cpp + +commit 2ad795e5832bf730cbdd5c2aacd4c2a4e94806bd +Author: Peng Wu +Date: 2016-03-18 10:54:12 +0800 + + update test_chewing_table.cpp + +M tests/storage/test_chewing_table.cpp + +commit 1cf671992f34c0067d576c612aa94f7f28679aad +Author: Peng Wu +Date: 2016-03-17 13:43:22 +0800 + + write mask_out method + +M src/storage/chewing_large_table2.h +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit e0808dcd36761dfca7f363cf139f073d1d94db6a +Author: Peng Wu +Date: 2016-03-16 11:19:33 +0800 + + write remove_index method + +M src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 5488e7375d6c9bb55eb69e32246192f01bde3e61 +Author: Peng Wu +Date: 2016-03-16 10:47:56 +0800 + + write add_index method + +M src/storage/chewing_large_table2_kyotodb.cpp + +commit 0b005914605bb36e2ad38a777db04e4122b06428 +Author: Peng Wu +Date: 2016-03-15 13:50:28 +0800 + + fixes indent + +M src/storage/chewing_large_table2_bdb.cpp + +commit 6f7db0c76f4557245c51b4fe4ab1b9973cad8c74 +Author: Peng Wu +Date: 2016-03-15 13:47:10 +0800 + + write search method + +M src/storage/chewing_large_table2_kyotodb.cpp + +commit 63ad8a96490927f6261089e7c59d23d00cb2f069 +Author: Peng Wu +Date: 2016-03-15 13:26:06 +0800 + + fixes warnings + +M src/storage/phrase_large_table2.cpp + +commit 8f3603807183cbe4c05f5f3d926c809698aacb9d +Author: Peng Wu +Date: 2016-03-15 13:14:51 +0800 + + refactor code + +M src/storage/chewing_large_table2.cpp +M src/storage/chewing_large_table2_bdb.cpp + +commit aedbe291325b62efee3307699107c9594e23d394 +Author: Peng Wu +Date: 2016-03-15 13:12:32 +0800 + + update chewing_large_table2_kyotodb.h + +M src/storage/chewing_large_table2_kyotodb.h + +commit db0aa4dec5793e99a3405368565b5f4f0e05ee64 +Author: Peng Wu +Date: 2016-03-14 13:59:41 +0800 + + fixes a typo + +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 3fb3c2825a2ee43f88b4ed9a5ec50663d8fcf8cd +Author: Peng Wu +Date: 2016-03-14 13:58:50 +0800 + + write class ChewingLargeTable2 in progress + +M src/storage/chewing_large_table2_kyotodb.cpp + +commit c8068ec8520d3ab1f34b7e55c9238827d8d56a68 +Author: Peng Wu +Date: 2016-03-14 13:48:07 +0800 + + re-factor code + +M src/storage/chewing_large_table2.cpp +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_kyotodb.h + +commit 312eb6bb3212ed3aceef1daaadfe3e7d5554c95a +Author: Peng Wu +Date: 2016-03-14 13:45:37 +0800 + + write fini_entries method + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit 0a229eec709ba7a1da94d7885fe73acfeb1b2047 +Author: Peng Wu +Date: 2016-03-14 13:39:56 +0800 + + add chewing_large_table2_kyotodb.cpp + +M src/storage/Makefile.am +A src/storage/chewing_large_table2_kyotodb.cpp +M src/storage/chewing_large_table2_kyotodb.h + +commit f8524d6dfa56207d1cfe6480707d9acf01c0a376 +Author: Peng Wu +Date: 2016-03-11 14:22:09 +0800 + + write mask_out method + +M src/storage/chewing_large_table2_bdb.cpp + +commit e4974da2914a30d3629feff4c8eff7011e43d214 +Author: Peng Wu +Date: 2016-03-11 13:50:25 +0800 + + use int phrase_length + +M src/storage/chewing_large_table2.h +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit 0c3f25027e190d9644f904940d117f5d00a8a35c +Author: Peng Wu +Date: 2016-03-10 14:03:54 +0800 + + fixes indent + +M src/storage/chewing_large_table2_bdb.cpp + +commit d443ce735d26e18a8119d81932c05488abc82bbb +Author: Peng Wu +Date: 2016-03-10 13:59:22 +0800 + + write remove_index method + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit 68a2f07e7ba7a7458f806662225df5440741955b +Author: Peng Wu +Date: 2016-03-09 16:14:02 +0800 + + add assert + +M src/storage/chewing_large_table2_bdb.cpp + +commit a6c8ddff4742406fb1af2aea237c537024464682 +Author: Peng Wu +Date: 2016-03-09 15:04:23 +0800 + + write add_index method + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit 850e3d51ae96b2f626f5c88c164d6860279b2584 +Author: Peng Wu +Date: 2016-03-09 12:03:08 +0800 + + fixes typos + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit be2dafb5c4aa1deca6746134beebc420bf0e424e +Author: Peng Wu +Date: 2016-03-09 11:54:29 +0800 + + fixes search method + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit 270402c3e14b0a975da5e80e456befebdd85eced +Author: Peng Wu +Date: 2016-03-09 11:48:20 +0800 + + add const modifiers + +M src/storage/chewing_large_table2.h +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit 026f53bd34ba93050178b36fc4bdde2a7528b5cc +Author: Peng Wu +Date: 2016-03-08 15:55:09 +0800 + + write search method + +M src/storage/chewing_large_table2.h +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit 5d16830d7e1ce3df548bca0017a4deaccdc8cfb0 +Author: Peng Wu +Date: 2016-03-07 15:43:33 +0800 + + write chewing_large_table2_bdb.cpp in progress + +M src/storage/chewing_large_table2_bdb.cpp + +commit 7b8d727d6048affa0e934e821007c5198be4b332 +Author: Peng Wu +Date: 2016-03-07 15:31:49 +0800 + + begin to write chewing_large_table2_bdb.cpp + +M src/storage/chewing_large_table2_bdb.cpp +M src/storage/chewing_large_table2_bdb.h + +commit 5e8cd71e7c7238a37321941a8dd7dc5c31d087bc +Author: Peng Wu +Date: 2016-03-07 14:56:40 +0800 + + add chewing_large_table2_bdb.cpp + +M src/storage/Makefile.am +A src/storage/chewing_large_table2_bdb.cpp + +commit 3c5ef62e8f6399f26ef95d75b235e66d94811e99 +Author: Peng Wu +Date: 2016-03-03 17:35:21 +0800 + + fixes warnings + +M tests/storage/test_phrase_table.cpp +M tests/tests_helper.h +M utils/utils_helper.h + +commit a7efd29de74fcef6667c3e2c1695c39b3a48c477 +Author: Peng Wu +Date: 2016-03-03 17:25:20 +0800 + + use class CopyVisitor + +M src/storage/ngram_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 5dd5415a7d170a2cdb01e17480a5fec622afa747 +Author: Peng Wu +Date: 2016-03-03 17:22:23 +0800 + + write class CopyVisitor + +M src/storage/kyotodb_utils.h + +commit ce72a2532ad39b0cfec46ca344c99f09bb151c55 +Author: Peng Wu +Date: 2016-03-03 17:19:22 +0800 + + use attach_options function + +M src/storage/ngram_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 7c1f8a98786856cf145734c966beecce2dfeeb37 +Author: Peng Wu +Date: 2016-03-03 17:15:26 +0800 + + write attach_options function + +M src/storage/kyotodb_utils.h + +commit 84e6293dc5d85f0bc9d2623bd3eda7aef97cf39f +Author: Peng Wu +Date: 2016-03-03 17:11:34 +0800 + + add kyotodb_utils.h + +M src/storage/Makefile.am +A src/storage/kyotodb_utils.h + +commit d602f8dd52fa4aea9e8f53066483b6bf97168794 +Author: Peng Wu +Date: 2016-03-03 17:05:14 +0800 + + fixes compile + +M src/storage/bdb_utils.h +M src/storage/phrase_large_table3_bdb.cpp + +commit 21892aaad6e37ab6134c2bd9270605270964c893 +Author: Peng Wu +Date: 2016-03-03 17:02:18 +0800 + + use copy_bdb function in phrase_large_table3_bdb.cpp + +M src/storage/phrase_large_table3_bdb.cpp + +commit 17eca1b8defe9f890790b1c897407c471ac0562f +Author: Peng Wu +Date: 2016-03-03 16:58:49 +0800 + + use copy_bdb function in ngram_bdb.cpp + +M src/storage/ngram_bdb.cpp + +commit 2c39a250adcef967493bcfc1201435f91249ad70 +Author: Peng Wu +Date: 2016-03-03 16:54:14 +0800 + + write copy_bdb function + +M src/storage/bdb_utils.h + +commit 9181f558e6aa784d7734a728e1581a16ba36b422 +Author: Peng Wu +Date: 2016-03-03 16:44:19 +0800 + + use attach_options function + +M src/storage/ngram_bdb.cpp +M src/storage/phrase_large_table3_bdb.cpp + +commit 9d0f69f772571e2ea2e3c9f50198d843d07227a8 +Author: Peng Wu +Date: 2016-03-03 16:41:39 +0800 + + write attach_option function + +M src/storage/bdb_utils.h + +commit 9ce89e8d3ac1926e87d8964337d72526ffc57c6e +Author: Peng Wu +Date: 2016-03-03 16:33:51 +0800 + + add bdb_utils.h + +M src/storage/Makefile.am +A src/storage/bdb_utils.h + +commit 69546e6ce25ef8a93287370a07e48ed892f846e8 +Author: Peng Wu +Date: 2016-03-02 15:32:26 +0800 + + write mask_out method + +M src/storage/chewing_large_table2.h + +commit f3c74ca5eb43801efd396e030579a1b4d53decbc +Author: Peng Wu +Date: 2016-03-02 15:22:50 +0800 + + write get_length method + +M src/storage/chewing_large_table2.h +M src/storage/phrase_large_table3.cpp + +commit b176ce01e4c7aaa67b16511ecf82e963e67e33df +Author: Peng Wu +Date: 2016-03-02 15:15:50 +0800 + + write remove_index method + +M src/storage/chewing_large_table2.h + +commit ce724784daf9e2eb6608278bc6712ebedbfc5e66 +Author: Peng Wu +Date: 2016-03-02 15:00:34 +0800 + + write add_index method + +M src/storage/chewing_large_table2.h + +commit 6f785fe6118aff18ea596c095ce67e513de88471 +Author: Peng Wu +Date: 2016-02-29 15:54:20 +0800 + + fixes a typo + +M src/storage/chewing_large_table2.h + +commit b3fb0481719dfdbbf2cf7a692a831a87d2416419 +Author: Peng Wu +Date: 2016-02-29 15:49:29 +0800 + + write search method + +M src/storage/chewing_large_table2.cpp +M src/storage/chewing_large_table2.h +M src/storage/pinyin_phrase3.h + +commit 571322984a1b87bf6341492d7289a77d13a5a9d6 +Author: Peng Wu +Date: 2016-02-29 14:46:31 +0800 + + write load_text method + +M src/storage/chewing_large_table2.cpp + +commit 9385abef7168ef63cdab6c56f5181574c87cee26 +Author: Peng Wu +Date: 2016-02-29 14:44:05 +0800 + + add chewing_large_table2.cpp + +M src/storage/Makefile.am +A src/storage/chewing_large_table2.cpp +M src/storage/chewing_large_table2.h + +commit a59f4bb0c2f766565664787ab7efbfee53b03f71 +Author: Peng Wu +Date: 2016-02-25 16:02:58 +0800 + + use chewing_large_table2.h + +M src/pinyin_internal.h +M src/storage/Makefile.am + +commit 1f82a5cc608561199469695b5f98c46bdc5c2449 +Author: Peng Wu +Date: 2016-02-25 15:57:29 +0800 + + declare class ChewingLargeTable2 for Kyoto Cabinet + +M src/storage/chewing_large_table2_bdb.h +A src/storage/chewing_large_table2_kyotodb.h + +commit 776ad4988988f6aa2b664e1a596838e5b785aad6 +Author: Peng Wu +Date: 2016-02-25 15:45:56 +0800 + + declare class ChewingLargeTable2 for Berkeley DB + +A src/storage/chewing_large_table2_bdb.h + +commit cf3d51fca85888657cb2e0d8d54ee7bd8de114b5 +Author: Peng Wu +Date: 2016-02-25 15:31:33 +0800 + + update chewing_large_table2.h + +M src/storage/chewing_large_table2.h + +commit b93bca7c15be3ed1d2331edbca90165e69f20770 +Author: Peng Wu +Date: 2016-02-25 13:29:49 +0800 + + add comments + +M src/storage/chewing_large_table2.h + +commit 71895122df40eaec777d5033b02e3da3f9ef47f7 +Author: Peng Wu +Date: 2016-02-25 11:12:49 +0800 + + declare class ChewingTableEntry + +A src/storage/chewing_large_table2.h + +commit 1366b0518ab211e7e48901851afa9373f4668c8f +Author: Peng Wu +Date: 2016-02-25 10:54:04 +0800 + + add comments + +M src/storage/pinyin_phrase3.h + +commit c91834aa9ad131f6d67e1f7442cca0029fc4d3cf +Author: Peng Wu +Date: 2016-02-24 14:36:46 +0800 + + write compute*chewing_index functions + +M src/storage/pinyin_phrase3.h + +commit f142f1c24866423974a692c3e71b6e052faf5e61 +Author: Peng Wu +Date: 2016-02-24 14:16:59 +0800 + + write contains_incomplete_pinyin function + +M src/storage/pinyin_phrase3.h + +commit 72fe72ed62a55d8ed13e012c13acfae3e9de2e67 +Author: Peng Wu +Date: 2016-02-24 14:10:08 +0800 + + write pinyin_compare_with_tones function + +M src/storage/pinyin_phrase3.h + +commit 3636f34f41b174fb34bf9331bb742a9d7bc4d4fb +Author: Peng Wu +Date: 2016-02-24 14:03:00 +0800 + + write pinyin_compare_*3 functions + +M src/storage/pinyin_phrase3.h + +commit 707a5a875ac570929cf8dab8f34e4769ee00099e +Author: Peng Wu +Date: 2016-02-24 13:49:20 +0800 + + refactor pinyin_phrase2.h + +M src/storage/pinyin_phrase2.h +M src/storage/pinyin_phrase3.h + +commit 9b88313553228c21f0284b0449e717c255cd0ac3 +Author: Peng Wu +Date: 2016-02-23 15:41:17 +0800 + + write class FacadeChewingTable2 + +M src/storage/facade_chewing_table2.h + +commit e4eaafa722b3a54d1f1aa771a961f2175269b023 +Author: Peng Wu +Date: 2016-02-23 15:37:16 +0800 + + write class FacadeChewingTable2 in progress + +A src/storage/facade_chewing_table2.h + +commit 81724d8500464fc86e6e440a4d9012d889c8a742 +Author: Peng Wu +Date: 2016-02-22 14:24:50 +0800 + + update test_phrase_table + +M tests/storage/test_phrase_table.cpp + +commit 520dc8d10941ef08bf1ffaa24d2325182f4b6d5f +Author: Peng Wu +Date: 2016-02-22 10:49:34 +0800 + + fixes PhraseLargeTable3 constructors + +M src/storage/phrase_large_table3_bdb.cpp +M src/storage/phrase_large_table3_kyotodb.cpp + +commit aa7c854dbe00e9ad2cb42db54c22130d59b48409 +Author: Peng Wu +Date: 2016-02-19 14:22:48 +0800 + + write mask_out method + +M src/storage/phrase_large_table3.h +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 00a5bc60af4476c8964ff7bb1d845f5b4b29baca +Author: Peng Wu +Date: 2016-02-19 13:11:57 +0800 + + write remove_index method + +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 92ae893fe9811be579ceecd3dcec4adc88e4a5bb +Author: Peng Wu +Date: 2016-02-19 10:56:44 +0800 + + fixes typo + +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 3858d216e817e6536e0db00e243efd21fd8e351f +Author: Peng Wu +Date: 2016-02-18 15:12:23 +0800 + + write add_index method + +M src/storage/phrase_large_table3_kyotodb.cpp + +commit e4040fc2362e077cbe92eb2deaa18f1c2c11dc40 +Author: Peng Wu +Date: 2016-02-18 11:33:18 +0800 + + write search method + +M src/storage/phrase_large_table3_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.h + +commit 0d5cec839163b988213108ffcff3141aee7c898b +Author: Peng Wu +Date: 2016-02-05 16:47:11 +0800 + + write load_db/write_db methods + +M src/storage/phrase_large_table3_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.h + +commit fa4f8cdc44f3825c5532227e90c6d9ed8c6fbe0d +Author: Peng Wu +Date: 2016-02-05 16:45:00 +0800 + + fixes typos + +M src/storage/ngram_kyotodb.cpp + +commit 21f1ccd98393aa1d4e63766cf4edf633b1d49d3c +Author: Peng Wu +Date: 2016-02-05 16:17:56 +0800 + + write attach method + +M src/storage/phrase_large_table3_kyotodb.cpp + +commit 94f9dcccec57f245c765eeac3a4fcd716ac733ec +Author: Peng Wu +Date: 2016-02-05 15:42:24 +0800 + + begin to write PhraseLargeTable3 for Kyoto Cabinet + +M src/storage/phrase_large_table3_kyotodb.cpp +M src/storage/phrase_large_table3_kyotodb.h + +commit 5cf152d3c98ca4e13c091455c26e8a8200751e0b +Author: Peng Wu +Date: 2016-02-05 15:32:13 +0800 + + add phrase_large_table3_kyotodb.cpp + +M src/storage/Makefile.am +A src/storage/phrase_large_table3_kyotodb.cpp + +commit ccabfcadd353c047cffe31f71ee8b3f5ec31a0dc +Author: Peng Wu +Date: 2016-02-04 13:59:59 +0800 + + fixes a typo + +M src/storage/phrase_large_table3_bdb.cpp + +commit 705183aa86743b312988732c59a20ebe1e36ee21 +Author: Peng Wu +Date: 2016-02-04 13:42:29 +0800 + + write mask_out method + +M src/storage/phrase_large_table3_bdb.cpp + +commit abe78a4d197831ca2e08aef7266593b147603ced +Author: Peng Wu +Date: 2016-02-04 12:20:48 +0800 + + update facade_phrase_table3.h + +M src/storage/facade_phrase_table3.h + +commit c74ba4bbf10f2913c2c775f6f54266ce9df151f1 +Author: Peng Wu +Date: 2016-02-04 11:29:17 +0800 + + write remove_index method + +M src/storage/phrase_large_table3_bdb.cpp + +commit ec0ca6fc051ceaad8c8db9b2f3345e34ac853632 +Author: Peng Wu +Date: 2016-02-03 10:11:56 +0800 + + update phrase_large_table3_bdb.cpp + +M src/storage/phrase_large_table3_bdb.cpp + +commit 1cdc42439e9ea9a8217909afbf396a03193d7cd9 +Author: Peng Wu +Date: 2016-02-03 09:35:23 +0800 + + update phrase_large_table3.cpp + +M src/storage/phrase_large_table3.cpp + +commit 719f114eb3a18ea54068a5e5d2c5241ebb1075f4 +Author: Peng Wu +Date: 2016-02-03 09:30:04 +0800 + + update phrase_large_table3.h + +M src/storage/phrase_large_table3.h + +commit d743ad0eb55a91405c251a8999f838d656d72729 +Author: Peng Wu +Date: 2016-02-03 09:27:22 +0800 + + remove table_entry_header_t + +M src/include/novel_types.h + +commit 2e80a5f6f7864c8fd4dba2878102681a4ea4b407 +Author: Peng Wu +Date: 2016-02-03 09:22:28 +0800 + + fixes typos + +M src/storage/ngram_bdb.cpp +M src/storage/ngram_kyotodb.cpp + +commit f9c65e5be707abd028638636bda46062aa9fff23 +Author: Peng Wu +Date: 2016-01-28 16:06:34 +0800 + + write class PhraseLargeTable3 in progress + +M src/storage/phrase_large_table3_bdb.cpp + +commit 2c93495fd59031b4a6bbe04dad6399d263129e72 +Author: Peng Wu +Date: 2016-01-28 15:13:04 +0800 + + write class PhraseLargeTable3 in progress + +M src/storage/phrase_large_table3_bdb.cpp + +commit 82e482b394d08ee2001cfbccc8fe72cf8fa9e438 +Author: Peng Wu +Date: 2016-01-27 16:02:26 +0800 + + rename load/store to load_db/store_db methods + +M src/storage/facade_phrase_table3.h +M src/storage/phrase_large_table3_bdb.cpp +M src/storage/phrase_large_table3_bdb.h +M src/storage/phrase_large_table3_kyotodb.h + +commit b564ca7a9266364f538ec548b02c1eee64c4d373 +Author: Peng Wu +Date: 2016-01-27 15:55:06 +0800 + + fixes compile + +M src/storage/phrase_large_table3_bdb.cpp + +commit b2277491f1261600e6a14f8a04bb95bc70b566e0 +Author: Peng Wu +Date: 2016-01-27 15:52:02 +0800 + + write class PhraseLargeTable3 in progress + +M src/storage/phrase_large_table3_bdb.cpp + +commit 52cf66e1216224f333a49e327ee37ed448423727 +Author: Peng Wu +Date: 2016-01-27 15:50:22 +0800 + + update ngram_bdb.cpp + +M src/storage/ngram_bdb.cpp + +commit db3153f9b6c6f4c156d54cfcfb4056183e83493e +Author: Peng Wu +Date: 2016-01-27 12:14:18 +0800 + + add phrase_large_table3_bdb.cpp + +M src/storage/Makefile.am +A src/storage/phrase_large_table3_bdb.cpp + +commit 65276d8bef358c3d74957ac07a06cbfaa4ebed0b +Author: Peng Wu +Date: 2016-01-27 12:03:28 +0800 + + refactor PhraseLargeTable3 + +M src/storage/facade_phrase_table3.h +M src/storage/phrase_large_table3_bdb.h +M src/storage/phrase_large_table3_kyotodb.h + +commit 8a69df17c20e7b09fc91856d6653ff52b5f297aa +Author: Peng Wu +Date: 2016-01-26 16:01:40 +0800 + + update member variables + +M src/storage/phrase_large_table3_bdb.h +M src/storage/phrase_large_table3_kyotodb.h + +commit 4e0c42f37615c7efc24d8a06b9e77b025824c8b0 +Author: Peng Wu +Date: 2016-01-26 15:56:57 +0800 + + update phrase_large_table3.h and Makefile.am + +M src/storage/Makefile.am +M src/storage/phrase_large_table3.h + +commit 105f9ac5332547ecec7169e5f52a9eaf1b641d6a +Author: Peng Wu +Date: 2016-01-26 15:53:58 +0800 + + write phrase_large_table3_kyotodb.h + +M src/storage/phrase_large_table3.h +A src/storage/phrase_large_table3_kyotodb.h + +commit c195ccfafdb0dee07e3ee04a04755a571bd474de +Author: Peng Wu +Date: 2016-01-26 15:51:29 +0800 + + write phrase_large_table3_bdb.h + +A src/storage/phrase_large_table3_bdb.h + +commit b88fe953c5fabf900e58aa5be590d382d9bb0539 +Author: Peng Wu +Date: 2016-01-26 14:20:32 +0800 + + update FacadePhraseTable3 + +M src/storage/facade_phrase_table3.h +M src/storage/phrase_large_table3.h + +commit a1d8b3aff09476f0a4e2f9d39a91252a188e4af9 +Author: Peng Wu +Date: 2016-01-25 16:17:52 +0800 + + write PhraseTableEntry::mask_out method + +M src/storage/phrase_large_table3.cpp + +commit 9235edee9e310c02f80d96710809dd0e8ee4ced5 +Author: Peng Wu +Date: 2016-01-25 15:21:29 +0800 + + write PhraseTableEntry::remove_index method + +M src/storage/phrase_large_table3.cpp + +commit fa4854d1ef818aec6457698f2cf503147c039dbd +Author: Peng Wu +Date: 2016-01-25 15:00:57 +0800 + + write PhraseTableEntry::add_index method + +M src/storage/phrase_large_table3.cpp + +commit cbc65ce11de0b735aeba598357a5b25ad026de6e +Author: Peng Wu +Date: 2016-01-25 14:08:00 +0800 + + write PhraseTableEntry::search method + +M src/storage/phrase_large_table3.cpp +M src/storage/phrase_large_table3.h + +commit aaf6de3afa7f1289c1d5a6adb115bfe5ad232c93 +Author: Peng Wu +Date: 2016-01-22 10:01:09 +0800 + + update phrase_large_table3.h + +M src/storage/phrase_large_table3.cpp +M src/storage/phrase_large_table3.h + +commit a56ff04587ffbf134132716b40e63e42a2e25a7e +Author: Peng Wu +Date: 2016-01-22 09:58:42 +0800 + + update PhraseTableEntry + +M src/storage/phrase_large_table3.cpp +M src/storage/phrase_large_table3.h + +commit 229fc2d9928943d21699eb17bb8886be4b1c523c +Author: Peng Wu +Date: 2016-01-21 13:39:51 +0800 + + update class PhraseTableEntry + +M src/storage/phrase_large_table3.cpp + +commit a7526ca001e88457c290547bd42315bd4bb876be +Author: Peng Wu +Date: 2016-01-21 13:29:19 +0800 + + declare class PhraseTableEntry + +M src/include/novel_types.h +M src/storage/phrase_large_table3.cpp + +commit 9b3aad3a507b98bbccad3b37f97b7a9213ca7655 +Author: Peng Wu +Date: 2016-01-18 11:13:34 +0800 + + drop libdatrie depends + +M configure.ac +M src/Makefile.am +M src/storage/phrase_large_table3.cpp +M src/storage/phrase_large_table3.h + +commit ec35afec701df415f4617fd33a5ca1675c686c68 +Author: Peng Wu +Date: 2016-01-13 13:57:19 +0800 + + write class PhraseLargeTable3 in progress + +M src/storage/phrase_large_table3.cpp +M src/storage/phrase_large_table3.h + +commit 6fdeb6f930c59a34c39b455e39e375dbc0258095 +Author: Peng Wu +Date: 2016-01-12 15:38:57 +0800 + + fixes a typo + +M src/storage/facade_phrase_table3.h + +commit 9ebef8a9a1dad8dc3956d7b0b8a8b86b49f0468e +Author: Peng Wu +Date: 2016-01-12 15:30:46 +0800 + + use facade_phrase_table3.h + +M src/lookup/phrase_lookup.cpp +M src/pinyin_internal.h +M src/storage/Makefile.am + +commit 287ee0ad22ef071a71bcedc98c48649e07e6422d +Author: Peng Wu +Date: 2016-01-12 15:26:44 +0800 + + add comments + +M src/storage/facade_phrase_table3.h + +commit d768c883730a41808d1004b96d4722d572ec2b2a +Author: Peng Wu +Date: 2016-01-12 15:21:28 +0800 + + write facade_phrase_table3.h + +A src/storage/facade_phrase_table3.h + +commit de3179e4d600dfa45408c8618dbf0b326dc44a20 +Author: Peng Wu +Date: 2016-01-12 15:07:12 +0800 + + update phrase_large_table3.h + +M src/storage/phrase_large_table3.h + +commit fc7fffecf01667281cb094147e20aedcd4d7a8dd +Author: Peng Wu +Date: 2016-01-08 12:52:17 +0800 + + refactor code + +M src/storage/chewing_key.cpp +M src/storage/pinyin_parser2.h +M src/storage/zhuyin_parser2.h + +commit 1df99e805cb16bc8f9b46e1a45ea7e0eecb0aeff +Author: Peng Wu +Date: 2016-01-08 12:46:17 +0800 + + use zhuyin_parser2.h + +M src/pinyin_internal.h +M src/storage/Makefile.am +M src/storage/pinyin_parser2.cpp +M src/storage/zhuyin_parser2.cpp +M src/storage/zhuyin_parser2.h +M tests/storage/test_parser2.cpp + +commit 2952fef39edfd345905bee53460c3d2737a489dc +Author: Peng Wu +Date: 2016-01-08 12:41:47 +0800 + + use pinyin_phrase3.h + +M src/pinyin_internal.h +M src/storage/Makefile.am +M src/storage/chewing_large_table.cpp +M src/storage/phrase_index.h +M src/storage/pinyin_parser2.cpp +M src/storage/zhuyin_parser2.cpp + +commit ad9b5cdcb5e4455d2c353f8f823c63e8ef70e184 +Author: Peng Wu +Date: 2016-01-08 12:40:54 +0800 + + refactor code + +M src/storage/pinyin_parser2.h +A src/storage/zhuyin_parser2.h + +commit 96ca8abf09bd53ed62ed5be347d5243e9ce9f154 +Author: Peng Wu +Date: 2016-01-08 12:36:53 +0800 + + refactor code + +M src/storage/pinyin_phrase2.h +M src/storage/pinyin_phrase3.h + +commit c253c4fcbf2a9b49224a825f5e5dcffcb412d0a0 +Author: Peng Wu +Date: 2016-01-08 12:30:15 +0800 + + refactor code + +M src/storage/pinyin_phrase2.h +A src/storage/pinyin_phrase3.h + +commit 5f84a89a63a572a7c1b7139c3658ea04ce6d16ba +Author: Peng Wu +Date: 2016-01-08 12:16:18 +0800 + + update Makefile.am + +M configure.ac +M src/Makefile.am +M src/pinyin_internal.h +M src/storage/Makefile.am + +commit d9c257652632721cd933df93a71fdb33754ca09a +Author: Peng Wu +Date: 2016-01-08 12:12:30 +0800 + + add phrase_large_table3.cpp + +A src/storage/phrase_large_table3.cpp + +commit 496a95e798e6783d35f96fa3b5bdb555db825a41 +Author: Peng Wu +Date: 2016-01-07 15:30:53 +0800 + + update phrase_large_table3.h + +M src/storage/phrase_large_table3.h + +commit 2185ba0adf256e4fac611a5fafbff23ded0ef314 +Author: Peng Wu +Date: 2016-01-07 14:48:05 +0800 + + refactor code + +M src/storage/phrase_large_table2.h +M src/storage/phrase_large_table3.h + +commit 719018effb4077de11c09e451278a7c7866e1669 +Author: Peng Wu +Date: 2016-01-07 14:43:05 +0800 + + write phrase_large_table3.h + +A src/storage/phrase_large_table3.h + +commit 5bc4719fb6e74db0a0d3296fd7dce021b457352d +Author: Peng Wu +Date: 2016-01-07 14:28:02 +0800 + + refactor code + +M src/storage/pinyin_parser2.h +M src/storage/pinyin_phrase2.h + +commit a9c1c8359c45e5186865adf027b18d2facdbd313 +Author: Peng Wu +Date: 2016-01-06 13:01:36 +0800 + + write pinyin_custom3.h + +M src/include/novel_types.h +A src/storage/pinyin_custom3.h + +commit 3da54d43273d44be2861192c8ed1c573efe537c7 +Author: Peng Wu +Date: 2015-12-24 13:08:39 +0800 + + simplify ZhuyinDaChenCP26Parser2 + +M src/storage/zhuyin_parser2.cpp + +commit 7b790c9dbf5d93882be92feff98b8e2aa6b429c3 +Author: Peng Wu +Date: 2015-12-04 11:05:40 +0800 + + bump version 1.3.0 + +M configure.ac + +commit 6783bac98e70b14f1c58de63a9dcc9fce919d78c +Author: Peng Wu +Date: 2015-11-23 13:29:22 +0800 + + fixes double pinyin parser + +M src/storage/pinyin_parser2.cpp + +commit e19961b71aacaa4136c0a7e603aabcddd09de054 +Author: Peng Wu +Date: 2015-10-19 12:57:20 +0800 + + update scripts + +M scripts2/fullpinyintable.py +M scripts2/generateheader.py + +commit 105517b9e8aa729cfdda104ee3ded16ad8959d1a +Author: Peng Wu +Date: 2015-10-19 12:56:39 +0800 + + fixes pinyin_custom2.h + +M src/storage/pinyin_custom2.h + +commit 46e538b87c97b33545a951b49133bdb34bb9206d +Author: Peng Wu +Date: 2015-10-17 11:38:00 +0800 + + fixes ZhuyinSimpleParser2::in_chewing_schem method + +M src/storage/zhuyin_parser2.cpp + +commit 69aeaf03a8b0694269108a7a2d4297b7ddec289f +Author: Peng Wu +Date: 2015-10-16 13:45:45 +0800 + + fixes compile + +M scripts2/templates/zhuyin_table.h.in +M src/pinyin.cpp +M src/storage/zhuyin_table.h + +commit 3d38c9355a73b58f327aa370a9290b8ff5fb349e +Author: Peng Wu +Date: 2015-10-16 13:40:42 +0800 + + update test_parser2.cpp + +M tests/storage/test_parser2.cpp + +commit 16ab6e9d719acd02a1dbe65f8255fc65c06fbda2 +Author: Peng Wu +Date: 2015-10-16 13:32:51 +0800 + + rename pinyin_set_chewing_scheme to pinyin_set_zhuyin_scheme + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit ac96a6ee83d172561628e0e7cbdd71deb9f6f04f +Author: Peng Wu +Date: 2015-10-16 13:24:07 +0800 + + update pinyin_in_chewing_keyboard method + +M src/pinyin.cpp +M src/pinyin.h + +commit 5c07a9c2ba8e12eadffa0f2c569334947193ca91 +Author: Peng Wu +Date: 2015-10-16 13:18:14 +0800 + + rename pinyin_get_chewing_string to pinyin_get_zhuyin_string + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 4f7407ea0b6e3611f9f177dfe1d179f287553a89 +Author: Peng Wu +Date: 2015-10-16 13:14:54 +0800 + + bump version and so name + +M configure.ac + +commit 369a4d63b24d441c87da55aa11774881d02fd0a7 +Author: Peng Wu +Date: 2015-10-16 13:13:27 +0800 + + add pinyin_get_luoma_pinyin_string and pinyin_get_secondary_zhuyin_string + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h +M src/storage/pinyin_custom2.h +M src/storage/pinyin_parser2.cpp + +commit 7f77d9dcbc043d00d3ef2eacfb1237b32b1d6136 +Author: Peng Wu +Date: 2015-10-16 12:59:34 +0800 + + write pinyin_set_full_pinyin_scheme + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h +M src/storage/pinyin_parser2.h + +commit 51e7af528a4fe1c5da660eba48268369225c064c +Author: Peng Wu +Date: 2015-10-15 11:07:08 +0800 + + use PinyinDirectParser2 + +M src/storage/chewing_large_table.cpp +M src/storage/phrase_index.cpp + +commit dcc594e5c54f5d3bbae442434e080bab52f9b9cf +Author: Peng Wu +Date: 2015-10-15 11:01:35 +0800 + + write PinyinDirectParser2 + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 7bcaabf8549d55b8c51d9c74ac7841fd635d18b8 +Author: Peng Wu +Date: 2015-10-14 16:53:06 +0800 + + update chewing_key.cpp + +M src/storage/chewing_key.cpp + +commit 987b82c533f31d6730c4057b67d6cb59b30d8c74 +Author: Peng Wu +Date: 2015-10-14 16:49:26 +0800 + + update chewing_key.h + +M src/storage/chewing_key.cpp +M src/storage/chewing_key.h + +commit 918cd6a4d934f56bfe07a384c5b2eeb6bf6486c4 +Author: Peng Wu +Date: 2015-10-14 16:39:56 +0800 + + use Zhuyin instead of Chewing + +M src/storage/pinyin_parser2.h +M src/storage/zhuyin_parser2.cpp + +commit 1ddf347454d6d651b5fec4f93713a87c3dbbf991 +Author: Peng Wu +Date: 2015-10-14 16:27:59 +0800 + + update zhuyin_table.h + +M src/storage/zhuyin_table.h + +commit 13de73c5408b67a26b317c205b61f07fa922806c +Author: Peng Wu +Date: 2015-10-14 16:26:07 +0800 + + update zhuyin_table.h.in + +M scripts2/templates/zhuyin_table.h.in + +commit f98dda5d83059dc45076a795d048239dd889de47 +Author: Peng Wu +Date: 2015-10-14 16:21:52 +0800 + + use zhuyin instead of chewing + +M src/storage/pinyin_parser2.h +M src/storage/zhuyin_parser2.cpp + +commit dc867750ebef213bf8717cb46777a8a68b550f4a +Author: Peng Wu +Date: 2015-10-14 16:04:34 +0800 + + remove scripts directory + +D scripts/Makefile.data +D scripts/bopomofo.py +D scripts/chewing.py +D scripts/chewing_enum.h.in +D scripts/chewing_table.h.in +D scripts/chewingkey.py +D scripts/correct.py +D scripts/double_pinyin_table.h.in +D scripts/genbopomofoheader.py +D scripts/genchewingkey.py +D scripts/gendoublepinyinheader.py +D scripts/genpinyinheader.py +D scripts/genpinyins.py +D scripts/genpinyintable.py +D scripts/genspecialtable.py +D scripts/pinyin.py +D scripts/pinyin_parser_table.h.in +D scripts/pinyintable.py +D scripts/specials.txt +D scripts/specialtable.py +D scripts/utils.py + +commit d23ca05207341dce426e6e470e283eed891b9085 +Author: Peng Wu +Date: 2015-10-14 15:51:51 +0800 + + update comments + +M src/storage/pinyin_parser2.h + +commit df36b6d1c5fb6731e1d1b18b45e76bdf736a0b51 +Author: Peng Wu +Date: 2015-10-14 15:49:29 +0800 + + update Makefile.am + +M src/storage/Makefile.am + +commit d13ff12005105e8b7ab8414377e95692c05a060b +Author: Peng Wu +Date: 2015-10-14 15:49:15 +0800 + + write chewing_key.cpp + +A src/storage/chewing_key.cpp +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp + +commit fd7ddae3a8c86a52a1cc3b5a54b50d37f95bce55 +Author: Peng Wu +Date: 2015-10-14 15:33:43 +0800 + + update zhuyin_parser2.cpp + +M src/storage/zhuyin_parser2.cpp + +commit 05288c898565689d191780e3c76f2e665c624280 +Author: Peng Wu +Date: 2015-10-14 11:26:51 +0800 + + update pinyin_parser2.cpp + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 3c89c1aa4c818205cf2e871b932b1f4f0fe3fb21 +Author: Peng Wu +Date: 2015-10-14 11:03:57 +0800 + + update FullPinyinParser2 + +M src/storage/Makefile.am +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h +M src/storage/zhuyin_parser2.cpp + +commit f699a47356f3ec5062a505ec2e5cddd929144ce3 +Author: Peng Wu +Date: 2015-10-14 11:00:57 +0800 + + clean pinyin_parser2.cpp + +M src/storage/pinyin_parser2.cpp + +commit 5335cee1d4861ee92cd1db44a50ec04c56678172 +Author: Peng Wu +Date: 2015-10-14 10:56:59 +0800 + + import zhuyin_parser2.cpp + +A src/storage/zhuyin_parser2.cpp + +commit 0541bc80ec068a0d97bf9d7d4a5da676c84cc446 +Author: Peng Wu +Date: 2015-10-14 10:48:11 +0800 + + update pinyin_parser2.h + +M src/storage/pinyin_parser2.h + +commit 31695561f476e98f64aeb447b45de0a03b5fce86 +Author: Peng Wu +Date: 2015-10-13 16:57:46 +0800 + + fixes a typo + +M src/storage/pinyin_parser2.cpp + +commit 6608b8f6fb6c7c49536d10d64ac8e0d8b2e589e6 +Author: Peng Wu +Date: 2015-10-13 16:48:11 +0800 + + update double_pinyin_table.h + +M src/storage/double_pinyin_table.h + +commit 20aa3a5380ac803a53ce79388c776963aea8379c +Author: Peng Wu +Date: 2015-10-13 16:46:56 +0800 + + update parse_one_key method for double pinyin + +M src/storage/pinyin_parser2.cpp + +commit 0b65ed208068a55d262a67991b8962dbec7c4362 +Author: Peng Wu +Date: 2015-10-13 16:42:15 +0800 + + update doublepinyintable.py + +M scripts2/doublepinyintable.py + +commit 0030a2639d96eaa93fd6ed5a416f96f3036e4a6e +Author: Peng Wu +Date: 2015-10-13 16:16:47 +0800 + + init fallback tables + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 04127c26fc5b4d99b41cbe53651b98bb0a39857a +Author: Peng Wu +Date: 2015-10-13 15:56:20 +0800 + + update double_pinyin_table.h + +M src/storage/double_pinyin_table.h + +commit 9c490c6b8fe425eef1690f62e1655a045e254d9e +Author: Peng Wu +Date: 2015-10-13 15:54:58 +0800 + + support fallback tables in double pinyin + +M scripts2/generateheader.py +M scripts2/templates/double_pinyin_table.h.in +M src/storage/pinyin_parser2.h + +commit 390a0c0959500de088783273fda4341e0644c24e +Author: Peng Wu +Date: 2015-10-13 15:45:01 +0800 + + support force tone in pinyin parsers + +M src/storage/pinyin_parser2.cpp + +commit 3264d488a3d21bdc3abc0b23a8fb1ea9e2a88e35 +Author: Peng Wu +Date: 2015-10-13 15:16:57 +0800 + + update pinyin_custom2.h + +M src/storage/pinyin_custom2.h + +commit 1b656956e662d507c8c38f112db160bff2234c03 +Author: Peng Wu +Date: 2015-10-12 16:07:21 +0800 + + update table files + +M src/storage/pinyin_parser_table.h +M src/storage/zhuyin_table.h + +commit 76bf60b29794095fa6183124bff84ffce5ba7523 +Author: Peng Wu +Date: 2015-10-12 15:53:24 +0800 + + update src/storage/Makefile.am and script/Makefile.data + +M scripts/Makefile.data +M src/storage/Makefile.am + +commit bc660fd1fd0c7b71848c7ad29afeefadf4761649 +Author: Peng Wu +Date: 2015-10-12 15:50:44 +0800 + + update pinyin_parser2.* + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 788fa3209ab79a217502f6d5ecf02dd2102eed94 +Author: Peng Wu +Date: 2015-10-12 15:49:16 +0800 + + update python scripts2 + +M scripts2/fullpinyintable.py +M scripts2/templates/zhuyin_table.h.in + +commit 9be1773d9d3ffa72fa6f5fa3fbc49e0a9e208bf0 +Author: Peng Wu +Date: 2015-10-12 15:32:51 +0800 + + update Makefile.data + +M scripts2/Makefile.data + +commit 9535aaf6f1fbc8f4239db69bb931b9fbee782a1f +Author: Peng Wu +Date: 2015-10-12 15:31:58 +0800 + + rename chewing_table.h to zhuyin_table.h + +R100 src/storage/chewing_table.h src/storage/zhuyin_table.h + +commit 3d9e1ee4d4de86b722d07a822ebb5521acd33f03 +Author: Peng Wu +Date: 2015-10-12 15:31:26 +0800 + + update Makefile.data + +A scripts2/Makefile.data +M scripts2/tools/distill.py + +commit fbc36eb1382314da72beab865e7c815846f93d05 +Author: Peng Wu +Date: 2015-10-12 15:20:59 +0800 + + use IS_ZHUYIN and ZHUYIN_INCOMPLETE + +M scripts2/fullpinyintable.py + +commit 0bd18c59a46a6688075f1548f775cdfbdd720910 +Author: Peng Wu +Date: 2015-10-12 15:04:46 +0800 + + update pinyin_custom2.h + +M src/storage/pinyin_custom2.h + +commit be06691180cdf7da6b3654f3f11123e233e0ec8e +Author: Peng Wu +Date: 2015-10-10 16:07:22 +0800 + + use model11.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit 77c17bd843c37cb1141e85a45013bdea4d87bdb4 +Author: Peng Wu +Date: 2015-10-09 14:10:17 +0800 + + fixes a typo + +M utils/storage/gen_pinyin_table.cpp + +commit f10e7058309e99efe02807ff92974c8a8f13d84a +Author: Peng Wu +Date: 2015-09-10 13:52:03 +0800 + + update filter_pinyin_list function + +M scripts2/fullpinyintable.py + +commit 20b4caeecc909ea45e1aaed05a1654b2ae02d5cd +Author: Peng Wu +Date: 2015-09-10 13:36:31 +0800 + + update fullpinyintable.py + +M scripts2/fullpinyintable.py + +commit d49449b6d88531d76e442cebd5197a6f944469e3 +Author: Peng Wu +Date: 2015-09-09 10:51:32 +0800 + + update pinyin_parser_table.h.in + +M scripts2/templates/pinyin_parser_table.h.in + +commit 5875bb62a662a9bbc1559bf85ccd4474741fdd62 +Author: Peng Wu +Date: 2015-09-08 16:30:24 +0800 + + import pinyin_parser_table.h.in + +A scripts2/templates/pinyin_parser_table.h.in + +commit bfa488b1e2fdd91cf18e7fa9e45d45623a60b8ae +Author: Peng Wu +Date: 2015-09-08 16:24:15 +0800 + + fixes typo + +M scripts2/fullpinyintable.py +M scripts2/utils.py + +commit 114466ac12094a9b7950bc1f2e5ffec2975a7240 +Author: Peng Wu +Date: 2015-09-08 16:11:00 +0800 + + import zhuyin_table.h.in from chewing_table.h.in + +A scripts2/templates/zhuyin_table.h.in + +commit cad449b5036ff2f28d1be62660838c0cac47b4f3 +Author: Peng Wu +Date: 2015-09-08 16:06:19 +0800 + + import double_pinyin_table.h.in + +A scripts2/templates/double_pinyin_table.h.in + +commit 7597bb8b2db9a56d06d94837d9d7f84a3a6c773c +Author: Peng Wu +Date: 2015-09-08 16:02:54 +0800 + + import chewing_enum.h.in + +A scripts2/templates/chewing_enum.h.in + +commit de99332cb5171628ff6f8968576bc9235121a876 +Author: Peng Wu +Date: 2015-09-08 16:01:29 +0800 + + fixes gen_table_index_for_chewing_key function + +M scripts2/fullpinyintable.py + +commit f40946027ed3bd50d5cce100564340d2b9161c0d +Author: Peng Wu +Date: 2015-09-08 15:51:12 +0800 + + merge specialtable.py and genspecialtable.py into specialtable.py + +M scripts2/bopomofotable.py +M scripts2/fullpinyintable.py +M scripts2/generateheader.py +A scripts2/specialtable.py + +commit dff380f2847a030ae1e2db4c26c2316cf70fa7ca +Author: Peng Wu +Date: 2015-09-08 15:34:08 +0800 + + write generateheader.py + +M scripts2/bopomofotable.py +M scripts2/doublepinyintable.py +A scripts2/generateheader.py +M scripts2/utils.py + +commit 07d54709eaed625c3e30e50bf7e76826f132d446 +Author: Peng Wu +Date: 2015-09-08 13:55:13 +0800 + + import bopomofotable.py from genbopomofoheader.py + +M scripts2/bopomofo.py +A scripts2/bopomofotable.py + +commit c2042c858732363b1be6848003d9335e41a67e07 +Author: Peng Wu +Date: 2015-09-08 13:42:55 +0800 + + update doublepinyintable.py + +M scripts2/doublepinyintable.py + +commit 9f39cd0266ae44167fe9fb71c9be428d07aff637 +Author: Peng Wu +Date: 2015-09-07 15:16:29 +0800 + + update doublepinyintable.py + +M scripts2/doublepinyintable.py + +commit a44728667329e19418cc9fa28a0dd63e8a1ce9bb +Author: Peng Wu +Date: 2015-09-07 14:44:23 +0800 + + import doublepinyintable.py from gendoublepinyinheader.py + +A scripts2/doublepinyintable.py + +commit 58ceaafb09440502c0a30895cf2ca4447cc2323d +Author: Peng Wu +Date: 2015-09-07 14:34:06 +0800 + + merge specialtable.py into fullpinyintable.py + +M scripts2/fullpinyintable.py + +commit 1a7731b1c634be215175f4a8418f60c059f9323c +Author: Peng Wu +Date: 2015-09-06 16:44:38 +0800 + + rename bopomofo to zhuyin + +M scripts2/fullpinyintable.py + +commit 0e2cbd36b424ba10cc329662d3aca443ad414363 +Author: Peng Wu +Date: 2015-09-06 15:55:47 +0800 + + rename gen_table_index to gen_table_index_for_chewing_key + +M scripts2/chewing.py +M scripts2/fullpinyintable.py + +commit 4c6198bb8862fcba958afb7c31e0d74b13647017 +Author: Peng Wu +Date: 2015-09-06 15:43:45 +0800 + + merge pinyintable.py and genpinyintable.py into fullpinyintable.py + +M scripts2/bopomofo.py +M scripts2/chewing.py +M scripts2/fullpinyintable.py + +commit 37fe99533ccfb267bb2553093188a9df509b1b5a +Author: Peng Wu +Date: 2015-09-06 15:43:03 +0800 + + update options.py + +M scripts2/options.py + +commit d5d459be076cfc94821dab17aa6a45d382d7f2ff +Author: Peng Wu +Date: 2015-09-06 15:11:17 +0800 + + update chewing.py + +M scripts2/chewing.py +A scripts2/fullpinyintable.py + +commit 1a66187b3b7ff5c52a1cb4458b17ceaed90ec77d +Author: Peng Wu +Date: 2015-09-06 14:43:21 +0800 + + import utils.py from libzhuyin + +A scripts2/utils.py + +commit 98074b17447f8aeca00ab037ae6b0c3c02a2a90b +Author: Peng Wu +Date: 2015-09-06 14:29:10 +0800 + + import distill.py from genpinyins.py + +A scripts2/tools/distill.py + +commit 62ea43a74061fdee78620b77e07f1c224fde0ef1 +Author: Peng Wu +Date: 2015-09-01 11:31:13 +0800 + + import bopomofo.py from bopomofokeyboard.py + +A scripts2/bopomofo.py + +commit 5fb644a3641f6eee533ffd8282682af293d2ac63 +Author: Peng Wu +Date: 2015-09-01 11:13:55 +0800 + + import doublepinyin.py from pinyin.py + +A scripts2/doublepinyin.py + +commit feae0a6ff6d98ccaf5ae07d4e1957a668b4dd68f +Author: Peng Wu +Date: 2015-09-01 11:10:44 +0800 + + import fullpinyin.py from pinyin.py + +A scripts2/fullpinyin.py + +commit 57637e9a9644b363786322243a1d83f2350d35d0 +Author: Peng Wu +Date: 2015-09-01 10:59:58 +0800 + + import options.py + +A scripts2/options.py + +commit ec9f8d14d8f4ff3e7985f3c0c65af66657e40d3a +Author: Peng Wu +Date: 2015-08-26 11:44:36 +0800 + + fixes chewing.py + +M scripts2/chewing.py + +commit 577087d8e902efff747a664db9078384a9b44207 +Author: Peng Wu +Date: 2015-08-26 11:41:00 +0800 + + add test cases + +M scripts2/chewing.py + +commit 5d2d133448e2ada2c2ebe8b10b6c4fef8b54fc8c +Author: Peng Wu +Date: 2015-08-26 11:36:29 +0800 + + update chewing.py + +M scripts2/chewing.py + +commit 5fa4dea7beda95e27de1b6252ecf071c2d7112dd +Author: Peng Wu +Date: 2015-08-26 11:24:02 +0800 + + import chewing.py + +A scripts2/chewing.py + +commit 4e66a92d8917401b955dc5fd5349851760efc54f +Author: Peng Wu +Date: 2015-08-25 16:07:15 +0800 + + import pyzymap.py from bopomofo.py + +A scripts2/pyzymap.py + +commit 958c597219b869ed28d46b609e9fbbf38f9b0c7c +Author: Peng Wu +Date: 2015-07-31 13:03:27 +0800 + + update ChangeLog + +M ChangeLog + +commit 9caefd422e907e03a30665f149785a21021a7b6b +Author: Peng Wu +Date: 2015-07-31 13:01:58 +0800 + + bump version 1.2.0 + +M configure.ac + +commit 53adb3f3140790ec323381f39eea6ce79b5711c3 +Merge: 3120d04 99aefab +Author: Peng Wu +Date: 2015-07-20 13:24:08 +0800 + + Merge branch 'obache-neatsrc' + +commit 99aefab704c29e814e3fce38c1ed5fe3a749b31c +Merge: 3120d04 b6baee1 +Author: Peng Wu +Date: 2015-07-20 13:22:51 +0800 + + Merge branch 'neatsrc' of git://github.com/obache/libpinyin into obache-neatsrc + +commit b6baee109a978add5acc263b9b36470dec5e90e8 +Author: OBATA Akio +Date: 2015-07-19 14:35:23 +0900 + + Resolve ambiguos usage of log(3) + + lookup_t expect gfloat, so pass float literal value instead of int. + +M src/lookup/phrase_lookup.cpp +M src/lookup/pinyin_lookup2.cpp + +commit 80a82ee011e93fdf18c176b5508c859a4e28440c +Author: OBATA Akio +Date: 2015-07-19 14:34:36 +0900 + + Resolve NULL used in arithmetic + +M src/storage/phrase_index.cpp + +commit 3120d04f1aba5c745a9c7da5f8f40cf7851e9037 +Author: Peng Wu +Date: 2015-07-09 13:47:23 +0800 + + fixes Kyoto Cabinet bug + +M src/storage/ngram_kyotodb.cpp + +commit 3b7b004ecd617e392102d70c3828536235435a89 +Author: Peng Wu +Date: 2015-07-08 15:09:28 +0800 + + re-facter Makefile.am + +M src/Makefile.am +M tests/Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/segment/Makefile.am +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 3a7d3dc0c8982f89bdb2981ea4f5d56a696627b3 +Author: Peng Wu +Date: 2015-07-07 15:18:40 +0800 + + fixes a typo + +M ChangeLog + +commit 7e6ec25a752c1bb247344eba1999c67804ed504b +Author: Peng Wu +Date: 2015-07-07 13:48:13 +0800 + + update ChangeLog + +M ChangeLog + +commit a6899a116059ef457cab13db4febaea83b6c2a19 +Author: Peng Wu +Date: 2015-06-17 09:56:33 +0800 + + fixes data/Makefile.am + +M data/Makefile.am + +commit 49a8b79d086ae8f863bc82ba475b4f940c259dbc +Author: Peng Wu +Date: 2015-06-17 09:28:56 +0800 + + fixes pinyin_init function + +M src/pinyin.cpp + +commit 0cbdedd32c0c46e2cb8a088b582ec0432def9081 +Author: Peng Wu +Date: 2015-06-16 15:41:30 +0800 + + update Makefile.am + +M data/CMakeLists.txt +M data/Makefile.am + +commit c39c275789bbf065d3c0dcf766054c66fb9b9e9b +Author: Peng Wu +Date: 2015-06-16 14:45:01 +0800 + + fixes crash + +M src/pinyin.cpp + +commit f0f32b8e86014a9173a25c01c333118392eb7004 +Author: Peng Wu +Date: 2015-06-09 10:44:01 +0800 + + fixes a bug + +M src/storage/phrase_index.cpp + +commit 1b21bea5dd6acd635af7d981b2b8a8763e070fdd +Author: Peng Wu +Date: 2015-06-02 16:19:26 +0800 + + fixes a bug + +M src/storage/phrase_index.cpp + +commit 5cdd5675d09a10a515d8cfc5cf39ab825751339e +Author: Peng Wu +Date: 2015-06-02 15:57:27 +0800 + + re-factor code + +M src/storage/table_info.cpp + +commit 3c73a79a04c17b725b4ea272a594afa069394e97 +Author: Peng Wu +Date: 2015-06-01 15:08:24 +0800 + + bump version 1.1.91 + +M configure.ac + +commit dd29cfa06780eded6500fdae401625dbd2f28387 +Author: Peng Wu +Date: 2015-06-01 15:04:50 +0800 + + use model9.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit 619ed8a8d8e2ec2d4c64c6922c4a190033dfe6ee +Author: Peng Wu +Date: 2015-05-28 15:34:24 +0800 + + update pinyin_token_get_phrase function + +M src/pinyin.cpp + +commit 76db8f184c3ed7e09195e4168bc3453e4d38b148 +Author: Peng Wu +Date: 2015-05-28 15:26:26 +0800 + + fixes compile + +M src/pinyin.cpp + +commit 98f764e4acba396297a4776bb1d6293c5e3e5e9c +Author: Peng Wu +Date: 2015-05-28 15:23:41 +0800 + + update API + +M src/include/novel_types.h +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h +M src/storage/table_info.h + +commit 632da8adf04564a0ce928e8db3035f4fea79e734 +Author: Peng Wu +Date: 2015-05-28 14:47:32 +0800 + + update pinyin.cpp + +M src/pinyin.cpp + +commit 90fe6a15c295811daa2c840bff5ec19b070cd561 +Author: Peng Wu +Date: 2015-05-28 14:18:21 +0800 + + update pinyin_choose_candidate function + +M src/pinyin.cpp + +commit cde9cb6b85773069e706ae374396d4b9d2085298 +Author: Peng Wu +Date: 2015-05-28 13:46:07 +0800 + + update pinyin_guess_full_pinyin_candidates function + +M src/pinyin.cpp + +commit 4e829b1653e347bc171904c0f2c1e487403e3985 +Author: Peng Wu +Date: 2015-05-28 13:19:20 +0800 + + update pinyin_guess_candidates function + +M src/pinyin.cpp +M src/pinyin.h +M src/storage/table_info.cpp + +commit 59fe2160a265ebecce051645bba78b1fe3ddf8eb +Author: Peng Wu +Date: 2015-05-27 17:35:25 +0800 + + rename macros + +M src/pinyin.cpp +M src/pinyin_internal.h +M utils/storage/gen_binary_files.cpp + +commit 64b5d653dfc2fb9125c6f407f784fd73c46bb045 +Author: Peng Wu +Date: 2015-05-27 17:30:48 +0800 + + fixes compile + +M src/pinyin.cpp + +commit 1f30ff7ba5b589a1b6f16d9b330f6baa71ac57d8 +Author: Peng Wu +Date: 2015-05-27 17:26:03 +0800 + + update pinyin.cpp + +M src/pinyin.cpp +M src/pinyin.h + +commit 2138e95c8c6a3a702346ea4072de593f2865f215 +Author: Peng Wu +Date: 2015-05-27 16:37:41 +0800 + + add comments + +M src/pinyin.cpp + +commit f82963f28c0d57574e077417d092fba4cbfead06 +Author: Peng Wu +Date: 2015-05-25 15:16:11 +0800 + + fixes a bug + +M src/storage/phrase_index.cpp +M utils/training/gen_unigram.cpp + +commit 6cca2a97d0660e5a51f65389fbfacc0f5cdaaf5d +Author: Peng Wu +Date: 2015-05-22 14:44:07 +0800 + + update gen_unigram + +M utils/training/gen_unigram.cpp + +commit 686b5b3dc16236e0214b942719d2cd9f17e83566 +Author: Peng Wu +Date: 2015-05-22 14:43:48 +0800 + + update pinyin_internal.h + +M src/pinyin_internal.h + +commit 16c86ec97f7e4e812c685e7a52842e72e25f9e91 +Author: Peng Wu +Date: 2015-05-22 14:20:09 +0800 + + update gen_binary_files + +M utils/storage/gen_binary_files.cpp + +commit c8362b0c42886e87a9cfb5893bc9c462bf3a1b83 +Author: Peng Wu +Date: 2015-05-21 16:21:16 +0800 + + update training tools + +M utils/training/estimate_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/import_k_mixture_model.cpp + +commit f855b47d291124256fa4c9b1ea2cef056db4020b +Author: Peng Wu +Date: 2015-05-21 16:14:42 +0800 + + update storage tools + +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp + +commit c68cd44758b6ce03cff661fca83cf2c72aef8991 +Author: Peng Wu +Date: 2015-05-21 15:59:05 +0800 + + update segment tools + +M utils/segment/mergeseq.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit 7a5a8b88cef79e3f5db45a860201d5d5d9841d52 +Author: Peng Wu +Date: 2015-05-21 14:47:06 +0800 + + update test cases + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp +M tests/storage/test_table_info.cpp + +commit c0442398c0bed7f1f4c67bfd338faf3e37904547 +Author: Peng Wu +Date: 2015-05-21 13:17:02 +0800 + + update test_table_info + +M tests/storage/test_table_info.cpp + +commit 2fd097b32236f156aa18e7ee077ef34dc36d2d52 +Author: Peng Wu +Date: 2015-05-21 13:12:49 +0800 + + re-factor table info + +M src/include/novel_types.h +M src/storage/table_info.cpp + +commit fad72be7fbcc4f52bfc1ce28c2caaa32ac5f9188 +Author: Peng Wu +Date: 2015-05-20 17:10:43 +0800 + + update table info + +M src/include/novel_types.h +M src/storage/table_info.cpp + +commit 2f6ca082caa7be4e32d61fff80f9330ef800086f +Author: Peng Wu +Date: 2015-05-20 15:51:54 +0800 + + update test_table_info + +M tests/storage/test_table_info.cpp + +commit d068b1c9e446fb5d391639ff1a78a531e2691bb9 +Author: Peng Wu +Date: 2015-05-20 15:48:19 +0800 + + update SystemTableInfo2::load + +M src/storage/table_info.cpp + +commit 9c174991333d33f61d7beda6dbfb9a83864b5f5c +Author: Peng Wu +Date: 2015-05-20 15:46:39 +0800 + + update tables + +M src/include/novel_types.h + +commit 06842584c86efcf947c8b3eac2b0834f7ed32e39 +Author: Peng Wu +Date: 2015-05-20 15:18:52 +0800 + + remove postfix_tables from table info + +M src/storage/table_info.cpp +M src/storage/table_info.h + +commit dec9d3f7f0aba34dccd8dbecb8a5277bdfa10196 +Author: Peng Wu +Date: 2015-05-20 15:16:18 +0800 + + support default and addon table info + +M src/storage/table_info.cpp +M src/storage/table_info.h + +commit 927c7ea42bd759b05518dbbf2a0f89d263cfe437 +Author: Peng Wu +Date: 2015-05-20 14:46:59 +0800 + + rename SystemTableInfo to SystemTableInfo2 + +M src/storage/table_info.cpp +M src/storage/table_info.h + +commit 42c7299f3bbe2191a44aa17fe17829361aede7eb +Author: Peng Wu +Date: 2015-05-20 14:28:51 +0800 + + add phonetic table type to table info + +M src/include/novel_types.h +M src/storage/table_info.cpp +M src/storage/table_info.h + +commit 8fc2fc4da82250bfe33c81c3575cb4d5fdde10dc +Author: Peng Wu +Date: 2015-04-21 15:04:27 +0800 + + fixes bugs + +M src/storage/flexible_ngram_kyotodb.h +M utils/training/estimate_k_mixture_model.cpp + +commit 107f642630eed151e859583d493ee677b5b063b9 +Author: Peng Wu +Date: 2015-04-21 11:19:00 +0800 + + add copy parameter to Bigram::load + +M src/storage/flexible_ngram_bdb.h +M src/storage/flexible_ngram_kyotodb.h +M src/storage/ngram_bdb.cpp +M src/storage/ngram_bdb.h +M src/storage/ngram_kyotodb.cpp +M src/storage/ngram_kyotodb.h + +commit fb3a0fa827098b9c2f8885e1e55e761deccdac1d +Author: Peng Wu +Date: 2015-04-21 11:13:50 +0800 + + add copy parameter to single gram constructor + +M src/storage/flexible_single_gram.h +M src/storage/ngram.cpp +M src/storage/ngram.h + +commit 66e1956cedc8e0e33a900e843cfea842e4483a6a +Author: Peng Wu +Date: 2015-04-20 16:21:58 +0800 + + update Makefile.am + +M tests/Makefile.am +M tests/lookup/Makefile.am +M utils/segment/Makefile.am +M utils/storage/Makefile.am + +commit 8e47e4c42f969ffd3709079db7a74b01ffd0663d +Author: Peng Wu +Date: 2015-04-20 15:10:16 +0800 + + write flexible_ngram_kyotodb.h + +M src/storage/flexible_ngram_kyotodb.h + +commit 01aed1f2efffa461e24d3bacdf0d499456b81ce6 +Author: Peng Wu +Date: 2015-04-17 14:53:23 +0800 + + fixes typos + +M src/storage/flexible_ngram_bdb.h +M src/storage/ngram_kyotodb.cpp + +commit 87c1f5002150f24a45bf0b33f4fa0b7de44aaa2e +Author: Peng Wu +Date: 2015-04-17 14:52:57 +0800 + + write class FlexibleBigram in progress + +M src/storage/flexible_ngram_kyotodb.h + +commit 3a64180cf94cd36641f485b94fdf2e8831b63e53 +Author: Peng Wu +Date: 2015-04-17 13:59:59 +0800 + + begin to write class FlexibleBigram + +M src/storage/flexible_ngram_kyotodb.h + +commit 4da56126200cbfdca51eafe3dcb5f074599b7b2b +Author: Peng Wu +Date: 2015-04-17 13:43:27 +0800 + + add flexible_ngram_kyotodb.h + +M src/storage/Makefile.am +M src/storage/flexible_ngram.h +A src/storage/flexible_ngram_kyotodb.h + +commit 66c47c64247f64c4add135b4be5297eb39b6a051 +Author: Peng Wu +Date: 2015-04-16 13:56:36 +0800 + + update Makefile.am + +M src/storage/Makefile.am + +commit dcabdc5b28f8cac72ac57f8d70590b79e321c2f5 +Author: Peng Wu +Date: 2015-04-16 13:54:15 +0800 + + add flexible_single_gram.h + +M src/storage/flexible_ngram.h +A src/storage/flexible_single_gram.h + +commit b54e2c1991d62f852f42e7689c6c156e4ca0cf47 +Author: Peng Wu +Date: 2015-04-16 13:45:57 +0800 + + add flexible_ngram_bdb.h + +M src/storage/flexible_ngram.h +A src/storage/flexible_ngram_bdb.h + +commit 999d77bd238b4f2dbadfca682483939a5f39bf69 +Author: Peng Wu +Date: 2015-04-16 13:38:55 +0800 + + update Makefile.am + +M src/storage/Makefile.am +M utils/training/Makefile.am + +commit 92c3f5a62c3a1603ecddcd18381843fe3b403144 +Author: Peng Wu +Date: 2015-04-15 16:16:32 +0800 + + update test_ngram + +M tests/storage/Makefile.am +M tests/storage/test_ngram.cpp + +commit 9f6e89adbe37bd10bb8049cea03d890696e7de3d +Author: Peng Wu +Date: 2015-04-15 16:15:39 +0800 + + write ngram_kyotodb.cpp + +M src/storage/ngram_kyotodb.cpp + +commit f18291a36a316496e63142cc34b01377c6b5a58e +Author: Peng Wu +Date: 2015-04-14 16:45:14 +0800 + + write ngram_kyotodb.cpp in progress + +M src/storage/Makefile.am +M src/storage/ngram.h +M src/storage/ngram_bdb.cpp +M src/storage/ngram_bdb.h +A src/storage/ngram_kyotodb.cpp +M src/storage/ngram_kyotodb.h + +commit e8d9463f45a7214e0eb36cfe09f45cce3b7baeb9 +Author: Peng Wu +Date: 2015-04-14 11:20:04 +0800 + + add ngram_kyotodb.h + +M src/storage/ngram_bdb.h +A src/storage/ngram_kyotodb.h + +commit ebbe25e0cae57e530a11ae12b965a330ff9496f4 +Author: Peng Wu +Date: 2015-04-13 14:02:15 +0800 + + update autoconf + +M configure.ac +M src/lookup/phrase_lookup.cpp +M src/storage/Makefile.am + +commit a1d27fd07ae0dd1001dc6a0a2efd2d6890bcc1ed +Author: Peng Wu +Date: 2015-04-13 13:59:45 +0800 + + add ngram_bdb.h + +M src/storage/ngram.h +A src/storage/ngram_bdb.h + +commit 5ebfb006ccc4a90777c4266623fd5ee05d8d9dd4 +Author: Peng Wu +Date: 2015-04-10 14:08:03 +0800 + + update autoconf to detect Kyoto Cabinet + +M configure.ac +M src/storage/Makefile.am + +commit b77d7fb0df28c02389f873717a7557bb7fba62a1 +Author: Peng Wu +Date: 2015-04-09 16:13:33 +0800 + + continue to re-factor Bigram + +M src/storage/ngram.h +M src/storage/ngram_bdb.cpp + +commit 941d6c364906a932b4f2874177962e50188e38de +Author: Peng Wu +Date: 2015-04-09 16:02:05 +0800 + + re-factor Bigram + +M src/storage/ngram.cpp +A src/storage/ngram_bdb.cpp + +commit 9a6dfc762edd7ce29a9ef3d225dc8bd51bc6fcb9 +Author: Peng Wu +Date: 2015-04-08 16:34:52 +0800 + + use MemoryChunk::mmap + +M src/pinyin.cpp + +commit 8f7571b2c5ac37e2741833e0e56567fac2ccd98f +Author: Peng Wu +Date: 2015-04-08 16:09:32 +0800 + + split load method into load and mmap of MemoryChunk + +M src/include/memory_chunk.h + +commit 41d3fd472f5290103927aae0966fbae40fa379e7 +Author: Peng Wu +Date: 2015-04-08 16:02:54 +0800 + + code style re-factor + +M src/include/memory_chunk.h + +commit 60253149ece14cfa5c6a0e119dc5d5d614791201 +Author: Peng Wu +Date: 2015-03-03 15:24:57 +0800 + + update ChangeLog + +M ChangeLog + +commit 49fa2bdad16b9df638f117acb1f2a7826897d9c7 +Author: Peng Wu +Date: 2015-03-03 15:24:36 +0800 + + bump version 1.1.0 + +M configure.ac + +commit 42121a7a95a703db5af20bf799943bb460f7c281 +Author: Peng Wu +Date: 2015-02-09 15:15:37 +0800 + + fixes pinyin_get_pinyin_key_rest_offset method + +M src/pinyin.cpp + +commit f35e3f29d7f4ab0c175bfe16cc9df2f0df1154e6 +Author: Peng Wu +Date: 2015-02-09 15:08:56 +0800 + + install tools again for fcitx-libpinyin + +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 4d9d74865cc48a6fec59a9813f3be3681bd4fb57 +Author: Peng Wu +Date: 2015-01-28 17:25:40 +0800 + + fixes pinyin_iterator_get_next_phrase method + +M src/pinyin.cpp + +commit e60fddffd519f10f70e49aae5ba431bc9badad33 +Author: Peng Wu +Date: 2015-01-22 15:12:19 +0800 + + add comments + +M src/libpinyin.ver +M src/pinyin.h + +commit 71f0161885f333ee13d81215b201bef9fd28c928 +Author: Peng Wu +Date: 2015-01-22 12:28:12 +0800 + + support to export user phrases + +M src/pinyin.cpp +M src/pinyin.h + +commit 99266561a5c5ec8e43944e807ef795c72fa46170 +Author: Peng Wu +Date: 2014-12-18 11:19:40 +0800 + + write pinyin_get_context and pinyin_get_pinyin_is_incomplete method + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 5cfda4c383a3b02cbbfca39ee5058abee7de3dee +Author: Peng Wu +Date: 2014-09-10 11:25:32 +0800 + + bump so version + +M configure.ac + +commit fb47cda1d61682f5c2c67e9ae325c21498d726d5 +Author: Peng Wu +Date: 2014-09-03 11:11:29 +0800 + + remove docs + +M doc/Makefile.am +D doc/gen_binary_files.1 +D doc/gen_unigram.1 +D doc/import_interpolation.1 + +commit d8ea75b2af390b6d6105f2562b4460b8b1836930 +Author: Peng Wu +Date: 2014-09-03 11:09:44 +0800 + + do not install binary tools + +M doc/libpinyin.1 +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit c2ce3560f701aede519e51f4f70f97a015984efa +Author: Peng Wu +Date: 2014-08-19 14:28:55 +0800 + + bump version 1.0.99 + +M configure.ac + +commit 1108075bafc92feed92d268f425d410de4c8f705 +Author: Peng Wu +Date: 2014-08-19 14:00:18 +0800 + + add pinyin_get_pinyin_key_rest_offset function + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit e0a7f7052c3a7b8fa268c68c5f1f87bfc0b149e4 +Author: Peng Wu +Date: 2014-08-19 13:05:59 +0800 + + use model8.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit eea206e68189e3a09e9c8ab40be2f4358ceacaa4 +Author: Peng Wu +Date: 2014-08-19 13:04:54 +0800 + + move table.conf to model8.tar.gz + +D data/table.conf + +commit 7e1361ce511e98c843e0de83ced4490db23167ef +Author: Peng Wu +Date: 2014-04-24 14:49:52 +0800 + + update configure.ac + +M configure.ac + +commit 6a3fd302f0ca63ce02cda81950987fa0cdbea610 +Author: Peng Wu +Date: 2014-03-13 09:40:48 +0800 + + fixes fscanf + +M src/storage/chewing_large_table.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_large_table2.cpp +M src/storage/table_info.cpp +M utils/storage/gen_pinyin_table.cpp + +commit 740f54eed08e34348b377a33719368a05328e8fa +Author: Peng Wu +Date: 2014-01-20 13:25:14 +0800 + + fixes pinyin_choose_candidate + +M src/pinyin.cpp + +commit d682ca3dd46016f37e362008379fbc25e13f1814 +Author: Peng Wu +Date: 2014-01-16 14:38:35 +0800 + + fixes a typo + +M ChangeLog + +commit 1de9f99b43b7e1d4608e10dd715c05d17d2e528e +Author: Peng Wu +Date: 2014-01-16 14:33:20 +0800 + + update ChangeLog + +M ChangeLog + +commit 810e3780c7eccf45cdff2ac570db487656583d86 +Author: Peng Wu +Date: 2013-11-25 12:43:43 +0800 + + add filter to guess predicted candidates + +M src/pinyin.cpp + +commit 605e8ff9e28f372c43e5f133fe8a540857f819ae +Author: Peng Wu +Date: 2013-11-25 12:24:35 +0800 + + fixes crash + +M src/pinyin.cpp + +commit 8a165c91b93eb47fa7be195c7b78fdba46baaa16 +Author: Peng Wu +Date: 2013-11-20 11:10:25 +0800 + + add asserts + +M src/pinyin.cpp + +commit 94b7fe8792fc790510a5f3c5300ca349bf2bfba6 +Author: Peng Wu +Date: 2013-11-19 12:45:50 +0800 + + add methods to public api + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit e77c6a63e3e0160215da7579bf1d0301b3ce6e12 +Author: Peng Wu +Date: 2013-11-19 12:36:18 +0800 + + write pinyin_choose_predicted_candidate + +M src/pinyin.cpp + +commit 8e4f5fb7bcbdf3a67a4572231d757f0c6eb9ce6e +Author: Peng Wu +Date: 2013-11-19 12:11:51 +0800 + + write pinyin_guess_predicted_candidates + +M src/pinyin.cpp +M src/pinyin.h + +commit 75b9fa26f59f44567fb159bc74dbc3cee5914182 +Author: Peng Wu +Date: 2013-11-19 11:20:28 +0800 + + extract _compute_prefixes + +M src/pinyin.cpp + +commit d5de93dc76480d6016f5e5af0770c77e4105ec4a +Author: Peng Wu +Date: 2013-11-25 13:44:41 +0800 + + bump version 1.0.0 + +M configure.ac + +commit cf2720093fe3fae20d2c8378345d2c1c6d970815 +Author: Peng Wu +Date: 2013-11-01 14:29:20 +0800 + + update scripts + +M scripts/Makefile.data +M scripts/utils.py + +commit c36fa19972ca2971903fa5b19e6653fdf1d344f4 +Author: Peng Wu +Date: 2013-10-29 17:57:30 +0800 + + update cmake + +M data/CMakeLists.txt + +commit 262efe169dc2b7e0503b4f7fe6c500bb2cf32427 +Author: Peng Wu +Date: 2013-10-28 11:19:53 +0800 + + update table.conf + +M data/table.conf + +commit ec079c7366c76daf9e51476007c230e431fd627a +Author: Peng Wu +Date: 2013-10-25 10:43:01 +0800 + + use model7.text.tar.gz + +M data/Makefile.am + +commit 889ac374eff38924b590865a28c71d38144fb2c0 +Author: Peng Wu +Date: 2013-10-21 11:37:54 +0800 + + bump version 0.9.94 + +M configure.ac + +commit ab9126c1a0d62377e5f4fc43d11761ea53faeadf +Author: Peng Wu +Date: 2013-10-21 11:37:08 +0800 + + Revert "bump version 1.0.0" + + This reverts commit 84514d786097de4c33c71814fa431412ff0ad889. + +M configure.ac + +commit 6377b302af8aa66eaead9b8e4d13ad5e3f8faad3 +Author: Peng Wu +Date: 2013-10-14 13:44:25 +0800 + + clean up Makefile.am + +M tests/Makefile.am +M tests/include/Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/segment/Makefile.am +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 8c4416a0b02ee81925ab200be91e6a0a3de016fa +Author: Peng Wu +Date: 2013-10-09 15:20:49 +0800 + + fixes mergeseq.cpp + +M utils/segment/mergeseq.cpp + +commit 5809122820407c47dcccaa0499ff92e64f669499 +Author: Peng Wu +Date: 2013-09-22 16:33:42 +0800 + + fixes warnings + +M src/storage/pinyin_parser2.cpp + +commit c63a61178f3b9ef8728da3070efdc5114313c5b7 +Author: Peng Wu +Date: 2013-09-22 16:22:22 +0800 + + fixes warnings + +M src/storage/chewing_large_table.cpp + +commit 84514d786097de4c33c71814fa431412ff0ad889 +Author: Peng Wu +Date: 2013-09-11 11:11:41 +0800 + + bump version 1.0.0 + +M configure.ac + +commit fc16415abeab89dbcbbdabdceefed89ce34c029d +Author: Peng Wu +Date: 2013-08-23 10:59:16 +0800 + + rename PinyinParser2 to PhoneticParser2 + +M src/storage/pinyin_parser2.h +M tests/storage/test_parser2.cpp + +commit a1f1818238827c8ddddffb4e220944576bafde75 +Author: Peng Wu +Date: 2013-08-09 13:27:32 +0800 + + update cmake + +M data/CMakeLists.txt + +commit 8abc8cfd97cfe63c8e26e0838d4c825283b30630 +Author: Peng Wu +Date: 2013-07-26 12:35:46 +0800 + + Force to use C locale to load table.conf + +M src/storage/table_info.cpp +M tests/storage/test_table_info.cpp + +commit 3a2461b45a39d21cd9a92129327d055b1eed2927 +Author: Peng Wu +Date: 2013-06-18 13:55:19 +0800 + + bump version 0.9.93 + +M configure.ac + +commit 7361130eaed589ac76666bbf46dd9a00b856e0c7 +Author: Peng Wu +Date: 2013-06-18 13:54:08 +0800 + + Revert "bump version 0.10.91" + + This reverts commit 959bfefcb2a7829231b207c34ab76353f4ad41e5. + +M configure.ac + +commit 1ab1848e50da608ac768751f1d253a1c74ba4667 +Author: Peng Wu +Date: 2013-06-18 11:08:48 +0800 + + fixes lookups + +M src/lookup/phrase_lookup.cpp +M src/lookup/pinyin_lookup2.cpp + +commit 17221a12d28de70bf2d0071f2359a4b13668dfc5 +Author: Peng Wu +Date: 2013-06-18 10:53:04 +0800 + + fixes berkeley db calls + +M src/storage/flexible_ngram.h +M src/storage/ngram.cpp + +commit 0af289161d8498a0697132953b01b3ee2a340579 +Author: Peng Wu +Date: 2013-06-17 16:16:11 +0800 + + fixes validate_bigram + +M utils/training/validate_k_mixture_model.cpp + +commit a6879516feb3e906ba1d0ed7847300bcfee7e092 +Author: Peng Wu +Date: 2013-06-17 16:01:46 +0800 + + fixes memory leaks + +M src/storage/phrase_index.cpp +M utils/storage/export_interpolation.cpp +M utils/utils_helper.h + +commit 5049635bc3b6c1e261c57774e79345876644dfa2 +Author: Peng Wu +Date: 2013-06-17 15:46:24 +0800 + + fixes memory leaks + +M tests/tests_helper.h +M utils/utils_helper.h + +commit 77d9412336783469b7cebd37188f644e51f1a5df +Author: Peng Wu +Date: 2013-06-17 15:35:01 +0800 + + fixes table info load + +M src/storage/table_info.cpp + +commit 32071df5b2689e040073ef678bfd6766a26a4efd +Author: Peng Wu +Date: 2013-06-17 15:19:03 +0800 + + add asserts + +M utils/storage/import_interpolation.cpp +M utils/training/import_k_mixture_model.cpp + +commit 46af45028fbb166c3a4be4239b0126db39efd2b4 +Author: Peng Wu +Date: 2013-06-17 14:43:40 +0800 + + check return values + +M tests/storage/test_phrase_index_logger.cpp +M utils/training/prune_k_mixture_model.cpp + +commit 4f082982bcdb340b58454526da681169cee4fd9f +Author: Peng Wu +Date: 2013-06-17 14:29:29 +0800 + + fixes feed_file + +M utils/storage/gen_pinyin_table.cpp + +commit d835872ca31186eb743d23e6ac51e4b86bfb023d +Author: Peng Wu +Date: 2013-06-17 14:25:05 +0800 + + fixes pinyin_save + +M src/pinyin.cpp + +commit fff35792df8d7ae0e65a20b2e507f7fabbd8becb +Author: Peng Wu +Date: 2013-06-17 13:45:56 +0800 + + fixes load_text + +M src/storage/chewing_large_table.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_large_table2.cpp + +commit 959bfefcb2a7829231b207c34ab76353f4ad41e5 +Author: Peng Wu +Date: 2013-06-17 13:27:04 +0800 + + bump version 0.10.91 + +M configure.ac + +commit 8a5c4dad341754e64b62523f04eaf94cbf3a92d6 +Author: Peng Wu +Date: 2013-06-08 10:47:40 +0800 + + bump version 0.9.92 + +M configure.ac + +commit 6b90cea5b074bac66abc8845ba702e13072b6ed5 +Author: Peng Wu +Date: 2013-05-27 11:04:04 +0800 + + fixes pinyin_reset + +M src/pinyin.cpp + +commit aeed1c0e455c3d3c860fb5ae2cc5f20affcf1773 +Author: Peng Wu +Date: 2013-05-16 11:27:23 +0800 + + fixes table.conf again + +M data/table.conf + +commit dca6e2f8d7800bdc480178db3699013dbfe0931f +Author: Peng Wu +Date: 2013-05-16 10:47:51 +0800 + + fixes table.conf + +M data/table.conf +M src/storage/phrase_large_table2.h + +commit 4cebaa9013f68c99c45cd5109891737c68b049d7 +Author: Peng Wu +Date: 2013-04-28 16:31:22 +0800 + + update data/Makefile.am + +M data/Makefile.am + +commit b88df7e4a96f07f581c0004cf2a2c2d20c20d4a3 +Author: Peng Wu +Date: 2013-04-28 13:41:52 +0800 + + improves sed usage + +M data/Makefile.am + +commit 247da08fd69f5289186f83ce36b3fe1c744e593d +Author: Peng Wu +Date: 2013-04-28 12:38:33 +0800 + + use model6 + +M data/Makefile.am +M data/table.conf + +commit e6a8cf0cc8ad55e11e764e29a6997cce8c7397be +Author: Peng Wu +Date: 2013-04-18 15:02:13 +0800 + + fixes mergeseq.cpp + +M utils/segment/mergeseq.cpp + +commit cb827e2511b9557e41acec74a3d6ebcfaed862f8 +Author: Peng Wu +Date: 2013-04-18 11:26:23 +0800 + + add const modifiers for chewing table + +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table.h +M src/storage/facade_chewing_table.h +M src/storage/pinyin_phrase2.h + +commit 0ee1b6a1b63ae2d55684bd982a95a6a9389f12d2 +Author: Peng Wu +Date: 2013-04-18 11:16:14 +0800 + + add const modifiers for phrase table + +M src/storage/facade_phrase_table2.h +M src/storage/phrase_large_table2.cpp +M src/storage/phrase_large_table2.h + +commit bd771b0c51f35c6ab6377719ab654370782ef1c9 +Author: Peng Wu +Date: 2013-04-18 10:23:49 +0800 + + support two letter yunmu from full pinyin + +M scripts/pinyin.py +M src/storage/double_pinyin_table.h +M src/storage/pinyin_parser2.cpp + +commit 29ba511009f6346e0350735d342b81de56336b6b +Author: Peng Wu +Date: 2013-04-17 17:27:46 +0800 + + fixes pinyin_end_add_phrases + +M src/pinyin.cpp + +commit 3b34c96898d159c22eec5c003203f806900dae02 +Author: Peng Wu +Date: 2013-04-17 15:43:37 +0800 + + fixes compile + +M src/lookup/lookup.h +M utils/segment/Makefile.am +M utils/segment/mergeseq.cpp + +commit 2eba4a047a2639150c9448b04dc0af568f9b7538 +Author: Peng Wu +Date: 2013-04-17 15:29:13 +0800 + + write main function + +M utils/segment/mergeseq.cpp + +commit fb15ae7c60ad7806d6eb3aade05d5d02ec435f0e +Author: Peng Wu +Date: 2013-04-17 15:08:57 +0800 + + write feed_line + +M utils/segment/mergeseq.cpp + +commit e13055bcabe4fa7d91c79f9938d55147990d1ec4 +Author: Peng Wu +Date: 2013-04-17 13:58:33 +0800 + + write merge_sequence function + +M src/storage/phrase_large_table2.h +A utils/segment/mergeseq.cpp + +commit 4d1083b728818d89c8547fee6dcfc09a8c67abec +Author: Peng Wu +Date: 2013-04-16 13:41:20 +0800 + + fixes add phrase + +M src/pinyin.cpp + +commit edead27671841073511ba6ba521a8b5a261a9499 +Author: Peng Wu +Date: 2013-04-16 11:39:08 +0800 + + update utils/training + +M utils/training/estimate_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp +M utils/training/import_k_mixture_model.cpp + +commit eacd9bb91f34141ea7564d35d4bea1c1c5f6682d +Author: Peng Wu +Date: 2013-04-16 11:29:51 +0800 + + update utils/segment + +M utils/storage/export_interpolation.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/import_interpolation.cpp + +commit 42a2d6c9b7b2c2b0399f2e3034bf582dd6e91b47 +Author: Peng Wu +Date: 2013-04-16 11:23:19 +0800 + + update utils/segment + +M src/pinyin_internal.h +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit fc4779bafe885a7b43dc82cba3543b8449a8d5ff +Author: Peng Wu +Date: 2013-04-15 13:45:30 +0800 + + update spseg.cpp + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit 196601b5a3b8a2db0c520b03e6cde66904476bb4 +Author: Peng Wu +Date: 2013-04-12 08:58:44 +0800 + + remove LAMBDA_PARAMETER + +M data/Makefile.am +M src/include/novel_types.h +M src/pinyin.cpp + +commit d4a39f57c7d2dc715340e0c6cfd73f577ce5a7fa +Author: Peng Wu +Date: 2013-04-11 11:21:17 +0800 + + add lambda parameter + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +M utils/segment/ngseg.cpp +M utils/training/eval_correction_rate.cpp + +commit 9ca38247ddc9dfaa5f5d193a3727c4edbd18a799 +Author: Peng Wu +Date: 2013-04-11 11:11:26 +0800 + + update src/pinyin.cpp + +M src/pinyin.cpp + +commit 669090ae1dfca2fa3ac1cbd1612648891b53353f +Author: Peng Wu +Date: 2013-04-11 11:04:25 +0800 + + update PinyinLookup2 + +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit b72087c4ed9a3d36f6136b74ab848138a0974043 +Author: Peng Wu +Date: 2013-04-11 10:57:47 +0800 + + update PhraseLookup + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h + +commit 4f9911da462c0734af9e25a49bb20cdcfea8d4fb +Author: Peng Wu +Date: 2013-04-10 15:58:02 +0800 + + update table_info.cpp + +M src/storage/table_info.cpp + +commit 66d1f8c42f6cc8715402eeffe113f3ba4a65dcb9 +Author: Peng Wu +Date: 2013-04-10 15:55:39 +0800 + + update test_table_info.cpp + +M tests/storage/test_table_info.cpp + +commit 274f51f5af2555c4aa2b95f5c45e1468be572f18 +Author: Peng Wu +Date: 2013-04-10 15:45:05 +0800 + + fixes make distcheck + +M data/Makefile.am +M utils/storage/import_interpolation.cpp +M utils/training/gen_unigram.cpp + +commit 5cebe47fae1d07adc1d099c2fdbc1b06a4d526ce +Author: Peng Wu +Date: 2013-04-10 15:30:40 +0800 + + fixes gen_binary_files.cpp + +M utils/storage/gen_binary_files.cpp + +commit 34e763f4523ea05ea09340edbf3870f82888f5a9 +Author: Peng Wu +Date: 2013-04-10 15:08:52 +0800 + + update src/pinyin.cpp + +M src/pinyin.cpp + +commit a762acbcb5c16fe8bbcbc67ff05d0882ae9faa56 +Author: Peng Wu +Date: 2013-04-10 14:47:15 +0800 + + update gen_unigram.cpp + +M utils/training/gen_unigram.cpp + +commit 9ce3b3437d4e7164475aaf8efd00935f82ee3801 +Author: Peng Wu +Date: 2013-04-10 14:45:08 +0800 + + update gen_binary_files.cpp + +M utils/storage/gen_binary_files.cpp + +commit 8f1b6d0c5574f1367fb4e154d7972ef40e05dcdd +Author: Peng Wu +Date: 2013-04-10 14:41:15 +0800 + + update utils/training + +M utils/training/estimate_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/import_k_mixture_model.cpp + +commit 8045de6d4af0594344f8e9116368b02048a06eb5 +Author: Peng Wu +Date: 2013-04-10 14:34:02 +0800 + + update gen_ngram.cpp + +M utils/training/gen_ngram.cpp + +commit 865b5c981d6574e21efa58944182ceb67287eced +Author: Peng Wu +Date: 2013-04-10 14:27:12 +0800 + + update utils/storage + +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp + +commit 429090fb1a486f0d71fe7cf8a16b4e4d26161202 +Author: Peng Wu +Date: 2013-04-10 14:20:19 +0800 + + update utils/segment + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit d425f10801bc7d593c9464f25c9f84525972caeb +Author: Peng Wu +Date: 2013-04-10 14:11:22 +0800 + + update utils_helper.h + +M utils/utils_helper.h + +commit b94e131e6fadf4b83916251e187e30d4433ca1bf +Author: Peng Wu +Date: 2013-04-10 14:02:03 +0800 + + clean up test_memory_chunk.cpp + +M tests/include/test_memory_chunk.cpp + +commit 8888185c907779dc9aa20b0b2e7bd19af6d11d2c +Author: Peng Wu +Date: 2013-04-10 13:55:57 +0800 + + update tests/storage + +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp + +commit 2c7f91dd2546ccba87714391c1281ee8973de4ac +Author: Peng Wu +Date: 2013-04-10 13:49:41 +0800 + + update tests/lookup + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit 4e9b37108c4efc092f03b64a06a43ef95f437541 +Author: Peng Wu +Date: 2013-04-10 13:40:33 +0800 + + update tests_helper.h + +M tests/storage/test_table_info.cpp +M tests/tests_helper.h + +commit d972cff706c35d4bde2627083cf255ffa018db0a +Author: Peng Wu +Date: 2013-04-08 15:10:27 +0800 + + write test cases for table info + +M data/Makefile.am +M src/storage/table_info.cpp +M tests/storage/Makefile.am +A tests/storage/test_table_info.cpp + +commit 8ea45f079b7817f0421d4b8400cd957f68d42716 +Author: Peng Wu +Date: 2013-04-08 13:16:23 +0800 + + define filenames + +M src/pinyin.cpp +M src/pinyin_internal.h + +commit 367d15b8ef051caadad6ea2aa3827c34c28c2d56 +Author: Peng Wu +Date: 2013-04-08 12:57:52 +0800 + + update pinyin.cpp + +M data/Makefile.am +M src/pinyin.cpp +M src/pinyin.h +M src/pinyin_internal.h + +commit 2b6bbbf8d0f60ed83aec91db3cc0c6796c079d29 +Author: Peng Wu +Date: 2013-04-08 11:52:24 +0800 + + fixes compile + +M src/include/novel_types.h +M src/storage/Makefile.am +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M src/storage/table_info.cpp +M src/storage/table_info.h + +commit 415ccb56e84167f11bead9a1ca27be2e5216ba10 +Author: Peng Wu +Date: 2013-04-07 16:46:42 +0800 + + write table info + +M src/storage/table_info.cpp +M src/storage/table_info.h + +commit c7e3226b3090e7a54c16bcf0fe0b8f23f6cc2122 +Author: Peng Wu +Date: 2013-04-07 16:25:06 +0800 + + write table info in progress + +M src/storage/phrase_index.h +M src/storage/table_info.cpp +M src/storage/table_info.h + +commit 92df059d779e886d02b8a77d00fea8af297578cb +Author: Peng Wu +Date: 2013-04-07 14:06:19 +0800 + + write table.conf + +A data/table.conf + +commit 5211449d390c94bf225b028610d30047d51778d7 +Author: Peng Wu +Date: 2013-04-07 10:49:15 +0800 + + update table info + +M src/include/novel_types.h +M src/storage/table_info.h + +commit b65e269375526365bd5efbd0595647af51fc6ac3 +Author: Peng Wu +Date: 2013-04-03 11:03:37 +0800 + + write table info in progress + +M src/include/novel_types.h +A src/storage/table_info.cpp + +commit 0bb16eb3c5b383a5797a9c9afdf5c0843688755e +Author: Peng Wu +Date: 2013-04-03 10:57:46 +0800 + + begin to write table info + +A src/storage/table_info.h + +commit a8abe097d3f725518d787de409caa0013834fa75 +Author: Peng Wu +Date: 2013-04-02 14:44:26 +0800 + + update validate_k_mixture_model.cpp + +M utils/training/validate_k_mixture_model.cpp + +commit 45a393c549bf35c78b16061dbe50d7b041b02ac8 +Author: Peng Wu +Date: 2013-04-02 14:25:46 +0800 + + update prune_k_mixture_model.cpp + +M utils/training/prune_k_mixture_model.cpp + +commit 2dd91b537248f256e44cd6d6ebc7487fba73afe8 +Author: Peng Wu +Date: 2013-04-02 14:11:09 +0800 + + bring back some print_help methods + +M tests/lookup/test_phrase_lookup.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp +M utils/storage/gen_pinyin_table.cpp +M utils/training/gen_k_mixture_model.cpp + +commit db89cdf49dc5609ae42f9d6d83f0f1a929d258e0 +Author: Peng Wu +Date: 2013-04-02 12:47:57 +0800 + + update merge_k_mixture_model.cpp + +M utils/training/merge_k_mixture_model.cpp + +commit 9e910111bfb85e34284413a9e377497ee18fa5a2 +Author: Peng Wu +Date: 2013-04-02 12:39:28 +0800 + + update import_k_mixture_model.cpp + +M utils/training/import_k_mixture_model.cpp + +commit 64bb2122c263cd2680c839a3841fd3604e9373e2 +Author: Peng Wu +Date: 2013-04-02 12:22:56 +0800 + + update gen_ngram.cpp + +M utils/training/gen_ngram.cpp + +commit 989ccc528342d535c4f368e613e40efa3a2cae0b +Author: Peng Wu +Date: 2013-04-02 12:14:07 +0800 + + update gen_k_mixture_model.cpp + +M utils/training/gen_k_mixture_model.cpp + +commit 2035e97980062188b51e2e2b3631ce4cd1febda1 +Author: Peng Wu +Date: 2013-04-02 11:23:09 +0800 + + update gen_deleted_ngram.cpp + +M utils/training/gen_deleted_ngram.cpp + +commit 1c0feee3a9a7580d8452df7c5196fdba3a79a6f9 +Author: Peng Wu +Date: 2013-04-02 11:04:36 +0800 + + update test_phrase_lookup.cpp + +M tests/lookup/test_phrase_lookup.cpp + +commit b16eec3edfae292ac1c34bc7696e61ae8cd934d6 +Author: Peng Wu +Date: 2013-04-02 11:00:39 +0800 + + update export_k_mixture_model.cpp + +M utils/training/export_k_mixture_model.cpp + +commit 22b0c5bb461e4fb2bb0a9672b803fe803b7e50b2 +Author: Peng Wu +Date: 2013-04-02 10:46:16 +0800 + + update estimate_k_mixture_model.cpp + +M utils/training/estimate_k_mixture_model.cpp + +commit dd31367bdfdc250a628a71592e05846302766ddd +Author: Peng Wu +Date: 2013-04-01 17:49:41 +0800 + + polish code + +M tests/storage/test_parser2.cpp +M utils/storage/gen_pinyin_table.cpp + +commit 7327a0e4c3ac1b022ea6896ac890312912eea562 +Author: Peng Wu +Date: 2013-04-01 16:03:44 +0800 + + rename gen_chewing_table.cpp to gen_pinyin_table.cpp + +M utils/storage/Makefile.am +R100 utils/storage/gen_chewing_table.cpp utils/storage/gen_pinyin_table.cpp + +commit 9c909518c63db7f4a09982b48a167e30f0498042 +Author: Peng Wu +Date: 2013-04-01 16:00:44 +0800 + + update gen_chewing_table.cpp + +M utils/storage/gen_chewing_table.cpp + +commit 1d7a1b5e2efa0e559ba600d5452aa0444ddf56cb +Author: Peng Wu +Date: 2013-04-01 15:36:27 +0800 + + update gen_binary_files.cpp + +M tests/storage/test_parser2.cpp +M utils/storage/gen_binary_files.cpp + +commit c72df519d81a6735798f07d459a8fcace5ff7838 +Author: Peng Wu +Date: 2013-04-01 13:59:09 +0800 + + update ngseg.cpp + +M utils/segment/ngseg.cpp + +commit 796012ff32e0b39539ddd5d328403147d71a47ff +Author: Peng Wu +Date: 2013-04-01 13:53:23 +0800 + + update spseg.cpp + +M tests/storage/test_parser2.cpp +M utils/segment/spseg.cpp + +commit bd294b8971242bfa3602dbba85faca1643792366 +Author: Peng Wu +Date: 2013-04-01 12:36:57 +0800 + + update test_parser2.cpp + +M tests/storage/test_parser2.cpp + +commit bddc08bf7a8887fb26c563ef8abd0ba3a7a11e06 +Author: Peng Wu +Date: 2013-04-01 11:03:18 +0800 + + fixes test_memory_chunk.cpp + +M tests/include/test_memory_chunk.cpp + +commit 5c520717118df51ed6977e556fa846495419af24 +Author: Peng Wu +Date: 2013-03-28 12:21:41 +0800 + + write add_pronunciation + +M src/pinyin.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M tests/storage/test_phrase_index.cpp + +commit 6e7f0c8dd8b6c0f6efdc1d91a5ffdd1a85de6522 +Author: Peng Wu +Date: 2013-03-27 13:43:54 +0800 + + add comments + +M src/pinyin.h + +commit 373affdcdcef75ef2d10c427221e0c17fa8a3b7f +Author: Peng Wu +Date: 2013-03-26 10:22:55 +0800 + + add checks for add phrase function + +M src/pinyin.cpp + +commit 57ef745db0a4eb89b5194d110e5c66231ed40ddb +Author: Peng Wu +Date: 2013-03-25 12:02:49 +0800 + + improves pinyin_get_pinyin_strings + +M src/pinyin.cpp + +commit 48decbf44e5985a6200f5f800f92ec868372cc46 +Author: Peng Wu +Date: 2013-03-23 16:49:43 +0800 + + restore gen_unigram.cpp + +M utils/training/gen_unigram.cpp + +commit ffc216e482fea1063fa451ccbff41d755486aceb +Author: Peng Wu +Date: 2013-03-23 09:52:46 +0800 + + fixes import dict + +M src/storage/phrase_large_table2.h + +commit 03dd49a058f514adbf1b2ec733048dfb3c90e957 +Author: Peng Wu +Date: 2013-03-22 14:44:28 +0800 + + rename functions + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 5a74c91af79108d08427c6ff2cb46e0742f064de +Author: Peng Wu +Date: 2013-03-22 14:40:04 +0800 + + fixes include headers + +M src/storage/Makefile.am + +commit aa1e6359c4a3bb43f21bee6730c18f892d5977e7 +Author: Peng Wu +Date: 2013-03-22 11:18:35 +0800 + + fixes compile + +M src/pinyin.h +M tests/test_chewing.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp + +commit 2cc2dadc6bf0149f1a0ed386880e3fb4262e3b67 +Author: Peng Wu +Date: 2013-03-22 11:06:55 +0800 + + use G_BEGIN/END_DECLS + +M src/include/novel_types.h +M src/pinyin.h +M src/storage/chewing_key.h +M src/storage/pinyin_custom2.h +M tests/test_pinyin.cpp + +commit 60d7294cce9c5f57e3497765783b9fa65e7ff9c0 +Author: Peng Wu +Date: 2013-03-21 17:02:22 +0800 + + update test_phrase.cpp + +M tests/test_phrase.cpp + +commit 4348b63eeec5662fedfc39be6fc78b62e2e26467 +Author: Peng Wu +Date: 2013-03-21 16:57:30 +0800 + + write phrases methods + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 9c35f8e85d93356abfa91c08543fff97658ff463 +Author: Peng Wu +Date: 2013-03-21 16:42:35 +0800 + + update test_pinyin.cpp + +M tests/test_pinyin.cpp + +commit 2647e1ce64147061b9f2982c407cb3764be3c503 +Author: Peng Wu +Date: 2013-03-21 16:33:00 +0800 + + update libpinyin.ver + +M src/libpinyin.ver + +commit 5956a44f8a2b1d890b318a9517d23de895428586 +Author: Peng Wu +Date: 2013-03-21 16:27:01 +0800 + + write methods + +M src/pinyin.cpp +M src/pinyin.h + +commit 33fbca959cd63cf5de0c36695d9ec03dd8d7095a +Author: Peng Wu +Date: 2013-03-21 16:16:59 +0800 + + write get pinyin key and rest methods + +M src/pinyin.cpp +M src/pinyin.h + +commit 9a0fa3e39b7efb2e965243cf81a1ed86f6cb12b6 +Author: Peng Wu +Date: 2013-03-21 15:39:45 +0800 + + write candidates methods + +M src/pinyin.cpp +M src/pinyin.h + +commit ffe1467bae65ee5dbf863070f3765559a8bb8a12 +Author: Peng Wu +Date: 2013-03-21 13:57:59 +0800 + + fixes pinyin_parse_* + +M src/pinyin.cpp +M src/pinyin.h + +commit ca48b787e947d10dcc09a6986a23dbdd959a97bd +Author: Peng Wu +Date: 2013-03-21 11:13:09 +0800 + + clean again + +M src/pinyin.h + +commit 993bcbca62bee26aa3c23bc8edfd6dbe8eb66ad4 +Author: Peng Wu +Date: 2013-03-21 10:54:18 +0800 + + clean up pinyin.h + +M src/pinyin.cpp +M src/pinyin.h + +commit d172a790803df6f655e0594ab958544eba6dadad +Author: Peng Wu +Date: 2013-03-21 10:42:44 +0800 + + remove pinyin_free_candidates + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit b6f1d7593f57a5e1417def161490373f4603f02e +Author: Peng Wu +Date: 2013-03-21 10:24:12 +0800 + + update candidates methods + +M src/pinyin.cpp + +commit 76714898e47664cc1e47967a2e13e8e890583f17 +Author: Peng Wu +Date: 2013-03-21 10:15:22 +0800 + + rename candidates methods + +M src/libpinyin.ver +M src/pinyin.h + +commit 6f79ec094ff8d9e2c3c79737ad74ded27824934a +Author: Peng Wu +Date: 2013-03-21 10:10:11 +0800 + + add m_candidates + +M src/pinyin.cpp + +commit 581f0fd06f62791d5c2e31b4a8c7b1f07a82d313 +Author: Peng Wu +Date: 2013-03-21 09:55:59 +0800 + + hide defines + +M src/pinyin.cpp +M src/pinyin.h + +commit 1ac46fc96bbdbd1c15d3fd5b3057ae606999d933 +Author: Peng Wu +Date: 2013-03-21 09:49:21 +0800 + + re-factor ChewingKey* + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp + +commit 04593227a1cd13020a00217e1dca1ded287cb8ed +Author: Peng Wu +Date: 2013-03-20 17:29:07 +0800 + + bump soname + +M configure.ac + +commit de4fffe7565b81068356b0a7bf5bc47ea851b2c1 +Author: Peng Wu +Date: 2013-03-20 16:30:16 +0800 + + fixes novel_types.h + +M src/include/novel_types.h +M src/lookup/lookup.h +M utils/training/prune_k_mixture_model.cpp + +commit 714a4bd3d87abf8c377052c3edf6fd39f19f9aa0 +Author: Peng Wu +Date: 2013-03-18 14:53:40 +0800 + + bump version 0.9.91 + +M configure.ac + +commit 65a7d9aa703484212766d712409340100c4a35eb +Author: Peng Wu +Date: 2013-03-14 13:46:59 +0800 + + bump version 0.8.93 + +M configure.ac + +commit 62b0a79c8a3e4da8895258761ed99611ba321b62 +Author: Peng Wu +Date: 2013-03-14 13:41:31 +0800 + + re-factor pinyin_custom2.h + +M src/storage/chewing_key.h +M src/storage/pinyin_custom2.h + +commit 7cdbdbeea60b77c717f1ce7db45541c83d2ec01e +Author: Peng Wu +Date: 2013-03-13 11:44:21 +0800 + + add back pinyin_clear_constraint + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 22df46aee568d025e8fb5680bc3c4dc6bfa84829 +Author: Peng Wu +Date: 2013-03-12 13:44:35 +0800 + + fixes pinyin.h + +M src/pinyin.cpp +M src/pinyin.h +M tests/test_pinyin.cpp + +commit d6cd064a253f33263eea56c11d9f1c6b3c6f550d +Author: Peng Wu +Date: 2013-03-07 14:20:40 +0800 + + use model5.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit c69f94ba6473577997f57000f505868b70f0dc0d +Author: Peng Wu +Date: 2013-03-07 14:19:19 +0800 + + update lambda + +M data/Makefile.am +M src/include/novel_types.h + +commit 7fb284f657a5608f4dcf52afef53d9e66b5ead61 +Author: Peng Wu +Date: 2013-03-06 18:17:55 +0800 + + bump version 0.8.92 + +M configure.ac +M src/pinyin.h + +commit 1c59b5ed1a5660ea5da74bb8f44652b9f07479e9 +Author: Peng Wu +Date: 2013-03-04 12:16:05 +0800 + + use model4.text.tar.gz + +M data/CMakeLists.txt +M data/Makefile.am + +commit 5db769c9b4dd8eeccc3ec39aea6e615b3fa57f31 +Author: Peng Wu +Date: 2013-03-04 11:11:02 +0800 + + update lambda + +M data/Makefile.am +M src/include/novel_types.h + +commit b7c510534852e86e1bc7e86af652d5a3899a5682 +Author: Peng Wu +Date: 2013-03-04 11:07:43 +0800 + + fixes pinyin_iterator_add_phrase + +M src/pinyin.cpp + +commit ed506c6bdd7de47bc8bc091e39177a9852749d93 +Author: Peng Wu +Date: 2013-03-01 18:38:23 +0800 + + update binary file format version + + as gb_char.table and gbk_char.table has been updated. + +M src/pinyin.h + +commit 51afb0c5c08461abecec3ccce722f31b354ae0dd +Author: Peng Wu +Date: 2013-03-01 17:25:46 +0800 + + fixes cmake url + +M data/CMakeLists.txt + +commit 6642663ac3055dc3084f6a2de72e04692a31b782 +Author: Peng Wu +Date: 2013-03-01 17:03:46 +0800 + + fixes download url + +M data/Makefile.am +M libpinyin.spec.in + +commit 66eb528bfb26747e622e3b78dba606bff2b529ca +Author: Peng Wu +Date: 2013-02-28 12:32:46 +0800 + + fixes check_format + +M src/pinyin.cpp +M src/pinyin.h + +commit 13491ff484f8fb34b7c06efd41a97cf87c65bd3d +Author: Peng Wu +Date: 2013-02-27 11:43:31 +0800 + + update lambda parameter + +M data/Makefile.am +M src/include/novel_types.h + +commit 70b71f0ac41e98674e9c35b5ff770b8ed4128d4e +Author: Peng Wu +Date: 2013-02-27 10:45:01 +0800 + + update factor + +M src/lookup/pinyin_lookup2.cpp +M src/pinyin.cpp +M utils/training/gen_unigram.cpp + +commit 4d596ce01a4041d01e090211b850544a379b2abe +Author: Peng Wu +Date: 2013-02-25 13:55:43 +0800 + + update comments + +M src/pinyin.cpp + +commit 819d3edf26adb53cf2507af4868e75feac21a166 +Author: Peng Wu +Date: 2013-02-22 11:17:58 +0800 + + fixes gen_unigram.cpp + +M utils/training/gen_unigram.cpp + +commit 6f509d855cf5f19971130e97651be01b37ad0532 +Author: Peng Wu +Date: 2013-02-21 18:16:12 +0800 + + re-factor tables + +M scripts/chewing_table.h.in +M scripts/pinyin_parser_table.h.in +M src/storage/chewing_table.h +M src/storage/pinyin_parser_table.h + +commit 932126ad426803596f17a7ad320c8ded1ea8b2d7 +Author: Peng Wu +Date: 2013-02-21 13:14:55 +0800 + + write pinyin_get_pinyin_strings + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 6d73c79f073d241d57375a2c1078f4dc580d3bd9 +Author: Peng Wu +Date: 2013-02-21 11:25:52 +0800 + + update parser table + +M src/storage/pinyin_parser_table.h + +commit d963dc50f1d00f9d70bbe4ed51ad65329da22542 +Author: Peng Wu +Date: 2013-02-21 11:23:21 +0800 + + add get_shengmu/yunmu_string + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp + +commit 7dfc18b954da70f977c8b272503dd34df042419b +Author: Peng Wu +Date: 2013-02-21 11:10:46 +0800 + + add shengmu and yunmu to content_table + +M scripts/genpinyintable.py +M src/storage/pinyin_parser2.h + +commit 8280f39b9e4c765d50029c034d07f775900d1657 +Author: Peng Wu +Date: 2013-02-19 15:44:36 +0800 + + improves automake + +M data/Makefile.am +M utils/training/gen_unigram.cpp + +commit 46e6218e04b40b3fece89f752c8ac6334e5782d1 +Author: Peng Wu +Date: 2013-02-19 15:27:46 +0800 + + add save_dictionary + +M utils/storage/gen_binary_files.cpp +M utils/training/gen_unigram.cpp +M utils/utils_helper.h + +commit c446681d0c6e546b2cc1d3863ebea57757b12a21 +Author: Peng Wu +Date: 2013-02-19 14:29:28 +0800 + + update automake + +M data/Makefile.am + +commit 239835a2b3a08fa0c1d8d78981e2eb188909648b +Author: Peng Wu +Date: 2013-02-19 13:49:08 +0800 + + add assert + +M utils/storage/gen_binary_files.cpp +M utils/training/gen_unigram.cpp + +commit bbc4626d79a44be615665b1aabf274579a48b281 +Author: Peng Wu +Date: 2013-02-19 13:39:01 +0800 + + add m_dict_index + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 46b35845078da414b5cd1b51b5bd77334efaf110 +Author: Peng Wu +Date: 2013-02-19 13:27:38 +0800 + + add dictionary support + +M src/pinyin.cpp +M utils/storage/gen_binary_files.cpp +M utils/training/gen_unigram.cpp + +commit 779342214609c7d1935d109cadb412371037dc73 +Author: Peng Wu +Date: 2013-02-19 13:07:08 +0800 + + add new tables + +M src/storage/phrase_index.cpp + +commit b33991511be60368eb0ab38de70165606f4e5b14 +Author: Peng Wu +Date: 2013-02-19 12:54:35 +0800 + + add enum PHRASE_INDEX_LIBRARIES + +M src/include/novel_types.h +M src/storage/phrase_index.h + +commit 36ef85182a682e35a1a7ba7d79292c69fa184b38 +Author: Peng Wu +Date: 2013-02-18 14:36:13 +0800 + + fixes crash + +M src/storage/phrase_index.cpp + +commit a8421c0fb6a25e4af628d43841cbb8b7cca81997 +Author: Peng Wu +Date: 2013-02-17 17:28:43 +0800 + + Fixes issue reported by fundawang: + https://github.com/libpinyin/libpinyin/issues/33 + + merge libpinyin-0.8.0-link.patch. + +M configure.ac +M src/Makefile.am +M src/lookup/Makefile.am +M src/storage/Makefile.am +M tests/Makefile.am +M tests/include/Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/segment/Makefile.am +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 8c8eabf8451c91635edf4cf48b20bc59210037ef +Author: Peng Wu +Date: 2013-02-16 11:40:23 +0800 + + move data files to libdir + +M data/Makefile.am +M libpinyin.pc.in +M libpinyin.spec.in + +commit d30adf07184360c5c0ba9cb50bd9e021285de477 +Author: Peng Wu +Date: 2013-02-05 11:41:37 +0800 + + fixes typo + +M src/include/memory_chunk.h +M src/storage/chewing_large_table.h + +commit e70fa35d198a802c58ffc30968c21729d88c4f25 +Author: Peng Wu +Date: 2013-02-04 18:11:41 +0800 + + re-factor load/save + +M src/include/memory_chunk.h + +commit b0e127fb24247f038ec643803c93a09831667920 +Author: Peng Wu +Date: 2013-02-04 17:39:18 +0800 + + add mmap support + +M configure.ac +M src/include/memory_chunk.h + +commit dbd8fa467a1034c89d3c2ca9ab06228eae3b9cb9 +Author: Peng Wu +Date: 2013-02-04 14:01:40 +0800 + + add back ng + +M scripts/pinyin.py +M src/storage/pinyin_parser_table.h + +commit d4f3216453a75c932533e43f551dd87f810d0f24 +Author: Peng Wu +Date: 2013-02-01 14:08:57 +0800 + + fixes gen_extra_enter + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit 29c41a30a61e73c12b6494bfd1e2f4d6ccd455a4 +Author: Peng Wu +Date: 2013-02-01 12:38:27 +0800 + + update ngseg + +M utils/segment/ngseg.cpp + +commit 7a297e2a8d4c6201ba7a1687ddade69343096084 +Author: Peng Wu +Date: 2013-02-01 12:27:46 +0800 + + update spseg + +M utils/segment/spseg.cpp + +commit 589ef49ab8b7b7b917ca613bf202cf3cb52d5831 +Author: Peng Wu +Date: 2013-01-30 10:52:12 +0800 + + update download url + +M data/Makefile.am + +commit 6e42ca426e6411bb7d6b5e09b35ea578cf8ca124 +Author: Peng Wu +Date: 2013-01-25 12:16:19 +0800 + + fixes incomplete pinyin + +M src/storage/pinyin_phrase2.h + +commit 3bcd9383c18468c4a34feae7ce2cf48578f93d61 +Author: Peng Wu +Date: 2013-01-14 15:15:22 +0800 + + remove genpinyins.awk + +D scripts/genpinyins.awk + +commit e39223215f96debb725fd9a85f8e2df7d5ff03d7 +Author: Peng Wu +Date: 2013-01-14 15:15:05 +0800 + + code re-factor + +M scripts/Makefile.data +M scripts/specialtable.py + +commit 500c7a720fc5cbce34da5bb1eddcf2b50b20e76d +Author: Peng Wu +Date: 2013-01-14 15:09:18 +0800 + + write genpinyins.py + +A scripts/genpinyins.py + +commit 22113a32f7bef9010d12110ccb1e36b547c95ef0 +Author: Peng Wu +Date: 2013-01-14 13:55:00 +0800 + + code re-factor + +M scripts/specialtable.py + +commit 39e70310d49747ec1ec0890ccdfbf1a77c232338 +Author: Peng Wu +Date: 2012-12-31 10:54:30 +0800 + + clean up configure.ac + +M configure.ac + +commit 8e8ac5bc72c24f356cd64f798ab0f0e26cf40d53 +Author: Peng Wu +Date: 2012-12-18 11:20:25 +0800 + + fixes autogen.sh + +M autogen.sh + +commit 55d9118222721f73cc1d19566427c3f7705303dc +Author: Peng Wu +Date: 2012-12-11 14:15:49 +0800 + + a safe guard for chewing + +M src/storage/phrase_index.h + +commit 20fde3f877ec9448671c2a97ab035b3d844433c0 +Author: Peng Wu +Date: 2012-12-05 11:35:17 +0800 + + fixes pinyin_translate_token + +M src/pinyin.cpp +M tests/test_phrase.cpp + +commit a981d9a0704b84b04b90dcedfcf96c20c9ed4bb8 +Author: Peng Wu +Date: 2012-12-05 11:07:53 +0800 + + remove pinyin_get_pinyins_from_token + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit a772331638cce1d581da85fd3300fb00ba1acd2a +Author: Peng Wu +Date: 2012-12-05 11:05:05 +0800 + + remove pinyin_translate_token + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 2e0f37b400572b6ed9938229802efd47902f7985 +Author: Peng Wu +Date: 2012-12-05 11:01:27 +0800 + + remove pinyin_clear_constraint* + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit b79f409d67678275488bf803467dd48b00518309 +Author: Peng Wu +Date: 2012-12-04 13:01:01 +0800 + + add comments + +M src/pinyin.h + +commit fdefa16aae400be58033fa0be6daa0b9beeb0492 +Author: Peng Wu +Date: 2012-12-04 11:05:33 +0800 + + write pinyin_token_* + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 01b200662b3706c071658103c1cc73ea307d685f +Author: Peng Wu +Date: 2012-12-04 10:10:02 +0800 + + add comments + +M src/pinyin.h + +commit 3d1f1928a5d3317e90767a094466f3b2a0604254 +Author: Peng Wu +Date: 2012-12-04 10:04:09 +0800 + + write pinyin_get_chewing/pinyin_string + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 9cb03603a51252708a0f43992ce9d40e38e88a55 +Author: Peng Wu +Date: 2012-12-03 12:47:51 +0800 + + add test cases for pinyin_mask_out + +M tests/test_chewing.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp + +commit 226554dc4ca7c8271152136a640fe8dd4410dcd3 +Author: Peng Wu +Date: 2012-11-29 14:36:31 +0800 + + add mask out test cases to ngram + +M tests/storage/test_ngram.cpp + +commit 41f09223513a444f899b0c2def7325d2259d5300 +Author: Peng Wu +Date: 2012-11-29 14:35:08 +0800 + + add mask out test cases to chewing/pharse table + +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_table.cpp + +commit a94db825a915c1c02ee581495c1e97c6f573074f +Author: Peng Wu +Date: 2012-11-28 10:50:35 +0800 + + fixes a typo + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit c6aac3d5d953a2e68daca7e2abf8f9bd58145e74 +Author: Peng Wu +Date: 2012-11-28 10:24:10 +0800 + + add const modifiers + +M src/storage/phrase_large_table2.h + +commit 00a2fea0ee7695ee5fac6f06811d89a90a7d718c +Author: Peng Wu +Date: 2012-11-26 12:26:32 +0800 + + indent phrase_index.cpp + +M src/storage/phrase_index.cpp + +commit 9e1f6ed345381ae2005ead362dd24507ac9a1af8 +Author: Peng Wu +Date: 2012-11-19 11:35:34 +0800 + + add license + +M tests/storage/test_flexible_ngram.cpp + +commit d25206aa335a7b6735e704423877bdc64083548b +Author: Peng Wu +Date: 2012-11-15 11:44:37 +0800 + + fixes constraints array + +M src/pinyin.cpp +M tests/lookup/test_pinyin_lookup.cpp +M utils/training/eval_correction_rate.cpp + +commit b102f5a4314f05352b997892647d721daad89b09 +Author: Peng Wu +Date: 2012-11-14 16:10:32 +0800 + + fixes poke the next constraint + +M src/lookup/pinyin_lookup2.cpp + +commit 1c3139f0910b3d382247698f8831439c3314f4dc +Author: Peng Wu +Date: 2012-11-14 15:31:11 +0800 + + fixes one step constraint in get_best_match + +M src/lookup/pinyin_lookup2.cpp + +commit e007f82e9b6bd208f4a32da82f52fef7965361a3 +Author: Peng Wu +Date: 2012-11-12 14:36:40 +0800 + + mark format version as 0.8.0 + +M src/pinyin.h + +commit 8eb7cbb6224f7d1d6dcc17e6a3f9f8aec304a3c8 +Author: Peng Wu +Date: 2012-11-12 14:06:06 +0800 + + write pinyin_mask_out + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 0555fdd296f422c202098d42486c83f4a576dd93 +Author: Peng Wu +Date: 2012-11-12 13:27:12 +0800 + + write mask out for facade tables + +M src/include/novel_types.h +M src/storage/facade_chewing_table.h +M src/storage/facade_phrase_table2.h + +commit 5ac93b27a0b3fe0c23de226ba255643cfe93d40e +Author: Peng Wu +Date: 2012-11-08 12:14:49 +0800 + + write mask out for chewing large table + +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table.h + +commit 269525df8c441ca1f6b3df3991b819ed8775139e +Author: Peng Wu +Date: 2012-11-07 13:51:36 +0800 + + write mask out for phrase large table2 + +M src/storage/phrase_large_table2.cpp +M src/storage/phrase_large_table2.h + +commit b4b9e9b1371a8aa16bbab99dfdb84608ead6507a +Author: Peng Wu +Date: 2012-11-07 13:05:48 +0800 + + fixes pinyin_load_phrase_library + +M src/pinyin.cpp + +commit 49e3546a9fd5a655411af1840ed422bf0d67101d +Author: Peng Wu +Date: 2012-11-06 11:42:15 +0800 + + write remove index + +M src/storage/chewing_large_table.cpp +M src/storage/phrase_large_table2.cpp + +commit 92f204109d210d3670986fee625d9d708fb53a2d +Author: Peng Wu +Date: 2012-11-06 11:12:19 +0800 + + re-factor remove index in progress + +M src/storage/chewing_large_table.cpp +M src/storage/phrase_large_table2.cpp + +commit ed47add4965f5a22f697e1ec795be9e03065b18a +Author: Peng Wu +Date: 2012-11-05 13:55:34 +0800 + + write get length + +M src/storage/chewing_large_table.cpp +M src/storage/phrase_large_table2.cpp + +commit 52d001b0833ad3578873751bcb80010853add60f +Author: Peng Wu +Date: 2012-11-05 13:41:01 +0800 + + write get length in progress + +M src/storage/phrase_large_table2.cpp + +commit 96bddf9da58eb418dfea8ed9aff539f33c558b69 +Author: Peng Wu +Date: 2012-10-31 13:23:28 +0800 + + add comments + +M src/storage/ngram.h + +commit c315a6e31dcbd42d8151e250bed01edcf00932a4 +Author: Peng Wu +Date: 2012-10-30 17:33:08 +0800 + + write Bigram::mask_out + +M src/storage/ngram.cpp +M src/storage/ngram.h + +commit ef7b4c730872bb0312e7cdf0d10965881931dcd0 +Author: Peng Wu +Date: 2012-10-30 16:18:21 +0800 + + write SingleGram::mask_out + +M src/storage/ngram.cpp +M src/storage/ngram.h + +commit 39434b7b560399eba0050024bec19aefc772b457 +Author: Peng Wu +Date: 2012-10-26 14:49:11 +0800 + + write mask out method + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit bdb3f3ae7ecfba97abcf0553b4325fe97725c3ed +Author: Peng Wu +Date: 2012-10-26 14:15:23 +0800 + + write FacadePhraseIndex::merge_with_mask + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 2a765c8a8171b8283b2cee5c9fd80bb0eeca50b9 +Author: Peng Wu +Date: 2012-10-26 12:06:43 +0800 + + re-factor phrase index + +M src/storage/phrase_index.cpp + +commit fb62ce874969fe4111f3592f55e2c0dcbf2e6d9c +Author: Peng Wu +Date: 2012-10-25 15:09:40 +0800 + + write mask_out_phrase_index_logger + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 15d4a0e6298eca0def77b9d80d94ce6c4beccc95 +Author: Peng Wu +Date: 2012-10-22 16:31:42 +0800 + + move back get_first_token + +M src/storage/phrase_large_table2.h +M utils/segment/spseg.cpp + +commit bf3f5d029bb0432fbae882b8d0465d7a9b01f896 +Author: Peng Wu +Date: 2012-10-22 12:16:37 +0800 + + fixes utils helper + +M utils/utils_helper.h + +commit 15a7ffc524b2220c1d1b1ae06db153207abe7bdf +Author: Peng Wu +Date: 2012-10-22 11:31:17 +0800 + + rename evals.text to evals2.text + +M utils/training/eval_correction_rate.cpp + +commit 84e5341d4b9898e51220d6fbaa7b31f8268dd884 +Author: Peng Wu +Date: 2012-10-22 10:36:03 +0800 + + update cmake + +M data/CMakeLists.txt + +commit 2d42f29d97bcab3707365fdaa6df6920b2430ccb +Author: Peng Wu +Date: 2012-10-20 16:26:02 +0800 + + move get_first_token to spseg + +M src/storage/phrase_large_table2.h +M utils/segment/spseg.cpp + +commit 60265e9a6bcc58bcaec8dc07611f2c30371c2165 +Author: Peng Wu +Date: 2012-10-19 16:11:47 +0800 + + refine reduce_tokens + +M src/storage/phrase_large_table2.h + +commit ea6a9973cc5f14709a84f390789b7b2bec47c1c2 +Author: Peng Wu +Date: 2012-10-19 15:44:41 +0800 + + update pinyin_iterator_add_phrase + +M src/pinyin.cpp + +commit 1256e3c800f7d9136bcaf33627971b27e598bb83 +Author: Peng Wu +Date: 2012-10-19 15:16:10 +0800 + + update pinyin_guess_sentence_with_prefix + +M src/pinyin.cpp +M src/storage/phrase_large_table2.h + +commit 1a663eac6e9dcd16375690d9ab54f51bf02c83b7 +Author: Peng Wu +Date: 2012-10-19 15:04:30 +0800 + + rename pinyin_lookup_token to pinyin_lookup_tokens + +M configure.ac +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 595692374597ac71f0f39ea2444ea9d80c2a6184 +Author: Peng Wu +Date: 2012-10-19 15:00:17 +0800 + + write reduce_tokens + +M src/storage/phrase_large_table2.h + +commit aee9198d0a266429436dfbde4660baeb47429c4b +Author: Peng Wu +Date: 2012-10-19 13:44:33 +0800 + + fixes utils helper + +M utils/segment/spseg.cpp +M utils/utils_helper.h + +commit 3d9959ed830c4ae5bc7b4f7a525f25f34fc67313 +Author: Peng Wu +Date: 2012-10-19 12:24:06 +0800 + + clean up code + +M utils/training/eval_correction_rate.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/import_k_mixture_model.cpp + +commit 484cf316c1257bf138815614c1576d4fcbbeac6c +Author: Peng Wu +Date: 2012-10-19 12:18:04 +0800 + + update utils helper + +M utils/utils_helper.h + +commit f7bfa0e630aaf59c40cfa2fbed64a986b18505df +Author: Peng Wu +Date: 2012-10-19 12:17:03 +0800 + + update eval correction rate + +M utils/training/eval_correction_rate.cpp + +commit 2dad7c6847f49db991f092fa814f1d0660ba1d25 +Author: Peng Wu +Date: 2012-10-19 12:01:01 +0800 + + update gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit 04e303a068c11e4ac9629fb7a2f1ccde4209e3ef +Author: Peng Wu +Date: 2012-10-19 11:53:35 +0800 + + update gen deleted ngram + +M utils/training/gen_deleted_ngram.cpp + +commit f1e74f78a7569f5fa566ddae861624026db86563 +Author: Peng Wu +Date: 2012-10-19 11:50:19 +0800 + + update gen ngram + +M utils/training/gen_ngram.cpp + +commit fe5b03bb049d1eda7b447a433060203bb239bba6 +Author: Peng Wu +Date: 2012-10-19 11:49:14 +0800 + + clean up gen unigram + +M utils/training/gen_unigram.cpp + +commit 3b59361dcae0845af36c0cb2fbdd561fad528abe +Author: Peng Wu +Date: 2012-10-19 11:11:45 +0800 + + update data/Makefile.am + +M data/Makefile.am + +commit e16062739449853c9b40c60b807d97fdfc8156bb +Author: Peng Wu +Date: 2012-10-18 17:57:39 +0800 + + update ngseg + +M src/lookup/lookup.cpp +M src/lookup/lookup.h +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup2.h +M src/pinyin.cpp +M tests/lookup/test_phrase_lookup.cpp +M utils/segment/ngseg.cpp + +commit a949650e53700d1215bfe91b3f3172bb59fd2901 +Author: Peng Wu +Date: 2012-10-18 16:53:28 +0800 + + update tag utility + +M src/storage/tag_utility.cpp +M src/storage/tag_utility.h + +commit 67eb7b0d41e907d24bc6d1ad973290d61cd90c0a +Author: Peng Wu +Date: 2012-10-18 16:50:24 +0800 + + update utils helper + +M utils/utils_helper.h + +commit 7803cff4f0c464cf75d26a2056507e71cfed9934 +Author: Peng Wu +Date: 2012-10-18 16:42:52 +0800 + + update k mixture model to interpolation + +M utils/training/k_mixture_model_to_interpolation.cpp + +commit dc377a8d9124b0ac4baf412b9a0a96e61037f245 +Author: Peng Wu +Date: 2012-10-18 16:31:38 +0800 + + update import k mixture model + +M utils/training/import_k_mixture_model.cpp + +commit a12c6f102f13737b9a255f5bcf69e755694bb606 +Author: Peng Wu +Date: 2012-10-18 16:30:30 +0800 + + update import interpolation + +M utils/storage/import_interpolation.cpp + +commit 6f20354f6fe1772d150144c108760ba57e983ea4 +Author: Peng Wu +Date: 2012-10-18 13:27:18 +0800 + + update tag utility + +M src/storage/tag_utility.cpp +M src/storage/tag_utility.h + +commit 1f46032ac851f086a5e31f4f5b11ccf896844a74 +Author: Peng Wu +Date: 2012-10-18 13:10:29 +0800 + + update export k mixture model + +M utils/training/export_k_mixture_model.cpp + +commit 1fd4e8d8b2698f929ef7c744b1965f8e8dffef0a +Author: Peng Wu +Date: 2012-10-18 12:59:04 +0800 + + update export interpolation + +M utils/storage/export_interpolation.cpp + +commit 95df8197d506cbc07cef378f67e9be795e4c3110 +Author: Peng Wu +Date: 2012-10-17 14:31:28 +0800 + + bump version 0.8.91 + +M configure.ac +M src/pinyin.h + +commit 87c33763e8647c6daf6bf9488729d85699062033 +Author: Peng Wu +Date: 2012-10-15 10:20:22 +0800 + + bump version 0.7.92 + +M configure.ac +M src/pinyin.h + +commit e1046d79dc7b32c31d3dcc59216a3b0e6c3c7474 +Author: Peng Wu +Date: 2012-10-11 17:30:07 +0800 + + fixes memory leak in test pinyin + +M tests/test_pinyin.cpp + +commit e3a847651431bb9f1edd01a2606ff37d2286c055 +Author: Peng Wu +Date: 2012-10-11 17:29:42 +0800 + + fixes memory leak in pinyin.cpp + +M src/pinyin.cpp + +commit 5ed3e7452572dd9580c5c514e71a3494978e73b0 +Author: Peng Wu +Date: 2012-10-11 13:49:26 +0800 + + fixes memory leak in test pinyin lookup + +M tests/lookup/test_pinyin_lookup.cpp + +commit d23d9fca34dae6aea0cb6e8640ccf3f2cbc81256 +Author: Peng Wu +Date: 2012-10-11 13:47:31 +0800 + + fixes memory leak in facade chewing table + +M src/storage/facade_chewing_table.h + +commit ae3def02deedae9ec711397f8a0698949fd16080 +Author: Peng Wu +Date: 2012-10-11 13:36:24 +0800 + + fixes memory leak in facade phrase table2 + +M src/storage/facade_phrase_table2.h + +commit 995a9df0af809ee2b21b60b32ae424cf57f378e2 +Author: Peng Wu +Date: 2012-10-10 18:07:21 +0800 + + fixes memory leak in test chewing table + +M tests/storage/test_chewing_table.cpp + +commit 6c5a8a7b733263afc60c1bfd885802907e37070d +Author: Peng Wu +Date: 2012-10-10 18:06:51 +0800 + + fixes memory leak in chewing large table + +M src/storage/chewing_large_table.cpp + +commit 6a5a4a3f6eb0d951c8f0813ec806e40ace097775 +Author: Peng Wu +Date: 2012-10-10 17:02:52 +0800 + + fixes memory leak in phrase large table2 + +M src/storage/phrase_large_table2.cpp + +commit aced528d37c803442cd1f39e51e36e96c59d94f6 +Author: Peng Wu +Date: 2012-10-10 13:55:07 +0800 + + re-factor phrase lookup + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h + +commit 1f6d0a9f5155f1e95d1717625fe0a5b4a679aac2 +Author: Peng Wu +Date: 2012-10-09 14:16:47 +0800 + + fixes test_parser2 again + +M tests/storage/test_parser2.cpp + +commit 4f431b35d0241d57ce4edb48e78dd46eb82703e4 +Author: Peng Wu +Date: 2012-10-09 13:58:49 +0800 + + fixes memory leak in test_parser2 + +M tests/storage/test_parser2.cpp + +commit cf9791cfcce72347ac97c8766501fbaf1f8920b5 +Author: Peng Wu +Date: 2012-10-09 13:33:38 +0800 + + fixes memory leak in test_ngram + +M tests/storage/test_ngram.cpp + +commit 7a14c960194f3b417d06fb85267591fad0fb1b87 +Author: Peng Wu +Date: 2012-10-09 13:22:08 +0800 + + fixes memory leak in test_memory_chunk + +M tests/include/test_memory_chunk.cpp + +commit b999e8758ccdc340eeb8204b3cf2a9cdacccfc31 +Author: Peng Wu +Date: 2012-10-08 13:51:37 +0800 + + detect corrupted phrase index log file + +M src/storage/phrase_index.cpp +M src/storage/phrase_index_logger.h + +commit 4e024b971a013799ddd201011aca30a94870a46e +Author: Peng Wu +Date: 2012-10-08 12:41:56 +0800 + + improves test_pinyin output + +M tests/test_pinyin.cpp + +commit 0569a1bf2d894f1b72312ba860b58490fbdc4f8d +Merge: 7d8160e 84588c0 +Author: Peng Wu +Date: 2012-10-08 11:22:08 +0800 + + Merge remote-tracking branch 'libpinyin/master' + +commit 84588c04060bfc76edaede0a1ab6773073875e24 +Merge: 7012134 a2d0d2c +Author: Peng Wu +Date: 2012-10-07 20:15:02 -0700 + + Merge pull request #28 from maxiaojun/master + + Fix CMakeLists.txt + +commit a2d0d2c2100413f6a0ecc6ba36b2fe14b77a2d7e +Author: Xiaojun Ma +Date: 2012-10-05 22:53:13 -0500 + + Fix CMakeLists.txt + +M src/lookup/CMakeLists.txt +M src/storage/CMakeLists.txt + +commit 7d8160eb97be7375a7586fa2ffdcc08cb0ffa4d1 +Author: Peng Wu +Date: 2012-09-29 15:19:53 +0800 + + minor fixes again + +M src/pinyin.cpp + +commit 7332b902fcd943e2302056cd4d7fc12ec559aa60 +Author: Peng Wu +Date: 2012-09-29 14:45:25 +0800 + + minor fixes + +M src/lookup/pinyin_lookup2.cpp +M src/pinyin.cpp + +commit b449a30c6e3a9138c0d6fd32b9b6545e4fc79cac +Author: Peng Wu +Date: 2012-09-19 10:47:16 +0800 + + minor fix + +M src/lookup/pinyin_lookup2.cpp + +commit 7012134ed81f050c4f45f043a346818c76bf0fc7 +Author: Peng Wu +Date: 2012-09-17 13:10:18 +0800 + + bump version 0.7.91 + +M configure.ac +M src/pinyin.h + +commit 1545e641693a0ebc13c0da84f339fce2953479e5 +Author: Peng Wu +Date: 2012-09-13 10:44:37 +0800 + + fixes code + +M src/lookup/phrase_lookup.cpp + +commit 99d9f0afb3610b3e1e87926fce7853c82d09b87c +Author: Peng Wu +Date: 2012-09-12 09:56:29 +0800 + + re-factor phrase_lookup.cpp + +M src/lookup/phrase_lookup.cpp + +commit 1fcd7552ccc6116f141b631e77d236bb52126d11 +Author: Peng Wu +Date: 2012-09-12 09:52:35 +0800 + + re-factor pinyin_lookup2.cpp + +M src/lookup/pinyin_lookup2.cpp + +commit a23434cf655de95b7f8ee94c1cb44cd9a1ea3739 +Author: Peng Wu +Date: 2012-09-12 09:13:41 +0800 + + update final_step + +M src/lookup/phrase_lookup.cpp + +commit a3a09c574f3102b507e0534423cb9f67874bd0bb +Author: Peng Wu +Date: 2012-09-11 19:07:03 +0800 + + improves get_best_match + +M src/lookup/pinyin_lookup2.cpp + +commit 8da979f50ee5e34149fa632d909f81788cb7fe30 +Author: Peng Wu +Date: 2012-09-11 16:03:42 +0800 + + improves autoconf + +M configure.ac + +commit 4477ff8cb78805d3c86ee612338f18ba7728e07e +Author: Peng Wu +Date: 2012-09-11 15:55:26 +0800 + + remove pinyin_lookup.* + +D src/lookup/pinyin_lookup.cpp +D src/lookup/pinyin_lookup.h + +commit e37e1cd96935184bace71c8b2b4d4f57db56ef85 +Author: Peng Wu +Date: 2012-09-11 15:52:35 +0800 + + remove winner_tree.* + +D src/lookup/winner_tree.cpp +D src/lookup/winner_tree.h + +commit 55e7bee084bb025a73d6fd7aedf0a65a01ca6d07 +Author: Peng Wu +Date: 2012-09-11 15:33:57 +0800 + + turn off dump functions + +M src/lookup/pinyin_lookup2.cpp + +commit 9f1c534806b7391c0c9b96277a75708b1b07c04c +Author: Peng Wu +Date: 2012-09-11 14:58:55 +0800 + + use pinyin lookup2 + +M src/lookup/Makefile.am +M src/pinyin.cpp +M src/pinyin_internal.h +M tests/lookup/test_pinyin_lookup.cpp +M utils/training/eval_correction_rate.cpp + +commit 621f971e2574322e21aada3a08af1fb25129af0d +Author: Peng Wu +Date: 2012-09-11 14:42:25 +0800 + + fixes a typo + +M src/lookup/pinyin_lookup.cpp + +commit 7656210612f3de6934b72011807a8042535caa10 +Author: Peng Wu +Date: 2012-09-11 14:41:37 +0800 + + write pinyin_lookup2.* + +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit c6aaa8f66fb0267fadb6b72ef91b0143b7676c16 +Author: Peng Wu +Date: 2012-09-11 14:11:04 +0800 + + write get_best_match + +M src/lookup/pinyin_lookup2.cpp + +commit 8ebdaf1f72ad559c9c1fab72ca22e978697e64c9 +Author: Peng Wu +Date: 2012-09-10 16:11:42 +0800 + + fixes get_best_match + +M src/lookup/pinyin_lookup2.cpp + +commit eb63539270fab81678da97c292d247796bd5a367 +Author: Peng Wu +Date: 2012-09-10 15:48:26 +0800 + + write search_unigram2 and search_bigram2 + +M src/lookup/pinyin_lookup2.cpp +M src/lookup/pinyin_lookup2.h + +commit 7230dbfe956c6a3fc5c060f2859867f825039d25 +Author: Peng Wu +Date: 2012-09-10 13:44:44 +0800 + + write get_best_match + +M src/lookup/pinyin_lookup2.cpp + +commit a99fe32edd9a7d3e0600d1d13396ae84128688f7 +Author: Peng Wu +Date: 2012-09-10 13:08:51 +0800 + + begin to write pinyin lookup2 + +M src/lookup/pinyin_lookup2.cpp + +commit 9e8ed7cd7847f010da05f7f4d2a2c4f498693265 +Author: Peng Wu +Date: 2012-09-10 12:56:34 +0800 + + write aux functions for pinyin lookup2 + +M src/lookup/pinyin_lookup2.cpp + +commit dc3793a21d63b2d919a3a2642dbaf4a5984550c7 +Author: Peng Wu +Date: 2012-09-08 11:39:07 +0800 + + add dump methods + +M src/lookup/pinyin_lookup2.cpp + +commit ebe2e4da4b641915a33aeb574fd35ee1a155ff4f +Author: Peng Wu +Date: 2012-09-07 15:55:59 +0800 + + fixes compile + +M src/include/stl_lite.h +M src/lookup/Makefile.am + +commit c899d022e0e922c8c40ffd33d144d8ba63bbeeb0 +Author: Peng Wu +Date: 2012-09-07 15:37:44 +0800 + + begin to write pinyin_lookup2.cpp + +A src/lookup/pinyin_lookup2.cpp + +commit ee9436f88eab4fcee2ade36bf847812ea241e689 +Author: Peng Wu +Date: 2012-09-07 14:15:19 +0800 + + write pinyin_lookup2.h + +A src/lookup/pinyin_lookup2.h + +commit d3421240981c52ab7130bb131432b508eb0820df +Author: Peng Wu +Date: 2012-09-06 16:42:38 +0800 + + remove duplicated defines + +M utils/storage/import_interpolation.cpp +M utils/training/import_k_mixture_model.cpp +M utils/training/k_mixture_model_to_interpolation.cpp +M utils/utils_helper.h + +commit aa44636f3a8b9b5630d8785029617bbc81dca7b8 +Author: Peng Wu +Date: 2012-09-06 16:31:24 +0800 + + refactor k_mixture_model_to_interpolation.cpp + +M utils/training/k_mixture_model_to_interpolation.cpp + +commit 3ed43e3b45da85037b1d70fd5129b8cba5c5e184 +Author: Peng Wu +Date: 2012-09-06 13:57:14 +0800 + + fixes export_k_mixture_model.cpp + +M utils/training/export_k_mixture_model.cpp + +commit 732e8b4010613953e5af74ea6062af24b770f572 +Author: Peng Wu +Date: 2012-09-06 13:46:56 +0800 + + write TAGLIB_GET_TAGVALUE + +M utils/storage/import_interpolation.cpp +M utils/training/import_k_mixture_model.cpp + +commit bb3218247dfddf2c90f0a353059908dfb6890119 +Author: Peng Wu +Date: 2012-09-06 13:16:50 +0800 + + write TAGLIB_GET_VALUE + +M utils/storage/import_interpolation.cpp +M utils/training/import_k_mixture_model.cpp + +commit 8a0214e80f7034751d79135fa6d438bc1fe2a6a0 +Author: Peng Wu +Date: 2012-09-05 11:10:21 +0800 + + update import_k_mixture_model.cpp + +M utils/training/import_k_mixture_model.cpp + +commit e81ae4dadcd0d04b5c379d27094f4af2e7dda241 +Author: Peng Wu +Date: 2012-09-05 11:00:24 +0800 + + update import_interpolation.cpp + +M utils/storage/import_interpolation.cpp + +commit cf6be20927aa3dbe29bba4b18075be30c1eafcf4 +Author: Peng Wu +Date: 2012-09-04 21:22:44 +0800 + + fixes ngseg.cpp + +M utils/segment/ngseg.cpp + +commit cddb246f9d1cb0da41acc782d95548e4ca55e7a5 +Author: Peng Wu +Date: 2012-09-04 13:41:34 +0800 + + remove phrase_large_table.* + +D src/storage/phrase_large_table.cpp +D src/storage/phrase_large_table.h + +commit 57f546f6562c1815fe84816c8ed7a2179f5a9b39 +Author: Peng Wu +Date: 2012-09-04 13:41:03 +0800 + + update test cases + +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_table.cpp + +commit f917d5add0b3d67b2577b094614ab563bad73679 +Author: Peng Wu +Date: 2012-09-04 12:55:13 +0800 + + add clear_tokens call + +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp + +commit 9569248cb69d52a57cbb227c9312953545cea35a +Author: Peng Wu +Date: 2012-09-04 12:32:15 +0800 + + enhance test_phrase_table.cpp + +M tests/storage/test_phrase_table.cpp + +commit e5cd53d3416a500480db25c2363eabf6877ec67a +Author: Peng Wu +Date: 2012-09-04 11:17:04 +0800 + + refactor code + +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_table.cpp + +commit 8a490408bfc367325c32c7d0ad9491de2c96c46d +Author: Peng Wu +Date: 2012-09-04 10:48:22 +0800 + + remove facade_phrase_table.h + +D src/storage/facade_phrase_table.h + +commit 44396d5f6e5fb6901fd482d2e217d7f5cf097a7f +Author: Peng Wu +Date: 2012-09-04 10:47:18 +0800 + + add clear_ranges/clear_tokens back + +M src/storage/phrase_index.h + +commit 473bfc9ba3ffe72940570a7c6a1878a77ff45434 +Author: Peng Wu +Date: 2012-09-04 10:32:01 +0800 + + add assert to get_first_token + +M src/storage/phrase_large_table2.h + +commit d304f969dd1031cd837625dc21ad48602230956c +Author: Peng Wu +Date: 2012-09-03 18:05:03 +0800 + + fixes phrase_index.h + +M src/storage/phrase_index.h + +commit 81bbe53619915914ef99842f0657ed15f9c5fce7 +Author: Peng Wu +Date: 2012-09-03 17:44:29 +0800 + + update Makefile.am + +M src/storage/Makefile.am + +commit 116a784d59af74b3a3305a1e6f82a23c9c5d5828 +Author: Peng Wu +Date: 2012-09-03 17:37:18 +0800 + + update gen_ngram.cpp + +M utils/training/gen_ngram.cpp + +commit f3f161f020bc847055486ad84bc103ecf21e4f49 +Author: Peng Wu +Date: 2012-09-03 17:25:53 +0800 + + update eval_correction_rate.cpp + +M utils/training/eval_correction_rate.cpp + +commit aeadca38bc3187b99f106656f2f48481851368ff +Author: Peng Wu +Date: 2012-09-03 17:21:33 +0800 + + update gen_k_mixture_model.cpp + +M utils/training/gen_k_mixture_model.cpp + +commit 3c430d73871ad46a9994316d579202945e323a26 +Author: Peng Wu +Date: 2012-09-03 17:08:05 +0800 + + update import_k_mixture_model.cpp + +M utils/training/import_k_mixture_model.cpp + +commit 3a0be6c617ee70d6b2195882d105221a365f5193 +Author: Peng Wu +Date: 2012-09-03 16:54:15 +0800 + + update gen_ngram.cpp + +M utils/training/gen_ngram.cpp + +commit 5e42e9600b54b6db72df2f87196d4a7a6ba37fd0 +Author: Peng Wu +Date: 2012-09-03 16:45:07 +0800 + + update gen_deleted_ngram.cpp + +M src/storage/tag_utility.h +M utils/training/gen_deleted_ngram.cpp + +commit 424cc567dd0e84662b28baa17dd4879f95c0d507 +Author: Peng Wu +Date: 2012-09-03 16:33:25 +0800 + + fixes test_phrase_table.cpp + +M src/storage/facade_phrase_table2.h +M tests/storage/test_phrase_table.cpp + +commit c0f98a953be642a17d97caef95b92ee479353c94 +Author: Peng Wu +Date: 2012-09-03 16:27:03 +0800 + + polish gen_binary_files.cpp + +M utils/storage/gen_binary_files.cpp + +commit dd053f6ea1dafd6cec9d9d5a011bba5ef8d50dfc +Author: Peng Wu +Date: 2012-09-03 16:24:26 +0800 + + update utils/storage + +M utils/storage/gen_binary_files.cpp +M utils/storage/import_interpolation.cpp + +commit 1289df5e2ebfd7a9b6a5aa0b4f1739c48527ce19 +Author: Peng Wu +Date: 2012-09-03 16:14:09 +0800 + + update tag utility + +M src/storage/tag_utility.cpp +M src/storage/tag_utility.h + +commit b1bc974e89adc1ab13ea148686c7e2c2faf64e7a +Author: Peng Wu +Date: 2012-09-03 10:54:48 +0800 + + update segment to use phrase table ver2 + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit 13b537cd88a92bd6540ecdaa8f993a409d32776a +Author: Peng Wu +Date: 2012-09-03 10:40:10 +0800 + + update tests to use phrase table ver2 + +M Makefile.am +M tests/lookup/test_phrase_lookup.cpp +M tests/storage/test_phrase_table.cpp +M tests/tests_helper.h + +commit 1b76ad0ade6a2b2b658dddf4be331dc7988ffc50 +Author: Peng Wu +Date: 2012-09-03 10:26:50 +0800 + + update pinyin.cpp to use phrase table ver2 + +M src/pinyin.cpp +M src/pinyin_internal.h + +commit 4c940b80d41da810972ed7ebb7f6e7f5272df8a9 +Author: Peng Wu +Date: 2012-09-03 10:09:29 +0800 + + update PhraseLookup + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h + +commit 5ee955b80e969b650a92e679f4923c1c8bec769d +Author: Peng Wu +Date: 2012-09-03 10:08:03 +0800 + + fixes facade_phrase_table2.h + +M src/storage/facade_phrase_table2.h + +commit 930426a28be0774339950c508d5bb324961d0710 +Author: Peng Wu +Date: 2012-09-03 09:53:19 +0800 + + write get_first_token + +M src/storage/phrase_large_table2.h + +commit 4f3e1e5075b998b08dcec7d11d85ffb098ca9dcb +Author: Peng Wu +Date: 2012-09-01 11:50:31 +0800 + + write prepare/destroy tokens + +M src/storage/phrase_index.h + +commit ccd4c3fca513db530e0be91e4830df6e6c0555f4 +Author: Peng Wu +Date: 2012-09-01 11:27:18 +0800 + + refactor stl_lite.h + +M src/include/stl_lite.h + +commit 948b116c561584bf99aa332b714866640de929b0 +Author: Peng Wu +Date: 2012-08-31 17:56:12 +0800 + + fixes PinyinLookup::search_unigram + +M src/lookup/pinyin_lookup.cpp + +commit ea1c8d88ee73d012bb128122d4dc012921df49b6 +Author: Peng Wu +Date: 2012-08-31 15:00:06 +0800 + + drop FacadePhraseIndex::clear_ranges method + +M src/storage/phrase_index.h +M tests/storage/test_chewing_table.cpp + +commit 9ee32e665929ad81bd6688272868510eb5716d7c +Author: Peng Wu +Date: 2012-08-31 10:59:32 +0800 + + fixes a typo + +M src/storage/facade_phrase_table2.h + +commit 0b43ea6b03298d3dfa96720a1c4511812c544186 +Author: Peng Wu +Date: 2012-08-30 16:33:24 +0800 + + write facade_phrase_table2.h + +M src/storage/Makefile.am +M src/storage/facade_chewing_table.h +M src/storage/facade_phrase_table.h +A src/storage/facade_phrase_table2.h + +commit 9563ee6f1077b5f062505d5083263ea49ee9d15f +Author: Peng Wu +Date: 2012-08-29 13:42:08 +0800 + + polish code + +M src/storage/chewing_large_table.cpp + +commit c2f853e5c3d13c01bd64497b2104a1f8f8f46bb8 +Author: Peng Wu +Date: 2012-08-29 13:31:22 +0800 + + write load/store method + +M src/storage/phrase_large_table2.cpp + +commit e67363a8b68771a5f4314a507d6a78c27267a6f7 +Author: Peng Wu +Date: 2012-08-28 14:52:51 +0800 + + update comments + +M src/storage/chewing_large_table.cpp +M src/storage/phrase_large_table2.cpp + +commit 531c5ae2198e3a42f8c29d4498e0bf57eccf6602 +Author: Peng Wu +Date: 2012-08-28 14:50:26 +0800 + + write load_text method + +M src/storage/phrase_large_table2.cpp + +commit 8f9fbb002ed7cbf5ce055d0735c0929f6f7bbb7e +Author: Peng Wu +Date: 2012-08-28 14:43:23 +0800 + + write add/remove index method + +M src/storage/phrase_large_table2.cpp + +commit e3a573f93dd9f42a6456deb13cc1d6fd76f9f943 +Author: Peng Wu +Date: 2012-08-28 14:19:21 +0800 + + rename phrase_compare and phrase_less_than + +M src/storage/phrase_large_table2.cpp + +commit 7903b30fc6fdba5fc3ae9e0779e68179b5d12c21 +Author: Peng Wu +Date: 2012-08-28 11:13:53 +0800 + + write add/remove index method in progress + +M src/storage/phrase_large_table2.cpp + +commit c467718af4e0ba7bfcf162f690fb49a1b4d2621b +Author: Peng Wu +Date: 2012-08-28 10:56:12 +0800 + + begin to write add/remove index + +M src/storage/phrase_large_table2.cpp + +commit 457445fdc6cd0e5446665ec05a8fe25d6d9d49eb +Author: Peng Wu +Date: 2012-08-27 16:08:58 +0800 + + write search method + +M src/storage/phrase_large_table2.cpp + +commit f92f44995afc6e3ec2c1ea84a5083754e34a0d79 +Author: Peng Wu +Date: 2012-08-27 16:03:57 +0800 + + change phrase_length from int to size_t + +M src/storage/chewing_large_table.cpp +M src/storage/pinyin_phrase2.h + +commit bf2b12a7d866efcc45659a65727ac191293dcb48 +Author: Peng Wu +Date: 2012-08-27 14:31:14 +0800 + + write search method in progress + +M src/storage/phrase_large_table2.cpp + +commit 55424dc21ff006e91533d855dd4ad98c5bdc727a +Author: Peng Wu +Date: 2012-08-27 13:34:40 +0800 + + begin to write search method + +M src/storage/phrase_large_table2.cpp + +commit 0b35cb6786587dc9d0a442f1cd0267d13d1f19c2 +Author: Peng Wu +Date: 2012-08-27 10:59:32 +0800 + + rename PhraseIndexItem to PhraseIndexItem2 + +M src/storage/phrase_large_table2.cpp + +commit 993983933976cb2a864eb155b952deded9e20784 +Author: Peng Wu +Date: 2012-08-21 14:04:28 +0800 + + fixes compile + +M src/storage/Makefile.am +M src/storage/phrase_large_table2.cpp +M src/storage/phrase_large_table2.h + +commit fb29787830eb012a92d5c4c0bde18a4228ee4a83 +Author: Peng Wu +Date: 2012-08-21 14:00:14 +0800 + + write PhraseIndexItem + +M src/storage/phrase_large_table2.cpp + +commit 400c0c6f7d52d4f112a4cb418326374819d924a6 +Author: Peng Wu +Date: 2012-08-21 11:39:13 +0800 + + refine pinyin.h + +M src/include/novel_types.h +M src/pinyin.h +M src/storage/Makefile.am +M src/storage/pinyin_parser2.h + +commit ad4e7289182d50ebd7fb040fa180a0c4b54473f6 +Author: Peng Wu +Date: 2012-08-21 11:29:06 +0800 + + add phrase_large_table2.cpp + +A src/storage/phrase_large_table2.cpp +M src/storage/phrase_large_table2.h + +commit de4af396b7c93fa5aaf386afe21e06d0ae053e75 +Author: Peng Wu +Date: 2012-08-20 14:07:52 +0800 + + add phrase_large_table2.h + +M src/include/novel_types.h +A src/storage/phrase_large_table2.h + +commit c4d8e9b2effba5850cf03de5c275b95a5f8b4a22 +Author: Peng Wu +Date: 2012-08-24 14:20:10 +0800 + + fixes pinyin_lookup_token + +M src/pinyin.cpp + +commit 204216dbd7732bf6293d43b37b92374268cefb97 +Author: Peng Wu +Date: 2012-08-13 10:50:34 +0800 + + bump version 0.7.1 + +M configure.ac +M src/pinyin.h + +commit 75266eac0a459299e70314996d56eaa678cbf398 +Author: Peng Wu +Date: 2012-08-09 13:06:05 +0800 + + fixes pinyin_load_phrase_library + +M src/pinyin.cpp + +commit e965191eae06568d2e39f07db5c3d75a4e0deac2 +Author: Peng Wu +Date: 2012-08-08 10:33:30 +0800 + + update libpinyin.ver + +M src/libpinyin.ver + +commit 114d71e34b1ef47e4f4e4b39294349754b2c9968 +Author: Peng Wu +Date: 2012-08-07 13:55:21 +0800 + + fixes cmake + +M CMakeLists.txt + +commit ae01f6123774073d6f3504098ec6e6d2955620ea +Author: Peng Wu +Date: 2012-08-07 13:36:16 +0800 + + add comments for new apis + +M src/pinyin.h + +commit 28062ae7f665da020fec7e75754966a6209c2525 +Author: Peng Wu +Date: 2012-08-07 13:28:26 +0800 + + add apis + +M src/pinyin.cpp +M src/pinyin.h + +commit 839132342b4d5023e41fe96c120e4d16bf9928f7 +Author: Peng Wu +Date: 2012-08-02 17:30:49 +0800 + + fixes add phrase + +M src/pinyin.cpp + +commit 983c01c718584fb9e0f25d02e90bc5ebd135aa09 +Author: Peng Wu +Date: 2012-08-01 10:02:14 +0800 + + update cmake + +M data/CMakeLists.txt + +commit 7fb3ef7d2e49e8d4928d66349b55154e4df03678 +Author: Peng Wu +Date: 2012-07-31 13:56:30 +0800 + + fixes cmake + +M CMakeLists.txt +M data/CMakeLists.txt + +commit 81b4c63ac28e61e7f655d0ee2d0c589f06805b94 +Author: Peng Wu +Date: 2012-07-31 11:32:26 +0800 + + polish code + +M src/pinyin.cpp + +commit 4652b8f99a0c4f50dbcb156b2019c8f0b5183e28 +Merge: c675195 f1bcc07 +Author: Peng Wu +Date: 2012-07-29 22:00:20 -0700 + + Merge pull request #19 from alick9188/fix-data-dir + + fix text dat file location when out of tree build + +commit c6751959c57370c5c9e245dae44e26c5d6d2ea88 +Author: Peng Wu +Date: 2012-07-30 12:08:04 +0800 + + fixes pinyin_iterator_add_phrase + +M src/pinyin.cpp + +commit f1bcc07f2465b53e25a077695415fe5c70a1e95c +Author: Alick Zhao +Date: 2012-07-27 18:57:52 +0800 + + fix out of tree build when using git src repo + + The out of tree build failure only occurs when using git dev version. + It results from mismatch directory for textual data files. + It does not happen when using distributed tar ball because the textual + data files are distributed in the archive's data directory. + + This patch will workaround the problem by uncompressing downloaded + textual data archive into src/data directory. + Note in this way we cannot do VPATH build when developing. Let's just + assume that use case is rare. + +M data/Makefile.am + +commit a5331427b46a82183bfa95c1fb53ef3f104e583d +Author: Peng Wu +Date: 2012-07-27 16:54:10 +0800 + + fixes cmake + +M CMakeLists.txt + +commit 16393e0ccdbf5bd02e9a98da89a6c17b74dff53c +Author: Peng Wu +Date: 2012-07-27 11:07:58 +0800 + + bump version 0.7.0 + +M configure.ac +M src/pinyin.h + +commit 3f74e38f850f232c7b2637a4b70adc8ab9e0b903 +Author: Peng Wu +Date: 2012-07-09 12:48:55 +0800 + + fixes pinyin_reset + +M src/pinyin.cpp + +commit e8226de4e54798d65d7981830ff18e6367230be3 +Author: Peng Wu +Date: 2012-07-06 14:47:58 +0800 + + fixes _prepend_sentence_candidate + +M src/pinyin.cpp + +commit 91ce93e4807833b1f61a0ef79ce2a11187fb72e8 +Author: Peng Wu +Date: 2012-07-05 17:05:12 +0800 + + fixes libpinyin.ver + +M src/libpinyin.ver + +commit 7cd0517bcb30e2c802533ccfec9fc8228a410472 +Author: Peng Wu +Date: 2012-07-04 16:05:55 +0800 + + fixes ld script + +M src/libpinyin.ver + +commit f9f1575a983f184dd84b137d4b8d5ce3a35c063d +Author: Peng Wu +Date: 2012-07-04 13:21:42 +0800 + + fixes _compute_phrase_strings_of_items + +M src/pinyin.cpp + +commit f0fbf87fb1625bb8f8e362af3e1b4b3b20f67743 +Author: Peng Wu +Date: 2012-07-03 16:27:02 +0800 + + bump version 0.6.92 + +M configure.ac +M src/pinyin.h + +commit 088ee79c591f72f800a4ac5ac6d969b054b45027 +Author: Peng Wu +Date: 2012-07-03 12:04:31 +0800 + + fixes _prepend_sentence_candidate + +M src/pinyin.cpp + +commit 74fdc84d5e6436339bd96d3be8a125d89e969041 +Author: Peng Wu +Date: 2012-07-03 10:23:55 +0800 + + polish code + +M src/pinyin.cpp + +commit b717c79be91c000eb9f1de4ef46a32c398a02389 +Author: Peng Wu +Date: 2012-07-02 17:40:19 +0800 + + add comments + +M src/pinyin.cpp + +commit 39844b84481ca8e12c39b5774b61866a1aef7227 +Author: Peng Wu +Date: 2012-07-02 13:06:14 +0800 + + refine pinyin_free_candidates + +M src/pinyin.cpp + +commit c0e6b78d28120dff673f8a56b679e27ef312dd5a +Author: Peng Wu +Date: 2012-07-02 13:01:12 +0800 + + write pinyin_free_candidates + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit e0d7c0434b2589d387d30b64a57569ea46165a02 +Author: Peng Wu +Date: 2012-07-02 12:53:40 +0800 + + rename pinyin_choose_full_pinyin_candidate + +M src/pinyin.cpp +M src/pinyin.h + +commit 55ae13fb5320e86bebd6c178b69086aac5949188 +Author: Peng Wu +Date: 2012-07-02 12:51:52 +0800 + + remove pinyin_choose_candidate + +M src/pinyin.cpp +M src/pinyin.h + +commit 38d497bf3263ce67d6085283407189aa293bd843 +Author: Peng Wu +Date: 2012-07-02 12:02:31 +0800 + + fixes _remove_duplicated_items_by_phrase_string + +M src/pinyin.cpp + +commit b1563019cb3cad50e93416e310e8ab2cdaa516b2 +Author: Peng Wu +Date: 2012-07-02 11:51:47 +0800 + + enable remove duplicated items + +M src/pinyin.cpp + +commit 495bb0474cf8dd6515ff6ff749c9fbbf5b537911 +Author: Peng Wu +Date: 2012-07-02 11:42:55 +0800 + + update test_pinyin + +M tests/test_pinyin.cpp + +commit 0efcc8db282f836442907091fd24d9d2f844216a +Author: Peng Wu +Date: 2012-07-02 11:35:57 +0800 + + write _remove_duplicated_items_by_phrase_string + +M src/pinyin.cpp + +commit cb66df1cc752cddcf35ac3e8a00264b0df05d410 +Author: Peng Wu +Date: 2012-07-02 10:39:18 +0800 + + write _compute_strings_of_items + +M src/pinyin.cpp + +commit 5ff36bd939efdce410885454b253ae9a362f7e2b +Author: Peng Wu +Date: 2012-07-02 09:43:14 +0800 + + comment out _remove_duplicated_items + +M src/pinyin.cpp +M src/pinyin.h + +commit fa35deef0cfa25111dca343d321cfefeeed91f47 +Author: Peng Wu +Date: 2012-06-28 15:49:49 +0800 + + update spec.in + +M libpinyin.spec.in + +commit 433353d0063be4ea5527261bd403ad8bd06bd93e +Author: Peng Wu +Date: 2012-06-28 15:13:49 +0800 + + update pinyin_get/choose_candidates + +M src/pinyin.cpp +M src/pinyin.h + +commit ba1cd11a6ccf5ff85aa3a5df6deffd5097f12898 +Author: Peng Wu +Date: 2012-06-28 15:01:39 +0800 + + reduce phrase table size + +M src/storage/phrase_large_table.cpp +M src/storage/phrase_large_table.h + +commit 3dab1052e5a3b8177812a2dcba238aa1011d95bd +Author: Peng Wu +Date: 2012-06-28 14:47:38 +0800 + + add comments + +M src/pinyin.h + +commit 0291a9206f0a8c1f0171f78bb67ae4e0adedb80e +Author: Peng Wu +Date: 2012-06-28 14:38:49 +0800 + + add load/save multiple phrase libraries + +M src/pinyin.cpp + +commit fc5ef3a3bad5fb1513ebf7e36321be5c03d781e2 +Author: Peng Wu +Date: 2012-06-27 15:55:18 +0800 + + refine pinyin_guess_sentence_with_prefix + +M src/pinyin.cpp + +commit 0634ab933695ef0ecbbffd7495da351b8ea0022f +Author: Peng Wu +Date: 2012-06-27 15:53:05 +0800 + + write pinyin_iterator_add_phrase + +M src/pinyin.cpp +M src/storage/phrase_index.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit 2fa45a596858b41c2018df102d60c5a9a155d54a +Author: Peng Wu +Date: 2012-06-27 11:08:04 +0800 + + write pinyin begin/end add phrase + +M src/pinyin.cpp +M src/pinyin.h + +commit 8f8fb50a3d8bd31cb62d02299892343e993e49a6 +Author: Peng Wu +Date: 2012-06-26 12:34:54 +0800 + + begin to write import iterator + +M src/pinyin.cpp +M src/pinyin.h +M src/storage/ngram.cpp + +commit ddb8803e219bf4189f9a0105af7189b8c31c5d06 +Author: Peng Wu +Date: 2012-06-26 11:18:23 +0800 + + fixes a typo + +M src/pinyin.cpp + +commit 8ea792e62bcdcbf8625fb41fee6088caa1aa0f02 +Author: Peng Wu +Date: 2012-06-25 11:48:25 +0800 + + refine pinyin.cpp + +M src/pinyin.cpp +M src/pinyin.h + +commit b87f5ca4424584cca2623021174f6f5fcdca7c6a +Author: Peng Wu +Date: 2012-06-25 11:21:44 +0800 + + update utils + +M utils/storage/gen_binary_files.cpp +M utils/training/gen_unigram.cpp +M utils/utils_helper.h + +commit e9e00915580f2b9acc31e57e0bf950474d4fc062 +Author: Peng Wu +Date: 2012-06-25 11:11:56 +0800 + + update tests + +M tests/tests_helper.h + +commit 61dff7403370bd1902c73c78be8312be4d3caa68 +Author: Peng Wu +Date: 2012-06-25 10:58:39 +0800 + + refactor pinyin_phrase_files + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit aa31075db890e53bc6cec08d99ba4fb250fcab12 +Author: Peng Wu +Date: 2012-06-21 13:18:18 +0800 + + refine asserts in large tables + +M src/include/novel_types.h +M src/storage/chewing_large_table.cpp +M src/storage/phrase_large_table.cpp + +commit 606b4b110302fad6590eca56cba7108681b8b434 +Author: Peng Wu +Date: 2012-06-21 13:06:33 +0800 + + add ErrorResult + +M src/include/novel_types.h +M src/storage/chewing_large_table.cpp +M src/storage/phrase_large_table.cpp + +commit 9aa87d6bdadf9492a3c09d49841e23052c043d16 +Author: Peng Wu +Date: 2012-06-21 11:25:33 +0800 + + update autoconf + +M configure.ac +M libpinyin.pc.in +M src/Makefile.am +M src/include/Makefile.am +M src/storage/Makefile.am + +commit ec6e09e705e570236fbaf21b3acf9d30e6fa2381 +Author: Peng Wu +Date: 2012-06-21 11:13:55 +0800 + + update autogen.sh + +M autogen.sh + +commit 96f2c4d4321663d9bf817f01c5102b8ac59481fa +Author: Peng Wu +Date: 2012-06-21 10:25:58 +0800 + + add assert + +M src/pinyin.cpp + +commit 19fd61c47b7d3ecb116636a62a76668bbb38133e +Author: Peng Wu +Date: 2012-06-19 14:52:32 +0800 + + add comments + +M src/pinyin.h +M src/storage/phrase_index.h + +commit 3120e3f3208f3b0c9e30a811102e0d2ea9c5e29e +Author: Peng Wu +Date: 2012-06-19 14:41:18 +0800 + + fixes phrase library load + +M src/include/novel_types.h +M src/pinyin.cpp +M src/storage/phrase_index.h + +commit 05945ae69172859cb26f33363faccb76cb189629 +Author: Peng Wu +Date: 2012-06-19 11:22:08 +0800 + + improves pinyin_save + +M src/pinyin.cpp + +commit 20d042e8f021f6c1dd5a6adde7b726a153556f3b +Author: Peng Wu +Date: 2012-06-19 11:00:46 +0800 + + fixes pinyin_unload_phrase_library + +M src/pinyin.cpp + +commit 3b154a5caa175700771b1e4542bfb04f8fdd8234 +Author: Peng Wu +Date: 2012-06-19 10:57:52 +0800 + + fixes pinyin_fini + +M src/pinyin.cpp + +commit 4ab6c605831fc0bb05b1face2a02667f5fdab0c7 +Author: Peng Wu +Date: 2012-06-18 16:53:00 +0800 + + fixes crash + +M src/pinyin.cpp + +commit 9aaa1b504a366d5b13b138c44ed696306d4107b2 +Author: Peng Wu +Date: 2012-06-18 16:29:22 +0800 + + write get_dbin_filename + +M src/pinyin.cpp + +commit e347b7f9912592397accf7c51c0fa98335a70c86 +Author: Peng Wu +Date: 2012-06-18 16:24:26 +0800 + + update check_format + +M src/pinyin.cpp + +commit 64701cd5053430c4d83d90c3673e7a80ce32d28c +Author: Peng Wu +Date: 2012-06-18 16:05:13 +0800 + + write load/unload phrase index + +M src/pinyin.cpp + +commit 9d004b33d8fe47ae290c97e08785155d061784fd +Author: Peng Wu +Date: 2012-06-18 14:59:32 +0800 + + begin to write multiple phrase library support + +M src/pinyin.cpp +M src/pinyin.h + +commit 4c42f29cb8863cc5d6810a8a2a25c478e16292f7 +Author: Peng Wu +Date: 2012-06-14 11:13:51 +0800 + + refine tests + +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp +M tests/tests_helper.h + +commit 188af7797fc9fbb4d9ffe775ae2a05369698cdef +Author: Peng Wu +Date: 2012-06-12 14:10:27 +0800 + + update fsf address + +M CMakeLists.txt +M Makefile.am +M data/Makefile.am +M doc/Makefile.am +M src/Makefile.am +M src/include/Makefile.am +M src/lookup/Makefile.am +M src/storage/Makefile.am +M tests/Makefile.am +M tests/include/Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/Makefile.am +M utils/segment/Makefile.am +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 79298b931c4ab5c6271aa3666e229b7f1344cced +Author: Peng Wu +Date: 2012-06-12 14:09:28 +0800 + + update fsf address + +M scripts/bopomofo.py +M scripts/chewing.py +M scripts/chewingkey.py +M scripts/correct.py +M scripts/genbopomofoheader.py +M scripts/genchewingkey.py +M scripts/gendoublepinyinheader.py +M scripts/genpinyinheader.py +M scripts/genpinyintable.py +M scripts/genspecialtable.py +M scripts/pinyin.py +M scripts/pinyintable.py +M scripts/specialtable.py +M scripts/utils.py + +commit dfa327790662ad9a788f2e13f8f1962a12769a3b +Author: Peng Wu +Date: 2012-06-06 11:20:03 +0800 + + fixes jv,ju in ABC + +M src/storage/pinyin_parser2.cpp + +commit 6b2c3bad390dc5073fb12ae841d2fa061bc1a557 +Author: Peng Wu +Date: 2012-05-29 10:48:27 +0800 + + fixes pinyin_choose_full_pinyin_candidate + +M src/pinyin.cpp + +commit 8a169a4f2db04e2d8bd6c442696a606fc389923a +Author: Peng Wu +Date: 2012-05-28 15:54:30 +0800 + + fixes pinyin_get_candidates + +M src/pinyin.cpp + +commit 646d55409b13fec993b9cf64894c11ca6cc4f525 +Author: Peng Wu +Date: 2012-05-27 09:41:03 +0800 + + refine parse one key + +M src/storage/pinyin_parser2.cpp + +commit 745e87ade00dd7133613a923d7f14f3f8eb5ef97 +Author: Peng Wu +Date: 2012-05-25 15:22:38 +0800 + + fixes parse one key in double pinyin parser + +M src/storage/pinyin_parser2.cpp + +commit 829fe643575f17a7903287c921e3717a2d9db14a +Author: Peng Wu +Date: 2012-05-25 12:11:41 +0800 + + fixes test_flexible_ngram.cpp + +M tests/storage/test_flexible_ngram.cpp + +commit 12655089a96296c774b01d9046e82ea87055c512 +Author: Peng Wu +Date: 2012-05-25 12:06:07 +0800 + + fixes kfreebsd build + +M src/pinyin_internal.h + +commit 8c8cad5bbde21e96bfb7775b315680c854bb5834 +Author: Peng Wu +Date: 2012-05-24 11:36:55 +0800 + + bump version 0.6.91 + +M ChangeLog +M configure.ac +M libpinyin.spec.in +M src/pinyin.h + +commit 5c43c20c416f6e0d01eb6ce8352521d81c34d0de +Author: Peng Wu +Date: 2012-05-24 11:24:48 +0800 + + fixes _append_items + +M src/pinyin.cpp + +commit 1f811cb28e6ed1d0c1665943dd37025cdca1381e +Author: Peng Wu +Date: 2012-05-21 15:42:47 +0800 + + rename bin_file to binfile + +M tests/tests_helper.h +M utils/utils_helper.h + +commit 1b3140958408a80d029d59835d612f1b76f592ab +Author: Peng Wu +Date: 2012-05-21 15:39:41 +0800 + + update gen_unigram.cpp + +M utils/training/gen_unigram.cpp + +commit c34f87b345d762882c265a638d306f10b21d4cf8 +Author: Peng Wu +Date: 2012-05-21 15:34:06 +0800 + + rename compat to compact + +M src/pinyin.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M tests/storage/test_phrase_index.cpp +M utils/storage/gen_binary_files.cpp + +commit 4f7701c4d33c8b2df7c1cc29b1abf81ab7110e5c +Author: Peng Wu +Date: 2012-05-21 15:28:16 +0800 + + updates + +M utils/storage/gen_binary_files.cpp + +commit 48becacb2a3369491c869e78bcca88aa0db07518 +Author: Peng Wu +Date: 2012-05-21 15:21:10 +0800 + + updates tests + +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp + +commit 2380f39316da63d8c140fc920309e8ff149fec1f +Author: Peng Wu +Date: 2012-05-21 15:09:30 +0800 + + fixes compile + +M utils/storage/gen_binary_files.cpp + +commit 72016df041eaa99e2cd6d307ee60e03cf350dae8 +Author: Peng Wu +Date: 2012-05-21 15:08:58 +0800 + + add pinyin_table_files + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 34de36eabbc3baac56885e01fa2ec79ba7fb5cc6 +Author: Peng Wu +Date: 2012-05-21 14:56:50 +0800 + + write save_phrase_index + +M utils/storage/gen_binary_files.cpp +M utils/storage/import_interpolation.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp +M utils/utils_helper.h + +commit 931df7d5a0924cde0c5b249b5f82a8d5bf9039b5 +Author: Peng Wu +Date: 2012-05-21 12:07:13 +0800 + + rename init_phrase_index to load_phrase_index + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +M tests/tests_helper.h +M utils/segment/ngseg.cpp +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp +M utils/training/estimate_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp +M utils/utils_helper.h + +commit ad922c4b6f8a6f2062a980e7b15b4fa17428b182 +Author: Peng Wu +Date: 2012-05-18 11:42:05 +0800 + + refine utils + +M utils/Makefile.am +M utils/segment/Makefile.am +M utils/segment/ngseg.cpp +M utils/storage/Makefile.am +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp +M utils/training/Makefile.am +M utils/training/estimate_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp +M utils/utils_helper.h + +commit 46d7e4c0e4a1a0a8b8e8b8346e88d222597dacb7 +Author: Peng Wu +Date: 2012-05-18 11:13:13 +0800 + + fixes test_chewing_table + +M tests/storage/test_chewing_table.cpp +A utils/utils_helper.h + +commit 54b8d345cb1c5f527a58457e6619004f5ecf4fb0 +Author: Peng Wu +Date: 2012-05-18 11:09:30 +0800 + + refine tests + +M tests/Makefile.am +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +A tests/tests_helper.h + +commit 0b7fc32237ebdadb5f049835c026b8c19fdee6a8 +Author: Peng Wu +Date: 2012-05-17 15:35:40 +0800 + + updates utils + +M utils/segment/ngseg.cpp +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp +M utils/training/estimate_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp + +commit d6b9035b82cd00e1763c715386cfa52621945716 +Author: Peng Wu +Date: 2012-05-17 15:06:46 +0800 + + fixes compile + +M utils/training/gen_unigram.cpp + +commit 4797c0419273b71e5fa64ba7a1ee233de7c0ac48 +Author: Peng Wu +Date: 2012-05-17 15:01:11 +0800 + + update utils/training + +M utils/training/estimate_interpolation.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp + +commit 41286716a6b90e78eb3abe3aa5f1620bc5f0f605 +Author: Peng Wu +Date: 2012-05-17 14:55:52 +0800 + + update utils/storage + +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp + +commit 2c7b0915ced93c79938826e05922f4230c94d332 +Author: Peng Wu +Date: 2012-05-17 14:38:38 +0800 + + update ngseg + +M utils/segment/ngseg.cpp + +commit 347291e6e8533f5822ca040100fb38176db7c5d0 +Author: Peng Wu +Date: 2012-05-17 14:37:36 +0800 + + update test cases + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit 981d12ddb3610e4ca63423572651e3f667fa0073 +Author: Peng Wu +Date: 2012-05-17 14:30:53 +0800 + + update ngseg.cpp + +M utils/segment/ngseg.cpp + +commit 3746f9d87796057a076783fbbf33b54ad861f8cf +Author: Peng Wu +Date: 2012-05-17 14:26:35 +0800 + + fixes typos + +M src/storage/phrase_index.h +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit e864fe93329e03ab02e157d44df23d4cd949fecf +Author: Peng Wu +Date: 2012-05-17 14:16:27 +0800 + + update test_pinyin_lookup and test_phrase_lookup + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit 1f7619d24db40736a274b1c258c5206b06f3e538 +Author: Peng Wu +Date: 2012-05-17 13:54:04 +0800 + + add pinyin_phrase_files + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 1d317350af0202b4d32ae9417de2adf7817ad107 +Author: Peng Wu +Date: 2012-05-16 14:58:06 +0800 + + improves FacadePhraseIndex + +M src/storage/phrase_index.h + +commit 91109001e08ce8cd2748692eb8a031ef7e763896 +Author: Peng Wu +Date: 2012-05-16 14:50:41 +0800 + + update pinyin_lookup.* + +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h + +commit ef71c282849298f8c8065bd8d6f8d5a4c385e4db +Author: Peng Wu +Date: 2012-05-16 14:37:55 +0800 + + update pinyin.cpp + +M src/pinyin.cpp + +commit 6c7f7766ad087234c45f0d4115e59faaf34bcadf +Author: Peng Wu +Date: 2012-05-16 14:20:09 +0800 + + polish phrase_index.h + +M src/storage/phrase_index.h + +commit 6b86007755f0551e96c7d3796101e7889f5b4c3d +Author: Peng Wu +Date: 2012-05-16 14:18:15 +0800 + + update test_chewing_table.cpp + +M tests/storage/test_chewing_table.cpp + +commit 160a73b0d0efae72d2b6232e393897e3aa075811 +Author: Peng Wu +Date: 2012-05-16 14:14:39 +0800 + + write FacadePhraseIndex::clear_ranges + +M src/storage/phrase_index.h + +commit 26fa8c335d695379d139cd524d59482bdca7daba +Author: Peng Wu +Date: 2012-05-15 14:02:59 +0800 + + add methods to FacadePhraseIndex + +M src/storage/phrase_index.h + +commit 78ec3a2063b88db368d41a7411c794bbc48a035c +Author: Peng Wu +Date: 2012-05-08 14:25:43 +0800 + + update test_pinyin + +M tests/test_pinyin.cpp + +commit 4deccf8c77857f899198f267dc58b55301f1ea13 +Author: Peng Wu +Date: 2012-05-08 14:22:03 +0800 + + improves _get_previous_token + +M src/pinyin.cpp + +commit f383ccfbdd0bf1b3eca3e094879e9283287ad610 +Author: Peng Wu +Date: 2012-04-28 12:52:59 +0800 + + add comments + +M src/pinyin.h + +commit dd3b3559804d57c143443e1ae15562797508b793 +Author: Peng Wu +Date: 2012-04-27 10:36:59 +0800 + + write pinyin_choose_full_pinyin_candidate + +M src/pinyin.cpp + +commit ac03fe17e83abc8423c6803bf6939435ab5411ac +Author: Peng Wu +Date: 2012-04-25 14:13:21 +0800 + + fixes a typo + +M src/pinyin.cpp + +commit 6046c7de7d8cc3e489f0e256f9f603520c5ddb1a +Author: Peng Wu +Date: 2012-04-25 13:00:57 +0800 + + fixes _remove_duplicated_items + +M src/pinyin.cpp + +commit da3c53805ddb2f3849ba3e5df9731d484531cd29 +Author: Peng Wu +Date: 2012-04-25 12:10:14 +0800 + + fixes pinyin_get_full_pinyin_candidates + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp + +commit 9a4f390bcbda68a9bff33473e06aa5d6c6f9cff8 +Author: Peng Wu +Date: 2012-04-25 12:06:22 +0800 + + update test_pinyin + +M tests/test_pinyin.cpp + +commit 7c22b7f13486979c5fc5bb16dc8dbf03f7b5a0d8 +Author: Peng Wu +Date: 2012-04-24 16:47:35 +0800 + + refine _try_resplit_table + +M src/pinyin.cpp + +commit fb45330d93a3e66dc3bea583a1ce6325d8757a6d +Author: Peng Wu +Date: 2012-04-24 16:34:29 +0800 + + write _try_resplit_table + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp + +commit 52a5d26a187034f8f44557296149df7a2d90c1ae +Author: Peng Wu +Date: 2012-04-24 12:38:16 +0800 + + remove maximum forward match pass in full pinyin parser + +M src/storage/pinyin_parser2.cpp + +commit 3db734d981548650c32484ef37332e8cab8a4c37 +Author: Peng Wu +Date: 2012-04-24 09:43:52 +0800 + + refine ngseg + +M utils/segment/ngseg.cpp + +commit 0345e566360a25ac6f65ead509ebc21da8941c07 +Author: Peng Wu +Date: 2012-04-23 17:04:31 +0800 + + fixes comment + +M src/pinyin.cpp + +commit 8b965d46e1ce5c44c116049e408fb34f3c0403b4 +Author: Peng Wu +Date: 2012-04-23 15:10:35 +0800 + + write retrieve table items in progress + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 93c159120335d171c4d3a01fcc9f39cf2aeb7205 +Author: Peng Wu +Date: 2012-04-20 14:26:48 +0800 + + polish code + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp + +commit be2be435b1ad0371603407c567475d1490ade1ed +Author: Peng Wu +Date: 2012-04-19 14:51:00 +0800 + + refine retrieve_divided_item + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit fe4688fd9725b295a31c3475c0a117c78de59a0c +Author: Peng Wu +Date: 2012-04-19 14:42:42 +0800 + + write _try_divided_table + +M src/pinyin.cpp + +commit 5de9071bd724c90ec26cffbb0cb763412795be54 +Author: Peng Wu +Date: 2012-04-19 14:13:34 +0800 + + write pinyin_get_full_pinyin_candidates in progress + +M src/pinyin.cpp + +commit d87e71b496dcc2bd5f8f3bb8637111d0f4059f7d +Author: Peng Wu +Date: 2012-04-19 11:34:34 +0800 + + extract _append_items method + +M src/pinyin.cpp + +commit 5ea870f830598554c6815cc88a919bbb2ea11826 +Author: Peng Wu +Date: 2012-04-19 11:16:51 +0800 + + re-factor get candidates + +M src/pinyin.cpp + +commit a586f8da45e11c0cd84d5b1ff0582369fb5333c1 +Author: Peng Wu +Date: 2012-04-18 16:06:05 +0800 + + write pinyin_get_full_pinyin_candidates in progress + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 1ca1f3a99d1c4fc342bc9f19da93ff822de37018 +Author: Peng Wu +Date: 2012-04-18 10:28:09 +0800 + + remove old codes in pinyin_lookup.cpp + +M src/lookup/pinyin_lookup.cpp + +commit fb7ec2e7bfe2599360dcf5c26a7664ef475476c1 +Author: Peng Wu +Date: 2012-04-18 10:21:02 +0800 + + remove FullPinyinParser2::post_process + +M src/storage/pinyin_parser2.cpp + +commit 5fe339e560a0536f7de9ccdc06e6d2283ea6dfbd +Author: Peng Wu +Date: 2012-04-17 15:17:03 +0800 + + refine pinyin_get_candidates + +M src/pinyin.cpp + +commit 077944f3930b904594efba8c1b159347476aa596 +Author: Peng Wu +Date: 2012-04-17 14:37:54 +0800 + + write _get_previous_token + +M src/pinyin.cpp + +commit bf657efc00bdb1ffb8a57baf2674a828092f9e44 +Author: Peng Wu +Date: 2012-04-17 14:32:33 +0800 + + remove old code + +M src/pinyin.cpp + +commit 14bda49319f9ad23140fe78a38d62c94f174908b +Author: Peng Wu +Date: 2012-04-17 14:31:39 +0800 + + begin to write pinyin_get_full_pinyin_candidates + +M src/pinyin.cpp + +commit dda8493527daeb41f90296b4fa0f8f9b4bce1d15 +Author: Peng Wu +Date: 2012-04-17 12:46:57 +0800 + + update pinyin_choose_candidate + +M src/pinyin.cpp +M src/pinyin.h + +commit e923803661e82bda4e095a99279ac8f87c3382c3 +Author: Peng Wu +Date: 2012-04-17 12:39:18 +0800 + + update libpinyin.ver + +M src/libpinyin.ver + +commit d05bc0820b9c758da0d96125d0b79a9f02fdd5e1 +Author: Peng Wu +Date: 2012-04-17 12:37:41 +0800 + + refine candidate api + +M src/pinyin.cpp +M src/pinyin.h + +commit 67ded97ab3a0c03e11bc0776fbdec5b0bf3a1b3f +Author: Peng Wu +Date: 2012-04-17 11:11:12 +0800 + + re-factor pinyin_get_candidates + +M src/pinyin.cpp + +commit 556a8bb43e42e25df8f8f0bcedfcb1d0a4704d49 +Author: Peng Wu +Date: 2012-04-16 11:04:00 +0800 + + begin to write initial fuzzy pinyin support + +M src/pinyin.h + +commit d02d2e469585da83b1b3e1ec3a4a38083c5b8c30 +Author: Peng Wu +Date: 2012-04-16 10:47:03 +0800 + + add m_raw_full_pinyin to pinyin_instance_t + +M src/pinyin.cpp +M src/pinyin.h + +commit 48af9209a46e7f03c189a25ece4ab3bfacf66fa3 +Author: Peng Wu +Date: 2012-04-10 11:27:12 +0800 + + add DYNAMIC_ADJUST flag + +M src/pinyin.cpp +M src/storage/pinyin_custom2.h + +commit 5fb692bdbe0dabfc59be5524f9c413e3a94d3e78 +Author: Peng Wu +Date: 2012-04-09 14:54:55 +0800 + + fixes compile + +M src/pinyin.cpp + +commit 8008d0bec8361c2b1756c68201cf8de61be8063f +Author: Peng Wu +Date: 2012-04-09 14:49:14 +0800 + + improves pinyin_get_candidates + +M src/pinyin.cpp + +commit 230ee9362a2908e982ff7ff1766d070249cac5ca +Author: Peng Wu +Date: 2012-03-30 14:25:36 +0800 + + fixes post_process2 + +M src/storage/pinyin_parser2.cpp + +commit 75ad6e979ef5358a614924d9d31ceecaa66f9ae2 +Author: Peng Wu +Date: 2012-03-30 14:17:12 +0800 + + write post_process2 + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit dca3e8468c2a48b270a56bccf86eab608f2d675e +Author: Peng Wu +Date: 2012-03-29 14:24:37 +0800 + + begin to write post_process2 + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit efb861512c016a193ee907d97c1cb156f63787d5 +Author: Peng Wu +Date: 2012-03-29 14:22:47 +0800 + + update generated pinyin parser table header + +M src/storage/pinyin_parser_table.h + +commit a9ecf6dd0d492243dc4a38792411e5fa7c79f40b +Author: Peng Wu +Date: 2012-03-29 14:16:23 +0800 + + update special table + +M scripts/genspecialtable.py +M src/storage/pinyin_parser2.h + +commit a882d662f3b0a6c60234e87f7eaa78b11606caeb +Author: Peng Wu +Date: 2012-03-27 11:35:04 +0800 + + update comments + +M src/storage/pinyin_custom2.h + +commit fdaaf0e79d136d6cd173ef04b392360ef86782ee +Author: Peng Wu +Date: 2012-03-23 11:10:12 +0800 + + bump version 0.5.92 + +M ChangeLog +M configure.ac +M src/pinyin.h + +commit 610beb4d2217f6d123dd00ef9933c073da3b6fcd +Author: Peng Wu +Date: 2012-03-22 14:56:32 +0800 + + update comments + +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.h + +commit d8454869b62d72593c2393ef7d23c9e6c64f4b16 +Author: Peng Wu +Date: 2012-03-22 14:25:10 +0800 + + update validate_constraint method + +M src/lookup/pinyin_lookup.cpp + +commit e4364290948763d6024b0e00cac4e16148cea949 +Author: Peng Wu +Date: 2012-03-22 14:24:44 +0800 + + add comments + +M src/lookup/pinyin_lookup.h + +commit 656f3de497353660a702f8de5040d47b5be4accf +Author: Peng Wu +Date: 2012-03-21 15:27:31 +0800 + + update comments + +M src/storage/pinyin_parser2.h +M src/storage/tag_utility.h + +commit 224d3f608d3b1c89e9d120ee94544a4ff761a3fe +Author: Peng Wu +Date: 2012-03-21 14:31:57 +0800 + + add comments + +M src/storage/pinyin_parser2.h + +commit da357461c31dc73724eaae962742a00c21bed2a4 +Author: Peng Wu +Date: 2012-03-21 13:57:01 +0800 + + add comments + +M src/storage/phrase_index_logger.h + +commit 1da6d4af67bd5c9793030e307adde1f0b49b4a83 +Author: Peng Wu +Date: 2012-03-20 14:27:15 +0800 + + add comments + +M src/storage/phrase_index.h + +commit 5098a869dcf6c567f379e5b9c9f1a4a2c45af01a +Author: Peng Wu +Date: 2012-03-19 18:26:09 +0800 + + add comments + +M src/storage/phrase_index.h + +commit 801ea277514902013fb51e2a19013f95847208c0 +Author: Peng Wu +Date: 2012-03-16 15:14:57 +0800 + + add comments + +M src/storage/ngram.h + +commit a39b327648641d0b723f9a70e73d9c4efc7913a4 +Author: Peng Wu +Date: 2012-03-16 11:08:54 +0800 + + update comments + +M src/storage/flexible_ngram.h +M src/storage/ngram.cpp +M src/storage/ngram.h + +commit 8723118e91ccacda4bb3b55fba5eeaa5cbe2eff6 +Author: Peng Wu +Date: 2012-03-15 16:18:58 +0800 + + add comments + +M src/storage/facade_chewing_table.h +M src/storage/flexible_ngram.h + +commit fc5b1e375f9c923187175fc12e42720d620db3c6 +Author: Peng Wu +Date: 2012-03-14 14:48:32 +0800 + + update facade_phrase_table.h + +M src/storage/facade_phrase_table.h + +commit 9be8757a0609be90919e81d8df0176e489f6b274 +Author: Peng Wu +Date: 2012-03-14 14:11:27 +0800 + + update facade_chewing_table.h + +M src/storage/facade_chewing_table.h + +commit 3d9058d0ce6cff4db472214e3e7971020c55e098 +Author: Peng Wu +Date: 2012-03-13 13:20:14 +0800 + + add comments + +M src/include/memory_chunk.h + +commit 23ab2b89a584e68286edb0b361167eab0d3114b6 +Author: Peng Wu +Date: 2012-03-12 15:34:00 +0800 + + fixes pinyin_save + +M src/pinyin.cpp + +commit a4913c389c9ee431f486ae8c6befc2556d5ae3fc +Author: Peng Wu +Date: 2012-03-12 14:58:34 +0800 + + continue improves pinyin_save + +M src/pinyin.cpp + +commit ad345300d1bf8e9691ad24692a62421d04226948 +Author: Peng Wu +Date: 2012-03-12 13:55:53 +0800 + + improves pinyin_save + +M src/pinyin.cpp + +commit c71bfd49ed3042c2844b81e76fbf3cde7b0da10e +Author: Peng Wu +Date: 2012-03-05 17:22:22 +0800 + + refine test_pinyin.cpp + +M tests/test_pinyin.cpp + +commit 5f3b3345937e33438fb505635f2543038fc30cba +Author: Peng Wu +Date: 2012-03-05 16:14:20 +0800 + + update test_pinyin.cpp + +M tests/test_pinyin.cpp + +commit da7323a57cb89ca385676b9566f5b70e4a42e1a3 +Author: Peng Wu +Date: 2012-03-05 16:04:25 +0800 + + add pinyin_guess_sentence_with_prefix + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 536b587a1a5c2aa273026890cec64881e58e5cc5 +Author: Peng Wu +Date: 2012-03-02 16:21:18 +0800 + + fixes full pinyin parser + +M src/storage/pinyin_parser2.cpp + +commit 739f11026505d654eebd67ff5f128c844f454919 +Author: Peng Wu +Date: 2012-03-02 11:23:04 +0800 + + update test_pinyin_lookup.cpp + +M tests/lookup/test_pinyin_lookup.cpp + +commit 6219c4e75e25b14a78f39cfec0a252260a45f132 +Author: Peng Wu +Date: 2012-03-02 11:18:22 +0800 + + update utils + +M src/pinyin.cpp +M utils/training/eval_correction_rate.cpp + +commit df35a1ceaff8da71f9953c3f89cbb66b658f69eb +Author: Peng Wu +Date: 2012-03-02 11:09:10 +0800 + + update pinyin_lookup.* + +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h + +commit 92b698bcd9d09f8a5f3af62d70385b80cb0d1f59 +Author: Peng Wu +Date: 2012-03-02 11:01:09 +0800 + + update pinyin.* + +M src/pinyin.cpp +M src/pinyin.h + +commit c086810d3e0f2627d46a2b78103757af0f731dac +Author: Peng Wu +Date: 2012-02-29 16:00:37 +0800 + + clean up phrase_lookup.cpp + +M src/lookup/phrase_lookup.cpp + +commit d8db8c691894e653477c28dc13cff5e8db60502c +Author: Peng Wu +Date: 2012-02-29 15:50:25 +0800 + + clean up pinyin_lookup.cpp + +M src/lookup/pinyin_lookup.cpp + +commit 20acf51bad185665f9ef1ab4c46399befe93b28a +Author: Peng Wu +Date: 2012-02-29 13:31:28 +0800 + + add safe guard + +M src/storage/ngram.cpp + +commit ddaa170880aea10e5a08e71dfdde7b7cf57d18c1 +Author: Peng Wu +Date: 2012-02-27 16:33:51 +0800 + + update cmake + +M src/storage/CMakeLists.txt +M tests/storage/CMakeLists.txt +M utils/storage/CMakeLists.txt + +commit 798ff4f50da3fe48c7921bf725cd6685293aaf06 +Author: Peng Wu +Date: 2012-02-24 14:06:58 +0800 + + fixes gen_chewing_table.cpp + +M utils/storage/gen_chewing_table.cpp + +commit cc9b104329e04e38ce1c38ba3c82550a1b040bfa +Author: Peng Wu +Date: 2012-02-24 12:01:10 +0800 + + update Makefile.am + +M src/storage/Makefile.am +M tests/storage/Makefile.am +M utils/storage/Makefile.am + +commit dbf7a2dcd8e35f0db28e0a8f4ef324c12a3af1b4 +Author: Peng Wu +Date: 2012-02-24 11:55:52 +0800 + + remove old parsers + +D src/storage/pinyin_base.cpp +D src/storage/pinyin_base.h +D src/storage/pinyin_custom.h +D src/storage/pinyin_large_table.cpp +D src/storage/pinyin_large_table.h +D src/storage/pinyin_phrase.h +D src/storage/pinyin_zhuyin_map_data.h +D tests/storage/test_parser.cpp +D tests/storage/test_pinyin_table.cpp +D utils/storage/gen_pinyin_table.cpp +D utils/storage/gen_zhuyin_map.cpp + +commit 23b89bb317cdf38e645cd25b31e2a5dbaaf1fe84 +Author: Peng Wu +Date: 2012-02-23 13:04:42 +0800 + + add tests + +M tests/include/Makefile.am +M tests/storage/Makefile.am + +commit ade2d6970018fdba088874a1efd418760bb42d45 +Author: Peng Wu +Date: 2012-02-22 14:53:46 +0800 + + remove utf16_t definition + +M src/include/novel_types.h + +commit 3af888752c73601c2e581610ed566175a403eaf9 +Author: Peng Wu +Date: 2012-02-22 14:39:19 +0800 + + update comments + +M tests/lookup/test_phrase_lookup.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit 0ed214b64542bf59948cd2423c6a31d7d1de6dde +Author: Peng Wu +Date: 2012-02-22 14:36:54 +0800 + + update utils/segment + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit cae862b94fc2805e2b44d839bfec5960acf6e8e1 +Author: Peng Wu +Date: 2012-02-22 11:05:51 +0800 + + update utils/training + +M utils/training/eval_correction_rate.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp + +commit 62dffb4c3615c275d514ee9428d1688770c6173b +Author: Peng Wu +Date: 2012-02-21 14:09:32 +0800 + + update tests directory + +M tests/lookup/test_phrase_lookup.cpp +M tests/storage/test_chewing_table.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp + +commit 5deda46d8f6c8e922cc31e7958d3558589bb7260 +Author: Peng Wu +Date: 2012-02-21 10:44:27 +0800 + + update pinyin.cpp + +M src/pinyin.cpp + +commit 1ddce5136799a57d5c1fb745a747abdb76c6f9f3 +Author: Peng Wu +Date: 2012-02-21 10:41:31 +0800 + + update lookup directory + +M src/lookup/lookup.cpp +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h + +commit 285222db4fecdd2f92a54ba48736fee5f604e795 +Author: Peng Wu +Date: 2012-02-21 10:38:02 +0800 + + fixes compile + +M src/storage/phrase_large_table.h + +commit b5ed5f8c8b3f3aa841f8e7deae578c1bed27a679 +Author: Peng Wu +Date: 2012-02-21 10:33:49 +0800 + + update phrase_index.cpp + +M src/storage/phrase_index.cpp + +commit e43a8213434d4efa6b96a9fc17e0df55e41741bf +Author: Peng Wu +Date: 2012-02-20 16:40:59 +0800 + + update tag_utility.cpp + +M src/storage/tag_utility.cpp + +commit 79762a21f4400b14075b01fc1ef55b8287cb749d +Author: Peng Wu +Date: 2012-02-20 16:38:43 +0800 + + update phrase_index.h + +M src/storage/phrase_index.h + +commit 8d355fec2fa37d8fcb21f4967e409cc35dbb904b +Author: Peng Wu +Date: 2012-02-20 16:08:56 +0800 + + update comments + +M src/storage/phrase_index.h + +commit 739a7ace5f7c572073fb25af7dd0c003a62a6704 +Author: Peng Wu +Date: 2012-02-20 14:13:50 +0800 + + update phrase_large_table.cpp + +M src/storage/phrase_large_table.cpp +M src/storage/phrase_large_table.h + +commit 483edec762139c1360a0e641834de3308f7eb03b +Author: Peng Wu +Date: 2012-02-20 11:27:45 +0800 + + update class definition in phrase_large_table.cpp + +M src/storage/phrase_large_table.cpp + +commit 14a05845995550c15c8267a82750103c1149daac +Author: Peng Wu +Date: 2012-02-20 11:00:48 +0800 + + update phrase table headers + +M src/storage/facade_phrase_table.h +M src/storage/phrase_large_table.h + +commit 036cd24c064bac2b3a5d7e8e92c3bb34f376f353 +Author: Peng Wu +Date: 2012-02-16 16:13:07 +0800 + + begin to write ucs4 support + +M src/include/novel_types.h + +commit ba2b7875d9cd8fbed96ee30635cb3de03378454c +Author: Peng Wu +Date: 2012-02-17 11:25:20 +0800 + + fixes variable name + +M src/storage/phrase_large_table.cpp +M src/storage/phrase_large_table.h + +commit 36035361995fea3f44f1e1f78a9ac4aabf94290d +Author: Peng Wu +Date: 2012-02-17 10:54:45 +0800 + + add comments for full pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit a9fb045cae4df38786b12b4c66f316be5a0ee128 +Author: Peng Wu +Date: 2012-02-17 10:43:59 +0800 + + fixes middle_and_final_level_search + +M src/storage/chewing_large_table.cpp + +commit ad094960b7844a026e65c4d2aafb674783694a08 +Author: Peng Wu +Date: 2012-02-13 13:26:12 +0800 + + improves full pinyin parser + +M src/storage/pinyin_parser2.cpp + +commit df0a8d47d1a2559628bee1729d840100962b72ac +Author: Peng Wu +Date: 2012-02-13 10:45:44 +0800 + + update man pages + +M doc/gen_binary_files.1 +M doc/gen_unigram.1 +M doc/import_interpolation.1 + +commit ba77aa23be99f1487421d90b3b2e08aef4380d57 +Author: Peng Wu +Date: 2012-02-13 10:45:33 +0800 + + update libpinyin.spec.in + +M libpinyin.spec.in + +commit 190e178a3cc2920db66504b0343ff20b35c183c4 +Author: Peng Wu +Date: 2012-02-10 16:54:01 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit b960a4b18f691a9a01e29c720589af727ed4370c +Author: Peng Wu +Date: 2012-02-10 16:53:38 +0800 + + update python scripts + +M scripts/specials.txt + +commit 76f09ca801360d7ba5413f34eefd581d0199aeba +Author: Peng Wu +Date: 2012-02-10 16:53:11 +0800 + + improves pinyin parsers + +M src/storage/pinyin_parser2.cpp + +commit 64e3ee153b152091983cf830d214bb20bfa44b46 +Author: Peng Wu +Date: 2012-02-10 14:25:59 +0800 + + fixes in_chewing_scheme + +M src/pinyin.cpp +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit b5bec43f6ccd58e6eaf23eea0120bc50afdffb07 +Author: Peng Wu +Date: 2012-02-10 14:17:42 +0800 + + add some docs to pinyin.h + +M src/pinyin.h + +commit 59063295d3fec82dbfb2c8fe467722c97147214c +Author: Peng Wu +Date: 2012-02-09 13:12:21 +0800 + + add doc/Makefile.am + +M Makefile.am +M configure.ac +A doc/Makefile.am + +commit a459c31b7bb79ef1a2643e289e1c82486b957fec +Author: Peng Wu +Date: 2012-02-09 12:39:54 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit 1d6e7c7a8ccc222b004c5067a7c6e075808d4a0f +Author: Peng Wu +Date: 2012-02-09 12:39:39 +0800 + + add specials + +A scripts/specials.txt +M scripts/specialtable.py + +commit 92ec04e9c0b7e2c94ce48e880d87f22f3b49eec3 +Author: Peng Wu +Date: 2012-02-09 11:12:52 +0800 + + update man pages + +A doc/gen_binary_files.1 +A doc/gen_unigram.1 +A doc/import_interpolation.1 +M doc/libpinyin.1 + +commit fffb75f316a283dbd097b21e3a544e29ff4a3bf5 +Author: Peng Wu +Date: 2012-02-06 16:50:27 +0800 + + fixes libpinyin tools + +M utils/storage/gen_binary_files.cpp +M utils/storage/import_interpolation.cpp +M utils/training/gen_unigram.cpp + +commit 34909d3887a7ac3f423f00ec0913a2da6447e374 +Author: Peng Wu +Date: 2012-02-06 16:30:52 +0800 + + fixes format-security warnings + +M src/storage/tag_utility.cpp +M tests/storage/test_parser.cpp +M tests/storage/test_parser2.cpp + +commit a0095d85a122f7b4972471c9d7b0da414044a375 +Author: Peng Wu +Date: 2012-02-06 14:18:54 +0800 + + add libpinyin.1 + +A doc/libpinyin.1 + +commit e739e5c04929ee1d02505fb79102cd145b192572 +Author: Peng Wu +Date: 2012-01-29 13:17:33 +0800 + + fixes post process in full pinyin parser + +M src/storage/pinyin_parser2.cpp + +commit 93e8e69073840600d701bdd37067cbbc0afa23a8 +Author: Peng Wu +Date: 2012-01-29 11:06:48 +0800 + + fixes parse one key + +M src/storage/pinyin_parser2.cpp + +commit d92850fa529561d8e3cb9dfdc28a6280ce3fc81a +Author: Peng Wu +Date: 2012-01-29 10:26:17 +0800 + + fixes pinyin parsers + +M src/storage/pinyin_parser2.cpp + +commit f53ffed3119c278b4e6e7d3db7579fc0eae195a0 +Author: Peng Wu +Date: 2012-01-18 10:24:27 +0800 + + update ChangeLog + +M ChangeLog + +commit 86d8d8ecf8b656eaa2f2ec5b20a92aeda2c88c11 +Author: Peng Wu +Date: 2012-01-17 13:34:31 +0800 + + update ChangeLog + +M ChangeLog + +commit 40f435b0c74f061134f37e4baf48520d1dbb11e0 +Author: Peng Wu +Date: 2012-01-17 11:16:10 +0800 + + fixes a typo + +M src/storage/ngram.cpp + +commit 89299cf924543f454aa828d34d2d26cb1885ed35 +Author: Peng Wu +Date: 2012-01-17 10:27:48 +0800 + + bump version 0.5.91 + +M configure.ac +M src/pinyin.h + +commit 640a3a51f09ad64f02e562b938cd387c4e8043f5 +Author: Peng Wu +Date: 2012-01-16 16:40:12 +0800 + + fixes full pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit e0c9f028a1580816870e028c5337b2dce0b495ac +Author: Peng Wu +Date: 2012-01-14 10:29:32 +0800 + + fixes specialtable.py + +M scripts/specialtable.py + +commit fc5f2499c33c71df6c828a6527685f056a53d424 +Author: Peng Wu +Date: 2012-01-12 16:16:57 +0800 + + fixes full pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit 02a72ed015fe1ede3a718013231e4c3e20f29426 +Author: Peng Wu +Date: 2012-01-12 12:31:10 +0800 + + update test pinyin lookup + +M tests/lookup/test_pinyin_lookup.cpp + +commit 2d4a9aa1e2c76e6099a580cfccf73d5971eecf6a +Author: Peng Wu +Date: 2012-01-12 12:30:53 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit 845f8ed78a9a1ffe2ac8adf7cdb111473bb997e4 +Author: Peng Wu +Date: 2012-01-12 12:30:19 +0800 + + update pinyin parser + +M scripts/specialtable.py +M src/storage/pinyin_parser2.cpp + +commit ee0b9cde31d362a95f514cbab043229940d04973 +Author: Peng Wu +Date: 2012-01-12 11:20:55 +0800 + + write train result2 + +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h +M src/pinyin.cpp + +commit a9909e795ba81830439a1007a2b3ef24c9fc1f53 +Author: Peng Wu +Date: 2012-01-10 14:30:11 +0800 + + let pinyin lookup to use merge single gram + +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h + +commit f5f55fee7e078375ab40469d0417f202afdbd068 +Author: Peng Wu +Date: 2012-01-10 14:05:43 +0800 + + let phrase lookup to use merge single gram + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h + +commit e10ff28e8c84869f1a474b1211d1650300a47b89 +Author: Peng Wu +Date: 2012-01-10 15:34:30 +0800 + + improves heuristic method + +M src/storage/pinyin_parser2.cpp + +commit d35ee490607c4d222ae81106c28dd8d008d2e1fe +Author: Peng Wu +Date: 2012-01-10 15:33:16 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit 54ad235d3ca42925a84c1daa7540c7f5d41cf216 +Author: Peng Wu +Date: 2012-01-10 15:30:26 +0800 + + fixes specialtable.py + +M scripts/specialtable.py + +commit fabe3b1fd6b6ccab4f9f8b606a8503aee08c738d +Author: Peng Wu +Date: 2012-01-10 12:55:25 +0800 + + use facade * table + +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_pinyin_lookup.cpp +M utils/segment/ngseg.cpp +M utils/training/eval_correction_rate.cpp + +commit 742de0a367e511388ff197f6c21d586877698dda +Author: Peng Wu +Date: 2012-01-10 12:46:11 +0800 + + begin to use facade * table + +M src/lookup/lookup.h +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h +M src/pinyin.cpp + +commit 18e2714d4c67d55d9c054f8087b297e7862b433f +Author: Peng Wu +Date: 2012-01-09 13:12:53 +0800 + + fixes facade_*_table.h + +M src/storage/facade_chewing_table.h +M src/storage/facade_phrase_table.h + +commit 35b1fe95f26dfb0581d7212f61b402091d6c68d2 +Author: Peng Wu +Date: 2012-01-09 11:24:18 +0800 + + update libpinyin.spec.in + +M libpinyin.spec.in + +commit 3a9fd71ff8083d94ef144ef88ec56c2e3b160f5e +Author: Peng Wu +Date: 2012-01-09 11:23:28 +0800 + + update Makefile.am + +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit b2824b2735ff954ab1e8c0ab910afb0fda162cb5 +Author: Peng Wu +Date: 2012-01-05 13:03:05 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit 69a66088a60c6ae03462f8fba49383e5b4772b46 +Author: Peng Wu +Date: 2012-01-05 11:17:49 +0800 + + fixes chewing index + +M scripts/bopomofo.py +M scripts/genpinyintable.py +M scripts/pinyintable.py + +commit 8af616069b4805d43dc554a33d7d4503f9a87782 +Author: Peng Wu +Date: 2012-01-04 17:46:01 +0800 + + fixes crash + +M src/storage/pinyin_parser2.cpp + +commit 97c269ad379d7001d067757e556cbd0a7c30240c +Author: Peng Wu +Date: 2012-01-04 16:54:04 +0800 + + fixes ChewingParser2::in_chewing_scheme + +M src/storage/pinyin_parser2.cpp + +commit 8ebca1749f66d3a0705f60839658b3faf7ca202f +Author: Peng Wu +Date: 2011-12-30 17:22:40 +0800 + + fixes Makefile.am + +M data/Makefile.am + +commit 431f2b56db3f0c33f65f7a0e0366445c2cd4e6cc +Author: Peng Wu +Date: 2011-12-29 11:31:51 +0800 + + bump version 0.4.92 + +M configure.ac + +commit 9f0f08875bfc4125a0b4b8a7a7b31314d7c876d8 +Author: Peng Wu +Date: 2011-12-29 11:01:55 +0800 + + update pinyin.cpp + +M src/pinyin.cpp + +commit d3eda7ee46fdab4f4b5bf3cf4e0e2ab1db447b9b +Author: Peng Wu +Date: 2011-12-29 10:52:03 +0800 + + update libpinyin.spec.in + +M libpinyin.spec.in + +commit be97324565a43072744dc73a21ee4a2ae18f786c +Author: Peng Wu +Date: 2011-12-29 10:50:21 +0800 + + update ChangeLog + +M ChangeLog + +commit 13aac5af9c6e3f3a2e243806f102e7477b686c91 +Author: Peng Wu +Date: 2011-12-27 11:09:06 +0800 + + fixes data/Makefile.am + +M data/Makefile.am + +commit 2fd2eea102bfa32d662dca823bf1cfeed3a94c1c +Author: Peng Wu +Date: 2011-12-26 18:34:49 +0800 + + fixes parallel make + +M data/Makefile.am + +commit 49869f6917edf488f0daca22e32a8166cf6e0325 +Author: Peng Wu +Date: 2011-12-26 15:17:46 +0800 + + increase train factor + +M src/lookup/pinyin_lookup.cpp +M src/pinyin.cpp + +commit 11dfb3b72c7128e05e8608ff501d06b80a2788c1 +Author: Peng Wu +Date: 2011-12-26 14:56:09 +0800 + + fixes pinyin_translate_token + +M src/pinyin.cpp + +commit 6d821d1b145c307a9bd71c2615b8e596774d1c82 +Author: Peng Wu +Date: 2011-12-24 11:07:04 +0800 + + fixes post process in pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit cbd81a7b669bf97517ab9206ef12d29167a0fc41 +Author: Peng Wu +Date: 2011-12-23 14:14:26 +0800 + + fixes test chewing table + +M tests/storage/test_chewing_table.cpp + +commit 4904220051751d87461251f21e06b48ddc508589 +Author: Peng Wu +Date: 2011-12-22 10:59:30 +0800 + + fixes pinyin_custom2.h + +M src/storage/pinyin_custom2.h + +commit 5ed777d199dcfd8d24df8d6800564c19a8f6f327 +Author: Peng Wu +Date: 2011-12-21 13:04:31 +0800 + + add pinyin_in_chewing_keyboard + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit da0c48d52aad4541d38d45ad3490b151029b7f26 +Author: Peng Wu +Date: 2011-12-21 12:20:18 +0800 + + re-factor code + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit b381ab0f9d3aa3a607403f4981f32911869ea62e +Author: Peng Wu +Date: 2011-12-21 11:27:10 +0800 + + polish test chewing table + +M tests/storage/test_chewing_table.cpp + +commit e0e72e33e5ef14c89e57685cdf5d44f0faddedb1 +Author: Peng Wu +Date: 2011-12-20 17:29:11 +0800 + + fixes pinyin.h + +M src/pinyin.h + +commit 8c969628a1b800de07340130abf3ef0ac6e3d042 +Author: Peng Wu +Date: 2011-12-20 16:53:04 +0800 + + refine pinyin.h + +M src/pinyin.h + +commit faeb5a41fee376ed45862881873cb9ac33c34d8b +Author: Peng Wu +Date: 2011-12-20 15:06:00 +0800 + + fixes code style + +M src/storage/Makefile.am +M src/storage/pinyin_custom2.h + +commit 0bd6c94bd4d1d78e411d7d4fb52c5f7f3cb07aa8 +Author: Peng Wu +Date: 2011-12-20 14:29:37 +0800 + + add set options to pinyin lookup + +M src/lookup/pinyin_lookup.h +M src/pinyin.cpp + +commit 54304fd1441d9bb67299651b943577848c246892 +Author: Peng Wu +Date: 2011-12-20 13:44:34 +0800 + + refine pinyin_internal.h + +M src/pinyin_internal.h +M src/storage/flexible_ngram.h + +commit 29f9a74d45deffa61a58c6395418bdff79979996 +Author: Peng Wu +Date: 2011-12-20 12:50:43 +0800 + + add format version check + +M src/pinyin.cpp +M src/pinyin.h + +commit 66c80265f40d48519caba75e6e37a5e4ac9b83cd +Author: Peng Wu +Date: 2011-12-19 11:16:44 +0800 + + fixes pinyin_init + +M src/pinyin.cpp +M tests/lookup/test_pinyin_lookup.cpp + +commit 7efb58accb3e2e9fea4a578350a27447cb03383c +Author: Peng Wu +Date: 2011-12-15 13:36:02 +0800 + + fixes code style + +M scripts/chewingkey.py +M src/storage/chewing_large_table.cpp +M src/storage/phrase_index.cpp + +commit b76cdb25c9f724cd93c5555ac0e967a148d455dc +Author: Peng Wu +Date: 2011-12-15 11:06:08 +0800 + + refine python code + +M scripts/chewing_enum.h.in +M scripts/chewing_table.h.in +M scripts/double_pinyin_table.h.in +M scripts/pinyin_parser_table.h.in +M scripts/utils.py + +commit 8f6d32826c67dde615157aba21dbfdcdf4d479c7 +Author: Peng Wu +Date: 2011-12-15 10:56:03 +0800 + + use generated chewing_enum.h + +M src/storage/chewing_key.h + +commit 991daf5287d3abcc16d8f05fe801901a329c3093 +Author: Peng Wu +Date: 2011-12-14 15:13:02 +0800 + + add chewing_enum.h to Makefile.am + +M src/storage/Makefile.am + +commit c3488db653a99654163d7a44a2fc6fdca9e8883f +Author: Peng Wu +Date: 2011-12-14 15:08:50 +0800 + + update .gitignore + +M .gitignore + +commit cd8659a2748c8afe04e3c8e0964845a84ed739df +Author: Peng Wu +Date: 2011-12-14 15:06:39 +0800 + + refactor expand_file + +M scripts/genbopomofoheader.py +M scripts/gendoublepinyinheader.py +M scripts/genpinyinheader.py + +commit 8fe06a2c0f4f299bb2fa1610769814913fee5d6f +Author: Peng Wu +Date: 2011-12-14 14:56:40 +0800 + + add genchewingkey.py + +M scripts/Makefile.data +M scripts/chewing_enum.h.in +M scripts/chewingkey.py +A scripts/genchewingkey.py +A scripts/utils.py + +commit a62422e299a8b013819e8366e419bb4147421af3 +Author: Peng Wu +Date: 2011-12-14 14:55:06 +0800 + + add generated chewing_enum.h + +A src/storage/chewing_enum.h + +commit 5c89ad8b701188916847acf54e9efc025f9002bb +Author: Peng Wu +Date: 2011-12-14 14:34:40 +0800 + + remove table index in chewing key rest + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp + +commit aad64d52a5317a6b757725e3a1b209f43d34f86f +Author: Peng Wu +Date: 2011-12-14 14:25:21 +0800 + + clean up pinyin.h + +M src/pinyin.cpp +M src/pinyin.h + +commit b2f0a76e79eb8cc05adf31c36a70bc82c8b1f03d +Author: Peng Wu +Date: 2011-12-14 14:23:15 +0800 + + refine parse_one_key method + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 20cef0cea7407e95daedc36c612dfcfa8339b48d +Author: Peng Wu +Date: 2011-12-14 13:41:56 +0800 + + fixes phrase index + +M src/storage/phrase_index.cpp + +commit 9ffdfaa1b77c0a9e2136ad49768bc7df4329d454 +Author: Peng Wu +Date: 2011-12-14 13:39:06 +0800 + + refine ChewingKeyRest + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp +M tests/storage/test_parser2.cpp +M utils/storage/gen_chewing_table.cpp + +commit 2970679b136f91607f7db1d1a64c3158b1d60881 +Author: Peng Wu +Date: 2011-12-14 13:06:11 +0800 + + add get string to chewing key + +A scripts/chewing_enum.h.in +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp + +commit 23e34dfe67ef11c44b196337cd42e4f000f9b9fc +Author: Peng Wu +Date: 2011-12-13 17:41:50 +0800 + + fixes compile + +M scripts/pinyin_parser_table.h.in +M src/storage/pinyin_parser_table.h + +commit 4657987b1aedd94081238d60d48044326419f23b +Author: Peng Wu +Date: 2011-12-13 17:37:59 +0800 + + polish generated code + +M scripts/chewingkey.py + +commit f6d54473773c08e2c083b1ef299d2944bf39af78 +Author: Peng Wu +Date: 2011-12-13 17:23:15 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit b9dae484fb1119b89bb722f4f1ecb373b8e4cf52 +Author: Peng Wu +Date: 2011-12-13 17:21:38 +0800 + + fixes python scripts + +M scripts/genpinyinheader.py +M scripts/genpinyintable.py +M scripts/pinyin_parser_table.h.in + +commit 4d43f63b30bcb97b7e0f3761df5c7902d4575bc5 +Author: Peng Wu +Date: 2011-12-13 17:13:10 +0800 + + gen chewing key to table index map + +M scripts/chewingkey.py +M scripts/genpinyinheader.py +M scripts/genpinyintable.py + +commit c922c671b78d176c372eb323cacde33dba24b93b +Author: Peng Wu +Date: 2011-12-13 15:54:30 +0800 + + begin to write chewingkey.py + +A scripts/chewingkey.py + +commit 44d567eee4767c7b0bc4a2feb8cb9faaf8c83019 +Author: Peng Wu +Date: 2011-12-10 11:16:55 +0800 + + rename pinyin to pronunciation + +M src/lookup/pinyin_lookup.cpp +M src/pinyin.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M tests/storage/test_phrase_index.cpp + +commit 3af2cf9799894048f226e952ea9a0b06f5da6553 +Author: Peng Wu +Date: 2011-12-09 16:52:10 +0800 + + fixes code style + +M tests/storage/test_chewing_table.cpp +M tests/storage/test_pinyin_table.cpp + +commit 8ac95f0eefd222a27d28e8d92edcfa4b39464018 +Author: Peng Wu +Date: 2011-12-09 16:31:59 +0800 + + compatible with maximum forward parser + +M src/storage/pinyin_parser2.cpp + +commit 5a9dbf3667f0d9cb84af8e5ddecc52ccf6b4535d +Author: Peng Wu +Date: 2011-12-09 15:40:09 +0800 + + port eval_correction_rate.cpp + +M utils/training/eval_correction_rate.cpp + +commit 69bbefcd562e080cc3283dff623e67f6431d71e8 +Author: Peng Wu +Date: 2011-12-09 15:25:28 +0800 + + port gen_binary_files.cpp + +M utils/storage/gen_binary_files.cpp + +commit 50b8d01371708313ec063178f9819ee6230487d7 +Author: Peng Wu +Date: 2011-12-09 15:21:49 +0800 + + port gen_pinyin_table.cpp + +M utils/storage/gen_pinyin_table.cpp + +commit ec1e4559dede2e3bddf555c6322c64642bdbc1e0 +Author: Peng Wu +Date: 2011-12-09 15:19:42 +0800 + + port gen_zhuyin_map.cpp + +M utils/storage/gen_zhuyin_map.cpp + +commit 166e1723bd4677a8b454bb12bf22ed7f4ebac5c5 +Author: Peng Wu +Date: 2011-12-09 15:17:01 +0800 + + port test pinyin/phrase/chewing + +M tests/test_chewing.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp + +commit fe64288f056b3bbcbb512e892a4035a499ee5181 +Author: Peng Wu +Date: 2011-12-09 15:13:57 +0800 + + port test pinyin lookup + +M tests/lookup/test_pinyin_lookup.cpp + +commit c08deb484da57cfd7b5b64d499c48fb4193b68ad +Author: Peng Wu +Date: 2011-12-09 14:30:45 +0800 + + port test phrase index + +M tests/storage/test_phrase_index.cpp + +commit e19783cb89742ada08d65d0232eed8bbd19793df +Author: Peng Wu +Date: 2011-12-09 14:28:50 +0800 + + add operator == to ChewingKey + +M src/storage/chewing_key.h + +commit 83faf2027fffe8cba367edd9b33905cba1ceb900 +Author: Peng Wu +Date: 2011-12-09 14:18:46 +0800 + + port chewing table + +M tests/storage/test_chewing_table.cpp + +commit 8061ac47263cb9649e457ba7d553f622117fe7dd +Author: Peng Wu +Date: 2011-12-09 14:18:28 +0800 + + port test pinyin table + +M tests/storage/test_pinyin_table.cpp + +commit e924922ad2404ab49ea5809c8a197d945bf01c07 +Author: Peng Wu +Date: 2011-12-09 13:48:41 +0800 + + add comments + +M utils/storage/gen_chewing_table.cpp + +commit 7686fc7ad3b71877fe86ca84a6c38360df67ca3e +Author: Peng Wu +Date: 2011-12-08 17:23:39 +0800 + + port pinyin_internal.h + +M src/pinyin.cpp +M src/pinyin_internal.h + +commit c98f91e572ddcb4caf953e1d5032ac8442d7d2f4 +Author: Peng Wu +Date: 2011-12-08 17:19:47 +0800 + + port pinyin.cpp + +M src/pinyin.cpp +M src/pinyin.h +M src/pinyin_internal.h + +commit 669d5b63478a83df3938ae128f52dd3ef4fd7d2f +Author: Peng Wu +Date: 2011-12-08 16:55:49 +0800 + + port pinyin lookup + +M src/lookup/lookup.cpp +M src/lookup/lookup.h +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h + +commit fcd6aa844697457b3b5e8d38c485d57f92789ea9 +Author: Peng Wu +Date: 2011-12-08 16:41:17 +0800 + + port phrase index + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 0f816bbcb7fd1fcf60b630843a4a7d76105c5432 +Author: Jim Huang +Date: 2011-12-09 01:45:01 +0800 + + update CMake rules to reflect recent changes + +M tests/lookup/CMakeLists.txt +M tests/storage/CMakeLists.txt + +commit 01f7a5d90e6e35491561076bec86464c72052a56 +Author: Peng Wu +Date: 2011-12-08 10:40:50 +0800 + + begin to port + +M tests/storage/test_parser.cpp +M tests/storage/test_pinyin_table.cpp + +commit fbf33991cf8fb42858b2609760815ebb5d3ad7bc +Author: Peng Wu +Date: 2011-12-08 10:25:39 +0800 + + rename test_simple_lookup to test_pinyin_lookup + +M tests/lookup/Makefile.am +R100 tests/lookup/test_simple_lookup.cpp tests/lookup/test_pinyin_lookup.cpp + +commit dfe121f57c1834a622f8ea2dedafc47c47edec8f +Author: Peng Wu +Date: 2011-12-07 17:07:08 +0800 + + fixes test chewing table + +M tests/storage/test_chewing_table.cpp + +commit a9f3ef4fc24487828775e7dbdcda4bf0fdab023c +Author: Peng Wu +Date: 2011-12-07 16:59:46 +0800 + + fixes gen chewing table + +M utils/storage/gen_chewing_table.cpp + +commit 4aebb8f84e92da3075da3057afbcce5fa9fed2f7 +Author: Peng Wu +Date: 2011-12-07 15:56:49 +0800 + + write gen chewing table + +M src/storage/chewing_key.h +A utils/storage/gen_chewing_table.cpp + +commit dcfbeeaa0e381a7d03cdec05e8712753c2afb1e2 +Author: Peng Wu +Date: 2011-12-07 14:08:56 +0800 + + fixes compile + +M src/pinyin_internal.h +M utils/storage/Makefile.am + +commit ebed3789e3db58958106306f8907b3ea4ab9bcd6 +Author: Peng Wu +Date: 2011-12-07 12:32:57 +0800 + + rename test_pinyin_index to test_pinyin_table + +M tests/storage/Makefile.am +R100 tests/storage/test_pinyin_index.cpp tests/storage/test_pinyin_table.cpp + +commit 2ed063e8baa49779c810241119ba920917645890 +Author: Peng Wu +Date: 2011-12-07 11:30:03 +0800 + + improves test chewing table + +M tests/storage/test_chewing_table.cpp + +commit 417081e2ebe587bdb207241eb1e365c0d72d772f +Author: Peng Wu +Date: 2011-12-07 10:51:49 +0800 + + fixes load text in chewing large table + +M src/storage/chewing_large_table.cpp + +commit fc70339dea4380ddf3ccc5956346dceb8b0f7916 +Author: Peng Wu +Date: 2011-12-06 18:27:59 +0800 + + fixes test chewing table + +M tests/storage/test_chewing_table.cpp + +commit f48d39a105898a8f915b6609ec86e16cf74122fc +Author: Peng Wu +Date: 2011-12-06 18:16:28 +0800 + + fixes makefile + +M src/storage/Makefile.am + +commit d89098230d873ca1e56af70b3c25a136576e743f +Author: Peng Wu +Date: 2011-12-06 18:10:20 +0800 + + fixes test chewing table + +M tests/storage/test_chewing_table.cpp + +commit 2f329c267b26da0161135ec9f4033c7cd6bad508 +Author: Peng Wu +Date: 2011-12-06 17:58:37 +0800 + + fixes code style + +M src/storage/chewing_large_table.cpp + +commit b22d3305a927528a1c134eb6a875e5dc478a885a +Author: Peng Wu +Date: 2011-12-06 17:56:59 +0800 + + fixes chewing large table + +M src/storage/chewing_large_table.cpp + +commit 51ef74bdc4cd8df6049c6a5603b4c31524d70b31 +Author: Peng Wu +Date: 2011-12-06 17:24:43 +0800 + + write test chewing table + +M src/pinyin_internal.h +M tests/storage/Makefile.am +A tests/storage/test_chewing_table.cpp +M tests/storage/test_pinyin_index.cpp + +commit 469b8a9c4c77ca1bd4b33041a0badd388b474e04 +Author: Peng Wu +Date: 2011-12-06 16:51:35 +0800 + + fixes pinyin_internal.h + +M src/pinyin_internal.h +M src/storage/chewing_large_table.cpp +M src/storage/phrase_large_table.cpp + +commit e662a0d2ecb5e1910b9aec295df0a5b1098f7a41 +Author: Peng Wu +Date: 2011-12-06 11:42:33 +0800 + + add set options method to facade chewing table + +M src/storage/facade_chewing_table.h + +commit 8fa0b6e444294ab86aa88a35ff3cd04d1f5f9906 +Author: Peng Wu +Date: 2011-12-06 11:38:16 +0800 + + write facade chewing table + +M src/include/memory_chunk.h +M src/storage/chewing_large_table.cpp +A src/storage/facade_chewing_table.h + +commit 9fba60c221404d32c552771eb90e1046e99a4237 +Author: Peng Wu +Date: 2011-12-06 11:09:04 +0800 + + write facade phrase table + +A src/storage/facade_phrase_table.h +M src/storage/phrase_large_table.cpp + +commit 75a9c152b835c7e66222e23eba041bb6e09e6dac +Author: Peng Wu +Date: 2011-12-05 15:47:48 +0800 + + clean up parse_one_key in full pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit 0b4d5c66a57105ded0aa41ded6ea55c4edac24a7 +Author: Peng Wu +Date: 2011-12-05 14:35:02 +0800 + + fixes compile + +M src/storage/ngram.cpp + +commit a20107c9ca3aa1c9b8ed9b7a1f91335316bcd8a7 +Author: Peng Wu +Date: 2011-12-05 14:31:26 +0800 + + fixes merge single gram + +M src/storage/ngram.cpp + +commit 9cf00098f4628fb9797bb14963686384d406883b +Author: Peng Wu +Date: 2011-12-05 14:19:20 +0800 + + add const modifiers + +M src/storage/ngram.cpp +M src/storage/ngram.h + +commit 8ff7710aabb59538eb0b9b87c865d7aac5413032 +Author: Peng Wu +Date: 2011-12-05 14:16:16 +0800 + + write merge single gram + +M src/include/memory_chunk.h +M src/storage/ngram.cpp +M src/storage/ngram.h + +commit 3a99dcfdbe50c4a5a7810f3f640e81be877abd9c +Author: Peng Wu +Date: 2011-12-05 11:56:20 +0800 + + update chewing_table.h + +M src/storage/chewing_table.h + +commit 2a3f9b829c85ab8e26b13e9db3824863bb865e69 +Author: Peng Wu +Date: 2011-12-05 11:55:58 +0800 + + fixes genbopomofoheader.py + +M scripts/genbopomofoheader.py + +commit e2a8959307e801a1821caa28d5217a9833e6e907 +Author: Peng Wu +Date: 2011-12-05 11:47:08 +0800 + + write chewing large table + +M src/storage/chewing_large_table.cpp + +commit 1b975d9f86c1ccbace5e2a06080325fe5f42879b +Author: Peng Wu +Date: 2011-12-02 17:38:46 +0800 + + write load text method for chewing large table + +M src/storage/chewing_large_table.cpp +M src/storage/pinyin_large_table.cpp + +commit 23d9cb43b3880a8ce5daf896d7b1df931e3cdbba +Author: Peng Wu +Date: 2011-12-02 15:45:02 +0800 + + fixes remove index + +M src/storage/chewing_large_table.cpp + +commit 1ab715b2200375c41ac23a62b5207dfeb6c1fb94 +Author: Peng Wu +Date: 2011-12-02 15:30:25 +0800 + + write add/remove index for chewing large table + +M src/storage/chewing_large_table.cpp + +commit 9eb0bdb65967d2ab8ea9ea465347deb909f5dc75 +Author: Peng Wu +Date: 2011-12-02 15:04:35 +0800 + + write add/remove index of chewing large table in progress + +M src/storage/chewing_large_table.cpp + +commit 6db008752cfad90cd6c839f1776429ecee68948d +Author: Peng Wu +Date: 2011-12-02 11:08:09 +0800 + + fixes double pinyin parser + +M src/storage/pinyin_parser2.cpp +M tests/storage/test_parser2.cpp + +commit 1e9eafd096f28e88766d5cf26c1ccf4b336a1706 +Author: Jim Huang +Date: 2011-12-02 01:49:04 +0800 + + update .gitignore for executables and database + +M .gitignore + +commit d66265a28a2e85e520c39e4db5d24ae0166f4811 +Author: Jim Huang +Date: 2011-12-02 01:43:27 +0800 + + Ignore CMake generated files + +M .gitignore + +commit 56df943cf9ef4a136438eca8621db168b4f05a45 +Author: Jim Huang +Date: 2011-12-02 01:37:11 +0800 + + synchronize CMake rules to match Makefile.am + +M src/include/CMakeLists.txt +M src/lookup/CMakeLists.txt +M src/storage/CMakeLists.txt +M tests/storage/CMakeLists.txt +M utils/storage/CMakeLists.txt + +commit c34f5d50a1fdf4015d97dd1dba15657b5755ff44 +Author: Peng Wu +Date: 2011-12-01 15:40:26 +0800 + + update test cases + +M tests/lookup/test_simple_lookup.cpp +M tests/storage/test_parser2.cpp + +commit 3d95277dff2e91ce436874bee5e51315f7fc4462 +Author: Peng Wu +Date: 2011-12-01 15:33:27 +0800 + + add const modifiers + +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table.h + +commit 024dc9396afe9041af46b7ab8d91c68752054679 +Author: Peng Wu +Date: 2011-12-01 15:28:10 +0800 + + write search method for chewing large table + +M src/storage/chewing_large_table.cpp +M src/storage/pinyin_phrase2.h + +commit e1c4b6b0ee7455458a9de25a7195eea059dc5ca7 +Author: Peng Wu +Date: 2011-12-01 10:41:58 +0800 + + fixes a typo + +M src/storage/chewing_large_table.cpp + +commit 15f63b39f4461a5eec17e8ad5f616b74f3eede87 +Author: Peng Wu +Date: 2011-11-30 19:13:28 +0800 + + fixes compile + +M src/storage/chewing_large_table.cpp + +commit eb0ea0e4ffb8721845aeeec7145185e32fe5d246 +Author: Peng Wu +Date: 2011-11-30 19:06:49 +0800 + + write chewing large table in progress + +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table.h + +commit 9c98fc93d86ab6205cb15fec14a3bc190e448ee7 +Author: Peng Wu +Date: 2011-11-30 17:02:43 +0800 + + begin to write search method + +M src/storage/chewing_large_table.cpp + +commit 0fb25fb9700f0cd32679c3e3cc358c575c8b2826 +Author: Peng Wu +Date: 2011-11-30 16:17:58 +0800 + + refine chewing large table header + +M src/storage/chewing_large_table.h + +commit ddfd94c68310d2b8016de24f578145aff324482b +Author: Peng Wu +Date: 2011-11-30 12:46:39 +0800 + + fixes test chewing + +M tests/test_chewing.cpp + +commit 4f3150e44d8da95a0ff28e461c780abc2b472e5a +Author: Jim Huang +Date: 2011-11-30 01:24:45 +0800 + + tests: Update CMake rules after code refactoring + +M tests/lookup/CMakeLists.txt +M tests/storage/CMakeLists.txt + +commit 1eacb0a42d5c7263369fb1f712506aa28d0c37f7 +Author: Peng Wu +Date: 2011-11-29 16:31:08 +0800 + + write chewing large table in progress + +M src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table.h + +commit 192b5d79a24c36f0c1247bf837e2e837098145f6 +Author: Peng Wu +Date: 2011-11-29 15:51:22 +0800 + + refactor test cases + +M tests/Makefile.am +M tests/lookup/Makefile.am +M tests/lookup/test_simple_lookup.cpp +M tests/storage/Makefile.am +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp +M tests/storage/test_pinyin_index.cpp +A tests/timer.h + +commit 15cb3e9a981848bd1ad14a09067c102196c743db +Author: Peng Wu +Date: 2011-11-29 15:36:55 +0800 + + update test_parser2.cpp + +M tests/storage/test_parser2.cpp + +commit eb8fdda2965ca382a9b41d8cac65ee16e16ee6e6 +Author: Peng Wu +Date: 2011-11-29 14:31:57 +0800 + + begin to add chewing_large_table.cpp + +M src/include/memory_chunk.h +M src/storage/Makefile.am +A src/storage/chewing_large_table.cpp +M src/storage/chewing_large_table.h + +commit c9667ef0a30d03647fc97490326cea4c2426df13 +Author: Peng Wu +Date: 2011-11-29 14:26:47 +0800 + + write chewing_large_table.h + +A src/storage/chewing_large_table.h + +commit 4972231a663cfb8713d55287efb2638f7dec68f6 +Author: Peng Wu +Date: 2011-11-29 13:56:39 +0800 + + update test parser2 + +M tests/storage/test_parser2.cpp + +commit 9c9a11038a30285b3537af3f0df2d3331acd7ec0 +Author: Peng Wu +Date: 2011-11-29 13:56:11 +0800 + + add type pinyin_option_t + +M src/include/novel_types.h +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h +M src/storage/pinyin_phrase2.h + +commit 4e9139c635feb783ca5702394d331e4559318eba +Author: Peng Wu +Date: 2011-11-29 10:55:56 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit 6ab0e27aa525c498de954ce9c073d4599b4afe08 +Author: Peng Wu +Date: 2011-11-29 10:52:16 +0800 + + fixes gen_pinyins + +M scripts/pinyintable.py + +commit f151299744268571e9910ab5c10a6c688027fbe4 +Author: Peng Wu +Date: 2011-11-28 18:43:03 +0800 + + fixes full pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit 3a77085a17a66bcd9d231dfcefbbf886e79cfe82 +Author: Peng Wu +Date: 2011-11-28 17:54:25 +0800 + + add more tests for test parser2 + +M tests/storage/test_parser2.cpp + +commit d685c3add83239b70b8ed00408ac1613a9a654cb +Author: Peng Wu +Date: 2011-11-28 17:41:03 +0800 + + fixes chewing parser2 + +M src/storage/pinyin_parser2.cpp + +commit bcd0f502f7867dd7d1698b0101c4eab73ce686b8 +Author: Peng Wu +Date: 2011-11-28 17:35:37 +0800 + + write test parser2 + +M tests/storage/test_parser2.cpp + +commit 2e94362059fe96a490ef7a8b320a08941b96ec81 +Author: Peng Wu +Date: 2011-11-28 17:18:39 +0800 + + write test parser2 in progress + +M tests/storage/test_parser2.cpp + +commit b90b28bc329c1c7db4ea3e085b10218b3f6c47f2 +Author: Peng Wu +Date: 2011-11-28 15:51:09 +0800 + + begin to add test parser2 + +M tests/storage/Makefile.am +A tests/storage/test_parser2.cpp + +commit f87b9baab899ef0afa61f16757e63c926ffa1b81 +Author: Peng Wu +Date: 2011-11-25 15:18:42 +0800 + + update lambda parameter + +M src/include/novel_types.h + +commit 42b31ef48272c2914e2ffc2bb87608111792d2d0 +Author: Peng Wu +Date: 2011-11-25 14:58:45 +0800 + + add const modifiers to train factor + +M src/lookup/pinyin_lookup.cpp + +commit 3d731193a89fa725eec0bfce92489df0be7a272c +Author: Peng Wu +Date: 2011-11-24 13:02:10 +0800 + + increase train_factor because of larger model data + +M src/lookup/pinyin_lookup.cpp + +commit 2acda18725e41a3634e2226ef5a20a7599f5cff5 +Author: Peng Wu +Date: 2011-11-24 12:59:52 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit 2b889bde7ff9db60b09bb5129b76e2d106b7ed59 +Author: Peng Wu +Date: 2011-11-24 12:58:40 +0800 + + revert 'v'->'ü' + +M scripts/genpinyintable.py + +commit 5627b7bbfab5380196e4c1e3ffa8b06e258464d7 +Author: Peng Wu +Date: 2011-11-24 10:53:09 +0800 + + update comments + +M src/storage/pinyin_parser2.h + +commit cbe325008a4413d154eebf521ba5bfb25bae075d +Author: Peng Wu +Date: 2011-11-23 17:37:02 +0800 + + write parse method for chewing parser2 + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit dd2f732abd8d16891995c7c12c2ae73f449f2395 +Author: Peng Wu +Date: 2011-11-23 17:02:58 +0800 + + add comments + +M src/storage/pinyin_parser2.cpp + +commit 26719a855a15becc772e90f715bd974e113912b4 +Author: Peng Wu +Date: 2011-11-23 16:53:04 +0800 + + write parse_one_key for chewing parser2 + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit c69900e3d25a01101ac82081d9565a59aa477980 +Author: Peng Wu +Date: 2011-11-23 15:29:57 +0800 + + add set scheme for chewing parser2 + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 9f17bdefd4303242d017f2cd3e0ee3bfba819af2 +Author: Peng Wu +Date: 2011-11-23 15:18:49 +0800 + + begin to write chewing parser2 + +M scripts/genbopomofoheader.py +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 0f7b939fd5f21689448881fda1c598162eda9b51 +Author: Peng Wu +Date: 2011-11-23 15:18:27 +0800 + + update chewing_table.h + +M src/storage/chewing_table.h + +commit e04fdb591205c05b47eef83cb318c654b3f8f01d +Author: Peng Wu +Date: 2011-11-23 14:39:55 +0800 + + write parse method for double pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit 651f1af2f25cbea77db18d68ea8f31d36e58233a +Author: Peng Wu +Date: 2011-11-23 11:22:33 +0800 + + update chewing_table.h + +M src/storage/chewing_table.h + +commit 0ae49515d539175b888fbd3420908b949c6cae21 +Author: Peng Wu +Date: 2011-11-23 11:21:22 +0800 + + fixes gen bopomofo header + +M scripts/chewing_table.h.in +M scripts/genbopomofoheader.py + +commit 56abe0fc75529b7b3c054ca900ed28c3a33d08d0 +Author: Peng Wu +Date: 2011-11-23 11:17:14 +0800 + + delay yunmu shuffle for chewing parser2 + +M src/storage/pinyin_parser2.h + +commit 9653729be9644d4120e2e624e7a0dc68dd7c622f +Author: Peng Wu +Date: 2011-11-23 10:34:46 +0800 + + add comments + +M src/storage/pinyin_parser2.cpp + +commit bc1f11e11c308635197a05b9af4235d9e4640f82 +Author: Peng Wu +Date: 2011-11-22 17:51:01 +0800 + + fixes memory leak + +M src/storage/pinyin_parser2.cpp + +commit 5431afcc6ae10297314bfa6a685a5d9cbe9cb7ff +Author: Peng Wu +Date: 2011-11-22 17:34:54 +0800 + + fixes compile warnings + +M src/storage/pinyin_parser2.cpp + +commit b8f24229c7b6ca730fdd93e48e6e047f3151de4a +Author: Peng Wu +Date: 2011-11-22 17:29:21 +0800 + + write double pinyin parse one key + +M src/storage/pinyin_parser2.cpp + +commit 2c1b832d3823d82afafd449466a5e8b0d0bb9396 +Author: Peng Wu +Date: 2011-11-22 17:05:17 +0800 + + improves full pinyin parse_one_key + +M src/storage/pinyin_parser2.cpp + +commit bd310c159c36d8d671b7664039dd103e4e718dac +Author: Peng Wu +Date: 2011-11-22 16:55:55 +0800 + + refine full pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit f736c00e0d4b6640ab56abb84af123ceb20df647 +Author: Peng Wu +Date: 2011-11-22 15:46:35 +0800 + + add set scheme for double pinyin parser2 + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit d9d3c2c7292d209829823fb9ed1ac977ed6aeb07 +Author: Peng Wu +Date: 2011-11-22 15:26:14 +0800 + + update double_pinyin_table.h + +M src/storage/double_pinyin_table.h + +commit 09f1c10d797e4b7cc70cb0f8491619c477ca2838 +Author: Peng Wu +Date: 2011-11-22 15:25:58 +0800 + + update gen double pinyin header + +M scripts/gendoublepinyinheader.py + +commit a587af57ef8a5896622132b0f53001fa1211c04f +Author: Peng Wu +Date: 2011-11-22 15:19:51 +0800 + + update pinyin parser2 header + +M src/storage/pinyin_parser2.h + +commit 71c416406d483e1a861a557807e689afa40b26ca +Author: Peng Wu +Date: 2011-11-21 17:14:04 +0800 + + fixes makefile + +M src/storage/Makefile.am + +commit 84481dd2cfb46d12501bd64e8efe206ff3b37a08 +Author: Peng Wu +Date: 2011-11-21 17:09:35 +0800 + + add escape char to gen bopomofo header + +M scripts/genbopomofoheader.py +M src/storage/pinyin_parser2.cpp + +commit 9bd7c3a49309dc699f074567762d2b8062783f9b +Author: Peng Wu +Date: 2011-11-21 17:08:57 +0800 + + update chewing_table.h + +M src/storage/chewing_table.h + +commit 8ac98651bc12bb8cea38ca8bdb91f4187d0f8e99 +Author: Peng Wu +Date: 2011-11-21 17:04:53 +0800 + + add chewing_table.h + +M scripts/Makefile.data +A src/storage/chewing_table.h + +commit 66edb5757ba36adf5d31d29affd78881d186ae36 +Author: Peng Wu +Date: 2011-11-21 17:02:53 +0800 + + write gen bopomofo header + +M scripts/genbopomofoheader.py + +commit b8c33fc248ff56b15bfc4f1e74ac1240670d7173 +Author: Peng Wu +Date: 2011-11-21 16:39:31 +0800 + + add chewing_table.h.in + +A scripts/chewing_table.h.in +M scripts/genbopomofoheader.py +M src/storage/pinyin_parser2.h + +commit dd2fc6f500ad59c1c42e8875608b3a20057bc374 +Author: Peng Wu +Date: 2011-11-21 16:29:12 +0800 + + refine genbopomofoheader.py + +M scripts/genbopomofoheader.py + +commit 9f402d3b11ccc24ceaf461048c6d5adcc0a4f7ce +Author: Peng Wu +Date: 2011-11-21 16:22:03 +0800 + + add genbopomofoheader.py + +M scripts/bopomofo.py +A scripts/genbopomofoheader.py + +commit b502f9eb3d61967662407ccaa2d3f08de9592d50 +Author: Peng Wu +Date: 2011-11-21 15:56:15 +0800 + + update Makefile.am + +M src/storage/Makefile.am +M src/storage/pinyin_parser2.cpp + +commit 2c007ec9abfc8d22355bd7cf3619f4b5dac92f74 +Author: Peng Wu +Date: 2011-11-21 15:51:25 +0800 + + add double pinyin table header + +M scripts/Makefile.data +A src/storage/double_pinyin_table.h + +commit c46f20d200398b00e63e17d3426284796b821912 +Author: Peng Wu +Date: 2011-11-21 15:47:44 +0800 + + write gen double pinyin header + +M scripts/gendoublepinyinheader.py +M scripts/pinyin.py +M src/storage/pinyin_parser2.cpp + +commit 7cd34c7db28627f5eabab94059e56965e3bf8727 +Author: Peng Wu +Date: 2011-11-21 14:42:38 +0800 + + begin to write gen double pinyin header + +M scripts/double_pinyin_table.h.in +A scripts/gendoublepinyinheader.py +M src/storage/pinyin_parser2.h + +commit a2839e6a76eeeb49a8f5b0218548b8aa3bc136ad +Author: Peng Wu +Date: 2011-11-21 14:01:47 +0800 + + begin to write double pinyin parser2 + +A scripts/double_pinyin_table.h.in +M src/storage/pinyin_parser2.cpp + +commit 4dba58edd6bb7698fbd38e5c146848cabcadad1b +Author: Peng Wu +Date: 2011-11-21 10:00:20 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit 68e20601ce0ffc391171686ad7f0e2f17866fe13 +Author: Peng Wu +Date: 2011-11-21 09:57:52 +0800 + + handle v in gen pinyin table + +M scripts/genpinyintable.py + +commit 2c97eb4bdb4f4e121cc8618b639aa574387e99c1 +Author: Peng Wu +Date: 2011-11-18 16:02:42 +0800 + + clean up chewing parser2 definition + +M src/storage/pinyin_parser2.h + +commit 479f391d04433c91e3b4e5b537e856cb0e73e43b +Author: Peng Wu +Date: 2011-11-18 14:39:52 +0800 + + bump version + +M configure.ac + +commit aba60da76a2d105b57512bcd24df5cd8f09abf63 +Author: Peng Wu +Date: 2011-11-17 18:42:30 +0800 + + fixes post process in full pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit f22c9f45a7b9a9be6db89414618d4d2151af8ee6 +Author: Peng Wu +Date: 2011-11-17 18:33:45 +0800 + + update pinyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit ba69d0ee731ce6ea857a7dfe224d735e01a952e7 +Author: Peng Wu +Date: 2011-11-17 18:33:27 +0800 + + update python scripts + +M scripts/genspecialtable.py + +commit a36b1dbc6877b6df76ef2e86d0552e826c50b657 +Author: Peng Wu +Date: 2011-11-17 18:28:45 +0800 + + update divided/resplit table + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 3bcf118aab782f221185099de58de460c5d03077 +Author: Peng Wu +Date: 2011-11-17 18:16:54 +0800 + + add phrase compare2 + +M src/storage/pinyin_phrase2.h + +commit 38270cf002fa0ca6ba03d895c91487c940206f53 +Author: Peng Wu +Date: 2011-11-17 17:41:46 +0800 + + fixes compile + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h +M src/storage/pinyin_phrase2.h + +commit 77b35d500b9307793ab87870403e8db8b316c250 +Author: Peng Wu +Date: 2011-11-17 17:31:17 +0800 + + add compute lower/upper pinyin + +M src/storage/pinyin_phrase2.h + +commit 96b2e5ba48baa9ada8e64eba9ad43001a90524ce +Author: Peng Wu +Date: 2011-11-17 15:32:52 +0800 + + add pinyin compare 2 + +M src/storage/pinyin_parser2.h +M src/storage/pinyin_phrase2.h + +commit a9864c66724dc3a74324afc2a28ca801c6ca7477 +Author: Peng Wu +Date: 2011-11-17 15:06:52 +0800 + + begin to add pinyin_phrase2.h + +M src/storage/Makefile.am +A src/storage/pinyin_phrase2.h + +commit 7fddc0894cf2ea1bff0e10285cf5181d8f076074 +Author: Peng Wu +Date: 2011-11-17 14:11:10 +0800 + + write pinyin_compare_middle_and_final2 + +M src/storage/pinyin_parser2.h + +commit 8ec1d25f1e9cf032897e877b084220f0db60d452 +Author: Peng Wu +Date: 2011-11-17 13:45:44 +0800 + + write pinyin_compare_initial2 + +M src/storage/pinyin_custom2.h +M src/storage/pinyin_parser2.h + +commit 7dbb2263c0ba8690074e663ccebacffc7d1f9dca +Author: Peng Wu +Date: 2011-11-16 17:54:37 +0800 + + add post process method + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 7c2c087c4ab0cd31c12bf686fe754c0c1064847a +Author: Peng Wu +Date: 2011-11-16 17:43:32 +0800 + + begin to write re-split post processing + +M src/storage/pinyin_parser2.cpp + +commit 479745510f0f8bd99dec45a0822d77421129b976 +Author: Peng Wu +Date: 2011-11-16 16:53:47 +0800 + + add final step method + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit cde9dee85b12d86a17517c38dcd7c6dfc103eafc +Author: Peng Wu +Date: 2011-11-16 16:34:55 +0800 + + write final step for full pinyin parser2 + +M src/storage/pinyin_parser2.cpp + +commit fa01b30e81a723b7b7144b511fc30e01cc5dff76 +Author: Peng Wu +Date: 2011-11-16 16:04:42 +0800 + + write full pinyin parser in progress + +M src/storage/pinyin_parser2.cpp + +commit 9fa01b9621b7cdc102f7efda35fac5260cbf622d +Author: Peng Wu +Date: 2011-11-16 14:45:18 +0800 + + update pinyin parsers interface + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 5af041d0ecb0eeff49be8c35a2223e8458a93120 +Author: Peng Wu +Date: 2011-11-16 14:26:32 +0800 + + write full pinyin parser in progress + +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 4794f487807d6f9ab26df198e27edb46e8353b31 +Author: Peng Wu +Date: 2011-11-16 10:05:32 +0800 + + add use tone option check + +M src/storage/pinyin_parser2.cpp + +commit 3d258a59568cb9d6114b8f80784d94abcb1b7905 +Author: Peng Wu +Date: 2011-11-15 17:52:28 +0800 + + update m_table_index name + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp + +commit 4e5e619a20c4d7c9cc1229a2f3e26a7219bf6841 +Author: Peng Wu +Date: 2011-11-15 17:07:56 +0800 + + begin to write full pinyin parser2 parse_one_key + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit 5501ea429dd50330caa9cd6ffbd8236d1663fa6e +Author: Peng Wu +Date: 2011-11-15 14:30:07 +0800 + + write chewing key rest in progress + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp + +commit ba0fe0bfcd3d37f86fad9e7cdf44c511352eca08 +Author: Peng Wu +Date: 2011-11-15 13:42:41 +0800 + + update gen pinyin table + +M scripts/genpinyintable.py + +commit aa88ca0ec666553b1a79b632ecaf9ef32049840f +Author: Peng Wu +Date: 2011-11-15 11:28:22 +0800 + + refine pinyin parser2 + +M src/storage/pinyin_parser2.h + +commit 8919f4c989c55e52ae6a18bfc4e1e4a1ed35d48b +Author: Peng Wu +Date: 2011-11-14 16:52:42 +0800 + + refine pinyin custom2 + +M src/storage/pinyin_custom2.h + +commit 9f8dc17faa2286c55cc39f39661b0e6f6cb78873 +Author: Peng Wu +Date: 2011-11-14 16:33:51 +0800 + + add pinyin/chewing check options + +M src/storage/pinyin_custom2.h +M src/storage/pinyin_parser2.cpp + +commit f42e1536efb4b396a53c50162a67cd35cd22f8f6 +Author: Peng Wu +Date: 2011-11-14 14:36:24 +0800 + + update pinyin parser table + +M src/storage/pinyin_parser_table.h + +commit 8f78ff8923670275bed69291c723e05b66edb22e +Author: Peng Wu +Date: 2011-11-14 14:33:26 +0800 + + fixes pinyintable.py + +M scripts/pinyintable.py + +commit 33d64f5e310e9a61a2031d1988251fe351540255 +Author: Peng Wu +Date: 2011-11-14 10:39:16 +0800 + + clean up code + +M src/include/stl_lite.h +M src/lookup/pinyin_lookup.cpp + +commit e1680b821e3d59010c664a3d6046179bb8281430 +Author: Peng Wu +Date: 2011-11-11 17:29:42 +0800 + + fixes a typo + +M src/storage/chewing_key.h + +commit 7bc654629866b4363263f84498d6a96254691001 +Author: Peng Wu +Date: 2011-11-11 15:49:31 +0800 + + add pinyin parser class definition + +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.h + +commit 881cb28569082bdaa5be92ab991dcf28577636dd +Author: Peng Wu +Date: 2011-11-11 13:58:11 +0800 + + rename beta to 2 + +M src/storage/pinyin_custom2.h + +commit bf3d1381ed800e0f93b98d2aa2b9f7d0e45d6d9e +Author: Peng Wu +Date: 2011-11-09 18:18:33 +0800 + + add more flags to pinyin_custom2.h + +M src/storage/pinyin_custom2.h + +commit 5b048d44fea9e76c38556a20ad409fb049709b2c +Author: Peng Wu +Date: 2011-11-09 16:39:29 +0800 + + fixes test_parser.cpp + +M tests/storage/test_parser.cpp + +commit bcebd6b9e4ffb3c62e0b7dacf3abe4fb872c6243 +Author: Peng Wu +Date: 2011-11-09 15:19:16 +0800 + + update Makefile.data and genspecialtable.py + +M scripts/Makefile.data +M scripts/genspecialtable.py + +commit 7027b77680b25eca4c4b5041c2c9ecd8cc0149e2 +Author: Peng Wu +Date: 2011-11-09 15:15:38 +0800 + + update generated inyin_parser_table.h + +M src/storage/pinyin_parser_table.h + +commit 520920c35ccbac3bfdca0aa76a0859a6edd8d528 +Author: Peng Wu +Date: 2011-11-09 15:15:07 +0800 + + fixes load_phrase + +M scripts/Makefile.data +M scripts/specialtable.py + +commit af7acd67e0b8649c2dcd79b2de7d4a6b20446d29 +Author: Peng Wu +Date: 2011-11-09 15:02:13 +0800 + + add origin freq for divided table + +M scripts/Makefile.data +R068 scripts/genpinyin2.awk scripts/genpinyins.awk +M scripts/genspecialtable.py +M scripts/specialtable.py +M src/storage/pinyin_parser2.h + +commit 266386321bc1ac40551e63977d58a68ff9abb8ce +Author: Peng Wu +Date: 2011-11-09 14:31:04 +0800 + + revert re-split table + +M scripts/genspecialtable.py +M src/storage/pinyin_parser2.h + +commit 4f995dab994c66b68b4821e69f170ddc4c0285f7 +Author: Peng Wu +Date: 2011-11-09 13:23:27 +0800 + + add generated pinyin_parser_table.h + +A src/storage/pinyin_parser_table.h + +commit 0862e20f358e93957a4f5cb10b571d015f33fa96 +Author: Peng Wu +Date: 2011-11-09 13:21:57 +0800 + + add genpinyin2.awk + +A scripts/Makefile.data +A scripts/genpinyin2.awk + +commit 4fbe19e5eaeb4d1bdb509daafeedbf923438b1b7 +Author: Peng Wu +Date: 2011-11-09 10:33:22 +0800 + + fixes pinyin parser table compile + +M scripts/pinyin_parser_table.h.in +M scripts/pinyintable.py +M src/storage/chewing_key.h +M src/storage/pinyin_parser2.cpp +M src/storage/pinyin_parser2.h + +commit c389ac98652ac83bb3bbc16368fee799df3aef29 +Author: Peng Wu +Date: 2011-11-09 10:12:55 +0800 + + update pinyin_parser_table.h.in + +M scripts/pinyin_parser_table.h.in +M src/pinyin.h +M src/storage/Makefile.am +A src/storage/pinyin_parser2.cpp + +commit a3c4fcbc634c9c5db7522f2e05a0c18aa3f98427 +Author: Peng Wu +Date: 2011-11-09 09:58:11 +0800 + + write gen pinyin header + +M scripts/genpinyinheader.py + +commit 083a9fb6a32b1750c0924baf8cee550d75da64c3 +Author: Peng Wu +Date: 2011-11-09 09:25:18 +0800 + + refine python code + +M scripts/genpinyintable.py +M scripts/genspecialtable.py +M scripts/specialtable.py + +commit 2980b45009e45b12fe233d945fea1be3275de26d +Author: Peng Wu +Date: 2011-11-09 09:21:05 +0800 + + add gen pinyin header + +A scripts/genpinyinheader.py +M src/storage/pinyin_custom2.h + +commit 9532617ce6542916b8eb5e30153f09aeeb5a54fa +Author: Peng Wu +Date: 2011-11-08 16:35:56 +0800 + + add comments + +M scripts/genpinyintable.py +M scripts/genspecialtable.py +M scripts/pinyintable.py + +commit 3b030513e61763bd5dbf197517ed9be7bc070884 +Author: Peng Wu +Date: 2011-11-08 11:16:38 +0800 + + begin to write pinyin parser beta + +A src/storage/pinyin_parser2.h + +commit 8f879fc75272a6feb5f1892e7ad2d07b2a58c13c +Author: Peng Wu +Date: 2011-11-07 13:29:57 +0800 + + add note + +M src/Makefile.am + +commit a6af8ae0d842ae50b3e824a76c03ff0f9029f7b1 +Author: Jim Huang +Date: 2011-11-05 02:24:39 +0800 + + CMake: add -fPIC flag to combine static libraries to dynamic one + + Machines running Linux on architectures such as amd64 require flag + "-fPIC" to be specified to compile shared libraries, and it would + be helpful to have this a default for CMake when building libpinyin. + +M src/lookup/CMakeLists.txt +M src/storage/CMakeLists.txt + +commit e7087ceb62f26c74460519ff7afd60fb9c7300b9 +Author: Peng Wu +Date: 2011-11-05 11:47:55 +0800 + + improves gen special table + +M scripts/genspecialtable.py + +commit e4fa71454b95d5f3b13e5e43fa6788d2bd3bfb02 +Author: Peng Wu +Date: 2011-11-03 14:45:37 +0800 + + fixes a typo + +M scripts/genpinyintable.py + +commit 146d3c7185b6beafac1f1f818e638f32f2b9b743 +Author: Jim Huang +Date: 2011-11-03 05:27:00 +0800 + + update CMake rules to reflect recent changes + + Signed-off-by: Peng Wu + +M src/lookup/CMakeLists.txt +M tests/CMakeLists.txt + +commit a041ca72f4b8f971f357acb5f2ccd563a5a7fe46 +Author: Peng Wu +Date: 2011-11-03 10:53:23 +0800 + + add comment + +M scripts/genspecialtable.py + +commit ccb963c2cea6c30d6879c69c48062ee1f4ddf443 +Author: Peng Wu +Date: 2011-11-02 14:59:28 +0800 + + write gen special table + +M scripts/genspecialtable.py +M scripts/pinyintable.py + +commit 880b6876320b98e7d9a17aa3029c1ae35c9d0809 +Author: Peng Wu +Date: 2011-11-02 14:49:24 +0800 + + fixes gen special table + +M scripts/genspecialtable.py +M scripts/pinyintable.py + +commit 7486c26af092ed6b40c640cd1dbf99456ba51892 +Author: Peng Wu +Date: 2011-11-02 14:29:32 +0800 + + begin to write gen special table + +A scripts/genspecialtable.py +M scripts/specialtable.py + +commit 50d6a3f57c46189daaf9e48a5420c1e7b8906273 +Author: Peng Wu +Date: 2011-11-02 13:37:07 +0800 + + rename files + +R100 scripts/gentable.py scripts/genpinyintable.py + +commit e8855f5885f12504e7d8d13014505a44dab44a94 +Author: Peng Wu +Date: 2011-11-02 13:36:42 +0800 + + write gen pinyin table + +M scripts/gentable.py + +commit 75546099491c6082f5f8fe0a16f7dd1cbd5d4fdb +Author: Peng Wu +Date: 2011-11-02 13:19:51 +0800 + + write gentable.py in progress + +A scripts/gentable.py +M scripts/pinyintable.py + +commit 2ef0735e5fafa28a51ec04cf8e24e21c7486a040 +Author: Peng Wu +Date: 2011-11-02 12:08:45 +0800 + + rename files + +R100 scripts/genpytable.py scripts/pinyintable.py +R100 scripts/genspecialtable.py scripts/specialtable.py + +commit d894cf14145e54d934d0490aae80bfb8c7aafb79 +Author: Peng Wu +Date: 2011-11-02 12:07:02 +0800 + + write pinyin_parser_table.h.in + +M scripts/genspecialtable.py +A scripts/pinyin_parser_table.h.in + +commit c25fd787f6d4c20236ff8488f21891dc82b78749 +Author: Peng Wu +Date: 2011-11-02 11:23:56 +0800 + + update pinyin_custom2.h + +M src/storage/pinyin_custom2.h + +commit 19edffb0b8a3342e20f8bbfee9b1dec8f4ca7f9e +Author: Peng Wu +Date: 2011-11-02 11:01:43 +0800 + + fixes choose short candidate + +M src/lookup/pinyin_lookup.cpp + +commit 600255c235047ae8972d3474e402d69282f602c0 +Author: Peng Wu +Date: 2011-10-30 16:36:44 +0800 + + handle tone in gen special table + +M scripts/genspecialtable.py + +commit 85a934c958a036d17b548919d2264825eae8a68b +Author: Peng Wu +Date: 2011-10-27 18:05:44 +0800 + + fixes save_db + +M src/pinyin.cpp +M src/storage/ngram.cpp + +commit b6ddd796eb5169cb372c9baf63607dcc02458d30 +Author: Peng Wu +Date: 2011-10-27 14:37:43 +0800 + + fixes load_db + +M src/storage/ngram.cpp + +commit c0ff923d2fc2a5e02d76decb95d3a8f4dd14c63c +Author: Peng Wu +Date: 2011-10-27 10:38:40 +0800 + + update chewing_key.h + +M .gitignore +M src/storage/chewing_key.h + +commit 914895f2e1cccd498d4b1838da3fef6a4c892d3d +Author: Peng Wu +Date: 2011-10-26 15:27:57 +0800 + + fixes pep8 warnings + +M scripts/genpytable.py + +commit 746e6b11a88ce3b120b052253f5773f361c03b16 +Author: Peng Wu +Date: 2011-10-26 15:23:24 +0800 + + write gen special in progress + +M scripts/genpytable.py +M scripts/genspecialtable.py + +commit b5f85c8f94097e34a91e6a74cc4f0e3736aa2c2f +Author: Peng Wu +Date: 2011-10-26 10:22:44 +0800 + + add m_modified + +M src/pinyin.cpp + +commit cfa83483dae050b6010f9de0f9fef8b76501f520 +Author: Peng Wu +Date: 2011-10-25 15:10:02 +0800 + + begin to write special table + +A scripts/genspecialtable.py +M scripts/pinyin.py + +commit 0cf993ec98d7f25475bd1c1a8266e5822caeb5f9 +Author: Peng Wu +Date: 2011-10-25 12:46:36 +0800 + + write gen pinyin table + +M scripts/genpytable.py + +commit bf5eddadc363f60165cd89a7cbab7cfb404323bc +Author: Peng Wu +Date: 2011-10-24 16:42:22 +0800 + + write gen pinyin table in progress + +M scripts/correct.py +M scripts/genpytable.py +M scripts/pinyin.py +M src/storage/pinyin_custom2.h + +commit c8c7f23307fd7f8c36573c101161cb4c9ea6646e +Author: Peng Wu +Date: 2011-10-24 12:27:51 +0800 + + use chewing to gen pinyin table + +M scripts/bopomofo.py +M scripts/genpytable.py + +commit 880a5af5dca113b480c05bfea63fccbddd03a5d2 +Author: Peng Wu +Date: 2011-10-22 11:00:37 +0800 + + update genpytable + +M scripts/genpytable.py + +commit 62bdc82ef11924ac4991bf4589e0964b8a3213f3 +Author: Peng Wu +Date: 2011-10-22 10:52:06 +0800 + + begin to add pinyin_custom2.h + +M src/pinyin.h +M src/storage/Makefile.am +D src/storage/chewing_custom.h +M src/storage/pinyin_custom.h +A src/storage/pinyin_custom2.h + +commit 86771016e43aab669a3866ccbad4962689633194 +Author: Peng Wu +Date: 2011-10-22 10:15:27 +0800 + + begin to write chewing key + +M scripts/genpytable.py +M src/pinyin.h +M src/storage/Makefile.am +A src/storage/chewing_custom.h +M src/storage/chewing_key.h + +commit df20383358485ac69158b6dd4bec1a3c2e5bf9ea +Author: Peng Wu +Date: 2011-10-21 17:35:25 +0800 + + improves get chewing + +M scripts/genpytable.py +M src/storage/chewing_key.h + +commit 7114c007f02e6005fd08b5647e48d53184a0739a +Author: Peng Wu +Date: 2011-10-21 14:47:41 +0800 + + fixes get chewing + +M scripts/chewing.py +R097 scripts/fuzzy.py scripts/correct.py +M scripts/genpytable.py +M src/storage/chewing_key.h + +commit 683ca48eb08e2ab80c476088be9be9756a80a796 +Author: Peng Wu +Date: 2011-10-21 13:36:57 +0800 + + add get_chewing + +M scripts/chewing.py +M scripts/genpytable.py + +commit b4cbe2df994564efa1d7b0e6d2e76c59deaa12ab +Author: Peng Wu +Date: 2011-10-21 13:18:26 +0800 + + add 'ng' + +M scripts/bopomofo.py +M scripts/chewing.py + +commit c1a2c8e0902f456e38c35168b5487ef2bb66d79d +Author: Peng Wu +Date: 2011-10-21 11:15:56 +0800 + + add chewing.py + +A scripts/chewing.py +A scripts/fuzzy.py +M scripts/genpytable.py + +commit 9f284c8544bc6ab3873c2b892986dc60011dc2b3 +Author: Peng Wu +Date: 2011-10-20 16:19:12 +0800 + + add check + +M scripts/bopomofo.py +A scripts/genpytable.py +R100 scripts/pydict.py scripts/pinyin.py + +commit a2c44bac1a9fff08673095b94cd0e1ead380bcd2 +Author: Peng Wu +Date: 2011-10-20 13:49:40 +0800 + + add use tone + +M src/storage/pinyin_custom.h + +commit 01057b8a853e791e7a5b924c0a579f4eb1cf4491 +Author: Peng Wu +Date: 2011-10-20 10:54:01 +0800 + + add scripts + +A scripts/bopomofo.py +A scripts/pydict.py + +commit 6c001174f81c1c21828f4fe32a6f02b22932e75c +Author: Peng Wu +Date: 2011-10-19 16:23:46 +0800 + + begin to write chewing key header + +A src/storage/chewing_key.h + +commit 127a5ce640ec5282bbb4b473c01c5366e3c5e2f2 +Author: Peng Wu +Date: 2011-10-11 14:56:23 +0800 + + fixes fsf address + +M src/include/memory_chunk.h +M src/include/novel_types.h +M src/lookup/lookup.cpp +M src/lookup/lookup.h +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h +M src/lookup/winner_tree.cpp +M src/lookup/winner_tree.h +M src/pinyin.cpp +M src/pinyin.h +M src/pinyin_internal.h +M src/storage/flexible_ngram.h +M src/storage/ngram.cpp +M src/storage/ngram.h +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M src/storage/phrase_index_logger.h +M src/storage/phrase_large_table.cpp +M src/storage/phrase_large_table.h +M src/storage/pinyin_base.cpp +M src/storage/pinyin_base.h +M src/storage/pinyin_custom.h +M src/storage/pinyin_large_table.cpp +M src/storage/pinyin_large_table.h +M src/storage/pinyin_phrase.h +M src/storage/tag_utility.h +M tests/lookup/test_phrase_lookup.cpp +M tests/storage/test_phrase_index_logger.cpp +M tests/test_chewing.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp +M utils/storage/export_interpolation.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp +M utils/storage/gen_zhuyin_map.cpp +M utils/storage/import_interpolation.cpp +M utils/training/estimate_interpolation.cpp +M utils/training/estimate_k_mixture_model.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp +M utils/training/import_k_mixture_model.cpp +M utils/training/k_mixture_model.h +M utils/training/k_mixture_model_to_interpolation.cpp +M utils/training/merge_k_mixture_model.cpp +M utils/training/prune_k_mixture_model.cpp +M utils/training/validate_k_mixture_model.cpp + +commit eecf06e590cfead43cd54940698523c1b5753141 +Author: Peng Wu +Date: 2011-10-11 12:45:10 +0800 + + version 0.2.99.2 + +M configure.ac +M libpinyin.spec.in + +commit 84b8ecaf7b1c016b304015788e5ded68abc0d7db +Author: Peng Wu +Date: 2011-10-11 11:03:10 +0800 + + re-factor choose candidate + +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h +M src/pinyin.cpp +M src/pinyin.h + +commit e478deb3365e6b46bfde473ff0c09d47ac89cc45 +Author: Peng Wu +Date: 2011-10-10 17:30:15 +0800 + + fixes user dir == NULL + +M src/pinyin.cpp + +commit 2a24ccdf8f6d2083fce3cca72931eeaf7410f368 +Author: Peng Wu +Date: 2011-10-10 11:19:34 +0800 + + improves get candidates + +M src/pinyin.cpp + +commit 2dee9aa54537a77bf463799d864dc68a515201e5 +Author: Peng Wu +Date: 2011-10-08 19:47:43 +0800 + + fixes get candidates + +M src/pinyin.cpp + +commit d9a4f1249a803408adb00e11306ea17644acd109 +Author: Peng Wu +Date: 2011-09-28 11:57:29 +0800 + + update libpinyin.spec.in + +M libpinyin.spec.in + +commit 8991f91d9fe77903b558ffc07d8186e3d7236afb +Author: Peng Wu +Date: 2011-09-27 15:34:13 +0800 + + clean up .gitignore + +M .gitignore + +commit 61ee715927f782dd16f9a7b7ec0e3e989786e0c8 +Author: Peng Wu +Date: 2011-09-27 10:40:26 +0800 + + fixes test parser + +M configure.ac +M tests/storage/test_parser.cpp +M tests/test_pinyin.cpp + +commit 9249dbb49b26b6aac78b0a79081c261f971db978 +Author: Peng Wu +Date: 2011-09-26 15:25:44 +0800 + + add set scheme + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit e8b396bccf51c206218fc5105d230f1a885883b1 +Author: Peng Wu +Date: 2011-09-26 15:18:06 +0800 + + add more double pinyin maps + +M src/storage/pinyin_base.cpp +M src/storage/pinyin_base.h +M tests/storage/test_parser.cpp + +commit 0258a5e5058f9ce22e0428e66f5fd33eb64f3e24 +Author: Peng Wu +Date: 2011-09-26 12:56:47 +0800 + + add more checks + +M src/pinyin.cpp +M tests/test_pinyin.cpp + +commit 48fa6408f09833129bf56e33bdb3aa949ca213aa +Author: leeight +Date: 2011-09-23 22:39:17 +0800 + + FIX core dump issues and upgrade .gitignore + +M .gitignore +M src/pinyin.cpp +M tests/test_pinyin.cpp + +commit ffef5f16f7f1bc7c0c0cbbfa73e21728c32d7669 +Author: Peng Wu +Date: 2011-09-26 11:07:29 +0800 + + auto download textual model data + +M autogen.sh +M data/Makefile.am +M src/pinyin.cpp + +commit 0884a67e7f67d141d1af3943bdfb31cdce2b1234 +Author: Peng Wu +Date: 2011-09-23 14:15:00 +0800 + + add correction options to pinyin custom settings + +M src/storage/pinyin_base.cpp +M src/storage/pinyin_custom.h + +commit be59e5b5f901f0959e8824e81a7f49c434229440 +Author: Peng Wu +Date: 2011-09-21 14:46:12 +0800 + + change api + +M src/pinyin.cpp +M src/pinyin.h + +commit c4873c80ffb34e6c4456d9f2b571c612af08ad71 +Author: Peng Wu +Date: 2011-09-21 14:36:28 +0800 + + fixes test pinyin + +M tests/test_pinyin.cpp + +commit 2c2b6ef859b9e2b77478a483aed7c1b5148f4ef5 +Author: Peng Wu +Date: 2011-09-21 12:27:23 +0800 + + export pinyin key + +M src/libpinyin.ver + +commit 48548a2e90bf7a71e02893bede051eae356421de +Author: Peng Wu +Date: 2011-09-14 17:50:39 +0800 + + refine public api + +M src/storage/pinyin_base.cpp +M src/storage/pinyin_custom.h + +commit 2c29075b74f2c6d11f7348fc7cfa2f2d3d7b923e +Author: Peng Wu +Date: 2011-09-14 13:51:59 +0800 + + refactor pinyin phrase + +M src/storage/pinyin_large_table.cpp +M src/storage/pinyin_phrase.h + +commit 8076a7b21cc02123e2452e05afd68773dd918a8b +Author: Peng Wu +Date: 2011-09-14 12:39:47 +0800 + + update pinyin phrase + +M src/storage/pinyin_phrase.h + +commit 0cf6dd37e1dbd21195e78756aa90b36e59914f71 +Author: Peng Wu +Date: 2011-09-14 12:33:13 +0800 + + clean up pinyin_phrase.h + +M src/storage/pinyin_phrase.h + +commit 47a4d1ad7fa599ea6b8cf41c244e3bd60ebbc387 +Author: Peng Wu +Date: 2011-09-14 12:18:12 +0800 + + begin to split the fuzzy pinyin options + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M src/storage/pinyin_base.cpp +M src/storage/pinyin_custom.h +M src/storage/pinyin_large_table.cpp + +commit fd9ca5841dee309700444831c54f2ec743f7c5de +Author: Peng Wu +Date: 2011-09-09 15:54:15 +0800 + + update test case + +M tests/test_chewing.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp + +commit 3723941d4c85446ab6c63ed5eaa72efee57fae0a +Author: Peng Wu +Date: 2011-09-09 15:53:59 +0800 + + refine public api + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h + +commit 014d8c208f4edd8be02929893e270b1fbe17082b +Author: Peng Wu +Date: 2011-09-09 15:07:56 +0800 + + update test case for pinyin header + +M tests/test_chewing.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp + +commit 65d222d080b2bea07a49b981460435f39bff4f4b +Author: Peng Wu +Date: 2011-09-09 15:06:57 +0800 + + refine pinyin header + +M src/lookup/lookup.cpp +M src/lookup/pinyin_lookup.h +M src/pinyin.cpp +M src/pinyin.h + +commit 5846c125ad7eda5d8cd914dd32cebe2b34df9b97 +Author: Peng Wu +Date: 2011-09-09 14:58:00 +0800 + + update libpinyin.ver + +M src/libpinyin.ver + +commit f990d3004fed619377d5f5d0bd64f6201ce91c26 +Author: Peng Wu +Date: 2011-09-09 11:23:48 +0800 + + merge duplicated convert to utf8 functions + +M src/lookup/Makefile.am +A src/lookup/lookup.cpp +M src/lookup/lookup.h +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h + +commit 0b69e5f53462d0d44fcd69bb2a963785ea423fe2 +Author: Peng Wu +Date: 2011-09-09 11:00:26 +0800 + + begin to refine pinyin public interface + +M src/pinyin.h + +commit 72bd72e041428dd5c503d26a3feaad8eaa10a155 +Author: Peng Wu +Date: 2011-09-08 18:16:27 +0800 + + begin to polish pinyin public api + +M src/pinyin.cpp +M src/pinyin.h + +commit 03838c2f47ab836302e7d7aa85cc37e093fdbb45 +Author: Peng Wu +Date: 2011-09-08 16:33:00 +0800 + + update libpinyin.spec.in + +M libpinyin.spec.in + +commit 5194d84ad59e4ca060a7b5ea4c30768b9f3179a9 +Author: Peng Wu +Date: 2011-09-08 15:11:32 +0800 + + fixes libpinyin.pc.in + +M Makefile.am +M autogen.sh +M libpinyin.pc.in +M libpinyin.spec.in + +commit 5276b3dce7d6e8e758b4578a0096673255a44179 +Author: Peng Wu +Date: 2011-09-07 11:26:10 +0800 + + change size_t to guint16 in phrase index logger + +M src/storage/phrase_index_logger.h + +commit 574922492454300a5a0f4ea8bec845171387833a +Author: Peng Wu +Date: 2011-09-06 14:28:00 +0800 + + expose pinyin pos vector + +M tests/test_chewing.cpp +M tests/test_pinyin.cpp + +commit a49d9240720f7a8de1e2418a039f9850ccc08ca8 +Author: Peng Wu +Date: 2011-09-06 14:18:00 +0800 + + refine pinyin api + +M src/pinyin.cpp +M src/pinyin.h + +commit cd0ab1bf9664acee7b014c1b71c05270dee9f080 +Author: Peng Wu +Date: 2011-09-06 14:09:17 +0800 + + write test chewing + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h +M tests/test_chewing.cpp + +commit f31c2e6b65d7bfa50af449dd26206b0805968d81 +Author: Peng Wu +Date: 2011-09-06 13:57:57 +0800 + + add chewing support + +M src/pinyin.cpp +M src/pinyin.h +M tests/Makefile.am +A tests/test_chewing.cpp + +commit a4901dd10796363b9f74db459965c8a9d4628ddb +Author: Peng Wu +Date: 2011-09-06 12:04:48 +0800 + + fixes compile and a bug + +M src/pinyin.cpp +M tests/test_pinyin.cpp + +commit e2f06b37b9e2f8c1c1a9428c1619af4a8c5566c8 +Author: Peng Wu +Date: 2011-09-06 11:34:04 +0800 + + refine pinyin apis + +M src/libpinyin.ver +M src/pinyin.cpp +M src/pinyin.h +M tests/test_phrase.cpp +M tests/test_pinyin.cpp + +commit dbdfd3b658f0f723513fd08415d08554d125f302 +Author: Peng Wu +Date: 2011-09-06 11:06:29 +0800 + + update pinyin header + +M src/include/novel_types.h +M src/lookup/pinyin_lookup.h +M src/pinyin.h + +commit 2f401a29ab5317e5b1a7621fde958559bb355433 +Author: Peng Wu +Date: 2011-09-06 10:58:31 +0800 + + change pinyin context from stateful to stateless + +M src/libpinyin.ver +M src/pinyin.cpp + +commit 27ec12509ae84cc7848efabc21ea4630cc303e60 +Author: Peng Wu +Date: 2011-08-31 17:13:31 +0800 + + update zhuyin map + +M src/storage/pinyin_zhuyin_map_data.h + +commit 27f3ec826fbd49c1ebca756405dec6974d5f1c5c +Author: Peng Wu +Date: 2011-08-31 17:11:40 +0800 + + add gen zhuyin map + +M utils/storage/Makefile.am +A utils/storage/gen_zhuyin_map.cpp + +commit d6288dc6efd141b0307a56f0660771e11a1cc690 +Author: Peng Wu +Date: 2011-08-31 15:36:43 +0800 + + add test case for chewing + +M tests/storage/test_parser.cpp + +commit 35c9c51a81780340924cb0edef4b77e719f15b92 +Author: Peng Wu +Date: 2011-08-31 15:28:04 +0800 + + add chewing parser + +M src/storage/pinyin_base.cpp +M src/storage/pinyin_base.h + +commit 420ffb6d69189f5e0c4e80e7f829cde61fccab4f +Author: Peng Wu +Date: 2011-08-31 15:27:35 +0800 + + add swap to stl lite + +M src/include/stl_lite.h + +commit 7e85b8930fc00c3f66d689654e22930f2e15fc67 +Author: Peng Wu +Date: 2011-08-31 13:38:26 +0800 + + add libpinyin.spec.in + +M configure.ac +A libpinyin.spec.in + +commit 43c5fb9c202bb68314b2205a746fb0a578e97a7f +Author: Peng Wu +Date: 2011-08-31 10:45:47 +0800 + + improves Makefile.am + +M tests/include/Makefile.am + +commit f81c28d21486c984dc9454224929f44698a76191 +Author: Peng Wu +Date: 2011-08-30 15:07:26 +0800 + + add namespace pinyin + +M src/include/memory_chunk.h +M src/include/novel_types.h +M src/storage/pinyin_custom.h + +commit b988c0639be9b5b184aa2fed5fd69338abe748f5 +Author: Peng Wu +Date: 2011-08-30 15:00:37 +0800 + + install public headers only + +M src/Makefile.am +M src/include/Makefile.am +M src/lookup/Makefile.am +M src/storage/Makefile.am + +commit 12c6b51b1296aad330df572794693d37423179a4 +Author: Peng Wu +Date: 2011-08-30 14:41:29 +0800 + + switch to pinyin internal library + +M src/Makefile.am +A src/libpinyin.ver +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M tests/storage/test_parser.cpp +M utils/segment/Makefile.am +M utils/storage/Makefile.am +M utils/storage/gen_pinyin_table.cpp +M utils/training/Makefile.am + +commit 293003483072888aa954f06d3097f5b46f55e1e5 +Author: Peng Wu +Date: 2011-08-30 14:03:43 +0800 + + switch to pinyin internal header + +M tests/include/test_memory_chunk.cpp +M tests/lookup/test_phrase_lookup.cpp +M tests/lookup/test_simple_lookup.cpp +M tests/storage/test_flexible_ngram.cpp +M tests/storage/test_ngram.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_index_logger.cpp +M tests/storage/test_phrase_table.cpp +M tests/storage/test_pinyin_index.cpp +M tests/test_phrase.cpp +M tests/test_pinyin.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp +M utils/storage/export_interpolation.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp +M utils/storage/import_interpolation.cpp +M utils/training/estimate_interpolation.cpp +M utils/training/estimate_k_mixture_model.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp +M utils/training/import_k_mixture_model.cpp +M utils/training/k_mixture_model_to_interpolation.cpp +M utils/training/merge_k_mixture_model.cpp +M utils/training/prune_k_mixture_model.cpp +M utils/training/validate_k_mixture_model.cpp + +commit 3b548d20eaec21cbf9b8e955cca2679ed840e80e +Author: Peng Wu +Date: 2011-08-30 13:36:08 +0800 + + add pinyin internal header + +M src/Makefile.am +M src/pinyin.cpp +M src/pinyin.h +M src/pinyin_internal.cpp +M src/pinyin_internal.h + +commit 99c1e74faf22e50e63a7e8055f52cda9f9650061 +Author: Peng Wu +Date: 2011-08-30 13:00:34 +0800 + + add extern "C" + +M src/pinyin.cpp +M src/pinyin.h + +commit 2e4cb2b1fcfe9aa306c69a0ec1ed30136148e2b6 +Author: Peng Wu +Date: 2011-08-30 12:58:15 +0800 + + move pinyin custom settings to pinyin_custom.h + +M src/pinyin.h +A src/pinyin_internal.cpp +A src/pinyin_internal.h +M src/storage/pinyin_base.h +A src/storage/pinyin_custom.h + +commit 071817f652adc002f3ede82dd61008d773566b0f +Author: Peng Wu +Date: 2011-08-30 12:45:43 +0800 + + switch berkeley db to memory db + +M src/pinyin.cpp + +commit 938be01277acf6f1652794dc141e86e213ce1a5f +Author: Peng Wu +Date: 2011-08-29 16:40:14 +0800 + + add test phrase + +M src/pinyin.cpp +M src/pinyin.h +M tests/Makefile.am +A tests/test_phrase.cpp + +commit d8ccee5041c8ecbaf4568e42b0f187fe615ae7ad +Author: Peng Wu +Date: 2011-08-29 16:04:08 +0800 + + add pinyin apis + +M src/pinyin.cpp +M src/pinyin.h + +commit a5871126f29fb0bdf4a994221f4e51301c77aed1 +Author: Peng Wu +Date: 2011-08-29 14:09:28 +0800 + + improve pinyin parser + +M src/pinyin.cpp +M src/storage/pinyin_base.cpp + +commit c0a3bc04c7963f8a53447acec77497f28646fdf9 +Author: Peng Wu +Date: 2011-08-24 10:41:12 +0800 + + refine test cases + +M tests/lookup/test_simple_lookup.cpp +M tests/test_pinyin.cpp + +commit 51b8bf1f01b64cb8c22dd25e9ac636b80ba8cd18 +Author: Peng Wu +Date: 2011-08-24 09:37:34 +0800 + + fixes compile with c++0x + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h + +commit 0056e6c14abf84cbbcb41c0a70049d321a7ef4f4 +Author: Peng Wu +Date: 2011-08-24 09:17:45 +0800 + + fixes a typo + +M CMakeLists.txt + +commit 9df8678bb0bab71da9631ff13244555e7a33c458 +Author: Peng Wu +Date: 2011-08-23 18:39:16 +0800 + + fixes code style in src/include + +M src/include/memory_chunk.h +M src/include/novel_types.h + +commit 40c82f591553e94f21816b2d940aab1d47f2b3d3 +Author: Peng Wu +Date: 2011-08-23 18:36:30 +0800 + + write test pinyin + +M src/pinyin.cpp +M tests/lookup/test_simple_lookup.cpp +M tests/test_pinyin.cpp + +commit c108fa57f1e265a6682c9fdb267e7b2c1653a401 +Author: Peng Wu +Date: 2011-08-23 14:23:57 +0800 + + begin to write test pinyin + +M tests/Makefile.am +A tests/test_pinyin.cpp + +commit cda6da120aff1d3e228a9e99f0435ce862e05e12 +Author: Peng Wu +Date: 2011-08-22 19:12:53 +0800 + + fixes phrase index logger + +M src/include/memory_chunk.h +M src/storage/phrase_index.h +M src/storage/phrase_index_logger.h +M tests/storage/test_phrase_index_logger.cpp + +commit 806ee677ed908de317f0bbf377279d2083dce731 +Author: Peng Wu +Date: 2011-08-22 18:23:12 +0800 + + write test case for phrase index logger + +M src/storage/phrase_index.cpp +M src/storage/phrase_index_logger.h +M tests/storage/test_phrase_index_logger.cpp + +commit fe1980851c95afa18300c5cf9d8bbda842b784d2 +Author: Peng Wu +Date: 2011-08-22 14:45:48 +0800 + + begin to write test phrase index logger + +M tests/storage/Makefile.am +A tests/storage/test_phrase_index_logger.cpp + +commit 961234068dfa2bf504c25663fdabee0350bcab27 +Author: Peng Wu +Date: 2011-08-18 16:27:22 +0800 + + public pinyin apis + +M src/pinyin.cpp +M src/pinyin.h + +commit 30283199261a82a3807342d61ab36e8103f04063 +Author: Peng Wu +Date: 2011-08-18 15:56:12 +0800 + + write get candidates + +M src/pinyin.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 05f2dbbd28982192545fcfb2f38479d560987a90 +Author: Peng Wu +Date: 2011-08-18 15:15:57 +0800 + + write pinyin apis + +M src/pinyin.cpp + +commit 70571740ae2b8a71cfec139d674c8f3b3fd1c232 +Author: Peng Wu +Date: 2011-08-17 12:01:22 +0800 + + pinyin apis WIP + +M src/pinyin.cpp +M tests/lookup/test_simple_lookup.cpp + +commit 2b421aafedeba0a9e7d1684365a1e5671081e16b +Author: Peng Wu +Date: 2011-08-16 18:32:26 +0800 + + pinyin apis WIP + +M src/pinyin.cpp + +commit ada3ecdc29b23e420871f0dbacd070c67d1095ff +Author: Peng Wu +Date: 2011-08-16 15:39:50 +0800 + + pinyin apis write in progress + +M src/pinyin.cpp + +commit b17795c4a34228f6f3962309ccb0fefe05e2fb3a +Author: Peng Wu +Date: 2011-08-16 15:33:54 +0800 + + refine pinyin parser + +M src/storage/pinyin_base.h + +commit 96a7737277ae60adf8e724e482199d2f4f3cba84 +Author: Peng Wu +Date: 2011-08-16 15:11:08 +0800 + + write pinyin apis in progress + +M src/pinyin.cpp + +commit 90c1b73881e53373052889364b1c9cdb512f2bfd +Author: Peng Wu +Date: 2011-08-15 17:13:03 +0800 + + revise pinyin apis + +M src/pinyin.cpp + +commit 99c7e2ac2625f8b22782972dc98b0ff8d11165a2 +Author: Peng Wu +Date: 2011-08-15 11:32:40 +0800 + + change uni-gram computing from float to double in phrase and pinyin lookup + +M src/lookup/phrase_lookup.cpp +M src/lookup/pinyin_lookup.cpp + +commit aa0c5a5e74ddb8f3523d09dc67008afed304f2f2 +Author: Peng Wu +Date: 2011-08-15 11:18:51 +0800 + + comments gen unigram + +M utils/training/gen_unigram.cpp + +commit 299dc559ff9b0747a4cf214b70773e61b06752c7 +Author: Peng Wu +Date: 2011-08-12 15:06:02 +0800 + + refine cmake files + +M src/CMakeLists.txt +M src/lookup/CMakeLists.txt +M src/storage/CMakeLists.txt + +commit b7bb9c1df8a50ac296edce955b9c4f13ad9edc4a +Author: Peng Wu +Date: 2011-08-12 11:16:51 +0800 + + update test phrase index test case + +M tests/storage/test_phrase_index.cpp + +commit 6a1aa9ea5db1822350c78a66e65d4bd344e2d012 +Author: Peng Wu +Date: 2011-08-12 11:05:19 +0800 + + fixes code styles in test directory. + +M tests/include/test_memory_chunk.cpp +M tests/storage/test_parser.cpp +M tests/storage/test_phrase_index.cpp + +commit cc6a9b9b390326fbb504728ddede89a6e6918978 +Author: Peng Wu +Date: 2011-08-12 10:43:01 +0800 + + revert libpinyin.pc.in + +M libpinyin.pc.in + +commit c47a095c10f6104fefb7d0406b7f4076ed47f16c +Author: BYVoid +Date: 2011-08-11 18:19:08 +0800 + + Add cmake scripts. + +A CMakeLists.txt +A cmake/FindBerkeleyDB.cmake +A cmake/FindGLIB2.cmake +A data/CMakeLists.txt +M libpinyin.pc.in +A src/CMakeLists.txt +A src/include/CMakeLists.txt +A src/lookup/CMakeLists.txt +A src/storage/CMakeLists.txt +A tests/CMakeLists.txt +A tests/include/CMakeLists.txt +A tests/lookup/CMakeLists.txt +A tests/storage/CMakeLists.txt +A utils/CMakeLists.txt +A utils/segment/CMakeLists.txt +A utils/storage/CMakeLists.txt +A utils/training/CMakeLists.txt + +commit bd70f3fe77a2eda3b902c1514b07fbc821c9c1b4 +Author: Peng Wu +Date: 2011-08-11 13:31:54 +0800 + + simplify data generations + +M data/Makefile.am + +commit fd3d842f98184e075e6f3d6e1887bc37152a9542 +Author: Peng Wu +Date: 2011-08-10 15:27:43 +0800 + + write phrase index logger + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit ec332e5bcac3af0520803813a48ae4ee93c5713c +Author: Peng Wu +Date: 2011-08-10 12:58:13 +0800 + + write phrase index logger format in progress + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M src/storage/phrase_index_logger.h + +commit e4fa0bfd58813a248674bd41b5dcf61e9be3bdeb +Author: Peng Wu +Date: 2011-08-10 12:09:36 +0800 + + write phrase index logger in progress + +M src/pinyin.cpp +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M src/storage/phrase_index_logger.h + +commit 46a79d1e62a25c81f151e2e68244429ffdcf6731 +Author: Peng Wu +Date: 2011-08-09 15:12:16 +0800 + + refine remove record + +M src/storage/phrase_index_logger.h + +commit 7ee25c7f8e0f2a89ba2a3275361e63674dba6373 +Author: Peng Wu +Date: 2011-08-09 14:28:38 +0800 + + write the phrase index logger + +M src/pinyin.h +M src/storage/Makefile.am +M src/storage/phrase_index.h +M src/storage/phrase_index_logger.h + +commit 4fec952817475a3f14adf48ed657d985f51d3e5c +Author: Peng Wu +Date: 2011-08-09 10:53:18 +0800 + + refine pinyin.cpp + +M src/pinyin.cpp +A src/storage/phrase_index_logger.h + +commit fb0111bf00989afe61d075544b1dd11ce0f69dde +Author: Peng Wu +Date: 2011-08-08 15:32:08 +0800 + + fixes tag utility with namespace + +M src/storage/tag_utility.cpp +M src/storage/tag_utility.h + +commit 3de71392c23ff1012b9c38a03e6a53942eb704d5 +Author: Peng Wu +Date: 2011-08-08 15:24:51 +0800 + + refine namespace pinyin + +M src/lookup/lookup.h +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h +M src/lookup/winner_tree.cpp +M src/lookup/winner_tree.h +M src/pinyin.h +M src/storage/ngram.cpp +M src/storage/ngram.h +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M src/storage/phrase_large_table.h +M src/storage/pinyin_base.cpp +M src/storage/pinyin_base.h +M src/storage/pinyin_large_table.h +M src/storage/pinyin_phrase.h +M src/storage/tag_utility.cpp +M src/storage/tag_utility.h + +commit e44f8dc3df4766331b4d4296fd2cf7f88f70145a +Author: Peng Wu +Date: 2011-08-08 14:47:19 +0800 + + refine MatchResults/TokenVector + +M src/include/novel_types.h +M src/lookup/lookup.h +M src/pinyin.h +M utils/training/eval_correction_rate.cpp + +commit 63977b501f8a0df504fd83206cc690955519b640 +Author: Peng Wu +Date: 2011-08-08 14:41:18 +0800 + + refine pinyin.h + +M src/pinyin.cpp +M src/pinyin.h + +commit 1dab453f2326a9ad2c8b03ca1a26e5bac6906bb8 +Author: Peng Wu +Date: 2011-08-08 13:44:49 +0800 + + add Ge<=>Ke fuzzy pinyin + +M src/storage/pinyin_base.cpp +M src/storage/pinyin_base.h +M src/storage/pinyin_large_table.cpp + +commit 3aaa518dce7f164b2b758f1c3502b3fa6dde97d0 +Author: Peng Wu +Date: 2011-08-08 10:34:10 +0800 + + add libpinyin.pc to makefile + +M Makefile.am + +commit f701db6269d33cde567c710387466f653840dc48 +Author: Peng Wu +Date: 2011-08-06 15:16:23 +0800 + + remove Makefile.data + +D Makefile.data +M data/Makefile.am + +commit 777cdb83b8cca6aa6f2c0e6862531160b984eada +Author: Peng Wu +Date: 2011-08-06 15:02:27 +0800 + + refine utils/training + +M utils/training/estimate_interpolation.cpp +M utils/training/estimate_k_mixture_model.cpp +M utils/training/eval_correction_rate.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp +M utils/training/import_k_mixture_model.cpp + +commit f15a90da963d90d326a9ff7cd506d8962bb5d4e9 +Author: Peng Wu +Date: 2011-08-06 15:01:26 +0800 + + refine spseg + +M utils/segment/spseg.cpp + +commit c0615b9d1e52c985770d2c60c6c8a960ada7a93c +Author: Peng Wu +Date: 2011-08-06 14:47:22 +0800 + + refine utils/segment + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit 6504338199d28764aae9a1cefe2e14cf02d4287e +Author: Peng Wu +Date: 2011-08-06 14:11:44 +0800 + + refine utils/storage + +M data/Makefile.am +M utils/storage/export_interpolation.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp +M utils/storage/import_interpolation.cpp + +commit 589b10be816c4264fc1663f4680e4d71861f1682 +Author: Peng Wu +Date: 2011-08-05 20:39:07 +0800 + + refine autoconf + +M Makefile.data +M data/Makefile.am +M utils/storage/gen_binary_files.cpp + +commit 0572b575851a7c7055ae10b7c22d072fe685c5be +Author: Peng Wu +Date: 2011-08-05 16:37:28 +0800 + + add data subdir + +M Makefile.am +M Makefile.data +M configure.ac +A data/Makefile.am + +commit 237bd7b076ec9df92e6fdf021a34bf6ef811ae1b +Author: Peng Wu +Date: 2011-08-05 14:37:07 +0800 + + add libpinyin.pc + +M configure.ac +A libpinyin.pc.in + +commit a1b9f96c6878d06c5b803ccdcea26f5fcc971365 +Author: Peng Wu +Date: 2011-08-05 14:13:21 +0800 + + make libpinyin installable + +M configure.ac +M src/Makefile.am +M src/include/Makefile.am +M src/lookup/Makefile.am +M src/storage/Makefile.am + +commit d593958f5b3019c44a7bb6d7c664df12e0478d0e +Author: Peng Wu +Date: 2011-07-31 18:42:25 +0800 + + improve Makefile.data + +M Makefile.data + +commit 10d8c35319c2eb451f6df5dc6407fdaaad1858ed +Author: Peng Wu +Date: 2011-07-29 20:27:16 +0800 + + fixes prune tool + +M utils/training/eval_correction_rate.cpp +M utils/training/k_mixture_model.h +M utils/training/prune_k_mixture_model.cpp + +commit 20ee4a647744f4ae4327754e01301351146c440b +Author: Peng Wu +Date: 2011-07-29 20:01:21 +0800 + + improve eval correction rate + +M utils/training/eval_correction_rate.cpp + +commit 2f1e4e17542d7e91261e8d05321b2886fbe38298 +Author: Peng Wu +Date: 2011-07-29 11:47:56 +0800 + + fixes prune tool + +M utils/training/k_mixture_model.h +M utils/training/prune_k_mixture_model.cpp + +commit 1eb686be6f2ff7692fd4ba4fee58c19436710340 +Author: Peng Wu +Date: 2011-07-28 11:18:43 +0800 + + fixes prune k mixture model tool output + +M utils/training/prune_k_mixture_model.cpp + +commit 414162124e63e00ce5da41c643e67552e1b7549e +Author: Peng Wu +Date: 2011-07-28 10:56:26 +0800 + + fixes a typo + +M Makefile.data + +commit e696eb5ae23dfbb057ec4c9c2362bb57fdc48787 +Author: Peng Wu +Date: 2011-07-27 23:27:28 +0800 + + suppress output for Makefile.data rebuild + +M Makefile.data + +commit 6a7d4e5f6f8d629fbc36325fd816fde66e5d38ab +Author: Peng Wu +Date: 2011-07-27 23:23:57 +0800 + + improve prune k mixture model + +M utils/training/k_mixture_model.h +M utils/training/prune_k_mixture_model.cpp + +commit a4fddd81d5ba9638ded837fd3006b99184a9b6b4 +Author: Peng Wu +Date: 2011-07-27 19:11:25 +0800 + + improve Makefile.data + +M Makefile.data + +commit 35ef8dadd9f969f10ae7c4910e1417c848ecafd5 +Author: Peng Wu +Date: 2011-07-26 15:36:18 +0800 + + improve gen binary files + +M utils/storage/gen_binary_files.cpp + +commit 16a42ce9d4cc77de1670b725dcfb5c7e8e8c25bf +Author: Peng Wu +Date: 2011-07-26 15:30:38 +0800 + + improve test pinyin index + +M tests/storage/test_pinyin_index.cpp + +commit 20817e002894a3897f262938dba393296af10b53 +Author: Peng Wu +Date: 2011-07-26 15:26:17 +0800 + + fixes stderr fprintf + +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp +M tests/storage/test_pinyin_index.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp + +commit 8ef85b7328061e215f928346cf0881d2808ad284 +Author: Peng Wu +Date: 2011-07-26 11:12:48 +0800 + + add Makefile for data + +A Makefile.data + +commit 63e1d37800e2f2ecc71e347c79f85c772042d8d2 +Author: Peng Wu +Date: 2011-07-25 18:38:28 +0800 + + write eval correction rate + +M utils/training/eval_correction_rate.cpp + +commit b7ecd0860c793f25ed97fc717be3b4f07cbd8f3e +Author: Peng Wu +Date: 2011-07-25 18:12:22 +0800 + + re-factor gen deleted ngram + +M utils/training/gen_deleted_ngram.cpp + +commit 9323164541fe4f8d0847bd8dfb9c8a7b029fba23 +Author: Peng Wu +Date: 2011-07-25 15:34:09 +0800 + + begin to write eval correction rate + +M utils/training/Makefile.am +A utils/training/eval_correction_rate.cpp + +commit 546f675be708b4062942110e9fcf07851e4457fa +Author: Peng Wu +Date: 2011-07-25 13:56:49 +0800 + + add notes + +M src/pinyin.cpp + +commit 80c5600cc1d2596d63edb606d6b5bfbb32dbafff +Author: Peng Wu +Date: 2011-07-24 20:52:59 +0800 + + add errno to merge k mixture model + +M utils/training/merge_k_mixture_model.cpp + +commit 9e0f9cf94da0a656cc810fb5d96ec4774152871d +Author: Peng Wu +Date: 2011-07-20 19:37:19 +0800 + + refine test phrase lookup + +M tests/lookup/test_phrase_lookup.cpp +M utils/segment/ngseg.cpp + +commit 71d760a003d296413ab87aea4235dc96c9e68e69 +Author: Peng Wu +Date: 2011-07-20 19:29:51 +0800 + + refactor ngseg + +M utils/segment/ngseg.cpp + +commit 027b54b4cadda5af698e95b9ef27801f197cba49 +Author: Peng Wu +Date: 2011-07-20 19:25:12 +0800 + + add class destructor to phrase lookup + +M src/lookup/phrase_lookup.cpp + +commit 9bd6cea3eb09d561bb9f59468807a23debadb4f3 +Author: Peng Wu +Date: 2011-07-20 19:18:40 +0800 + + write test phrase lookup + +M .gitignore +M tests/lookup/test_phrase_lookup.cpp + +commit 4578356ad0d2854d631739967d01ef9755f3289e +Author: Peng Wu +Date: 2011-07-20 18:10:58 +0800 + + add test phrase lookup + +M tests/lookup/Makefile.am +A tests/lookup/test_phrase_lookup.cpp +M utils/segment/ngseg.cpp + +commit 39e9373312c719a1e151db8d2e35c57b39917d18 +Author: Peng Wu +Date: 2011-07-20 17:42:02 +0800 + + fixes a bug, gcc? + +M utils/segment/ngseg.cpp + +commit d5fba5d98c24c16e0142810c0b49ec7e4d212799 +Author: Peng Wu +Date: 2011-07-20 15:42:08 +0800 + + rename result_string variable to tmp_string + +M utils/segment/ngseg.cpp + +commit de7ef0bad17a6b1925f99e69ff50bf14e77faeba +Author: Peng Wu +Date: 2011-07-20 14:22:49 +0800 + + add error report to ngseg + +M utils/segment/ngseg.cpp + +commit c87e5cef11df74817926d4cd097bbb49796684d3 +Author: Peng Wu +Date: 2011-07-18 17:32:50 +0800 + + add end-of-file new line detects in segment + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit bfeb358622bde2d7bb872840bc28cd5b805549c9 +Author: Peng Wu +Date: 2011-07-18 14:48:46 +0800 + + temporarily work around ngseg + +M utils/segment/ngseg.cpp + +commit 192acabaf321f8233c9b252444abb1d93ca7a419 +Author: Peng Wu +Date: 2011-07-18 13:56:42 +0800 + + refine segment + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit 1c34a7091fb4a827fdc69ea4d43e037be6c9de03 +Author: Peng Wu +Date: 2011-07-11 12:45:23 +0800 + + refine README + +M README + +commit 9e3c4ad779e2f9fd9f8f8530326d7f8d55bff12a +Author: Peng Wu +Date: 2011-06-28 11:24:54 +0800 + + fixes a typo in prune tool + +M utils/training/prune_k_mixture_model.cpp + +commit 55ddfe743b3f983bbae64176f379883d9824dfee +Author: Peng Wu +Date: 2011-06-24 11:32:15 +0800 + + fixes estimate k mixture model + +M utils/training/estimate_interpolation.cpp +M utils/training/estimate_k_mixture_model.cpp + +commit d627d62cefd5c362bb65bd33ab7100926d01de15 +Author: Peng Wu +Date: 2011-06-24 11:08:53 +0800 + + fixes a typo + +M utils/training/gen_k_mixture_model.cpp + +commit 40565418ba236d4383b33d6d863375d881406803 +Author: Peng Wu +Date: 2011-06-24 10:56:46 +0800 + + add a check + +M utils/training/gen_k_mixture_model.cpp + +commit c6f13c8cd7991ed2de260ad105112ff77a5a0ff7 +Author: Peng Wu +Date: 2011-06-23 16:54:44 +0800 + + fixes AUTHORS + +M AUTHORS + +commit e4302b6af590bb61bc7034f47f4e3256911cded8 +Author: Peng Wu +Date: 2011-06-23 13:41:50 +0800 + + refine comments + +M utils/training/gen_k_mixture_model.cpp + +commit f67bd159b67464404b74fe3df0ee732dae995ac4 +Author: Peng Wu +Date: 2011-06-23 13:29:06 +0800 + + fixes unigram in k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit 299b703ef1502a74effc7432db93e26d30169ad6 +Author: Peng Wu +Date: 2011-06-23 10:28:24 +0800 + + fixes an important bug in gen k mixture model + +M utils/training/gen_k_mixture_model.cpp +M utils/training/k_mixture_model.h + +commit 387de20bc3ca05f3cdaad1f83cc87c8a40c36d07 +Author: Peng Wu +Date: 2011-06-22 18:13:42 +0800 + + fixes a bug in test simple lookup + +M tests/lookup/test_simple_lookup.cpp + +commit c7aeb1c57cea4f458b3084a34397e44110297ac8 +Author: Peng Wu +Date: 2011-06-09 18:04:45 +0800 + + fixes read document + +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp + +commit 982cb961cec5f400a52948a17e3d33ae10bb90b4 +Author: Peng Wu +Date: 2011-06-09 15:47:51 +0800 + + add comments and fixes compute B in k mixture model + +M utils/training/gen_k_mixture_model.cpp +M utils/training/k_mixture_model.h + +commit 97e8d2ff85c1d611df507b079c6bca0c339ff00a +Author: Peng Wu +Date: 2011-06-09 13:01:22 +0800 + + fixes a typo + +M utils/training/prune_k_mixture_model.cpp + +commit 6468909b0679ca88ea2eee8e129ef37cfeeb8b9f +Author: Peng Wu +Date: 2011-06-09 12:22:38 +0800 + + add unigram to prune k mixture model + +M utils/training/prune_k_mixture_model.cpp + +commit 1f7011bdd8a782b03905e33ff060482200080da5 +Author: Peng Wu +Date: 2011-06-09 11:06:40 +0800 + + add comment + +M utils/training/k_mixture_model_to_interpolation.cpp + +commit f62f97a9ec2f78ce77fce9cfad46e77dadfad290 +Author: Peng Wu +Date: 2011-06-09 10:40:27 +0800 + + refine code in k mixture model header + +M utils/training/k_mixture_model.h + +commit e731a39df3eed466093c977eb1f4dd67ca8bbefc +Author: Peng Wu +Date: 2011-06-09 10:39:03 +0800 + + add unigram to merge k mixture model + +M utils/training/merge_k_mixture_model.cpp + +commit bcf6608ccc250942f670617b19d71b033677e347 +Author: Peng Wu +Date: 2011-06-09 10:24:29 +0800 + + improves estimate k mixture model + +M utils/training/estimate_k_mixture_model.cpp + +commit e5e61366f18eb7d3a2f9671768e4480704f3b62f +Author: Peng Wu +Date: 2011-06-08 15:57:36 +0800 + + fixes estimate k mixture model + +M utils/training/estimate_k_mixture_model.cpp + +commit e14ce09105fb44019b3a60dfd70a5b63d05b9fff +Author: Peng Wu +Date: 2011-06-08 13:19:28 +0800 + + ignore zero items in conversion tool + +M utils/training/k_mixture_model_to_interpolation.cpp + +commit a6604222afc1d3c6b5612752ef30377307bc09a7 +Author: Peng Wu +Date: 2011-06-08 13:16:04 +0800 + + refine validate tool + +M utils/training/validate_k_mixture_model.cpp + +commit 52090399726e082b4eef39bc8cb65eb5812b6562 +Author: Peng Wu +Date: 2011-06-07 19:32:46 +0800 + + add unigram to k mixture model to interpolation + +M utils/training/k_mixture_model_to_interpolation.cpp + +commit 6b9c537506903a8e01eba10fa12200bfdf75ef9f +Author: Peng Wu +Date: 2011-06-07 16:10:35 +0800 + + add unigram to gen k mixture model + +M utils/training/gen_k_mixture_model.cpp +M utils/training/k_mixture_model.h + +commit 00b8f056a10af903b15b29c6c782b3f74a6147aa +Author: Peng Wu +Date: 2011-06-07 15:05:14 +0800 + + add unigram to validate k mixture model + +M utils/training/validate_k_mixture_model.cpp + +commit f1b4b7024df6aa8a279e7ac8fbaf9a5701e446c4 +Author: Peng Wu +Date: 2011-06-07 14:39:59 +0800 + + add unigram to export k mixture model tool + +M utils/training/export_k_mixture_model.cpp + +commit dce4901ac2edd459ea8d53c210f0aa09115b679e +Author: Peng Wu +Date: 2011-06-07 14:33:56 +0800 + + add unigram to import k mixture model tool + +M utils/training/import_k_mixture_model.cpp + +commit 9c76830f200f90448fb7f218a359b1e6d08322f4 +Author: Peng Wu +Date: 2011-06-07 14:04:17 +0800 + + fixes k mixture model + +M utils/training/k_mixture_model.h + +commit 0aec5e7e66ddde36da734993e6afe57f856b23bc +Author: Peng Wu +Date: 2011-06-01 10:29:48 +0800 + + fixes gen ngram + +M utils/training/gen_ngram.cpp + +commit ca16b0628857bd3cef581414a850108c56f782b1 +Author: Peng Wu +Date: 2011-05-31 10:58:06 +0800 + + refine gen ngram and gen deleted ngram + +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_ngram.cpp + +commit 5f91468f3fb6a26b15a3ba417c4b1978646a17c4 +Author: Peng Wu +Date: 2011-05-31 10:38:30 +0800 + + remove zero uni-gram item in export interpolation + +M utils/storage/export_interpolation.cpp + +commit b09c5c020d4721590d2e966df3a0e5d700eae0f9 +Author: Peng Wu +Date: 2011-05-30 17:41:42 +0800 + + fixes a typo + +M utils/training/gen_k_mixture_model.cpp + +commit fdcd60b8c885296f6854eb27b117ce2b5a176e10 +Author: Peng Wu +Date: 2011-05-30 17:37:53 +0800 + + fixes gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit e68ab087a01c8f4cf1b5d509cfc0658ea7cf4ab3 +Author: Peng Wu +Date: 2011-05-26 10:44:37 +0800 + + fixes prune k mixture model + +M utils/training/prune_k_mixture_model.cpp + +commit f132bb1045506e4dad744c09ac5ad1a4f593bea3 +Author: Peng Wu +Date: 2011-05-25 15:17:49 +0800 + + temporarily fixes gen k mixture model + +M utils/training/gen_k_mixture_model.cpp +M utils/training/k_mixture_model.h + +commit c66f9cad23a8264ab9649cb8a67d68460030a718 +Author: Peng Wu +Date: 2011-05-25 13:15:59 +0800 + + refine gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit 49cbd833fe1f5c0a65b5c4f58bf465b69896856c +Author: Peng Wu +Date: 2011-05-25 12:59:18 +0800 + + fixes a typo + +M src/storage/flexible_ngram.h +M utils/training/gen_k_mixture_model.cpp + +commit 4bb7f472a4fba814d02bdca5b011b5a6f68d4949 +Author: Peng Wu +Date: 2011-05-25 10:50:31 +0800 + + remove in \1-gram in conversion tool + +M utils/training/k_mixture_model_to_interpolation.cpp + +commit 2688f37ac6cbdb6276ec5bf9f9bc3b1a5ad393c0 +Author: Peng Wu +Date: 2011-05-24 16:10:12 +0800 + + add '\n' to k mixture model to interpolation model + +M utils/training/k_mixture_model_to_interpolation.cpp + +commit 66371f639be3179e48081002ee942ac55f47b054 +Author: Peng Wu +Date: 2011-05-24 15:56:11 +0800 + + fixes merge k mixture model + +M utils/training/merge_k_mixture_model.cpp + +commit cc2643225897f45b5e01d10b0152c88b87c56fc4 +Author: Peng Wu +Date: 2011-05-24 13:30:58 +0800 + + refine gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit 1bb50d2455d69047cccc53f0daf0debac73ec403 +Author: Peng Wu +Date: 2011-05-24 11:20:51 +0800 + + fixes m_N in magic header of gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit aa84722e1a97cba481d717284ca8160bd5e1d2ac +Author: Peng Wu +Date: 2011-05-24 11:15:42 +0800 + + fixes merge k mixture model + +M utils/training/merge_k_mixture_model.cpp + +commit 47089bf0d8767dcca81fd6ca5f680bb651b356ec +Author: Peng Wu +Date: 2011-05-24 11:08:02 +0800 + + remove some global varibles in gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit 674d1bf7611715babce989d150348e7085eaec6b +Author: Peng Wu +Date: 2011-05-24 10:55:41 +0800 + + re-fine gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit 1dd97f2e017d2f398203ab91b4b6ebbd232d11d8 +Author: Peng Wu +Date: 2011-05-24 10:40:22 +0800 + + fixes tag utility cpp + +M src/storage/tag_utility.cpp + +commit f3d3d4bb01553f3d8d7a07d9d57d4ce525a57b6e +Author: Peng Wu +Date: 2011-05-23 17:10:03 +0800 + + fixes validate k mixture model + +M utils/training/validate_k_mixture_model.cpp + +commit 77e4f599b2e7123887660ca13ba7d7929bd04407 +Author: Peng Wu +Date: 2011-05-23 16:23:25 +0800 + + fixes gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit 2edbe14f3e66f9b2b25cd3e1afea23f602c16f41 +Author: Peng Wu +Date: 2011-05-23 12:24:29 +0800 + + fixes import/export tools + +M utils/training/export_k_mixture_model.cpp +M utils/training/import_k_mixture_model.cpp + +commit b47878f90385acd42588658a6dcf2c0edfae419f +Author: Peng Wu +Date: 2011-05-23 11:38:14 +0800 + + write validate k mixture model tool + +M utils/training/Makefile.am +M utils/training/export_k_mixture_model.cpp +A utils/training/validate_k_mixture_model.cpp + +commit 5a6ac44fa3d1acb7cd6ff62cb1e71d6c9d8a8fed +Author: Peng Wu +Date: 2011-05-20 11:07:59 +0800 + + remove tag utility header in tools from utils + +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/import_k_mixture_model.cpp +M utils/training/k_mixture_model_to_interpolation.cpp + +commit f18a652c8a03961ae1004daf051d28aedbae282f +Author: Peng Wu +Date: 2011-05-20 11:02:55 +0800 + + move tag utility to src/storage + +M src/pinyin.h +M src/storage/Makefile.am +R099 utils/storage/tag_utility.cpp src/storage/tag_utility.cpp +R100 utils/storage/tag_utility.h src/storage/tag_utility.h +M utils/storage/Makefile.am +M utils/training/Makefile.am + +commit 5150341809f92fb2179decdfdd6ec1477d988461 +Author: Peng Wu +Date: 2011-05-19 13:36:10 +0800 + + write k mixture model to interpolation conversion tool + +M utils/training/Makefile.am +M utils/training/import_k_mixture_model.cpp +A utils/training/k_mixture_model_to_interpolation.cpp + +commit 2988e1a53748d31c6dae10f909465d52ab82e6bd +Author: Peng Wu +Date: 2011-05-18 13:59:29 +0800 + + wrote import k mixture model + +M utils/storage/import_interpolation.cpp +M utils/training/import_k_mixture_model.cpp + +commit faa30bc5e1b5c2f98959936334340f84d30e82bb +Author: Peng Wu +Date: 2011-05-17 15:57:44 +0800 + + begin to write import k mixture model + +M utils/storage/import_interpolation.cpp +M utils/training/Makefile.am +A utils/training/import_k_mixture_model.cpp + +commit 00099bfaac3911f13c38c593d01f8c2c3bd35523 +Author: Peng Wu +Date: 2011-05-17 11:25:41 +0800 + + add \end line to export k mixture model + +M utils/training/export_k_mixture_model.cpp + +commit 55831261b3c63c4a6e2e0163e1f5a5c7ff3e2673 +Author: Peng Wu +Date: 2011-05-16 19:19:02 +0800 + + add missing n_1 in export k mixture model + +M utils/training/export_k_mixture_model.cpp + +commit e53a3eb2c3e3cf3f0929a8671c6d79ac193f5858 +Author: Peng Wu +Date: 2011-05-16 15:15:22 +0800 + + fixes print_help + +M utils/training/estimate_k_mixture_model.cpp +M utils/training/export_k_mixture_model.cpp +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/gen_ngram.cpp +M utils/training/merge_k_mixture_model.cpp +M utils/training/prune_k_mixture_model.cpp + +commit 2b3ff42b8795a2b4644c3983568a33d63baf984b +Author: Peng Wu +Date: 2011-05-16 14:59:05 +0800 + + refine export interpolation + +M utils/storage/export_interpolation.cpp + +commit 5bf8ae9ab5f227ec14d0d7cd671c491189733a94 +Author: Peng Wu +Date: 2011-05-16 14:57:18 +0800 + + wrote export k mixture model + +M utils/storage/export_interpolation.cpp +M utils/training/Makefile.am +M utils/training/export_k_mixture_model.cpp + +commit ec8c2e7e553ca4faf51c4372ee96f7b1ac34886c +Author: Peng Wu +Date: 2011-05-16 14:12:47 +0800 + + begin to write export k mixture model + +A utils/training/export_k_mixture_model.cpp + +commit 5394772a45e214206652ad565f506ed3d3a149af +Author: Peng Wu +Date: 2011-05-16 14:11:05 +0800 + + move token string conversion function to taglib + +M utils/storage/Makefile.am +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp +M utils/storage/tag_utility.cpp +M utils/storage/tag_utility.h + +commit 82c49d8b7337dca828c142c902682bb991382df0 +Author: Peng Wu +Date: 2011-05-13 10:49:13 +0800 + + add cmd options for merge k mixture model + +M utils/training/gen_k_mixture_model.cpp +M utils/training/merge_k_mixture_model.cpp + +commit 58f510f72eb5cbb321dd6783a98b6c8e0ac304bb +Author: Peng Wu +Date: 2011-05-13 10:35:07 +0800 + + add berkeley db sync + +M src/storage/flexible_ngram.h +M src/storage/ngram.h + +commit fc8fd83c063c0a99bbe4973529670c63e1113cc5 +Author: Peng Wu +Date: 2011-05-12 15:05:58 +0800 + + refine merge k mixture model + +M utils/training/merge_k_mixture_model.cpp + +commit 1b5ea010d98d272deb845965cef1511ccf3076de +Author: Peng Wu +Date: 2011-05-12 14:56:00 +0800 + + write merge k mixture model in progress + +M utils/training/merge_k_mixture_model.cpp + +commit 8156def6af7977a59ca44d1a26c53e588535d914 +Author: Peng Wu +Date: 2011-05-12 11:48:25 +0800 + + write merge_two_phrase_array function + +M utils/training/merge_k_mixture_model.cpp + +commit f110c5501299adb2e809a678001257f455407e3b +Author: Peng Wu +Date: 2011-05-12 10:19:36 +0800 + + refine gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit 9ebfcbba3dc5d069dd8bf89fcb69b2d388aa3289 +Author: Peng Wu +Date: 2011-05-11 16:23:31 +0800 + + begin to write merge k mixture model. + +M utils/training/Makefile.am +A utils/training/merge_k_mixture_model.cpp + +commit d757c8339b3e7bd747777f3c5fc3b7d7ca49fd1c +Author: Peng Wu +Date: 2011-05-11 15:54:49 +0800 + + fixes a typo + +M utils/training/k_mixture_model.h + +commit f6db0114debc6928eaaf1b526d8507a5b045ea85 +Author: Peng Wu +Date: 2011-05-11 13:47:29 +0800 + + refine gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit e101e93196ba381850c5e33f9f9151616bb7c87d +Author: Peng Wu +Date: 2011-05-10 15:05:16 +0800 + + add cmd line options to gen k mixture model + +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_k_mixture_model.cpp +M utils/training/prune_k_mixture_model.cpp + +commit 8f0f9f33716e9c81a74f2ff8bb77eb32ec8cd41a +Author: Peng Wu +Date: 2011-05-10 14:03:31 +0800 + + write main for gen k mixture model + +M utils/training/gen_k_mixture_model.cpp + +commit c3ab43532529b45048a7a711e94d0a37f102d603 +Author: Peng Wu +Date: 2011-05-10 13:54:22 +0800 + + add enter at file tail + +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp + +commit f0f1771e3bbe95dffaa4d42596b7d4aace277d2c +Author: Peng Wu +Date: 2011-05-10 13:50:55 +0800 + + use binary format of phrase large table + +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_ngram.cpp + +commit d4eb5445d98587c05be46747ab3da99d3df67a5a +Author: Peng Wu +Date: 2011-05-10 13:31:36 +0800 + + write gen k mixture model in progress + +M utils/training/gen_k_mixture_model.cpp + +commit c7c8dda99cdf334803b72da07d8389e19cf365d8 +Author: Peng Wu +Date: 2011-05-10 13:12:36 +0800 + + fixes a typo in the load method of flexible ngram + +M src/storage/flexible_ngram.h + +commit 54eb877f6df998eaabb397caed32cab760edbb9b +Author: Peng Wu +Date: 2011-05-09 14:32:13 +0800 + + fixes compile for gen k mixture model + +M utils/training/Makefile.am +M utils/training/gen_k_mixture_model.cpp + +commit 930e49f27a996f3ec88ddd690008c2c0daf299b4 +Author: Peng Wu +Date: 2011-05-09 14:05:28 +0800 + + begin to write gen k mixture model + +A utils/training/gen_k_mixture_model.cpp + +commit 13dc86d5c66157fa113a4e4d88720339939fabb5 +Author: Peng Wu +Date: 2011-05-09 11:20:20 +0800 + + fixes linebuf + +M utils/training/gen_deleted_ngram.cpp +M utils/training/gen_ngram.cpp + +commit 7e2d45c46aeb95ce64113d1f2dfab09142430c95 +Author: Peng Wu +Date: 2011-05-06 10:31:28 +0800 + + fixes cmd line options for gen_deleted_ngram + +M utils/training/gen_deleted_ngram.cpp + +commit 5b972580775a1eeb1683b73d5ee6a9126e8271a5 +Author: Peng Wu +Date: 2011-05-05 13:11:50 +0800 + + refine gen ngram + +M utils/training/Makefile.am +A utils/training/gen_deleted_ngram.cpp +M utils/training/gen_ngram.cpp + +commit 1326788b7e88051375c54b9eef5f3d19457a7db4 +Author: Peng Wu +Date: 2011-05-05 11:32:55 +0800 + + add cmd line options to prune k mixture model + +M utils/training/gen_ngram.cpp +M utils/training/prune_k_mixture_model.cpp + +commit 5f987095add7f63c7389fc5255c74fc408351c71 +Author: Peng Wu +Date: 2011-05-05 11:13:34 +0800 + + refine attach method in flexible n-gram + +M src/include/novel_types.h +M src/storage/flexible_ngram.h +M src/storage/ngram.h +M tests/storage/test_flexible_ngram.cpp +M utils/training/estimate_k_mixture_model.cpp +M utils/training/prune_k_mixture_model.cpp + +commit d91e11a3e0e3215db7b87eb902dc7e7f9974823f +Author: Peng Wu +Date: 2011-05-04 13:45:16 +0800 + + wrote prune k mixture model + +M utils/training/prune_k_mixture_model.cpp + +commit db9ed7743d01b898b1cdc086339da1dd79047a18 +Author: Peng Wu +Date: 2011-05-04 11:35:30 +0800 + + begin to write prune k mixture model + +M utils/training/Makefile.am +A utils/training/prune_k_mixture_model.cpp + +commit 2358bbb3d0348dd940fa10fd40dbe0f2af6d9db0 +Author: Peng Wu +Date: 2011-05-04 11:25:00 +0800 + + refine k mixture model + +M utils/training/k_mixture_model.h + +commit e85c6ac35846b87a794f8b2d85cbe472b3c7e8b7 +Author: Peng Wu +Date: 2011-05-03 16:28:58 +0800 + + polish flexible n-gram + +M src/storage/flexible_ngram.h + +commit ef74ee17426d2b7c82a5962c6f554930d015147c +Author: Peng Wu +Date: 2011-05-03 15:58:09 +0800 + + fixes some error + +M src/storage/flexible_ngram.h + +commit 8c6cfe9243013e32ee0b3a8e78dd68e6de4df77f +Author: Peng Wu +Date: 2011-05-03 15:51:48 +0800 + + add flexible n-gram signature check + +M src/storage/flexible_ngram.h +M src/storage/ngram.cpp +M tests/storage/test_flexible_ngram.cpp +M utils/training/estimate_k_mixture_model.cpp +M utils/training/k_mixture_model.h + +commit 881d876d71098dce20b8df12bc893a243027c339 +Author: Peng Wu +Date: 2011-05-03 11:13:55 +0800 + + fixes source code file permissions + +M src/include/memory_chunk.h +M src/include/novel_types.h +M src/storage/phrase_index.h +M src/storage/pinyin_large_table.h +M tests/include/test_memory_chunk.cpp + +commit 80d2b005249b772e7cd7fdf763e217576d401823 +Author: Peng Wu +Date: 2011-04-28 15:04:46 +0800 + + use errno + +M src/storage/flexible_ngram.h +M tests/storage/test_phrase_index.cpp +M tests/storage/test_pinyin_index.cpp +M utils/segment/ngseg.cpp +M utils/segment/spseg.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp +M utils/storage/import_interpolation.cpp +M utils/training/estimate_k_mixture_model.cpp +M utils/training/gen_ngram.cpp + +commit b7909ecd1b39843c99b44118a8e0fe269da7f098 +Author: Peng Wu +Date: 2011-04-28 13:46:02 +0800 + + add options to estimate k mixture model + +M utils/training/estimate_k_mixture_model.cpp +M utils/training/gen_ngram.cpp + +commit dcb51949e11f944a2acbb06394afef4c26a9e654 +Author: Peng Wu +Date: 2011-04-28 11:36:47 +0800 + + wrote estimate k mixture model + +M utils/training/estimate_interpolation.cpp +M utils/training/estimate_k_mixture_model.cpp + +commit 0b173665c29bd5a2d3b81625e7112cb503d357a9 +Author: Peng Wu +Date: 2011-04-27 17:01:08 +0800 + + add remove method to flexible n-gram + +M src/storage/flexible_ngram.h +M tests/storage/test_flexible_ngram.cpp +M utils/training/estimate_k_mixture_model.cpp + +commit 844ff3da1745e9433f893390e85eb64c5c3fd5aa +Author: Peng Wu +Date: 2011-04-27 16:11:06 +0800 + + write compute interpolation for flexible bi-gram + +M utils/training/estimate_k_mixture_model.cpp + +commit c44fa3478994e94d0fea8f2984c1d45515ec7024 +Author: Peng Wu +Date: 2011-04-27 15:50:40 +0800 + + fixes code style + +M utils/training/estimate_interpolation.cpp + +commit b19ebbcbeb89f49decb318dcce94ff2824fcd412 +Author: Peng Wu +Date: 2011-04-27 14:49:24 +0800 + + begin to write estimate k mixture model parameters + +M utils/training/Makefile.am +A utils/training/estimate_k_mixture_model.cpp +M utils/training/k_mixture_model.h + +commit 2737e5a53bafcad3971f6fdbcfb1ad3dcb7df66b +Author: Peng Wu +Date: 2011-04-27 14:29:31 +0800 + + clear retval for flexible n-gram + +M src/storage/flexible_ngram.h + +commit 1e5d6fe851eeff76322cc65a5c80b936c1bac746 +Author: Peng Wu +Date: 2011-04-27 14:07:55 +0800 + + add magic number for k mixture model + +M utils/training/k_mixture_model.h + +commit 8a3ab40902b4d0b3a576d669d2a40e2101b450c4 +Author: Peng Wu +Date: 2011-04-25 18:11:30 +0800 + + fixes import interpolation + +M utils/storage/import_interpolation.cpp + +commit 54b399a04fff283dec5299fc9f1d66985456754d +Author: Peng Wu +Date: 2011-04-25 15:54:42 +0800 + + define k mixture model bi-gram + +M utils/training/k_mixture_model.h + +commit 765a730f31d5f8a0ef2b95d2fc9966cdc9f09b46 +Author: Peng Wu +Date: 2011-04-20 14:54:01 +0800 + + add flexible_ngram.h and k_mixture_model.h to Makefile.am + +M src/storage/Makefile.am +M utils/training/Makefile.am + +commit e3b450140cd21b13122b1fec1a99b3923bb0a951 +Author: Peng Wu +Date: 2011-04-20 14:24:44 +0800 + + add test cases to bi-gram + +M tests/storage/test_ngram.cpp + +commit 75a02c90ca93e81117f16c44793fd825311b5774 +Author: Peng Wu +Date: 2011-04-20 14:22:23 +0800 + + add load/save bi-gram db + +M src/storage/ngram.cpp + +commit 15c689c48ec55e45389367c5a3e58de18bdb9156 +Author: Peng Wu +Date: 2011-04-19 11:09:16 +0800 + + add an assert to bi-gram + +M src/storage/ngram.cpp + +commit c255e8e389ff8e0f8803e57d75b29ea4c904dbcb +Author: Peng Wu +Date: 2011-04-19 10:33:36 +0800 + + add more test cases + +M src/storage/ngram.cpp +M tests/storage/test_flexible_ngram.cpp +M tests/storage/test_ngram.cpp + +commit 1bd05a07d29dbe3f8b03ae73b879797aea8c653a +Author: Peng Wu +Date: 2011-04-19 10:12:12 +0800 + + fixes phrase large table + +M utils/training/gen_ngram.cpp + +commit d74fda51c92a80d195f9e7030dc7cf1ddb47f23d +Author: Peng Wu +Date: 2011-04-18 17:54:39 +0800 + + add asserts to gen ngram + +M utils/training/gen_ngram.cpp + +commit 5186a4ba9f180e0ba10996893aecc63150caabde +Author: Peng Wu +Date: 2011-04-18 17:36:06 +0800 + + refine bigram load + +M src/storage/ngram.cpp + +commit 0eef018fd451b66288684fdeb8d26e59117a4ebb +Author: Peng Wu +Date: 2011-04-18 17:16:47 +0800 + + fixes test phrase table. + +M tests/storage/test_phrase_table.cpp + +commit c418ddb0e8ec1eb8e79cb03e83ed3ebc202d02e5 +Author: Peng Wu +Date: 2011-04-18 16:59:03 +0800 + + use new bi-gram + +M tests/lookup/test_simple_lookup.cpp +M tests/storage/test_ngram.cpp +M utils/segment/ngseg.cpp +M utils/storage/export_interpolation.cpp +M utils/storage/import_interpolation.cpp +M utils/training/estimate_interpolation.cpp +M utils/training/gen_ngram.cpp + +commit 0b113f330653b82be8a87af8b8b4ac826e72b296 +Author: Peng Wu +Date: 2011-04-18 16:29:17 +0800 + + refine bi-gram + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h + +commit 647b365bbf25bc1e8db10aa26427fddbbbaf4626 +Author: Peng Wu +Date: 2011-04-18 16:16:59 +0800 + + refine bi-gram + +M src/storage/ngram.cpp +M src/storage/ngram.h + +commit 1ab6f0e8292074a8feac390db820305968147b3b +Author: Peng Wu +Date: 2011-04-18 15:46:15 +0800 + + add more test cases for n-gram + +M tests/storage/test_flexible_ngram.cpp +M tests/storage/test_ngram.cpp + +commit 469bcc917fdc827b6904c329a3c7c6e8c43aabaf +Author: Peng Wu +Date: 2011-04-18 15:42:21 +0800 + + add insert/remove array item to flexible bi-gram + +M src/storage/flexible_ngram.h +M src/storage/ngram.cpp + +commit 643bbc2a749f9a37a915c9daedaf544478711e42 +Author: Peng Wu +Date: 2011-04-18 14:37:21 +0800 + + refine insert/set freq + +M src/lookup/pinyin_lookup.cpp +M tests/storage/test_ngram.cpp +M utils/storage/import_interpolation.cpp +M utils/training/gen_ngram.cpp + +commit d91242f6b9577c1eeef98929c8420e1bcd18e6ec +Author: Peng Wu +Date: 2011-04-18 14:25:42 +0800 + + add insert/remove freq to bi-gram + +M src/storage/ngram.cpp +M src/storage/ngram.h + +commit 2f85c451d14b0bb0284daf25d7b4f639355532c2 +Author: Peng Wu +Date: 2011-04-15 17:13:24 +0800 + + add more test cases for get/set array header + +M tests/storage/test_flexible_ngram.cpp + +commit f3e68a089ba76467a7adc15d657dd2f9552b2bc7 +Author: Peng Wu +Date: 2011-04-15 13:51:02 +0800 + + add get/set array header to flexible bi-gram + +M src/storage/flexible_ngram.h +M tests/storage/test_flexible_ngram.cpp + +commit 06f2399d0d425c51f383d1c0b5f8fd7dc823be7a +Author: Peng Wu +Date: 2011-04-13 14:18:55 +0800 + + write k mixture model + +A utils/training/k_mixture_model.h + +commit 16383e366489943da229e97badab62625c85751d +Author: Peng Wu +Date: 2011-04-08 14:42:08 +0800 + + fixes a warning + +M tests/lookup/test_simple_lookup.cpp + +commit 8c7b4f779a5a9bc8b01f1580a44fa02ebc1948f1 +Author: Peng Wu +Date: 2011-04-08 12:23:25 +0800 + + add test case + +M src/storage/flexible_ngram.h +M tests/storage/test_flexible_ngram.cpp +M tests/storage/test_ngram.cpp + +commit 0d839f2ef6d4f70dbad007384ca998eb0ae51732 +Author: Peng Wu +Date: 2011-04-07 14:07:18 +0800 + + add test case for flexible ngram + +M src/pinyin.cpp +M src/pinyin.h +M tests/storage/Makefile.am +A tests/storage/test_flexible_ngram.cpp + +commit 7d46595e8d2391fc70be12f3ecf8119bdaa47c7b +Author: Peng Wu +Date: 2011-04-07 13:47:05 +0800 + + write flexible n-gram + +M src/storage/flexible_ngram.h + +commit 74721fab7449e1fb9e655812a067cd0dd3d7c26d +Author: Peng Wu +Date: 2011-04-06 14:47:57 +0800 + + add get/set array item methods + +M src/storage/flexible_ngram.h + +commit dc42988b0d0378e3f12eea06c0a0de52d6875b4c +Author: Peng Wu +Date: 2011-04-06 14:07:22 +0800 + + add retrieve all and search methods + +M src/storage/flexible_ngram.h + +commit f7c301f3d5a6b87dba2b0747367c0aaa30604526 +Author: Peng Wu +Date: 2011-04-06 13:33:11 +0800 + + add get/set array header methods + +M src/storage/flexible_ngram.h + +commit 0d68d1990958df65f8cde110756ee18c785d51cc +Author: Peng Wu +Date: 2011-04-06 13:23:25 +0800 + + refine code + +M src/storage/ngram.cpp + +commit b92726f8d77634f89b34d4f72efb75a5b3aad586 +Author: Peng Wu +Date: 2011-04-06 12:49:52 +0800 + + begin to write flexible single gram + +M src/pinyin.cpp +M src/storage/flexible_ngram.h + +commit 06b5488f084c5ad9fe5d70155b8c30ce2099501a +Author: Peng Wu +Date: 2011-04-02 15:12:28 +0800 + + add license + +M src/storage/flexible_ngram.h + +commit f1f777630f85e58b01b472da23e3f72a71dd1f49 +Author: Peng Wu +Date: 2011-04-01 11:03:46 +0800 + + refine code + +M src/storage/flexible_ngram.h +M src/storage/ngram.cpp +M src/storage/ngram.h +M utils/training/estimate_interpolation.cpp + +commit 37498f130e673dcb3052c029c0407ffa483dda8a +Author: Peng Wu +Date: 2011-03-31 17:39:10 +0800 + + refine ngram header + +M src/storage/ngram.h + +commit 97a6a4e00856fceb1a72e163ec54cfa94c04733e +Author: Peng Wu +Date: 2011-03-31 17:35:01 +0800 + + design flexible bi-gram + +A src/storage/flexible_ngram.h + +commit 4ce3b364ccd464d270266bb3f7a723a8acf1b055 +Author: Peng Wu +Date: 2011-03-31 11:09:21 +0800 + + rename namespace from novel to pinyin + +M src/lookup/lookup.h +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.h +M src/storage/ngram.h +M src/storage/phrase_index.h +M src/storage/phrase_large_table.cpp +M src/storage/phrase_large_table.h +M src/storage/pinyin_base.cpp +M src/storage/pinyin_base.h +M src/storage/pinyin_large_table.cpp +M src/storage/pinyin_large_table.h +M src/storage/pinyin_phrase.h + +commit 5c653c52b95686476f0e86ec1ae5cc658ae27a55 +Author: Peng Wu +Date: 2011-03-31 10:57:05 +0800 + + refine ngram header + +M src/storage/ngram.h + +commit 71e1bb340401ef63aa01245429487d90b58664ac +Author: Peng Wu +Date: 2010-11-29 14:50:22 +0800 + + fixes build with LDFLAGS --as-needed. + +M utils/training/Makefile.am + +commit b4785a45c0d83fbba1e652b483a42363f3c6cccf +Author: Peng Wu +Date: 2010-11-09 12:50:01 +0800 + + fixes a bug in phrase lookup + +M src/lookup/phrase_lookup.cpp +M utils/segment/ngseg.cpp + +commit 33d4a4dba293513531d8b4734b7e1053bc30f1e8 +Author: Peng Wu +Date: 2010-11-09 12:49:35 +0800 + + fixes a typo + +M src/lookup/pinyin_lookup.cpp + +commit 6df26a7719de824f1ce0617ee30d9cf40fc8fc79 +Author: Peng Wu +Date: 2010-11-08 17:11:13 +0800 + + Revert "re-factor code" + +M src/storage/phrase_large_table.cpp +M src/storage/pinyin_large_table.cpp + +commit f5f8fe94ffcda84c5a905fcc4a9dd452d8a12bbf +Author: Peng Wu +Date: 2010-11-08 16:44:32 +0800 + + write n-gram segment. + +M utils/segment/ngseg.cpp + +commit d7b59e84a518e06cfe04f21bba90dddcb4121ba2 +Author: Peng Wu +Date: 2010-11-08 16:44:19 +0800 + + re-factor spseg + +M utils/segment/spseg.cpp + +commit 28be2c426cc108903bd2e11dffc59ad8b803ff7f +Author: Peng Wu +Date: 2010-11-08 16:43:39 +0800 + + fixes memory leak + +M tests/lookup/test_simple_lookup.cpp + +commit 3d9a371be1e2f85ae3b43a6b88c51e60f1a204c8 +Author: Peng Wu +Date: 2010-11-08 15:48:54 +0800 + + re-factor code + +M src/storage/phrase_large_table.cpp +M src/storage/pinyin_large_table.cpp + +commit a4f92d38d0bfe20d69eddda95aaebc57e5b39d3b +Author: Peng Wu +Date: 2010-11-05 17:05:00 +0800 + + add comments + +M utils/segment/ngseg.cpp + +commit 80c67769939947d910907e882f24ce044a6034e1 +Author: Peng Wu +Date: 2010-11-03 16:12:20 +0800 + + begin to write n-gram segment + +M utils/segment/ngseg.cpp + +commit 40dbcb94a8058ce45edef5c6e5238c32121ebc1e +Author: Peng Wu +Date: 2010-11-03 14:39:20 +0800 + + fixes a typo + +M src/storage/phrase_index.cpp +M utils/segment/spseg.cpp + +commit 7e8a335a57c64349318d2e8a8e36eae36a8fa8f7 +Author: Peng Wu +Date: 2010-11-02 16:11:28 +0800 + + fixes compile errors + +M utils/segment/ngseg.cpp + +commit fd836905ef0f4d6669b60815eed3648a7890c232 +Author: Peng Wu +Date: 2010-11-02 16:01:46 +0800 + + add print help to ngseg + +M utils/segment/ngseg.cpp + +commit f20d44e42eab5df55656b7ebbfc7359b011dd08c +Author: Peng Wu +Date: 2010-11-02 16:00:57 +0800 + + fixes a typo + +M utils/segment/spseg.cpp + +commit 8557003bd3695ad23982958d94ec34ac60ea72f1 +Author: Peng Wu +Date: 2010-11-02 15:32:42 +0800 + + begin to write ngseg + +M utils/segment/Makefile.am +A utils/segment/ngseg.cpp + +commit 59f26f62a8a73fa139e2553f47a3935e0512bd14 +Author: Peng Wu +Date: 2010-11-01 19:44:22 +0800 + + fixes convert to utf8 in phrase lookup + +M src/lookup/phrase_lookup.cpp + +commit c622cd3d4aa44de57cb8e692dc5dba5832febccb +Author: Peng Wu +Date: 2010-11-01 17:08:05 +0800 + + Revert "strength reduce" + +M src/lookup/pinyin_lookup.cpp + +commit 7eb0282165e8f051fe3c1bb79f33705febb68d24 +Author: Peng Wu +Date: 2010-11-01 16:54:06 +0800 + + re-write convert to utf8 in phrase lookup + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h + +commit 0542734a86d0684345fd7b33fb5428fa6669c396 +Author: Peng Wu +Date: 2010-11-01 16:38:11 +0800 + + write final step for phrase lookup + +M src/lookup/phrase_lookup.cpp + +commit 195792a51d876ad22a304a4645588efe87e42c09 +Author: Peng Wu +Date: 2010-11-01 16:08:42 +0800 + + write search unigram and bigram in phrase lookup + +M src/lookup/phrase_lookup.cpp + +commit b64793569b765f924a65626be150923accc9a735 +Author: Peng Wu +Date: 2010-11-01 15:46:59 +0800 + + refine phrase lookup header file + +M src/lookup/phrase_lookup.h + +commit 832849ace9a4e4f78fc3be8c8068de2cca51a533 +Author: Peng Wu +Date: 2010-11-01 15:46:26 +0800 + + strength reduce + +M src/lookup/pinyin_lookup.cpp + +commit 559e721668ffe2be0e9a169408439d86dd9e068d +Author: Peng Wu +Date: 2010-11-01 15:07:45 +0800 + + fixes compile error + +M src/lookup/pinyin_lookup.cpp + +commit 5c7875b2ffb885aba4164d1f9b91362a939917a1 +Author: Peng Wu +Date: 2010-10-29 15:13:35 +0800 + + fixes a typo + +M src/lookup/phrase_lookup.cpp + +commit 97c9327e5dd9a3824be47a6d22749350280b1bf4 +Author: Peng Wu +Date: 2010-10-29 15:08:56 +0800 + + fixes compile error + +M src/lookup/phrase_lookup.cpp + +commit 9423a65c6cdd1e9442bf729e0e7dc4eee23cde03 +Author: Peng Wu +Date: 2010-10-29 15:01:23 +0800 + + write get_best_match for phrase lookup + +M src/lookup/phrase_lookup.cpp + +commit 982d04fce1e652ef2b35cca42eb89a4a2739b05d +Author: Peng Wu +Date: 2010-10-29 15:00:54 +0800 + + add comment + +M src/lookup/pinyin_lookup.cpp + +commit 70f3a5c8f1ed55a6fc96997c6cbdf4dad440f5f5 +Author: Peng Wu +Date: 2010-10-29 11:17:56 +0800 + + write phrase lookup in progress + +M src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h + +commit 78b810d20aefa6ce6efc5e61682476f34d8d7139 +Author: Peng Wu +Date: 2010-10-29 10:40:33 +0800 + + polish code + +M src/lookup/pinyin_lookup.cpp + +commit a17c69dd14138dd34531d6194090589a66edfebb +Author: Peng Wu +Date: 2010-10-29 10:06:32 +0800 + + add phrase_lookup.cpp + +M src/lookup/Makefile.am +A src/lookup/phrase_lookup.cpp +M src/lookup/phrase_lookup.h + +commit 00bb37cc3e5b298b35cd4af8cdeec2fa19e5922c +Author: Peng Wu +Date: 2010-10-27 11:28:35 +0800 + + switch to pinyin.h + +M utils/segment/Makefile.am +M utils/segment/spseg.cpp +M utils/training/Makefile.am +M utils/training/estimate_interpolation.cpp +M utils/training/gen_ngram.cpp +M utils/training/gen_unigram.cpp + +commit 62d4d99e5754304a57f53a80ff61061506a0e908 +Author: Peng Wu +Date: 2010-10-27 11:22:38 +0800 + + fixes makefiles + +M configure.ac +M src/Makefile.am +M utils/Makefile.am +M utils/segment/Makefile.am +M utils/training/Makefile.am + +commit e9e32f965272d5465b81d1ea62df3a7e3f97f134 +Author: Peng Wu +Date: 2010-10-27 11:12:41 +0800 + + move segment and training tools to utils + +R100 src/segment/Makefile.am utils/segment/Makefile.am +R100 src/segment/spseg.cpp utils/segment/spseg.cpp +R100 src/training/Makefile.am utils/training/Makefile.am +R100 src/training/estimate_interpolation.cpp utils/training/estimate_interpolation.cpp +R100 src/training/gen_ngram.cpp utils/training/gen_ngram.cpp +R100 src/training/gen_unigram.cpp utils/training/gen_unigram.cpp + +commit cb42269587055a80907efd863c367d659a022a06 +Author: Peng Wu +Date: 2010-10-27 11:11:38 +0800 + + define the phrase lookup interface + +M src/lookup/phrase_lookup.h + +commit 77f51924d4660e0a7c295dc9af6b305118214ede +Author: Peng Wu +Date: 2010-10-19 14:48:33 +0800 + + begin to write phrase lookup header + +M src/lookup/lookup.h +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.h + +commit 56c5c4a737c56de8e8e4ac0a09f8c2af4f6d0a39 +Author: Peng Wu +Date: 2010-10-18 16:46:38 +0800 + + re-factor lookup sub-directory + +M src/lookup/Makefile.am +A src/lookup/lookup.h +M src/lookup/phrase_lookup.h +M src/lookup/pinyin_lookup.h +M src/pinyin.h + +commit b3d27cd916a3c7591eb02e4417410f76649ade4f +Author: Peng Wu +Date: 2010-10-18 14:17:51 +0800 + + begin to write phrase lookup header file + +A src/lookup/phrase_lookup.h + +commit 275114c28f590f72bb7329cf53b88977baabc004 +Author: Peng Wu +Date: 2010-10-18 13:35:16 +0800 + + fixes pinyin lookup header + +M src/lookup/pinyin_lookup.h + +commit 0a0630746d37cb0088eea1e7d1420e76d5dd0d7f +Author: Peng Wu +Date: 2010-10-15 14:32:12 +0800 + + fixes compile warnings + +M tests/lookup/test_simple_lookup.cpp +M tests/storage/test_ngram.cpp +M tests/storage/test_parser.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp +M tests/storage/test_pinyin_index.cpp + +commit c41635080ec47ed414e1180212b30866a673eb44 +Author: Peng Wu +Date: 2010-10-14 14:58:50 +0800 + + fixes compile warnings for printf + +M tests/include/test_memory_chunk.cpp +M utils/storage/export_interpolation.cpp + +commit d9268d28d322918e8294dbf81fc41f8e2e12712c +Author: Peng Wu +Date: 2010-10-14 14:53:48 +0800 + + switch to pinyin.h for tests + +M tests/include/Makefile.am +M tests/include/test_memory_chunk.cpp +M tests/lookup/Makefile.am +M tests/lookup/test_simple_lookup.cpp +M tests/storage/Makefile.am +M tests/storage/test_ngram.cpp +M tests/storage/test_parser.cpp +M tests/storage/test_phrase_index.cpp +M tests/storage/test_phrase_table.cpp +M tests/storage/test_pinyin_index.cpp + +commit d51091e95735909b48f025be18238cd2f7b3931f +Author: Peng Wu +Date: 2010-10-14 14:46:11 +0800 + + fixes compile warning for pinyin_lookup.h + +M src/include/novel_types.h +M src/lookup/pinyin_lookup.h + +commit a99fa36f8e6a75f2c305a07e08354fa881a1a124 +Author: Peng Wu +Date: 2010-10-14 14:42:59 +0800 + + switch to pinyin.h for utils + +M utils/storage/Makefile.am +M utils/storage/export_interpolation.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp +M utils/storage/import_interpolation.cpp + +commit 3a976f98a272a6391f06dc1d2d5c9de36cb1aad2 +Author: Peng Wu +Date: 2010-10-14 14:39:38 +0800 + + add pinyin.h + +M src/Makefile.am +M src/pinyin.cpp +A src/pinyin.h + +commit ed23a551db0952a796fe04b3a582b3e67db0e76c +Author: Peng Wu +Date: 2010-10-14 14:18:48 +0800 + + add comment to pinyin_lookup.h + +M src/lookup/pinyin_lookup.h + +commit 1568cf19f696b549fbb373e7b8f9df0e48be052d +Author: Peng Wu +Date: 2010-10-13 15:22:12 +0800 + + fixes issues when rename lookup.h to pinyin_lookup.h + +M Makefile.am +M src/lookup/Makefile.am +M src/lookup/pinyin_lookup.cpp +M src/lookup/pinyin_lookup.h +M src/lookup/winner_tree.cpp +M src/lookup/winner_tree.h +M tests/lookup/test_simple_lookup.cpp + +commit c43523c720070394514163ff5378e3f945ee2689 +Author: Peng Wu +Date: 2010-10-13 15:14:13 +0800 + + rename lookup.h to pinyin_lookup.h + +R100 src/lookup/lookup.h src/lookup/pinyin_lookup.h + +commit 329d0c2fae01a21b5a0ba5cc3c038a862f98b9a1 +Author: Peng Wu +Date: 2010-10-13 10:50:53 +0800 + + increase total freq in single gram when importing interpolation model + +M utils/storage/import_interpolation.cpp + +commit ebef7e93515b40c25dbb1236e92383e8e1bb2ff4 +Author: Peng Wu +Date: 2010-10-12 16:02:12 +0800 + + write parse bigram + +M utils/storage/import_interpolation.cpp + +commit 6d18d7757a6bfd1edc4595861e4dbdd3a1eb1140 +Author: Peng Wu +Date: 2010-10-12 14:49:54 +0800 + + write parse unigram for import tool + +M utils/storage/import_interpolation.cpp + +commit e2e105eee7426cb75568f4954373e11c77f09d04 +Author: Peng Wu +Date: 2010-10-12 14:20:23 +0800 + + add error printf + +M utils/storage/export_interpolation.cpp + +commit 774f0353ae5a8f84b228b9a91a0b09e27e065f2d +Author: Peng Wu +Date: 2010-10-11 15:06:20 +0800 + + write import interpolation in progress + +M utils/storage/import_interpolation.cpp + +commit ed9e811631b71ec835a9f25243c354f6050c885e +Author: Peng Wu +Date: 2010-10-11 14:37:55 +0800 + + fixes compile warnings + +M src/storage/phrase_index.h + +commit 85685a27f4bc755dcb439959ecb106c9f83dfe04 +Author: Peng Wu +Date: 2010-10-11 14:34:56 +0800 + + fixes a typo + +M utils/storage/tag_utility.cpp + +commit 85e024d75628b2a9519412063b845c277afc36f6 +Author: Peng Wu +Date: 2010-10-11 13:46:50 +0800 + + fixes a typo + +M utils/storage/export_interpolation.cpp + +commit a0c22de6662b0980de9fccb274b8f019dcc95a54 +Author: Peng Wu +Date: 2010-10-11 13:33:05 +0800 + + fixes export interpolation + +M utils/storage/export_interpolation.cpp + +commit 46e5b717b729fa8746783556363260f615ff2e4b +Author: Peng Wu +Date: 2010-10-11 13:31:02 +0800 + + begin to write import interpolation model. + +M utils/storage/Makefile.am +A utils/storage/import_interpolation.cpp + +commit 1f23a4aa0f7454d8e9dbc53e4366b7a3fe338aa7 +Author: Peng Wu +Date: 2010-10-09 15:07:58 +0800 + + re-factor phrase large table + +M src/storage/phrase_large_table.cpp +M src/storage/phrase_large_table.h + +commit 6c9813e7e9afa18720912fa737cc21915756b84c +Author: Peng Wu +Date: 2010-10-09 15:05:09 +0800 + + re-factor pinyin large table + +M src/storage/pinyin_large_table.cpp +M src/storage/pinyin_large_table.h + +commit 08a4bfb28ff0690c4161b6744c6152a894db74e9 +Author: Peng Wu +Date: 2010-10-09 10:21:56 +0800 + + add comments + +M utils/storage/tag_utility.cpp + +commit 434f731dd015c2b7947a5f20a4c48df7dd5616e2 +Author: Peng Wu +Date: 2010-10-09 10:14:44 +0800 + + re-factor taglib_add_tag interface + +M utils/storage/tag_utility.cpp +M utils/storage/tag_utility.h + +commit 93943b03f6d28f9c4f6f531c5976f5a5ebaa321e +Author: Peng Wu +Date: 2010-10-08 18:28:29 +0800 + + fixes split_line + +M utils/storage/tag_utility.cpp + +commit 2ee8b9ec3b8c67e6016a9c6dc1c2ac03a499eef7 +Author: Peng Wu +Date: 2010-10-08 17:50:19 +0800 + + switch to split_line + +M utils/storage/tag_utility.cpp +M utils/storage/tag_utility.h + +commit 60b9330eb0348642ff414629b48786cd3de3ea18 +Author: Peng Wu +Date: 2010-09-30 15:22:43 +0800 + + add some required tags check + +M utils/storage/tag_utility.cpp + +commit f84457ea19cf4e402cce86d3d5a4a21baa72dcb8 +Author: Peng Wu +Date: 2010-09-30 15:08:07 +0800 + + add required check. + +M utils/storage/tag_utility.cpp + +commit 4374bffd4c98e9f3d6643f3855a4f49786b0257a +Author: Peng Wu +Date: 2010-09-30 14:47:04 +0800 + + write taglib_read + +M utils/storage/tag_utility.cpp + +commit 03eea13fa336cd9c8d3e6e926cf5c77b98f5bc06 +Author: Peng Wu +Date: 2010-09-30 10:41:11 +0800 + + add duplicate entry check in taglib_add_tag + +M utils/storage/tag_utility.cpp +M utils/storage/tag_utility.h + +commit 67d37c71948295ce86dd7b3d1101c61844dad554 +Author: Peng Wu +Date: 2010-09-29 15:38:37 +0800 + + fixes a typo + +M utils/storage/tag_utility.cpp + +commit efa41642f2d76a4b7836eacbd906afc39e0084ed +Author: Peng Wu +Date: 2010-09-29 14:20:27 +0800 + + write tag lib in progress + +M utils/storage/tag_utility.cpp +M utils/storage/tag_utility.h + +commit 3be73869b27dff9d99c243d82853d7ee6404fa09 +Author: Peng Wu +Date: 2010-09-27 16:45:29 +0800 + + fixes a typo + +M utils/storage/Makefile.am +M utils/storage/tag_utility.cpp +M utils/storage/tag_utility.h + +commit e6233cbb2da9d2a766aa4f3a33bfa5ea214e4372 +Author: Peng Wu +Date: 2010-09-27 16:00:46 +0800 + + design tag utility + +M utils/storage/Makefile.am +A utils/storage/tag_utility.cpp +M utils/storage/tag_utility.h + +commit 55d80b5ff7702b90fbe80ad1a65c2eb0797e1844 +Author: Peng Wu +Date: 2010-09-27 16:00:09 +0800 + + fixes compile warnings + +M utils/storage/gen_pinyin_table.cpp + +commit 0091f1c5cc535e0a4cf5bdd564d62544be847962 +Author: Peng Wu +Date: 2010-09-27 15:58:59 +0800 + + fixes compile warnings. + +M utils/storage/export_interpolation.cpp + +commit e3b77ed49636d108f725423855797c4324f32a43 +Author: Peng Wu +Date: 2010-09-21 10:31:59 +0800 + + re-fine the tag utility header + +M utils/storage/tag_utility.h + +commit ed7962be8ea097dc632a6a2fd7636a0c01d6bd24 +Author: Peng Wu +Date: 2010-09-17 16:17:25 +0800 + + add taglib interface + +A utils/storage/tag_utility.h + +commit 0713adcf7919b32eb5af0b3a81c3384f209c84e2 +Author: Peng Wu +Date: 2010-09-14 16:20:18 +0800 + + fixes compile warnings + +M src/storage/phrase_index.cpp +M src/storage/phrase_large_table.cpp +M src/storage/pinyin_large_table.cpp + +commit 32b04bf652dca5d8e4d9980a9066d6ada19c868c +Author: Peng Wu +Date: 2010-09-14 16:10:33 +0800 + + add test case for compat method + +M tests/storage/test_phrase_index.cpp +M utils/storage/gen_binary_files.cpp + +commit 9a5f7fb359c1a6ea6a6fde624473bfd4777b68a4 +Author: Peng Wu +Date: 2010-09-14 16:05:05 +0800 + + add compat method for phrase index + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h + +commit 2003b8b7c033a64395d69dd9bb445d8a13077430 +Author: Peng Wu +Date: 2010-09-14 11:25:52 +0800 + + re-factor gen_ngram + +M src/training/gen_ngram.cpp + +commit ea1c658ff751273429667537d70a4473eb884886 +Author: Peng Wu +Date: 2010-09-14 11:05:19 +0800 + + re-factor gen_unigram + +M src/storage/phrase_index.cpp +M src/training/gen_unigram.cpp + +commit a2a162ce1e4f4c09b2d4ec38920c47e1d2e1ae69 +Author: Peng Wu +Date: 2010-09-13 14:58:05 +0800 + + rm mmseg from make file + +M src/segment/Makefile.am + +commit eb7d923a547d655a259b4d6d331fed2645287e08 +Author: Peng Wu +Date: 2010-09-13 14:57:17 +0800 + + rm mmseg + +D src/segment/mmseg.cpp + +commit 5d676db7fd22fbbf1b56043e7dd89d0c326c8fd1 +Author: Peng Wu +Date: 2010-09-13 14:55:14 +0800 + + fixes mmseg + +M src/segment/mmseg.cpp + +commit 3db9ee7e2255b01e53865677dabf3fb680bc2b2e +Author: Peng Wu +Date: 2010-09-10 17:28:07 +0800 + + make spseg run + +M src/segment/spseg.cpp + +commit 598490883a327c0ab0c414e5851d8e749403492e +Author: Peng Wu +Date: 2010-09-10 14:39:40 +0800 + + write the shortest path segment + +M src/segment/spseg.cpp + +commit c8fbacc76996e693d734d0d5c94f63a7d6fe198a +Author: Peng Wu +Date: 2010-09-09 14:32:45 +0800 + + combine into libpinyin.a + +M src/Makefile.am +M src/lookup/Makefile.am +A src/pinyin.cpp +M src/storage/Makefile.am +M tests/include/Makefile.am +M tests/lookup/Makefile.am +M tests/storage/Makefile.am +M utils/storage/Makefile.am + +commit 9c20d17c0978f47ff2ae6e5f49f78a81db3040fa +Author: Peng Wu +Date: 2010-09-09 14:15:08 +0800 + + WIP of spseg + +M src/segment/spseg.cpp + +commit 3662fa38302b6b75fe1b03dfb68edfa641e4f13c +Author: Peng Wu +Date: 2010-09-08 18:13:51 +0800 + + fixes compile errors + +M src/segment/Makefile.am +M src/segment/spseg.cpp + +commit 3c97ae50df5022d82671982f86ad94c946f0c22d +Author: Peng Wu +Date: 2010-09-08 18:02:00 +0800 + + write shortest path segment in progress + +M src/segment/spseg.cpp + +commit 6dbdde8cc94c1c8634a29ab591f16ad06b2a7835 +Author: Peng Wu +Date: 2010-09-07 15:12:16 +0800 + + begin to add shortest path segment + +M src/segment/Makefile.am +A src/segment/spseg.cpp + +commit 673e351de76478a80d051d592212b93570134de7 +Author: Peng Wu +Date: 2010-09-07 14:15:41 +0800 + + add generating phrase index file + +M utils/storage/gen_binary_files.cpp + +commit cafe087c0776a90bd49e917d139dd946fb22a464 +Author: Peng Wu +Date: 2010-09-07 10:43:10 +0800 + + add test case + +M tests/storage/test_phrase_table.cpp + +commit cb201a70e7820d9690090e7de874b5410404926d +Author: Peng Wu +Date: 2010-09-06 16:13:14 +0800 + + add load/store method to phrase table + +M src/storage/phrase_large_table.cpp + +commit 1a5f598f322dc614ec29215e6653bdcfa55ed9a1 +Author: Peng Wu +Date: 2010-09-06 16:12:34 +0800 + + re-factor pinyin table + +M src/storage/pinyin_large_table.cpp + +commit e45b28dcf7234954f47192a65049caa1c231fe83 +Author: Peng Wu +Date: 2010-09-02 14:33:23 +0800 + + fixes a typo + +M src/storage/pinyin_large_table.cpp +M tests/storage/test_pinyin_index.cpp + +commit 82cbc78740e1bf34514137eddba58fa16e9788ac +Author: Peng Wu +Date: 2010-09-02 14:32:27 +0800 + + add test case for phrase table + +M tests/storage/test_phrase_table.cpp +M tests/storage/test_pinyin_index.cpp + +commit bee691f0e31f0b661f7c2c16230163dd7d526d4c +Author: Peng Wu +Date: 2010-09-01 17:04:38 +0800 + + add safe check for load_text. + +M src/storage/phrase_large_table.cpp +M src/storage/pinyin_large_table.cpp + +commit cdb3ae7a7bab2970eedae28ee7d1a387847f51fd +Author: Peng Wu +Date: 2010-09-01 15:32:15 +0800 + + begin to write phrase large table test case + +A tests/storage/test_phrase_table.cpp +M tests/storage/test_pinyin_index.cpp + +commit 7e544ad0d4261320ad4e2fa3228b9b81ed76ffb0 +Author: Peng Wu +Date: 2010-09-01 15:18:53 +0800 + + add test phrase to Makefile.am + +M tests/storage/Makefile.am + +commit adb921802288a80b216683aab0e454abfdd6fa00 +Author: Peng Wu +Date: 2010-09-01 14:46:03 +0800 + + add load_text to phrase large table + +M src/storage/phrase_large_table.cpp +M src/storage/pinyin_large_table.cpp + +commit 846e8ee8f62be6018a1d10d4d303f41d89e8787e +Author: Peng Wu +Date: 2010-08-31 15:37:10 +0800 + + fini add/remove index + +M src/storage/phrase_large_table.cpp +M src/storage/pinyin_large_table.cpp + +commit b0ea21fda50b43d964f8ddc84f62ff3bb61043c8 +Author: Peng Wu +Date: 2010-08-27 14:24:02 +0800 + + begin to add add_index/remove_index. + +M src/storage/phrase_large_table.cpp +M src/storage/pinyin_large_table.cpp + +commit 38068dc1f723f3960c144d82ec74eab7ecae9a31 +Author: Peng Wu +Date: 2010-08-27 13:17:40 +0800 + + clean up code + +M src/storage/pinyin_large_table.cpp + +commit 4d1695f4b3fb75cc23e984b5cf5ce5a5b6005119 +Author: Peng Wu +Date: 2010-08-27 11:22:24 +0800 + + fixes a typo + +M src/storage/pinyin_large_table.cpp +M src/storage/pinyin_large_table.h + +commit 9d4bd61a4431a69964e6173cbca11e4a2849cc50 +Author: Peng Wu +Date: 2010-08-26 15:57:27 +0800 + + fixes search in phrase large table. + +M src/storage/phrase_large_table.cpp + +commit 2e9663da330866e655ba414bed0dfcd0de486864 +Author: Peng Wu +Date: 2010-08-26 15:41:42 +0800 + + add search to phrase large table. + +M src/storage/phrase_large_table.cpp +M src/storage/pinyin_phrase.h + +commit b601fb3a3e0799d744f3eff61449d79ffbb6417d +Author: Peng Wu +Date: 2010-08-26 11:05:46 +0800 + + re-factor pinyin phrase + +M src/storage/pinyin_base.cpp +M src/storage/pinyin_phrase.h + +commit c7232e9e4545596913892f478405b8e8febc6e4b +Author: Peng Wu +Date: 2010-08-25 17:53:07 +0800 + + fixes compile errors + +M src/storage/Makefile.am +M src/storage/phrase_large_table.cpp +M src/storage/phrase_large_table.h + +commit 5b86b689d2bdf08778888d05faa9babe39d91464 +Author: Peng Wu +Date: 2010-08-25 17:39:04 +0800 + + write phrase large table in progress + +A src/storage/phrase_large_table.cpp +M src/storage/phrase_large_table.h +M src/storage/pinyin_large_table.cpp + +commit 7a5db88ba5e7a4c38e9206fcfb8286073201f1f9 +Author: Peng Wu +Date: 2010-08-24 13:56:30 +0800 + + add phrase large table impl. + +M src/storage/phrase_large_table.h +M src/storage/pinyin_large_table.h + +commit fb377d5bbbba988cd34d78e22d6403295956004c +Author: Peng Wu +Date: 2010-08-24 11:11:55 +0800 + + add license + +M utils/storage/export_interpolation.cpp +M utils/storage/gen_binary_files.cpp +M utils/storage/gen_pinyin_table.cpp + +commit 29fd54b78973059b8df54f6607c1c9722b2d6c72 +Author: Peng Wu +Date: 2010-08-23 14:08:53 +0800 + + fixes a typo. + +M src/storage/phrase_large_table.h +M src/storage/pinyin_large_table.h + +commit 241aedc1bcd468389851ad3aaa748463c73a8a5a +Author: Peng Wu +Date: 2010-08-23 14:02:19 +0800 + + add phrase large table interface + +M src/storage/phrase_large_table.h + +commit 8170190273c2211311ce6c501b7bbb2d65067c75 +Author: Peng Wu +Date: 2010-08-23 13:33:22 +0800 + + fixes PinyinBitmapIndexLevel + +M src/storage/phrase_large_table.h +M src/storage/pinyin_large_table.h + +commit 9822563242af16a1e8de2aa83bcd3c65dad1ed97 +Author: Peng Wu +Date: 2010-08-19 14:17:41 +0800 + + add phrase index table interface + +A src/storage/phrase_large_table.h +M src/storage/pinyin_large_table.h + +commit 6f3ee371d7118ac04327a7654a519657e8981edd +Author: Peng Wu +Date: 2010-08-18 14:58:57 +0800 + + add get_range to phrase index + +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M utils/storage/export_interpolation.cpp + +commit 6f8c022c759f7930449596bdad0bcc9b23cdcb41 +Author: Peng Wu +Date: 2010-08-18 14:36:43 +0800 + + clean up code. + +M utils/storage/export_interpolation.cpp + +commit 307aeb8feca322c0de144623c37edb4d7a21a66f +Author: Peng Wu +Date: 2010-08-18 14:33:52 +0800 + + migrate estimate interpolation to retrieve_all + +M src/training/estimate_interpolation.cpp + +commit eb08017561445d566b8c6c8558be18ff84038b42 +Author: Peng Wu +Date: 2010-08-18 14:29:12 +0800 + + migrate export interpolation to use retrieve_all + +M utils/storage/export_interpolation.cpp + +commit ce8b4cf9be402e42cc8f8abd55daef2aee7e7cf6 +Author: Peng Wu +Date: 2010-08-18 14:22:00 +0800 + + add function retrieve_all. + +M src/include/novel_types.h +M src/storage/ngram.cpp + +commit ac7b8fa13887e0e663b515f40e4cbc7b2c2b9661 +Author: Peng Wu +Date: 2010-08-18 14:05:21 +0800 + + add retrieve_all defination. + +M src/include/novel_types.h +M src/storage/ngram.h + +commit a0412414b3b5f8647ff41405254dbcb4e334e3ae +Author: Peng Wu +Date: 2010-08-17 15:43:11 +0800 + + add gen bigram + +M utils/storage/export_interpolation.cpp + +commit 53d5ff8aaa86a307ef98284f00c55fb9017856df +Author: Peng Wu +Date: 2010-08-17 12:32:04 +0800 + + add special phrase index handle + +M utils/storage/export_interpolation.cpp + +commit b328718959470e2a104e5aa492e13fd71ff14162 +Author: Peng Wu +Date: 2010-08-17 12:19:00 +0800 + + write gen_unigram + +M utils/storage/export_interpolation.cpp + +commit eab92608cd2658e70cb5a5c7362635179f87c03a +Author: Peng Wu +Date: 2010-08-17 10:29:08 +0800 + + add export tool. + +M utils/storage/Makefile.am +A utils/storage/export_interpolation.cpp + +commit e9df591634a8f1cd7cbea6fdf8d1a9fa46401b03 +Author: Peng Wu +Date: 2010-08-16 15:21:19 +0800 + + fixes pinyin lookup + +M src/lookup/pinyin_lookup.cpp +M src/training/estimate_interpolation.cpp + +commit 535860f63095e2d877290b657d864a10cd11c9cd +Author: Peng Wu +Date: 2010-08-16 15:10:21 +0800 + + update test case. + +M tests/storage/test_phrase_index.cpp + +commit caca9580d210204c86844c6e9834b6b0aa7b3f45 +Author: Peng Wu +Date: 2010-08-16 15:04:15 +0800 + + re-factor sub phrase index + +M src/include/novel_types.h +M src/storage/phrase_index.cpp + +commit 1640bc4ef6d60f57132d19e9abbaedc6a0f6c731 +Author: Peng Wu +Date: 2010-08-16 14:45:35 +0800 + + fixes sub phrase index header + +M src/storage/phrase_index.h + +commit 62778b817b8673807f403348dd9f595eec66e6db +Author: Peng Wu +Date: 2010-08-16 14:43:59 +0800 + + fixes facade phrase index + +M src/storage/phrase_index.h + +commit be41870202762f9dca8fa732ef8ffce2a6a1a280 +Author: Peng Wu +Date: 2010-08-16 14:12:13 +0800 + + add description. + +M src/storage/phrase_index.h + +commit cf5571547919329d8dd09bd827fc00fe22008124 +Author: Peng Wu +Date: 2010-08-16 14:05:35 +0800 + + add a error check. + +M src/storage/phrase_index.cpp + +commit 137145409fd1493e40f4482d89f71a0c7ebcc743 +Author: Peng Wu +Date: 2010-08-16 14:04:22 +0800 + + add PhraseIndexError + +M src/include/novel_types.h + +commit 1b0c733a6596c8f3250e847ea2d92cd7a32000ae +Author: Peng Wu +Date: 2010-08-16 13:50:50 +0800 + + re-factor remove_phrase_item. + +M src/storage/phrase_index.cpp + +commit fe5d37164a6274180843234a3b959c59f0763582 +Author: Peng Wu +Date: 2010-08-16 11:33:59 +0800 + + add comment for novel-pinyin.h + +M src/include/novel_types.h + +commit a09f59ffd11df79d7bfcd47e3eb7b97af0723387 +Author: Peng Wu +Date: 2010-08-05 17:19:03 +0800 + + fixes load method. + +M src/include/memory_chunk.h + +commit 8f9b41ba0be98e6a3caf71b5798bf38324db0676 +Author: Peng Wu +Date: 2010-08-05 16:00:30 +0800 + + fixes test_parser.cpp. + +M tests/storage/test_parser.cpp + +commit 9d966927dfb0b3e91e42144e895d420fe4fc1192 +Author: Peng Wu +Date: 2010-08-05 15:57:59 +0800 + + clean up test_parser. + +M tests/storage/test_parser.cpp + +commit b9f688f1a442bd5f14a55ad4e4afab0f427d95f5 +Author: Peng Wu +Date: 2010-08-05 15:21:26 +0800 + + clean up test_memory_chunk. + +M tests/include/test_memory_chunk.cpp + +commit e575243528074934c3f54cb181cfb7bf5b78fe45 +Author: Peng Wu +Date: 2010-08-03 13:29:13 +0800 + + rename to libpinyin in file headers. + +M src/include/memory_chunk.h +M src/include/novel_types.h +M src/lookup/lookup.h +M src/lookup/pinyin_lookup.cpp +M src/lookup/winner_tree.cpp +M src/lookup/winner_tree.h +M src/segment/mmseg.cpp +M src/storage/ngram.cpp +M src/storage/ngram.h +M src/storage/phrase_index.cpp +M src/storage/phrase_index.h +M src/storage/pinyin_base.cpp +M src/storage/pinyin_base.h +M src/storage/pinyin_large_table.cpp +M src/storage/pinyin_large_table.h +M src/storage/pinyin_phrase.h +M src/training/estimate_interpolation.cpp +M src/training/gen_ngram.cpp +M src/training/gen_unigram.cpp + +commit 2e09a0edae6b97e18b1adb5cc5dd30491ca68a62 +Author: Peng Wu +Date: 2010-08-03 11:27:23 +0800 + + Add Changelog. + +A ChangeLog +A NEWS + +commit 1e5f387d9148e6c0c1492e42f7cebf78d2787813 +Author: Peng Wu +Date: 2010-08-03 11:24:36 +0800 + + fixes .gitignore + +M .gitignore + +commit a7104b5a177b6020d637c15f6552117968e29bde +Author: Peng Wu +Date: 2010-08-03 11:08:59 +0800 + + fixes autoconf. + +M Makefile.am +M configure.ac + +commit bc405dc74f029339a2267daf0654839288109f9e +Author: Peng Wu +Date: 2010-08-03 10:59:46 +0800 + + clear Makefile.am + +M Makefile.am + +commit 89c1b1032b9f92ff3c426f3db28f62d579be7963 +Author: Peng Wu +Date: 2010-08-03 10:51:27 +0800 + + clean up configure.ac + +M configure.ac + +commit f41d1fdf83408e042ab07925710a8913bad0c27c +Author: Peng Wu +Date: 2010-08-03 10:42:47 +0800 + + import from pinyin. + +A AUTHORS +A COPYING +A Makefile.am +A autogen.sh +A configure.ac +A src/Makefile.am +A src/include/Makefile.am +A src/include/memory_chunk.h +A src/include/novel_types.h +A src/include/stl_lite.h +A src/lookup/Makefile.am +A src/lookup/lookup.h +A src/lookup/pinyin_lookup.cpp +A src/lookup/winner_tree.cpp +A src/lookup/winner_tree.h +A src/segment/Makefile.am +A src/segment/mmseg.cpp +A src/storage/Makefile.am +A src/storage/ngram.cpp +A src/storage/ngram.h +A src/storage/phrase_index.cpp +A src/storage/phrase_index.h +A src/storage/pinyin_base.cpp +A src/storage/pinyin_base.h +A src/storage/pinyin_large_table.cpp +A src/storage/pinyin_large_table.h +A src/storage/pinyin_phrase.h +A src/storage/pinyin_zhuyin_map_data.h +A src/training/Makefile.am +A src/training/estimate_interpolation.cpp +A src/training/gen_ngram.cpp +A src/training/gen_unigram.cpp +A tests/Makefile.am +A tests/include/Makefile.am +A tests/include/test_memory_chunk.cpp +A tests/lookup/Makefile.am +A tests/lookup/test_simple_lookup.cpp +A tests/storage/Makefile.am +A tests/storage/test_ngram.cpp +A tests/storage/test_parser.cpp +A tests/storage/test_phrase_index.cpp +A tests/storage/test_pinyin_index.cpp +A utils/Makefile.am +A utils/storage/Makefile.am +A utils/storage/gen_binary_files.cpp +A utils/storage/gen_pinyin_table.cpp + +commit 34acf9be9033e0dc0a5905999133482c20b6cbf3 +Author: Peng Wu +Date: 2010-08-03 10:39:34 +0800 + + add .gitignore + +A .gitignore + +commit 01d8f8be4c0e27e7a1aca072618e232db50b4f01 +Author: Peng Wu +Date: 2010-07-27 16:47:42 +0800 + + add README. + +A README diff -Nru libpinyin-2.3.0/compile libpinyin-2.6.0/compile --- libpinyin-2.3.0/compile 2019-02-22 07:54:27.000000000 +0000 +++ libpinyin-2.6.0/compile 2020-11-30 08:42:40.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Nru libpinyin-2.3.0/config.guess libpinyin-2.6.0/config.guess --- libpinyin-2.3.0/config.guess 2019-02-22 07:54:27.000000000 +0000 +++ libpinyin-2.6.0/config.guess 2020-11-30 08:42:40.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-03-08' +timestamp='2018-08-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -84,8 +84,6 @@ exit 1 fi -trap 'exit 1' 1 2 15 - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -96,34 +94,39 @@ # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 +trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 + +set_cc_for_build() { + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$driver" + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi @@ -138,7 +141,7 @@ # We could probably try harder. LIBC=gnu - eval "$set_cc_for_build" + set_cc_for_build cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) @@ -199,7 +202,7 @@ os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -237,7 +240,7 @@ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi}" + echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -389,20 +392,15 @@ echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval "$set_cc_for_build" - SUN_ARCH=i386 - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH=x86_64 - fi - fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + case `isainfo -b` in + 32) + echo i386-pc-solaris2"$UNAME_REL" + ;; + 64) + echo x86_64-pc-solaris2"$UNAME_REL" + ;; + esac exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -482,7 +480,7 @@ echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -579,7 +577,7 @@ exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include @@ -660,7 +658,7 @@ esac fi if [ "$HP_ARCH" = "" ]; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -700,7 +698,7 @@ esac if [ "$HP_ARCH" = hppa2.0w ] then - eval "$set_cc_for_build" + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -726,7 +724,7 @@ echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include int @@ -840,6 +838,17 @@ *:BSD/OS:*:*) echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + else + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + fi + exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` case "$UNAME_PROCESSOR" in @@ -894,8 +903,8 @@ # other systems with GNU libc and userland echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - i*86:Minix:*:*) - echo "$UNAME_MACHINE"-pc-minix + *:Minix:*:*) + echo "$UNAME_MACHINE"-unknown-minix exit ;; aarch64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -922,7 +931,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -971,7 +980,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} @@ -1285,7 +1294,7 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval "$set_cc_for_build" + set_cc_for_build if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi @@ -1358,6 +1367,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. + # shellcheck disable=SC2154 if test "$cputype" = 386; then UNAME_MACHINE=i386 else diff -Nru libpinyin-2.3.0/config.sub libpinyin-2.6.0/config.sub --- libpinyin-2.3.0/config.sub 2019-02-22 07:54:27.000000000 +0000 +++ libpinyin-2.6.0/config.sub 2020-11-30 08:42:40.000000000 +0000 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-05-05' +timestamp='2018-08-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -110,16 +110,20 @@ exit 1;; esac -# Spilt fields of configuration type +# Split fields of configuration type IFS="-" read -r field1 field2 field3 field4 <&2 + exit 1 + ;; *-*-*-*) basic_machine=$field1-$field2 - os=-$field3-$field4 + os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two @@ -132,1227 +136,1133 @@ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=-$maybe_os + os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=-linux-android + os=linux-android ;; *) basic_machine=$field1-$field2 - os=-$field3 + os=$field3 ;; esac ;; *-*) - basic_machine=$field1 - os=-$field2 + # A lone config we happen to match not fitting any patern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + os= + ;; + *) + basic_machine=$field1 + os=$field2 + ;; + esac + ;; + esac ;; *) - basic_machine=$1 - os= - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + os=bsd + ;; + a29khif) + basic_machine=a29k-amd + os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=scout + ;; + alliant) + basic_machine=fx80-alliant + os= + ;; + altos | altos3068) + basic_machine=m68k-altos + os= + ;; + am29k) + basic_machine=a29k-none + os=bsd + ;; + amdahl) + basic_machine=580-amdahl + os=sysv + ;; + amiga) + basic_machine=m68k-unknown + os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=bsd + ;; + aros) + basic_machine=i386-pc + os=aros + ;; + aux) + basic_machine=m68k-apple + os=aux + ;; + balance) + basic_machine=ns32k-sequent + os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=linux + ;; + cegcc) + basic_machine=arm-unknown + os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=bsd + ;; + convex-c2) + basic_machine=c2-convex + os=bsd + ;; + convex-c32) + basic_machine=c32-convex + os=bsd + ;; + convex-c34) + basic_machine=c34-convex + os=bsd + ;; + convex-c38) + basic_machine=c38-convex + os=bsd + ;; + cray) + basic_machine=j90-cray + os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + os= + ;; + da30) + basic_machine=m68k-da30 + os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + os= + ;; + delta88) + basic_machine=m88k-motorola + os=sysv3 + ;; + dicos) + basic_machine=i686-pc + os=dicos + ;; + djgpp) + basic_machine=i586-pc + os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=ose + ;; + gmicro) + basic_machine=tron-gmicro + os=sysv + ;; + go32) + basic_machine=i386-pc + os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=hms + ;; + harris) + basic_machine=m88k-harris + os=sysv3 + ;; + hp300) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=hpux + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=proelf + ;; + i386mach) + basic_machine=i386-mach + os=mach + ;; + vsta) + basic_machine=i386-pc + os=vsta + ;; + isi68 | isi) + basic_machine=m68k-isi + os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=sysv + ;; + merlin) + basic_machine=ns32k-utek + os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + os=coff + ;; + morphos) + basic_machine=powerpc-unknown + os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=moxiebox + ;; + msdos) + basic_machine=i386-pc + os=msdos + ;; + msys) + basic_machine=i686-pc + os=msys + ;; + mvs) + basic_machine=i370-ibm + os=mvs + ;; + nacl) + basic_machine=le32-unknown + os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=newsos + ;; + news1000) + basic_machine=m68030-sony + os=newsos + ;; + necv70) + basic_machine=v70-nec + os=sysv + ;; + nh3000) + basic_machine=m68k-harris + os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=cxux + ;; + nindy960) + basic_machine=i960-intel + os=nindy + ;; + mon960) + basic_machine=i960-intel + os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=ose + ;; + os68k) + basic_machine=m68k-none + os=os68k + ;; + paragon) + basic_machine=i860-intel + os=osf + ;; + parisc) + basic_machine=hppa-unknown + os=linux + ;; + pw32) + basic_machine=i586-unknown + os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=rdos + ;; + rdos32) + basic_machine=i386-pc + os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=coff + ;; + sa29200) + basic_machine=a29k-amd + os=udi + ;; + sei) + basic_machine=mips-sei + os=seiux + ;; + sequent) + basic_machine=i386-sequent + os= + ;; + sps7) + basic_machine=m68k-bull + os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + os= + ;; + stratus) + basic_machine=i860-stratus + os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + os= + ;; + sun2os3) + basic_machine=m68000-sun + os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + os= + ;; + sun3os3) + basic_machine=m68k-sun + os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + os= + ;; + sun4os3) + basic_machine=sparc-sun + os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + os= + ;; + sv1) + basic_machine=sv1-cray + os=unicos + ;; + symmetry) + basic_machine=i386-sequent + os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=unicos + ;; + t90) + basic_machine=t90-cray + os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + os=tpf + ;; + udi29k) + basic_machine=a29k-amd + os=udi + ;; + ultra3) + basic_machine=a29k-nyu + os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=none + ;; + vaxv) + basic_machine=vax-dec + os=sysv + ;; + vms) + basic_machine=vax-dec + os=vms + ;; + vxworks960) + basic_machine=i960-wrs + os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=vxworks + ;; + xbox) + basic_machine=i686-pc + os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + os=unicos + ;; + *) + basic_machine=$1 + os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper | csky \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nfp \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m9s12z | m68hcs12z | hcs12z | s12z) - basic_machine=s12z-unknown - os=-none + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nfp-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-pc - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx + cpu=m68k + vendor=motorola ;; dpx2*) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + cpu=m68k + vendor=bull + os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + os=${os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv32 ;; i*86v4*) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv4 ;; i*86v) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv ;; i*86sol2) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - vsta) - basic_machine=i386-unknown - os=-vsta + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=solaris2 + ;; + j90 | j90-cray) + cpu=j90 + vendor=cray + os=${os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi + cpu=mips + vendor=sgi case $os in - -irix*) + irix*) ;; *) - os=-irix4 + os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent + cpu=m68000 + vendor=convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv + cpu=mips + vendor=sony + os=newsos ;; next | m*-next) - basic_machine=m68k-next + cpu=m68k + vendor=next case $os in - -nextstep* ) + nextstep* ) ;; - -ns2*) - os=-nextstep2 + ns2*) + os=nextstep2 ;; *) - os=-nextstep3 + os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsv-tandem) - basic_machine=nsv-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti + cpu=m68k + vendor=tti ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 + pc532) + cpu=ns32k + vendor=pc532 ;; - pc98) - basic_machine=i386-pc + pn) + cpu=pn + vendor=gould ;; - pc98-*) - basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` + power) + cpu=power + vendor=ibm ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc + ps2) + cpu=i386 + vendor=ibm ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc + rm[46]00) + cpu=mips + vendor=siemens ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc + rtpc | rtpc-*) + cpu=romp + vendor=ibm ;; - pentium4) - basic_machine=i786-pc + sde) + cpu=mipsisa32 + vendor=sde + os=${os:-elf} ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` + simso-wrs) + cpu=sparclite + vendor=wrs + os=vxworks ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + tower | tower-32) + cpu=m68k + vendor=ncr ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - pentium4-*) - basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + w65) + cpu=w65 + vendor=wdc ;; - pn) - basic_machine=pn-gould + w89k-*) + cpu=hppa1.1 + vendor=winbond + os=proelf ;; - power) basic_machine=power-ibm + none) + cpu=none + vendor=none ;; - ppc | ppcbe) basic_machine=powerpc-unknown + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown + + *-*) + IFS="-" read -r cpu vendor <&2 - exit 1 + # Recognize the cannonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv64 \ + | rl78 | romp | rs6000 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | wasm32 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1365,200 +1275,240 @@ case $os in # First match some system type aliases that might get confused # with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) + bluegene*) + os=cnk + ;; + solaris1 | solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -solaris) - os=-solaris2 + solaris) + os=solaris2 ;; - -unixware*) - os=-sysv4.2uw + unixware*) + os=sysv4.2uw ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - -es1800*) - os=-ose + es1800*) + os=ose + ;; + # Some version numbers need modification + chorusos*) + os=chorusos + ;; + isc) + os=isc2.2 + ;; + sco6) + os=sco5v6 + ;; + sco5) + os=sco3.2v5 + ;; + sco4) + os=sco3.2v4 + ;; + sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + ;; + sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + scout) + # Don't match below + ;; + sco*) + os=sco3.2v2 + ;; + psos*) + os=psos ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ - | -midnightbsd*) + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) + qnx*) + case $cpu in + x86 | i*86) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + hiux*) + os=hiuxwe2 ;; - -nto*) + nto-qnx*) + ;; + nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -xray | -os68k* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) + ;; + linux-dietlibc) + os=linux-dietlibc + ;; + linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - -mac*) + lynx*178) + os=lynxos178 + ;; + lynx*5) + os=lynxos5 + ;; + lynx*) + os=lynxos + ;; + mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -linux-dietlibc) - os=-linux-dietlibc + opened*) + os=openedition ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` + os400*) + os=os400 ;; - -sunos5*) + sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -sunos6*) + sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -opened*) - os=-openedition + wince*) + os=wince ;; - -os400*) - os=-os400 + utek*) + os=bsd ;; - -wince*) - os=-wince + dynix*) + os=bsd ;; - -utek*) - os=-bsd + acis*) + os=aos ;; - -dynix*) - os=-bsd + atheos*) + os=atheos ;; - -acis*) - os=-aos + syllable*) + os=syllable ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd + 386bsd) + os=bsd ;; - -ctix* | -uts*) - os=-sysv + ctix* | uts*) + os=sysv ;; - -nova*) - os=-rtmk-nova + nova*) + os=rtmk-nova ;; - -ns2) - os=-nextstep2 + ns2) + os=nextstep2 ;; - -nsk*) - os=-nsk + nsk*) + os=nsk ;; # Preserve the version number of sinix5. - -sinix5.*) + sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -sinix*) - os=-sysv4 + sinix*) + os=sysv4 ;; - -tpf*) - os=-tpf + tpf*) + os=tpf ;; - -triton*) - os=-sysv3 + triton*) + os=sysv3 ;; - -oss*) - os=-sysv3 + oss*) + os=sysv3 ;; - -svr4*) - os=-sysv4 + svr4*) + os=sysv4 ;; - -svr3) - os=-sysv3 + svr3) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + sysvr4) + os=sysv4 ;; - # This must come after -sysvr4. - -sysv*) + # This must come after sysvr4. + sysv*) ;; - -ose*) - os=-ose + ose*) + os=ose ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -zvmoe) - os=-zvmoe + zvmoe) + os=zvmoe ;; - -dicos*) - os=-dicos + dicos*) + os=dicos ;; - -pikeos*) + pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. - case $basic_machine in + case $cpu in arm*) - os=-eabi + os=eabi ;; *) - os=-elf + os=elf ;; esac ;; - -nacl*) + nacl*) ;; - -ios) + ios) ;; - -none) + none) ;; - -*-eabi) - case $basic_machine in - arm*) - ;; - esac + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1575,254 +1525,261 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) +case $vendor in + unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + clix*) + vendor=intergraph + ;; + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac - basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$basic_machine$os" +echo "$cpu-$vendor-$os" exit # Local variables: diff -Nru libpinyin-2.3.0/configure libpinyin-2.6.0/configure --- libpinyin-2.3.0/configure 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/configure 2020-12-15 03:49:35.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpinyin 2.3.0. +# Generated by GNU Autoconf 2.69 for libpinyin 2.6.0. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libpinyin' PACKAGE_TARNAME='libpinyin' -PACKAGE_VERSION='2.3.0' -PACKAGE_STRING='libpinyin 2.3.0' +PACKAGE_VERSION='2.6.0' +PACKAGE_STRING='libpinyin 2.6.0' PACKAGE_BUGREPORT='https://github.com/libpinyin/libpinyin/issues/new' PACKAGE_URL='' @@ -638,6 +638,7 @@ LTLIBOBJS ENABLE_LIBZHUYIN_FALSE ENABLE_LIBZHUYIN_TRUE +DATABASE_FORMAT KYOTOCABINET_FALSE KYOTOCABINET_TRUE KYOTOCABINET_LIBS @@ -680,6 +681,8 @@ build_cpu build LIBTOOL +CLANG_FALSE +CLANG_TRUE HAVE_CXX11 EGREP GREP @@ -1352,7 +1355,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpinyin 2.3.0 to adapt to many kinds of systems. +\`configure' configures libpinyin 2.6.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1425,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpinyin 2.3.0:";; + short | recursive ) echo "Configuration of libpinyin 2.6.0:";; esac cat <<\_ACEOF @@ -1549,7 +1552,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpinyin configure 2.3.0 +libpinyin configure 2.6.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2093,7 +2096,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpinyin $as_me 2.3.0, which was +It was created by libpinyin $as_me 2.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2959,7 +2962,7 @@ # Define the identity of the package. PACKAGE='libpinyin' - VERSION='2.3.0' + VERSION='2.6.0' cat >>confdefs.h <<_ACEOF @@ -6016,6 +6019,21 @@ +# Detect whether clang is being used +# clang has a gcc alias, so we can no tell from $CXX +using_clang=no +if `$CXX --version 2>&1 | grep 'clang' >/dev/null 2>&1` ; then + using_clang=yes +fi + if test "$using_clang" = "yes"; then + CLANG_TRUE= + CLANG_FALSE='#' +else + CLANG_TRUE='#' + CLANG_FALSE= +fi + + # Init libtool case `pwd` in *\ * | *\ *) @@ -18157,7 +18175,7 @@ if test "x$ac_cv_header_db_h" = xyes; then : else - as_fn_error $? "Cannot find Berkeley DB library version 4" "$LINENO" 5 + as_fn_error $? "Cannot find Berkeley DB library version 5" "$LINENO" 5 fi @@ -18217,7 +18235,7 @@ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - as_fn_error $? "Cannot find Berkeley DB library version 4" "$LINENO" 5 + as_fn_error $? "Cannot find Berkeley DB library version 5" "$LINENO" 5 fi @@ -18402,6 +18420,9 @@ fi +DATABASE_FORMAT="$DBM" + + # --enable-libzhuyin # Check whether --enable-libzhuyin was given. if test "${enable_libzhuyin+set}" = set; then : @@ -18421,7 +18442,7 @@ -ac_config_files="$ac_config_files libpinyin.pc libzhuyin.pc libpinyin.spec Makefile doc/Makefile data/Makefile src/Makefile src/include/Makefile src/storage/Makefile src/lookup/Makefile tests/Makefile tests/include/Makefile tests/storage/Makefile tests/lookup/Makefile utils/Makefile utils/storage/Makefile utils/segment/Makefile utils/training/Makefile" +ac_config_files="$ac_config_files libpinyin.pc libzhuyin.pc libpinyin.spec Makefile doc/Makefile data/Makefile data/table.conf src/Makefile src/include/Makefile src/storage/Makefile src/lookup/Makefile tests/Makefile tests/include/Makefile tests/storage/Makefile tests/lookup/Makefile utils/Makefile utils/storage/Makefile utils/segment/Makefile utils/training/Makefile" cat >confcache <<\_ACEOF @@ -18561,6 +18582,10 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CLANG_TRUE}" && test -z "${CLANG_FALSE}"; then + as_fn_error $? "conditional \"CLANG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${BERKELEYDB_TRUE}" && test -z "${BERKELEYDB_FALSE}"; then as_fn_error $? "conditional \"BERKELEYDB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18970,7 +18995,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpinyin $as_me 2.3.0, which was +This file was extended by libpinyin $as_me 2.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19036,7 +19061,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpinyin config.status 2.3.0 +libpinyin config.status 2.6.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19555,6 +19580,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/table.conf") CONFIG_FILES="$CONFIG_FILES data/table.conf" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;; "src/storage/Makefile") CONFIG_FILES="$CONFIG_FILES src/storage/Makefile" ;; @@ -20244,7 +20270,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -Nru libpinyin-2.3.0/configure.ac libpinyin-2.6.0/configure.ac --- libpinyin-2.3.0/configure.ac 2019-03-05 05:41:52.000000000 +0000 +++ libpinyin-2.6.0/configure.ac 2020-12-14 03:49:01.000000000 +0000 @@ -5,7 +5,7 @@ # if not 1, append datestamp to the version number. m4_define([libpinyin_released], [1]) m4_define([libpinyin_major_version], [2]) -m4_define([libpinyin_minor_version], [3]) +m4_define([libpinyin_minor_version], [6]) m4_define([libpinyin_micro_version], [0]) m4_define(libpinyin_maybe_datestamp, m4_esyscmd([if test x]libpinyin_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -49,6 +49,14 @@ AX_CXX_COMPILE_STDCXX([11]) +# Detect whether clang is being used +# clang has a gcc alias, so we can no tell from $CXX +using_clang=no +if `$CXX --version 2>&1 | grep 'clang' >/dev/null 2>&1` ; then + using_clang=yes +fi +AM_CONDITIONAL([CLANG], [test "$using_clang" = "yes"]) + # Init libtool AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) @@ -92,9 +100,9 @@ if test x"$DBM" = x"BerkeleyDB"; then # Check Berkeley DB - AC_CHECK_HEADER([db.h], [], AC_MSG_ERROR([Cannot find Berkeley DB library version 4])) + AC_CHECK_HEADER([db.h], [], AC_MSG_ERROR([Cannot find Berkeley DB library version 5])) - AC_SEARCH_LIBS([db_create], [db], [], AC_MSG_ERROR([Cannot find Berkeley DB library version 4])) + AC_SEARCH_LIBS([db_create], [db], [], AC_MSG_ERROR([Cannot find Berkeley DB library version 5])) AC_DEFINE([HAVE_BERKELEY_DB], [], [Have Berkeley DB.]) fi @@ -112,6 +120,9 @@ AM_CONDITIONAL([KYOTOCABINET], [test x"$DBM" = x"KyotoCabinet"]) +DATABASE_FORMAT="$DBM" +AC_SUBST(DATABASE_FORMAT) + # --enable-libzhuyin AC_ARG_ENABLE(libzhuyin, AC_HELP_STRING([--enable-libzhuyin], @@ -128,6 +139,7 @@ Makefile doc/Makefile data/Makefile + data/table.conf src/Makefile src/include/Makefile src/storage/Makefile diff -Nru libpinyin-2.3.0/data/Makefile.am libpinyin-2.6.0/data/Makefile.am --- libpinyin-2.3.0/data/Makefile.am 2019-03-15 08:51:30.000000000 +0000 +++ libpinyin-2.6.0/data/Makefile.am 2020-10-28 08:05:08.000000000 +0000 @@ -38,7 +38,7 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = $(textual_model_data) \ - table.conf + table.conf.in libpinyin_db_DATA = $(binary_model_data) \ table.conf @@ -48,8 +48,8 @@ CLEANFILES = $(binary_model_data) interpolation2.text: - wget http://downloads.sourceforge.net/libpinyin/models/model17.text.tar.gz - tar xvf model17.text.tar.gz -C $(top_srcdir)/data + wget http://downloads.sourceforge.net/libpinyin/models/model19.text.tar.gz + tar xvf model19.text.tar.gz -C $(top_srcdir)/data $(tablefiles) table.conf: interpolation2.text diff -Nru libpinyin-2.3.0/data/Makefile.in libpinyin-2.6.0/data/Makefile.in --- libpinyin-2.3.0/data/Makefile.in 2019-03-15 08:53:13.000000000 +0000 +++ libpinyin-2.6.0/data/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -99,7 +99,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = table.conf CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -150,7 +150,7 @@ am__installdirs = "$(DESTDIR)$(libpinyin_dbdir)" DATA = $(libpinyin_db_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/table.conf.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -170,6 +170,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -302,7 +303,7 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = $(textual_model_data) \ - table.conf + table.conf.in libpinyin_db_DATA = $(binary_model_data) \ table.conf @@ -341,6 +342,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +table.conf: $(top_builddir)/config.status $(srcdir)/table.conf.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -532,8 +535,8 @@ interpolation2.text: - wget http://downloads.sourceforge.net/libpinyin/models/model17.text.tar.gz - tar xvf model17.text.tar.gz -C $(top_srcdir)/data + wget http://downloads.sourceforge.net/libpinyin/models/model19.text.tar.gz + tar xvf model19.text.tar.gz -C $(top_srcdir)/data $(tablefiles) table.conf: interpolation2.text diff -Nru libpinyin-2.3.0/data/table.conf libpinyin-2.6.0/data/table.conf --- libpinyin-2.3.0/data/table.conf 2019-03-06 10:37:17.000000000 +0000 +++ libpinyin-2.6.0/data/table.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -binary format version:5 -model data version:14 -lambda parameter:0.312699 - -source table format:pinyin - -default RESERVED NULL NULL NULL NOT_USED -default GB_DICTIONARY gb_char.table gb_char.bin gb_char.dbin SYSTEM_FILE -default GBK_DICTIONARY gbk_char.table gbk_char.bin gbk_char.dbin SYSTEM_FILE -default OPENGRAM_DICTIONARY opengram.table opengram.bin opengram.dbin SYSTEM_FILE -default MERGED_DICTIONARY merged.table merged.bin merged.dbin SYSTEM_FILE -default ADDON_DICTIONARY NULL NULL addon.bin USER_FILE -default NETWORK_DICTIONARY NULL NULL network.bin USER_FILE -default USER_DICTIONARY NULL NULL user.bin USER_FILE - -addon 4 art.table art.bin NULL DICTIONARY -addon 5 culture.table culture.bin NULL DICTIONARY -addon 6 economy.table economy.bin NULL DICTIONARY -addon 7 geology.table geology.bin NULL DICTIONARY -addon 8 history.table history.bin NULL DICTIONARY - -addon 9 life.table life.bin NULL DICTIONARY -addon 10 nature.table nature.bin NULL DICTIONARY -addon 11 people.table people.bin NULL DICTIONARY -addon 12 science.table science.bin NULL DICTIONARY -addon 13 society.table society.bin NULL DICTIONARY -addon 14 sport.table sport.bin NULL DICTIONARY -addon 15 technology.table technology.bin NULL DICTIONARY diff -Nru libpinyin-2.3.0/data/table.conf.in libpinyin-2.6.0/data/table.conf.in --- libpinyin-2.3.0/data/table.conf.in 1970-01-01 00:00:00.000000000 +0000 +++ libpinyin-2.6.0/data/table.conf.in 2020-10-28 08:04:37.000000000 +0000 @@ -0,0 +1,29 @@ +binary format version:6 +model data version:14 +lambda parameter:0.312699 + +source table format:pinyin +database format:@DATABASE_FORMAT@ + +default RESERVED NULL NULL NULL NOT_USED +default GB_DICTIONARY gb_char.table gb_char.bin gb_char.dbin SYSTEM_FILE +default GBK_DICTIONARY gbk_char.table gbk_char.bin gbk_char.dbin SYSTEM_FILE +default OPENGRAM_DICTIONARY opengram.table opengram.bin opengram.dbin SYSTEM_FILE +default MERGED_DICTIONARY merged.table merged.bin merged.dbin SYSTEM_FILE +default ADDON_DICTIONARY NULL NULL addon.bin USER_FILE +default NETWORK_DICTIONARY NULL NULL network.bin USER_FILE +default USER_DICTIONARY NULL NULL user.bin USER_FILE + +addon 4 art.table art.bin NULL DICTIONARY +addon 5 culture.table culture.bin NULL DICTIONARY +addon 6 economy.table economy.bin NULL DICTIONARY +addon 7 geology.table geology.bin NULL DICTIONARY +addon 8 history.table history.bin NULL DICTIONARY + +addon 9 life.table life.bin NULL DICTIONARY +addon 10 nature.table nature.bin NULL DICTIONARY +addon 11 people.table people.bin NULL DICTIONARY +addon 12 science.table science.bin NULL DICTIONARY +addon 13 society.table society.bin NULL DICTIONARY +addon 14 sport.table sport.bin NULL DICTIONARY +addon 15 technology.table technology.bin NULL DICTIONARY diff -Nru libpinyin-2.3.0/debian/changelog libpinyin-2.6.0/debian/changelog --- libpinyin-2.3.0/debian/changelog 2020-03-21 12:28:26.000000000 +0000 +++ libpinyin-2.6.0/debian/changelog 2020-12-26 20:40:13.000000000 +0000 @@ -1,8 +1,12 @@ -libpinyin (2.3.0-1build1) focal; urgency=medium +libpinyin (2.6.0-1) unstable; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * Team upload. + * New upstream release. + * Bump debhelper compat to v13. + * Bump Standards-Version to 4.5.1. + * debian/libzhuyin13.symbols: Refresh symbols. - -- Matthias Klose Sat, 21 Mar 2020 13:28:26 +0100 + -- Boyuan Yang Sat, 26 Dec 2020 15:40:13 -0500 libpinyin (2.3.0-1) unstable; urgency=medium diff -Nru libpinyin-2.3.0/debian/compat libpinyin-2.6.0/debian/compat --- libpinyin-2.3.0/debian/compat 2019-07-21 17:30:47.000000000 +0000 +++ libpinyin-2.6.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -12 diff -Nru libpinyin-2.3.0/debian/control libpinyin-2.6.0/debian/control --- libpinyin-2.3.0/debian/control 2019-07-21 17:30:57.000000000 +0000 +++ libpinyin-2.6.0/debian/control 2020-12-26 20:39:28.000000000 +0000 @@ -7,11 +7,11 @@ Asias He , ChangZhuo Chen (陳昌倬) , Build-Depends: - debhelper (>= 12~), + debhelper-compat (= 13), libdb-dev, libglib2.0-dev, libltdl-dev, -Standards-Version: 4.4.0 +Standards-Version: 4.5.1 Section: libs Homepage: https://github.com/libpinyin/libpinyin Vcs-Git: https://salsa.debian.org/debian/libpinyin.git diff -Nru libpinyin-2.3.0/debian/libzhuyin13.symbols libpinyin-2.6.0/debian/libzhuyin13.symbols --- libpinyin-2.3.0/debian/libzhuyin13.symbols 2019-07-21 17:24:34.000000000 +0000 +++ libpinyin-2.6.0/debian/libzhuyin13.symbols 2020-12-26 20:40:13.000000000 +0000 @@ -19,6 +19,8 @@ zhuyin_get_pinyin_string@LIBZHUYIN 2.1.0 zhuyin_get_right_zhuyin_offset@LIBZHUYIN 2.1.0 zhuyin_get_sentence@LIBZHUYIN 2.1.0 + zhuyin_get_zhuyin_key@LIBZHUYIN 2.6.0 + zhuyin_get_zhuyin_key_rest@LIBZHUYIN 2.6.0 zhuyin_get_zhuyin_key_rest_length@LIBZHUYIN 2.1.0 zhuyin_get_zhuyin_key_rest_positions@LIBZHUYIN 2.1.0 zhuyin_get_zhuyin_offset@LIBZHUYIN 2.1.0 diff -Nru libpinyin-2.3.0/debian/rules libpinyin-2.6.0/debian/rules --- libpinyin-2.3.0/debian/rules 2019-07-21 17:33:00.000000000 +0000 +++ libpinyin-2.6.0/debian/rules 2020-12-26 20:39:59.000000000 +0000 @@ -2,7 +2,6 @@ include /usr/share/dpkg/architecture.mk -DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: @@ -15,9 +14,5 @@ --enable-libzhuyin \ $(NULL) -override_dh_install: +execute_before_dh_install: find debian/ -name *.la -delete - dh_install - -override_dh_missing: - dh_missing --fail-missing diff -Nru libpinyin-2.3.0/depcomp libpinyin-2.6.0/depcomp --- libpinyin-2.3.0/depcomp 2019-02-22 07:54:28.000000000 +0000 +++ libpinyin-2.6.0/depcomp 2020-11-30 08:42:40.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru libpinyin-2.3.0/doc/Makefile.in libpinyin-2.6.0/doc/Makefile.in --- libpinyin-2.3.0/doc/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/doc/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -171,6 +171,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ diff -Nru libpinyin-2.3.0/install-sh libpinyin-2.6.0/install-sh --- libpinyin-2.3.0/install-sh 2019-02-22 07:54:27.000000000 +0000 +++ libpinyin-2.6.0/install-sh 2020-11-30 08:42:40.000000000 +0000 @@ -451,7 +451,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff -Nru libpinyin-2.3.0/libpinyin.pc.in libpinyin-2.6.0/libpinyin.pc.in --- libpinyin-2.3.0/libpinyin.pc.in 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/libpinyin.pc.in 2020-11-16 05:28:45.000000000 +0000 @@ -3,6 +3,7 @@ libdir=@libdir@ includedir=@includedir@ pkgdatadir=@libdir@/libpinyin +database_format=@DATABASE_FORMAT@ libpinyinincludedir=${includedir}/libpinyin-@VERSION@ libpinyin_binary_version=@LIBPINYIN_BINARY_VERSION@ diff -Nru libpinyin-2.3.0/libzhuyin.pc.in libpinyin-2.6.0/libzhuyin.pc.in --- libpinyin-2.3.0/libzhuyin.pc.in 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/libzhuyin.pc.in 2020-11-16 05:29:05.000000000 +0000 @@ -2,6 +2,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +database_format=@DATABASE_FORMAT@ libzhuyinincludedir=${includedir}/libpinyin-@VERSION@ libzhuyin_binary_version=@LIBPINYIN_BINARY_VERSION@ diff -Nru libpinyin-2.3.0/Makefile.am libpinyin-2.6.0/Makefile.am --- libpinyin-2.3.0/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -31,3 +31,8 @@ if ENABLE_LIBZHUYIN pkgconfig_DATA += libzhuyin.pc endif + +dist-hook: + if test -d .git ; then \ + git log --name-status --date=iso > $(distdir)/ChangeLog ; \ + fi diff -Nru libpinyin-2.3.0/Makefile.in libpinyin-2.6.0/Makefile.in --- libpinyin-2.3.0/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,8 +169,8 @@ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -256,6 +256,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -633,6 +634,9 @@ || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -656,6 +660,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -698,6 +706,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -879,23 +889,29 @@ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ - dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-pkgconfigDATA + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkgconfigDATA .PRECIOUS: Makefile +dist-hook: + if test -d .git ; then \ + git log --name-status --date=iso > $(distdir)/ChangeLog ; \ + fi + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru libpinyin-2.3.0/missing libpinyin-2.6.0/missing --- libpinyin-2.3.0/missing 2019-02-22 07:54:27.000000000 +0000 +++ libpinyin-2.6.0/missing 2020-11-30 08:42:40.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru libpinyin-2.3.0/NEWS libpinyin-2.6.0/NEWS --- libpinyin-2.3.0/NEWS 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/NEWS 2020-12-15 03:22:31.000000000 +0000 @@ -0,0 +1,158 @@ +version 2.6.0 +* bug fixes + +version 2.4.92 +* update pinyin data +* bug fixes + +version 2.4.91 +* improve full pinyin auto correction +* bug fixes + +version 2.3.0 +* update pinyin data + +version 2.2.2 +* minor fixes + +version 2.2.1 +* fixes predicted candidates + +version 2.2.0 +* bug fixes + +version 2.1.91 +* fixes zhuyin parsers; + +version 2.1.0 +* support sort option in pinyin_guess_candidates function; + +version 2.0.92 +* reduce memory consumption after imported user dictionary; + +version 2.0.91 +* merge libzhuyin code; + +version 2.0.0 +* the first official release of 2.0.x; +* fixes autoconf; + +version 1.9.92 +* fixes crash in double pinyin; + +version 1.9.91 +* multiple sentence candidates; + +version 1.7.0 +* fixes build on FreeBSD; +* update cmake files; + +version 1.6.91 +* change license to GPLv3+; +* import open-gram dictionary and remove pinyin tones; +* add some checks when load data from file; + +version 1.6.0 +* bug fixes. + +version 1.5.91 +* change pinyin/phrase tables to use dbm. +* enhance pinyin key representation and pinyin parsers. + +version 1.2.0 +* bug fixes. + +version 1.1.91 +* support Kyoto Cabinet as alternative to Berkeley DB. +* improve multiple dictionaries support feature. + +version 1.1.0 +* support to export user phrases. + +version 1.0.0 +* the first official release of 1.0.x. + +version 0.9.94 +* bug fixes. + +version 0.9.93 +* fixes libpinyin issues from coverity scan report. + +version 0.9.92 +* bug fixes. + +version 0.9.91 +* code re-factor. + +version 0.9.0 +* the first official release of 0.9.x. +* fixes import dictionary. + +version 0.8.93 +* add back pinyin_clear_constraint. + +version 0.8.92 +* fixes model data. + +version 0.8.91 +* multiple dictioniares and user dictionary support. + +version 0.8.1 +* bug fixes. + +version 0.8.0 +* the first official release of 0.8.x. + +version 0.7.92 +* re-factor PhraseLookup class. +* all tests passed simple valgrind memory check. + +version 0.7.91 +* simplify PinyinLookup class. + +version 0.7.1 +* add API to lookup pinyin for characters. + +version 0.7.0 +* the first official release of 0.7.x. + +version 0.6.92 +* draft support for multiple professional phrase libraries. + +version 0.6.91 +* support ucs4 characters. +* support guess sentence with prefix. +* initially support fuzzy pinyin segment. + +version 0.6.0 +* the first official release of 0.6.x. + +version 0.5.92 +* fixes new parsers and chewing large table. +* improves pinyin_save. + +version 0.5.91 +* some code re-factor and simplify. +* fixes the self-learning work around. + +version 0.5.0 +* the first official release of 0.5.x. + +version 0.4.93 +* fixes some bugs in new parsers. + +version 0.4.92 +* enable parallel make. + +version 0.4.91 +* New parsers for full pinyin/double pinyin/chewing. + * libpinyin now fully supports all pinyin auto corrections of +ibus-pinyin. + * libpinyin now better supports an/ang, en/eng, in/ing fuzzy +pinyin match. + +version 0.3.0 +* the first official release of 0.3.x. + +version 0.2.99 +* import from pinyin. diff -Nru libpinyin-2.3.0/src/include/Makefile.am libpinyin-2.6.0/src/include/Makefile.am --- libpinyin-2.3.0/src/include/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/include/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -14,11 +14,11 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ libpinyininclude_HEADERS= novel_types.h -noinst_HEADERS = memory_chunk.h \ - stl_lite.h +noinst_HEADERS = memory_chunk.h \ + stl_lite.h diff -Nru libpinyin-2.3.0/src/include/Makefile.in libpinyin-2.6.0/src/include/Makefile.in --- libpinyin-2.3.0/src/include/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/src/include/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,6 +189,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -307,7 +308,7 @@ libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ libpinyininclude_HEADERS = novel_types.h noinst_HEADERS = memory_chunk.h \ - stl_lite.h + stl_lite.h all: all-am diff -Nru libpinyin-2.3.0/src/lookup/Makefile.am libpinyin-2.6.0/src/lookup/Makefile.am --- libpinyin-2.3.0/src/lookup/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/lookup/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -14,27 +14,23 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/storage \ - @GLIB2_CFLAGS@ - -noinst_HEADERS = lookup.h \ - pinyin_lookup2.h \ - phrase_lookup.h \ - phonetic_lookup.h \ - phonetic_lookup_linear.h \ - phonetic_lookup_heap.h - - -noinst_LTLIBRARIES = liblookup.la - -liblookup_la_CXXFLAGS = "-fPIC" - -liblookup_la_LDFLAGS = -static - -liblookup_la_SOURCES = pinyin_lookup2.cpp \ - phrase_lookup.cpp \ - lookup.cpp \ - phonetic_lookup.cpp +AM_CPPFLAGS = -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/storage \ + @GLIB2_CFLAGS@ + +noinst_HEADERS = lookup.h \ + pinyin_lookup2.h \ + phrase_lookup.h \ + phonetic_lookup.h \ + phonetic_lookup_linear.h \ + phonetic_lookup_heap.h + + +noinst_LIBRARIES = liblookup.a + +liblookup_a_SOURCES = pinyin_lookup2.cpp \ + phrase_lookup.cpp \ + lookup.cpp \ + phonetic_lookup.cpp diff -Nru libpinyin-2.3.0/src/lookup/Makefile.in libpinyin-2.6.0/src/lookup/Makefile.in --- libpinyin-2.3.0/src/lookup/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/src/lookup/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,19 +103,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -liblookup_la_LIBADD = -am_liblookup_la_OBJECTS = liblookup_la-pinyin_lookup2.lo \ - liblookup_la-phrase_lookup.lo liblookup_la-lookup.lo \ - liblookup_la-phonetic_lookup.lo -liblookup_la_OBJECTS = $(am_liblookup_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -liblookup_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(liblookup_la_CXXFLAGS) \ - $(CXXFLAGS) $(liblookup_la_LDFLAGS) $(LDFLAGS) -o $@ +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +liblookup_a_AR = $(AR) $(ARFLAGS) +liblookup_a_LIBADD = +am_liblookup_a_OBJECTS = pinyin_lookup2.$(OBJEXT) \ + phrase_lookup.$(OBJEXT) lookup.$(OBJEXT) \ + phonetic_lookup.$(OBJEXT) +liblookup_a_OBJECTS = $(am_liblookup_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -131,13 +130,16 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/liblookup_la-lookup.Plo \ - ./$(DEPDIR)/liblookup_la-phonetic_lookup.Plo \ - ./$(DEPDIR)/liblookup_la-phrase_lookup.Plo \ - ./$(DEPDIR)/liblookup_la-pinyin_lookup2.Plo +am__depfiles_remade = ./$(DEPDIR)/lookup.Po \ + ./$(DEPDIR)/phonetic_lookup.Po ./$(DEPDIR)/phrase_lookup.Po \ + ./$(DEPDIR)/pinyin_lookup2.Po am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ @@ -154,8 +156,8 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(liblookup_la_SOURCES) -DIST_SOURCES = $(liblookup_la_SOURCES) +SOURCES = $(liblookup_a_SOURCES) +DIST_SOURCES = $(liblookup_a_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -201,6 +203,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -316,24 +319,22 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/storage \ - @GLIB2_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/storage \ + @GLIB2_CFLAGS@ noinst_HEADERS = lookup.h \ - pinyin_lookup2.h \ - phrase_lookup.h \ - phonetic_lookup.h \ - phonetic_lookup_linear.h \ - phonetic_lookup_heap.h - -noinst_LTLIBRARIES = liblookup.la -liblookup_la_CXXFLAGS = "-fPIC" -liblookup_la_LDFLAGS = -static -liblookup_la_SOURCES = pinyin_lookup2.cpp \ - phrase_lookup.cpp \ - lookup.cpp \ - phonetic_lookup.cpp + pinyin_lookup2.h \ + phrase_lookup.h \ + phonetic_lookup.h \ + phonetic_lookup_linear.h \ + phonetic_lookup_heap.h + +noinst_LIBRARIES = liblookup.a +liblookup_a_SOURCES = pinyin_lookup2.cpp \ + phrase_lookup.cpp \ + lookup.cpp \ + phonetic_lookup.cpp all: all-am @@ -369,19 +370,13 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -liblookup.la: $(liblookup_la_OBJECTS) $(liblookup_la_DEPENDENCIES) $(EXTRA_liblookup_la_DEPENDENCIES) - $(AM_V_CXXLD)$(liblookup_la_LINK) $(liblookup_la_OBJECTS) $(liblookup_la_LIBADD) $(LIBS) +liblookup.a: $(liblookup_a_OBJECTS) $(liblookup_a_DEPENDENCIES) $(EXTRA_liblookup_a_DEPENDENCIES) + $(AM_V_at)-rm -f liblookup.a + $(AM_V_AR)$(liblookup_a_AR) liblookup.a $(liblookup_a_OBJECTS) $(liblookup_a_LIBADD) + $(AM_V_at)$(RANLIB) liblookup.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -389,10 +384,10 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblookup_la-lookup.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblookup_la-phonetic_lookup.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblookup_la-phrase_lookup.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblookup_la-pinyin_lookup2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lookup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phonetic_lookup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phrase_lookup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pinyin_lookup2.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -421,34 +416,6 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -liblookup_la-pinyin_lookup2.lo: pinyin_lookup2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblookup_la_CXXFLAGS) $(CXXFLAGS) -MT liblookup_la-pinyin_lookup2.lo -MD -MP -MF $(DEPDIR)/liblookup_la-pinyin_lookup2.Tpo -c -o liblookup_la-pinyin_lookup2.lo `test -f 'pinyin_lookup2.cpp' || echo '$(srcdir)/'`pinyin_lookup2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblookup_la-pinyin_lookup2.Tpo $(DEPDIR)/liblookup_la-pinyin_lookup2.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pinyin_lookup2.cpp' object='liblookup_la-pinyin_lookup2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblookup_la_CXXFLAGS) $(CXXFLAGS) -c -o liblookup_la-pinyin_lookup2.lo `test -f 'pinyin_lookup2.cpp' || echo '$(srcdir)/'`pinyin_lookup2.cpp - -liblookup_la-phrase_lookup.lo: phrase_lookup.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblookup_la_CXXFLAGS) $(CXXFLAGS) -MT liblookup_la-phrase_lookup.lo -MD -MP -MF $(DEPDIR)/liblookup_la-phrase_lookup.Tpo -c -o liblookup_la-phrase_lookup.lo `test -f 'phrase_lookup.cpp' || echo '$(srcdir)/'`phrase_lookup.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblookup_la-phrase_lookup.Tpo $(DEPDIR)/liblookup_la-phrase_lookup.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='phrase_lookup.cpp' object='liblookup_la-phrase_lookup.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblookup_la_CXXFLAGS) $(CXXFLAGS) -c -o liblookup_la-phrase_lookup.lo `test -f 'phrase_lookup.cpp' || echo '$(srcdir)/'`phrase_lookup.cpp - -liblookup_la-lookup.lo: lookup.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblookup_la_CXXFLAGS) $(CXXFLAGS) -MT liblookup_la-lookup.lo -MD -MP -MF $(DEPDIR)/liblookup_la-lookup.Tpo -c -o liblookup_la-lookup.lo `test -f 'lookup.cpp' || echo '$(srcdir)/'`lookup.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblookup_la-lookup.Tpo $(DEPDIR)/liblookup_la-lookup.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='lookup.cpp' object='liblookup_la-lookup.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblookup_la_CXXFLAGS) $(CXXFLAGS) -c -o liblookup_la-lookup.lo `test -f 'lookup.cpp' || echo '$(srcdir)/'`lookup.cpp - -liblookup_la-phonetic_lookup.lo: phonetic_lookup.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblookup_la_CXXFLAGS) $(CXXFLAGS) -MT liblookup_la-phonetic_lookup.lo -MD -MP -MF $(DEPDIR)/liblookup_la-phonetic_lookup.Tpo -c -o liblookup_la-phonetic_lookup.lo `test -f 'phonetic_lookup.cpp' || echo '$(srcdir)/'`phonetic_lookup.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblookup_la-phonetic_lookup.Tpo $(DEPDIR)/liblookup_la-phonetic_lookup.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='phonetic_lookup.cpp' object='liblookup_la-phonetic_lookup.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblookup_la_CXXFLAGS) $(CXXFLAGS) -c -o liblookup_la-phonetic_lookup.lo `test -f 'phonetic_lookup.cpp' || echo '$(srcdir)/'`phonetic_lookup.cpp - mostlyclean-libtool: -rm -f *.lo @@ -542,7 +509,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -577,14 +544,14 @@ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/liblookup_la-lookup.Plo - -rm -f ./$(DEPDIR)/liblookup_la-phonetic_lookup.Plo - -rm -f ./$(DEPDIR)/liblookup_la-phrase_lookup.Plo - -rm -f ./$(DEPDIR)/liblookup_la-pinyin_lookup2.Plo + -rm -f ./$(DEPDIR)/lookup.Po + -rm -f ./$(DEPDIR)/phonetic_lookup.Po + -rm -f ./$(DEPDIR)/phrase_lookup.Po + -rm -f ./$(DEPDIR)/pinyin_lookup2.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -630,10 +597,10 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/liblookup_la-lookup.Plo - -rm -f ./$(DEPDIR)/liblookup_la-phonetic_lookup.Plo - -rm -f ./$(DEPDIR)/liblookup_la-phrase_lookup.Plo - -rm -f ./$(DEPDIR)/liblookup_la-pinyin_lookup2.Plo + -rm -f ./$(DEPDIR)/lookup.Po + -rm -f ./$(DEPDIR)/phonetic_lookup.Po + -rm -f ./$(DEPDIR)/phrase_lookup.Po + -rm -f ./$(DEPDIR)/pinyin_lookup2.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -655,7 +622,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-generic clean-libtool clean-noinstLIBRARIES \ cscopelist-am ctags ctags-am distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ diff -Nru libpinyin-2.3.0/src/Makefile.am libpinyin-2.6.0/src/Makefile.am --- libpinyin-2.3.0/src/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/Makefile.am 2020-11-26 03:09:19.000000000 +0000 @@ -14,19 +14,18 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -AUTOMAKE_OPTIONS = gnu -SUBDIRS = include storage lookup +AUTOMAKE_OPTIONS = gnu subdir-objects +SUBDIRS = include storage lookup -EXTRA_DIST = libpinyin.ver \ - libzhuyin.ver +EXTRA_DIST = libpinyin.ver libzhuyin.ver -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in -CLEANFILES = *.bak +CLEANFILES = *.bak -ACLOCAL = aclocal -I $(ac_aux_dir) +ACLOCAL = aclocal -I $(ac_aux_dir) -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ @@ -40,33 +39,79 @@ libpinyininclude_HEADERS += zhuyin.h endif +pinyin_SOURCES = \ + storage/phrase_index.cpp \ + storage/phrase_large_table2.cpp \ + storage/phrase_large_table3.cpp \ + storage/ngram.cpp \ + storage/tag_utility.cpp \ + storage/chewing_key.cpp \ + storage/pinyin_parser2.cpp \ + storage/zhuyin_parser2.cpp \ + storage/phonetic_key_matrix.cpp \ + storage/chewing_large_table.cpp \ + storage/chewing_large_table2.cpp \ + storage/table_info.cpp \ + lookup/pinyin_lookup2.cpp \ + lookup/phrase_lookup.cpp \ + lookup/lookup.cpp \ + lookup/phonetic_lookup.cpp \ + $(NULL) + +if BERKELEYDB +pinyin_SOURCES += storage/ngram_bdb.cpp \ + storage/phrase_large_table3_bdb.cpp \ + storage/chewing_large_table2_bdb.cpp +endif + +if KYOTOCABINET +pinyin_SOURCES += storage/ngram_kyotodb.cpp \ + storage/phrase_large_table3_kyotodb.cpp \ + storage/chewing_large_table2_kyotodb.cpp +endif + + noinst_HEADERS = pinyin_internal.h -lib_LTLIBRARIES = libpinyin.la +lib_LTLIBRARIES = libpinyin.la -noinst_LTLIBRARIES = libpinyin_internal.la +noinst_LIBRARIES = libpinyin_internal.a -libpinyin_la_SOURCES = pinyin.cpp +libpinyin_la_SOURCES = $(pinyin_SOURCES) pinyin.cpp -libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la @GLIB2_LIBS@ +libpinyin_la_LIBADD = @GLIB2_LIBS@ -libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ +if CLANG +## LLVM linker does not support --version-script, +## use -exported_symbols_list instead +libpinyin_la_LDFLAGS = -Wl -exported_symbols_list $(srcdir)/libpinyin.exp \ + -version-info @LT_VERSION_INFO@ +else +libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ -version-info @LT_VERSION_INFO@ +endif if ENABLE_LIBZHUYIN lib_LTLIBRARIES += libzhuyin.la -libzhuyin_la_SOURCES = zhuyin.cpp +libzhuyin_la_SOURCES = $(pinyin_SOURCES) zhuyin.cpp -libzhuyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la @GLIB2_LIBS@ +libzhuyin_la_LIBADD = @GLIB2_LIBS@ -libzhuyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libzhuyin.ver \ +if CLANG +## LLVM linker does not support --version-script, +## use -exported_symbols_list instead +libzhuyin_la_LDFLAGS = -Wl -exported_symbols_list $(srcdir)/libzhuyin.exp \ + -version-info @LT_VERSION_INFO@ +else +libzhuyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libzhuyin.ver \ -version-info @LT_VERSION_INFO@ endif +endif -libpinyin_internal_la_SOURCES = pinyin_internal.cpp +libpinyin_internal_a_SOURCES = pinyin_internal.cpp -libpinyin_internal_la_LIBADD = storage/libstorage.la lookup/liblookup.la +libpinyin_internal_a_LIBADD = storage/libstorage.a lookup/liblookup.a ## Note: ## As libpinyin internal interface will change, only provides static library diff -Nru libpinyin-2.3.0/src/Makefile.in libpinyin-2.6.0/src/Makefile.in --- libpinyin-2.3.0/src/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/src/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -90,7 +91,15 @@ build_triplet = @build@ host_triplet = @host@ @ENABLE_LIBZHUYIN_TRUE@am__append_1 = zhuyin.h -@ENABLE_LIBZHUYIN_TRUE@am__append_2 = libzhuyin.la +@BERKELEYDB_TRUE@am__append_2 = storage/ngram_bdb.cpp \ +@BERKELEYDB_TRUE@ storage/phrase_large_table3_bdb.cpp \ +@BERKELEYDB_TRUE@ storage/chewing_large_table2_bdb.cpp + +@KYOTOCABINET_TRUE@am__append_3 = storage/ngram_kyotodb.cpp \ +@KYOTOCABINET_TRUE@ storage/phrase_large_table3_kyotodb.cpp \ +@KYOTOCABINET_TRUE@ storage/chewing_large_table2_kyotodb.cpp + +@ENABLE_LIBZHUYIN_TRUE@am__append_4 = libzhuyin.la subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ @@ -106,6 +115,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -135,9 +145,49 @@ } am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libpinyinincludedir)" -LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) -libpinyin_la_DEPENDENCIES = storage/libstorage.la lookup/liblookup.la -am_libpinyin_la_OBJECTS = pinyin.lo +LTLIBRARIES = $(lib_LTLIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libpinyin_internal_a_AR = $(AR) $(ARFLAGS) +libpinyin_internal_a_DEPENDENCIES = storage/libstorage.a \ + lookup/liblookup.a +am_libpinyin_internal_a_OBJECTS = pinyin_internal.$(OBJEXT) +libpinyin_internal_a_OBJECTS = $(am_libpinyin_internal_a_OBJECTS) +libpinyin_la_DEPENDENCIES = +am__libpinyin_la_SOURCES_DIST = storage/phrase_index.cpp \ + storage/phrase_large_table2.cpp \ + storage/phrase_large_table3.cpp storage/ngram.cpp \ + storage/tag_utility.cpp storage/chewing_key.cpp \ + storage/pinyin_parser2.cpp storage/zhuyin_parser2.cpp \ + storage/phonetic_key_matrix.cpp \ + storage/chewing_large_table.cpp \ + storage/chewing_large_table2.cpp storage/table_info.cpp \ + lookup/pinyin_lookup2.cpp lookup/phrase_lookup.cpp \ + lookup/lookup.cpp lookup/phonetic_lookup.cpp \ + storage/ngram_bdb.cpp storage/phrase_large_table3_bdb.cpp \ + storage/chewing_large_table2_bdb.cpp storage/ngram_kyotodb.cpp \ + storage/phrase_large_table3_kyotodb.cpp \ + storage/chewing_large_table2_kyotodb.cpp pinyin.cpp +am__dirstamp = $(am__leading_dot)dirstamp +@BERKELEYDB_TRUE@am__objects_1 = storage/ngram_bdb.lo \ +@BERKELEYDB_TRUE@ storage/phrase_large_table3_bdb.lo \ +@BERKELEYDB_TRUE@ storage/chewing_large_table2_bdb.lo +@KYOTOCABINET_TRUE@am__objects_2 = storage/ngram_kyotodb.lo \ +@KYOTOCABINET_TRUE@ storage/phrase_large_table3_kyotodb.lo \ +@KYOTOCABINET_TRUE@ storage/chewing_large_table2_kyotodb.lo +am__objects_3 = storage/phrase_index.lo storage/phrase_large_table2.lo \ + storage/phrase_large_table3.lo storage/ngram.lo \ + storage/tag_utility.lo storage/chewing_key.lo \ + storage/pinyin_parser2.lo storage/zhuyin_parser2.lo \ + storage/phonetic_key_matrix.lo storage/chewing_large_table.lo \ + storage/chewing_large_table2.lo storage/table_info.lo \ + lookup/pinyin_lookup2.lo lookup/phrase_lookup.lo \ + lookup/lookup.lo lookup/phonetic_lookup.lo $(am__objects_1) \ + $(am__objects_2) +am_libpinyin_la_OBJECTS = $(am__objects_3) pinyin.lo libpinyin_la_OBJECTS = $(am_libpinyin_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -146,15 +196,23 @@ libpinyin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libpinyin_la_LDFLAGS) $(LDFLAGS) -o $@ -libpinyin_internal_la_DEPENDENCIES = storage/libstorage.la \ - lookup/liblookup.la -am_libpinyin_internal_la_OBJECTS = pinyin_internal.lo -libpinyin_internal_la_OBJECTS = $(am_libpinyin_internal_la_OBJECTS) -@ENABLE_LIBZHUYIN_TRUE@libzhuyin_la_DEPENDENCIES = \ -@ENABLE_LIBZHUYIN_TRUE@ storage/libstorage.la \ -@ENABLE_LIBZHUYIN_TRUE@ lookup/liblookup.la -am__libzhuyin_la_SOURCES_DIST = zhuyin.cpp -@ENABLE_LIBZHUYIN_TRUE@am_libzhuyin_la_OBJECTS = zhuyin.lo +libzhuyin_la_DEPENDENCIES = +am__libzhuyin_la_SOURCES_DIST = storage/phrase_index.cpp \ + storage/phrase_large_table2.cpp \ + storage/phrase_large_table3.cpp storage/ngram.cpp \ + storage/tag_utility.cpp storage/chewing_key.cpp \ + storage/pinyin_parser2.cpp storage/zhuyin_parser2.cpp \ + storage/phonetic_key_matrix.cpp \ + storage/chewing_large_table.cpp \ + storage/chewing_large_table2.cpp storage/table_info.cpp \ + lookup/pinyin_lookup2.cpp lookup/phrase_lookup.cpp \ + lookup/lookup.cpp lookup/phonetic_lookup.cpp \ + storage/ngram_bdb.cpp storage/phrase_large_table3_bdb.cpp \ + storage/chewing_large_table2_bdb.cpp storage/ngram_kyotodb.cpp \ + storage/phrase_large_table3_kyotodb.cpp \ + storage/chewing_large_table2_kyotodb.cpp zhuyin.cpp +@ENABLE_LIBZHUYIN_TRUE@am_libzhuyin_la_OBJECTS = $(am__objects_3) \ +@ENABLE_LIBZHUYIN_TRUE@ zhuyin.lo libzhuyin_la_OBJECTS = $(am_libzhuyin_la_OBJECTS) libzhuyin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -176,7 +234,28 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/pinyin.Plo \ - ./$(DEPDIR)/pinyin_internal.Plo ./$(DEPDIR)/zhuyin.Plo + ./$(DEPDIR)/pinyin_internal.Po ./$(DEPDIR)/zhuyin.Plo \ + lookup/$(DEPDIR)/lookup.Plo \ + lookup/$(DEPDIR)/phonetic_lookup.Plo \ + lookup/$(DEPDIR)/phrase_lookup.Plo \ + lookup/$(DEPDIR)/pinyin_lookup2.Plo \ + storage/$(DEPDIR)/chewing_key.Plo \ + storage/$(DEPDIR)/chewing_large_table.Plo \ + storage/$(DEPDIR)/chewing_large_table2.Plo \ + storage/$(DEPDIR)/chewing_large_table2_bdb.Plo \ + storage/$(DEPDIR)/chewing_large_table2_kyotodb.Plo \ + storage/$(DEPDIR)/ngram.Plo storage/$(DEPDIR)/ngram_bdb.Plo \ + storage/$(DEPDIR)/ngram_kyotodb.Plo \ + storage/$(DEPDIR)/phonetic_key_matrix.Plo \ + storage/$(DEPDIR)/phrase_index.Plo \ + storage/$(DEPDIR)/phrase_large_table2.Plo \ + storage/$(DEPDIR)/phrase_large_table3.Plo \ + storage/$(DEPDIR)/phrase_large_table3_bdb.Plo \ + storage/$(DEPDIR)/phrase_large_table3_kyotodb.Plo \ + storage/$(DEPDIR)/pinyin_parser2.Plo \ + storage/$(DEPDIR)/table_info.Plo \ + storage/$(DEPDIR)/tag_utility.Plo \ + storage/$(DEPDIR)/zhuyin_parser2.Plo am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -196,10 +275,10 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(libpinyin_la_SOURCES) $(libpinyin_internal_la_SOURCES) \ +SOURCES = $(libpinyin_internal_a_SOURCES) $(libpinyin_la_SOURCES) \ $(libzhuyin_la_SOURCES) -DIST_SOURCES = $(libpinyin_la_SOURCES) \ - $(libpinyin_internal_la_SOURCES) \ +DIST_SOURCES = $(libpinyin_internal_a_SOURCES) \ + $(am__libpinyin_la_SOURCES_DIST) \ $(am__libzhuyin_la_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ @@ -289,6 +368,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -403,14 +483,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = gnu +AUTOMAKE_OPTIONS = gnu subdir-objects SUBDIRS = include storage lookup -EXTRA_DIST = libpinyin.ver \ - libzhuyin.ver - -MAINTAINERCLEANFILES = Makefile.in -CLEANFILES = *.bak -INCLUDES = -I$(top_srcdir)/src \ +EXTRA_DIST = libpinyin.ver libzhuyin.ver +MAINTAINERCLEANFILES = Makefile.in +CLEANFILES = *.bak +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ @@ -418,21 +496,38 @@ libpinyinincludedir = $(includedir)/libpinyin-@VERSION@ libpinyininclude_HEADERS = pinyin.h $(am__append_1) +pinyin_SOURCES = storage/phrase_index.cpp \ + storage/phrase_large_table2.cpp \ + storage/phrase_large_table3.cpp storage/ngram.cpp \ + storage/tag_utility.cpp storage/chewing_key.cpp \ + storage/pinyin_parser2.cpp storage/zhuyin_parser2.cpp \ + storage/phonetic_key_matrix.cpp \ + storage/chewing_large_table.cpp \ + storage/chewing_large_table2.cpp storage/table_info.cpp \ + lookup/pinyin_lookup2.cpp lookup/phrase_lookup.cpp \ + lookup/lookup.cpp lookup/phonetic_lookup.cpp $(NULL) \ + $(am__append_2) $(am__append_3) noinst_HEADERS = pinyin_internal.h -lib_LTLIBRARIES = libpinyin.la $(am__append_2) -noinst_LTLIBRARIES = libpinyin_internal.la -libpinyin_la_SOURCES = pinyin.cpp -libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la @GLIB2_LIBS@ -libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ - -version-info @LT_VERSION_INFO@ - -@ENABLE_LIBZHUYIN_TRUE@libzhuyin_la_SOURCES = zhuyin.cpp -@ENABLE_LIBZHUYIN_TRUE@libzhuyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la @GLIB2_LIBS@ -@ENABLE_LIBZHUYIN_TRUE@libzhuyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libzhuyin.ver \ -@ENABLE_LIBZHUYIN_TRUE@ -version-info @LT_VERSION_INFO@ +lib_LTLIBRARIES = libpinyin.la $(am__append_4) +noinst_LIBRARIES = libpinyin_internal.a +libpinyin_la_SOURCES = $(pinyin_SOURCES) pinyin.cpp +libpinyin_la_LIBADD = @GLIB2_LIBS@ +@CLANG_FALSE@libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ +@CLANG_FALSE@ -version-info @LT_VERSION_INFO@ + +@CLANG_TRUE@libpinyin_la_LDFLAGS = -Wl -exported_symbols_list $(srcdir)/libpinyin.exp \ +@CLANG_TRUE@ -version-info @LT_VERSION_INFO@ + +@ENABLE_LIBZHUYIN_TRUE@libzhuyin_la_SOURCES = $(pinyin_SOURCES) zhuyin.cpp +@ENABLE_LIBZHUYIN_TRUE@libzhuyin_la_LIBADD = @GLIB2_LIBS@ +@CLANG_FALSE@@ENABLE_LIBZHUYIN_TRUE@libzhuyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libzhuyin.ver \ +@CLANG_FALSE@@ENABLE_LIBZHUYIN_TRUE@ -version-info @LT_VERSION_INFO@ + +@CLANG_TRUE@@ENABLE_LIBZHUYIN_TRUE@libzhuyin_la_LDFLAGS = -Wl -exported_symbols_list $(srcdir)/libzhuyin.exp \ +@CLANG_TRUE@@ENABLE_LIBZHUYIN_TRUE@ -version-info @LT_VERSION_INFO@ -libpinyin_internal_la_SOURCES = pinyin_internal.cpp -libpinyin_internal_la_LIBADD = storage/libstorage.la lookup/liblookup.la +libpinyin_internal_a_SOURCES = pinyin_internal.cpp +libpinyin_internal_a_LIBADD = storage/libstorage.a lookup/liblookup.a all: all-recursive .SUFFIXES: @@ -467,6 +562,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -502,35 +600,108 @@ rm -f $${locs}; \ } -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } +libpinyin_internal.a: $(libpinyin_internal_a_OBJECTS) $(libpinyin_internal_a_DEPENDENCIES) $(EXTRA_libpinyin_internal_a_DEPENDENCIES) + $(AM_V_at)-rm -f libpinyin_internal.a + $(AM_V_AR)$(libpinyin_internal_a_AR) libpinyin_internal.a $(libpinyin_internal_a_OBJECTS) $(libpinyin_internal_a_LIBADD) + $(AM_V_at)$(RANLIB) libpinyin_internal.a +storage/$(am__dirstamp): + @$(MKDIR_P) storage + @: > storage/$(am__dirstamp) +storage/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) storage/$(DEPDIR) + @: > storage/$(DEPDIR)/$(am__dirstamp) +storage/phrase_index.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/phrase_large_table2.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/phrase_large_table3.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/ngram.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/tag_utility.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/chewing_key.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/pinyin_parser2.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/zhuyin_parser2.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/phonetic_key_matrix.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/chewing_large_table.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/chewing_large_table2.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/table_info.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +lookup/$(am__dirstamp): + @$(MKDIR_P) lookup + @: > lookup/$(am__dirstamp) +lookup/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) lookup/$(DEPDIR) + @: > lookup/$(DEPDIR)/$(am__dirstamp) +lookup/pinyin_lookup2.lo: lookup/$(am__dirstamp) \ + lookup/$(DEPDIR)/$(am__dirstamp) +lookup/phrase_lookup.lo: lookup/$(am__dirstamp) \ + lookup/$(DEPDIR)/$(am__dirstamp) +lookup/lookup.lo: lookup/$(am__dirstamp) \ + lookup/$(DEPDIR)/$(am__dirstamp) +lookup/phonetic_lookup.lo: lookup/$(am__dirstamp) \ + lookup/$(DEPDIR)/$(am__dirstamp) +storage/ngram_bdb.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/phrase_large_table3_bdb.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/chewing_large_table2_bdb.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/ngram_kyotodb.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/phrase_large_table3_kyotodb.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) +storage/chewing_large_table2_kyotodb.lo: storage/$(am__dirstamp) \ + storage/$(DEPDIR)/$(am__dirstamp) libpinyin.la: $(libpinyin_la_OBJECTS) $(libpinyin_la_DEPENDENCIES) $(EXTRA_libpinyin_la_DEPENDENCIES) $(AM_V_CXXLD)$(libpinyin_la_LINK) -rpath $(libdir) $(libpinyin_la_OBJECTS) $(libpinyin_la_LIBADD) $(LIBS) -libpinyin_internal.la: $(libpinyin_internal_la_OBJECTS) $(libpinyin_internal_la_DEPENDENCIES) $(EXTRA_libpinyin_internal_la_DEPENDENCIES) - $(AM_V_CXXLD)$(CXXLINK) $(libpinyin_internal_la_OBJECTS) $(libpinyin_internal_la_LIBADD) $(LIBS) - libzhuyin.la: $(libzhuyin_la_OBJECTS) $(libzhuyin_la_DEPENDENCIES) $(EXTRA_libzhuyin_la_DEPENDENCIES) $(AM_V_CXXLD)$(libzhuyin_la_LINK) $(am_libzhuyin_la_rpath) $(libzhuyin_la_OBJECTS) $(libzhuyin_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f lookup/*.$(OBJEXT) + -rm -f lookup/*.lo + -rm -f storage/*.$(OBJEXT) + -rm -f storage/*.lo distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pinyin.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pinyin_internal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pinyin_internal.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zhuyin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@lookup/$(DEPDIR)/lookup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@lookup/$(DEPDIR)/phonetic_lookup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@lookup/$(DEPDIR)/phrase_lookup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@lookup/$(DEPDIR)/pinyin_lookup2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/chewing_key.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/chewing_large_table.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/chewing_large_table2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/chewing_large_table2_bdb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/chewing_large_table2_kyotodb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/ngram.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/ngram_bdb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/ngram_kyotodb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/phonetic_key_matrix.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/phrase_index.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/phrase_large_table2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/phrase_large_table3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/phrase_large_table3_bdb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/phrase_large_table3_kyotodb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/pinyin_parser2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/table_info.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/tag_utility.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@storage/$(DEPDIR)/zhuyin_parser2.Plo@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -539,22 +710,25 @@ am--depfiles: $(am__depfiles_remade) .cpp.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< @@ -564,6 +738,8 @@ clean-libtool: -rm -rf .libs _libs + -rm -rf lookup/.libs lookup/_libs + -rm -rf storage/.libs storage/_libs install-libpinyinincludeHEADERS: $(libpinyininclude_HEADERS) @$(NORMAL_INSTALL) @list='$(libpinyininclude_HEADERS)'; test -n "$(libpinyinincludedir)" || list=; \ @@ -745,7 +921,7 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libpinyinincludedir)"; do \ @@ -778,6 +954,10 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f lookup/$(DEPDIR)/$(am__dirstamp) + -rm -f lookup/$(am__dirstamp) + -rm -f storage/$(DEPDIR)/$(am__dirstamp) + -rm -f storage/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -786,12 +966,34 @@ clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstLTLIBRARIES mostlyclean-am + clean-noinstLIBRARIES mostlyclean-am distclean: distclean-recursive -rm -f ./$(DEPDIR)/pinyin.Plo - -rm -f ./$(DEPDIR)/pinyin_internal.Plo + -rm -f ./$(DEPDIR)/pinyin_internal.Po -rm -f ./$(DEPDIR)/zhuyin.Plo + -rm -f lookup/$(DEPDIR)/lookup.Plo + -rm -f lookup/$(DEPDIR)/phonetic_lookup.Plo + -rm -f lookup/$(DEPDIR)/phrase_lookup.Plo + -rm -f lookup/$(DEPDIR)/pinyin_lookup2.Plo + -rm -f storage/$(DEPDIR)/chewing_key.Plo + -rm -f storage/$(DEPDIR)/chewing_large_table.Plo + -rm -f storage/$(DEPDIR)/chewing_large_table2.Plo + -rm -f storage/$(DEPDIR)/chewing_large_table2_bdb.Plo + -rm -f storage/$(DEPDIR)/chewing_large_table2_kyotodb.Plo + -rm -f storage/$(DEPDIR)/ngram.Plo + -rm -f storage/$(DEPDIR)/ngram_bdb.Plo + -rm -f storage/$(DEPDIR)/ngram_kyotodb.Plo + -rm -f storage/$(DEPDIR)/phonetic_key_matrix.Plo + -rm -f storage/$(DEPDIR)/phrase_index.Plo + -rm -f storage/$(DEPDIR)/phrase_large_table2.Plo + -rm -f storage/$(DEPDIR)/phrase_large_table3.Plo + -rm -f storage/$(DEPDIR)/phrase_large_table3_bdb.Plo + -rm -f storage/$(DEPDIR)/phrase_large_table3_kyotodb.Plo + -rm -f storage/$(DEPDIR)/pinyin_parser2.Plo + -rm -f storage/$(DEPDIR)/table_info.Plo + -rm -f storage/$(DEPDIR)/tag_utility.Plo + -rm -f storage/$(DEPDIR)/zhuyin_parser2.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -838,8 +1040,30 @@ maintainer-clean: maintainer-clean-recursive -rm -f ./$(DEPDIR)/pinyin.Plo - -rm -f ./$(DEPDIR)/pinyin_internal.Plo + -rm -f ./$(DEPDIR)/pinyin_internal.Po -rm -f ./$(DEPDIR)/zhuyin.Plo + -rm -f lookup/$(DEPDIR)/lookup.Plo + -rm -f lookup/$(DEPDIR)/phonetic_lookup.Plo + -rm -f lookup/$(DEPDIR)/phrase_lookup.Plo + -rm -f lookup/$(DEPDIR)/pinyin_lookup2.Plo + -rm -f storage/$(DEPDIR)/chewing_key.Plo + -rm -f storage/$(DEPDIR)/chewing_large_table.Plo + -rm -f storage/$(DEPDIR)/chewing_large_table2.Plo + -rm -f storage/$(DEPDIR)/chewing_large_table2_bdb.Plo + -rm -f storage/$(DEPDIR)/chewing_large_table2_kyotodb.Plo + -rm -f storage/$(DEPDIR)/ngram.Plo + -rm -f storage/$(DEPDIR)/ngram_bdb.Plo + -rm -f storage/$(DEPDIR)/ngram_kyotodb.Plo + -rm -f storage/$(DEPDIR)/phonetic_key_matrix.Plo + -rm -f storage/$(DEPDIR)/phrase_index.Plo + -rm -f storage/$(DEPDIR)/phrase_large_table2.Plo + -rm -f storage/$(DEPDIR)/phrase_large_table3.Plo + -rm -f storage/$(DEPDIR)/phrase_large_table3_bdb.Plo + -rm -f storage/$(DEPDIR)/phrase_large_table3_kyotodb.Plo + -rm -f storage/$(DEPDIR)/pinyin_parser2.Plo + -rm -f storage/$(DEPDIR)/table_info.Plo + -rm -f storage/$(DEPDIR)/tag_utility.Plo + -rm -f storage/$(DEPDIR)/zhuyin_parser2.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -863,7 +1087,7 @@ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ + clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \ cscopelist-am ctags ctags-am distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ diff -Nru libpinyin-2.3.0/src/pinyin.cpp libpinyin-2.6.0/src/pinyin.cpp --- libpinyin-2.3.0/src/pinyin.cpp 2019-01-17 07:27:48.000000000 +0000 +++ libpinyin-2.6.0/src/pinyin.cpp 2020-09-28 02:18:39.000000000 +0000 @@ -732,15 +732,7 @@ delete iter; } -bool pinyin_save(pinyin_context_t * context){ - if (!context->m_user_dir) - return false; - - if (!context->m_modified) - return false; - - context->m_phrase_index->compact(); - +static bool _write_files(pinyin_context_t * context){ const pinyin_table_info_t * phrase_files = context->m_system_table_info.get_default_tables(); @@ -788,11 +780,94 @@ gchar * tmppathname = g_build_filename(context->m_user_dir, tmpfilename, NULL); + + log->save(tmppathname); + + g_free(tmpfilename); + g_free(tmppathname); + delete log; + } + + if (USER_FILE == table_info->m_file_type) { + /* user phrase library */ + MemoryChunk * chunk = new MemoryChunk; + context->m_phrase_index->store(i, chunk); + + const char * userfilename = table_info->m_user_filename; + gchar * tmpfilename = g_strdup_printf("%s.tmp", userfilename); + gchar * tmppathname = g_build_filename(context->m_user_dir, + tmpfilename, NULL); + + chunk->save(tmppathname); + + g_free(tmpfilename); + g_free(tmppathname); + delete chunk; + } + } + + /* save user pinyin table */ + gchar * tmpfilename = g_build_filename + (context->m_user_dir, USER_PINYIN_INDEX ".tmp", NULL); + unlink(tmpfilename); + + context->m_pinyin_table->store(tmpfilename); + + g_free(tmpfilename); + + /* save user phrase table */ + tmpfilename = g_build_filename + (context->m_user_dir, USER_PHRASE_INDEX ".tmp", NULL); + unlink(tmpfilename); + + context->m_phrase_table->store(tmpfilename); + + g_free(tmpfilename); + + /* save user bi-gram */ + tmpfilename = g_build_filename + (context->m_user_dir, USER_BIGRAM ".tmp", NULL); + unlink(tmpfilename); + context->m_user_bigram->save_db(tmpfilename); + + g_free(tmpfilename); + + return true; +} + +static bool _rename_files(pinyin_context_t * context){ + const pinyin_table_info_t * phrase_files = + context->m_system_table_info.get_default_tables(); + + /* skip the reserved zero phrase library. */ + for (size_t i = 1; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) { + PhraseIndexRange range; + int retval = context->m_phrase_index->get_range(i, range); + + if (ERROR_NO_SUB_PHRASE_INDEX == retval) + continue; + + const pinyin_table_info_t * table_info = phrase_files + i; + + if (NOT_USED == table_info->m_file_type) + continue; + + const char * userfilename = table_info->m_user_filename; + + if (NULL == userfilename) + continue; + + if (SYSTEM_FILE == table_info->m_file_type || + DICTIONARY == table_info->m_file_type) { + const char * userfilename = table_info->m_user_filename; + gchar * tmpfilename = g_strdup_printf("%s.tmp", userfilename); + + gchar * tmppathname = g_build_filename(context->m_user_dir, + tmpfilename, NULL); g_free(tmpfilename); gchar * chunkpathname = g_build_filename(context->m_user_dir, userfilename, NULL); - log->save(tmppathname); int result = rename(tmppathname, chunkpathname); if (0 != result) @@ -801,14 +876,9 @@ g_free(chunkpathname); g_free(tmppathname); - delete log; } if (USER_FILE == table_info->m_file_type) { - /* user phrase library */ - MemoryChunk * chunk = new MemoryChunk; - context->m_phrase_index->store(i, chunk); - const char * userfilename = table_info->m_user_filename; gchar * tmpfilename = g_strdup_printf("%s.tmp", userfilename); gchar * tmppathname = g_build_filename(context->m_user_dir, @@ -818,8 +888,6 @@ gchar * chunkpathname = g_build_filename(context->m_user_dir, userfilename, NULL); - chunk->save(tmppathname); - int result = rename(tmppathname, chunkpathname); if (0 != result) fprintf(stderr, "rename %s to %s failed.\n", @@ -827,19 +895,15 @@ g_free(chunkpathname); g_free(tmppathname); - delete chunk; } } /* save user pinyin table */ gchar * tmpfilename = g_build_filename (context->m_user_dir, USER_PINYIN_INDEX ".tmp", NULL); - unlink(tmpfilename); gchar * filename = g_build_filename (context->m_user_dir, USER_PINYIN_INDEX, NULL); - context->m_pinyin_table->store(tmpfilename); - int result = rename(tmpfilename, filename); if (0 != result) fprintf(stderr, "rename %s to %s failed.\n", @@ -851,12 +915,9 @@ /* save user phrase table */ tmpfilename = g_build_filename (context->m_user_dir, USER_PHRASE_INDEX ".tmp", NULL); - unlink(tmpfilename); filename = g_build_filename (context->m_user_dir, USER_PHRASE_INDEX, NULL); - context->m_phrase_table->store(tmpfilename); - result = rename(tmpfilename, filename); if (0 != result) fprintf(stderr, "rename %s to %s failed.\n", @@ -868,9 +929,7 @@ /* save user bi-gram */ tmpfilename = g_build_filename (context->m_user_dir, USER_BIGRAM ".tmp", NULL); - unlink(tmpfilename); filename = g_build_filename(context->m_user_dir, USER_BIGRAM, NULL); - context->m_user_bigram->save_db(tmpfilename); result = rename(tmpfilename, filename); if (0 != result) @@ -880,10 +939,24 @@ g_free(tmpfilename); g_free(filename); + return true; +} + +bool pinyin_save(pinyin_context_t * context){ + if (!context->m_user_dir) + return false; + + if (!context->m_modified) + return false; + + context->m_phrase_index->compact(); + + bool retval = _write_files(context) && _rename_files(context); + mark_version(context); context->m_modified = false; - return true; + return retval; } bool pinyin_set_full_pinyin_scheme(pinyin_context_t * context, @@ -1208,9 +1281,10 @@ pinyin_context_t * & context = instance->m_context; pinyin_option_t options = context->m_options; + gint16 distance = 0; int pinyin_len = strlen(onepinyin); bool retval = context->m_full_pinyin_parser->parse_one_key - (options, *onekey, onepinyin, pinyin_len); + (options, *onekey, distance, onepinyin, pinyin_len); return retval; } @@ -1249,9 +1323,10 @@ pinyin_context_t * & context = instance->m_context; pinyin_option_t options = context->m_options; + gint16 distance = 0; int pinyin_len = strlen(onepinyin); bool retval = context->m_double_pinyin_parser->parse_one_key - (options, *onekey, onepinyin, pinyin_len); + (options, *onekey, distance, onepinyin, pinyin_len); return retval; } @@ -1289,9 +1364,10 @@ /* disable the zhuyin correction options. */ options &= ~ZHUYIN_CORRECT_ALL; + gint16 distance = 0; int chewing_len = strlen(onechewing); bool retval = context->m_chewing_parser->parse_one_key - (options, *onekey, onechewing, chewing_len ); + (options, *onekey, distance, onechewing, chewing_len ); return retval; } diff -Nru libpinyin-2.3.0/src/pinyin.h libpinyin-2.6.0/src/pinyin.h --- libpinyin-2.3.0/src/pinyin.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/pinyin.h 2020-07-24 02:26:21.000000000 +0000 @@ -600,20 +600,6 @@ gchar ** utf8_str); /** - * pinyin_get_luoma_pinyin_string: - * @instance: the pinyin instance. - * @key: the pinyin key. - * @utf8_str: the luoma pinyin string. - * @returns: whether the get operation is successful. - * - * Get the luoma pinyin string of the key. - * - */ -bool pinyin_get_luoma_pinyin_string(pinyin_instance_t * instance, - ChewingKey * key, - gchar ** utf8_str); - -/** * pinyin_get_secondary_zhuyin_string: * @instance: the pinyin instance. * @key: the pinyin key. diff -Nru libpinyin-2.3.0/src/storage/bdb_utils.h libpinyin-2.6.0/src/storage/bdb_utils.h --- libpinyin-2.3.0/src/storage/bdb_utils.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/bdb_utils.h 2020-09-29 08:45:30.000000000 +0000 @@ -59,6 +59,10 @@ while ((ret = cursorp->c_get(cursorp, &key, &data, DB_NEXT)) == 0) { ret = destdb->put(destdb, NULL, &key, &data, 0); assert(0 == ret); + + /* Initialize our DBTs. */ + memset(&key, 0, sizeof(DBT)); + memset(&data, 0, sizeof(DBT)); } assert(DB_NOTFOUND == ret); diff -Nru libpinyin-2.3.0/src/storage/chewing_large_table2_bdb.cpp libpinyin-2.6.0/src/storage/chewing_large_table2_bdb.cpp --- libpinyin-2.3.0/src/storage/chewing_large_table2_bdb.cpp 2019-01-17 07:20:32.000000000 +0000 +++ libpinyin-2.6.0/src/storage/chewing_large_table2_bdb.cpp 2020-10-14 02:42:40.000000000 +0000 @@ -448,6 +448,9 @@ #undef CASE + /* Initialize our DBTs. */ + memset(&db_key, 0, sizeof(DBT)); + memset(&db_data, 0, sizeof(DBT)); } assert(ret == DB_NOTFOUND); diff -Nru libpinyin-2.3.0/src/storage/chewing_large_table2.cpp libpinyin-2.6.0/src/storage/chewing_large_table2.cpp --- libpinyin-2.3.0/src/storage/chewing_large_table2.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/chewing_large_table2.cpp 2020-11-26 03:02:14.000000000 +0000 @@ -115,8 +115,13 @@ size_t freq; while (!feof(infile)) { +#ifdef __APPLE__ + int num = fscanf(infile, "%255s %255[^ \t] %u %ld", + pinyin, phrase, &token, &freq); +#else int num = fscanf(infile, "%255s %255s %u %ld", pinyin, phrase, &token, &freq); +#endif if (4 != num) continue; @@ -149,7 +154,7 @@ }; if (len != keys->len) { - fprintf(stderr, "ChewingLargeTable::load_text:%s\t%s\t%u\t%ld\n", + fprintf(stderr, "ChewingLargeTable2::load_text:%s\t%s\t%u\t%ld\n", pinyin, phrase, token, freq); continue; } diff -Nru libpinyin-2.3.0/src/storage/chewing_large_table2_kyotodb.cpp libpinyin-2.6.0/src/storage/chewing_large_table2_kyotodb.cpp --- libpinyin-2.3.0/src/storage/chewing_large_table2_kyotodb.cpp 2019-01-17 07:20:32.000000000 +0000 +++ libpinyin-2.6.0/src/storage/chewing_large_table2_kyotodb.cpp 2020-09-27 10:55:32.000000000 +0000 @@ -20,7 +20,7 @@ #include "chewing_large_table2.h" #include -#include +#include #include "kyotodb_utils.h" using namespace kyotocabinet; @@ -29,7 +29,7 @@ ChewingLargeTable2::ChewingLargeTable2() { /* create in-memory db. */ - m_db = new ProtoTreeDB; + m_db = new GrassDB; assert(m_db->open("-", BasicDB::OREADER|BasicDB::OWRITER|BasicDB::OCREATE)); m_entries = NULL; @@ -71,11 +71,15 @@ init_entries(); /* create in-memory db. */ - m_db = new ProtoTreeDB; + m_db = new GrassDB; if (!m_db->open("-", BasicDB::OREADER|BasicDB::OWRITER|BasicDB::OCREATE)) return false; + if (!m_db->load_snapshot(filename, NULL)) + return false; + +#if 0 /* load db into memory. */ BasicDB * tmp_db = new TreeDB; if (!tmp_db->open(filename, BasicDB::OREADER)) @@ -86,6 +90,7 @@ tmp_db->close(); delete tmp_db; +#endif return true; } @@ -95,6 +100,10 @@ if ( ret != 0 && errno != ENOENT) return false; + if (!m_db->dump_snapshot(new_filename, NULL)) + return false; + +#if 0 BasicDB * tmp_db = new TreeDB; if (!tmp_db->open(new_filename, BasicDB::OWRITER|BasicDB::OCREATE)) return false; @@ -105,6 +114,7 @@ tmp_db->synchronize(); tmp_db->close(); delete tmp_db; +#endif return true; } diff -Nru libpinyin-2.3.0/src/storage/chewing_large_table.cpp libpinyin-2.6.0/src/storage/chewing_large_table.cpp --- libpinyin-2.3.0/src/storage/chewing_large_table.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/chewing_large_table.cpp 2020-11-26 03:02:14.000000000 +0000 @@ -669,8 +669,13 @@ size_t freq; while (!feof(infile)) { +#ifdef __APPLE__ + int num = fscanf(infile, "%255s %255[^ \t] %u %ld", + pinyin, phrase, &token, &freq); +#else int num = fscanf(infile, "%255s %255s %u %ld", pinyin, phrase, &token, &freq); +#endif if (4 != num) continue; diff -Nru libpinyin-2.3.0/src/storage/flexible_ngram_bdb.h libpinyin-2.6.0/src/storage/flexible_ngram_bdb.h --- libpinyin-2.3.0/src/storage/flexible_ngram_bdb.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/flexible_ngram_bdb.h 2020-10-14 02:43:13.000000000 +0000 @@ -270,6 +270,10 @@ } phrase_token_t * token = (phrase_token_t *) key.data; g_array_append_val(items, *token); + + /* Initialize our DBTs. */ + memset(&key, 0, sizeof(DBT)); + memset(&data, 0, sizeof(DBT)); } if ( ret != DB_NOTFOUND ){ diff -Nru libpinyin-2.3.0/src/storage/kyotodb_utils.h libpinyin-2.6.0/src/storage/kyotodb_utils.h --- libpinyin-2.3.0/src/storage/kyotodb_utils.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/kyotodb_utils.h 2020-09-27 10:55:32.000000000 +0000 @@ -49,6 +49,7 @@ /* Kyoto Cabinet requires non-NULL pointer for zero length value. */ static const char * empty_vbuf = (char *)UINTPTR_MAX; +#if 0 class CopyVisitor : public DB::Visitor { private: BasicDB * m_db; @@ -68,6 +69,7 @@ return NOP; } }; +#endif }; diff -Nru libpinyin-2.3.0/src/storage/Makefile.am libpinyin-2.6.0/src/storage/Makefile.am --- libpinyin-2.3.0/src/storage/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -INCLUDES = -I$(top_srcdir)/src/include \ +AM_CPPFLAGS = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CFLAGS@ @@ -26,7 +26,7 @@ libpinyininclude_HEADERS += zhuyin_custom2.h endif -noinst_HEADERS = chewing_enum.h \ +noinst_HEADERS = chewing_enum.h \ chewing_key.h \ pinyin_parser2.h \ zhuyin_parser2.h \ @@ -64,13 +64,9 @@ kyotodb_utils.h -noinst_LTLIBRARIES = libstorage.la +noinst_LIBRARIES = libstorage.a -libstorage_la_CXXFLAGS = "-fPIC" - -libstorage_la_LDFLAGS = -static - -libstorage_la_SOURCES = phrase_index.cpp \ +libstorage_a_SOURCES = phrase_index.cpp \ phrase_large_table2.cpp \ phrase_large_table3.cpp \ ngram.cpp \ @@ -84,13 +80,13 @@ table_info.cpp if BERKELEYDB -libstorage_la_SOURCES += ngram_bdb.cpp \ +libstorage_a_SOURCES += ngram_bdb.cpp \ phrase_large_table3_bdb.cpp \ chewing_large_table2_bdb.cpp endif if KYOTOCABINET -libstorage_la_SOURCES += ngram_kyotodb.cpp \ +libstorage_a_SOURCES += ngram_kyotodb.cpp \ phrase_large_table3_kyotodb.cpp \ chewing_large_table2_kyotodb.cpp endif diff -Nru libpinyin-2.3.0/src/storage/Makefile.in libpinyin-2.6.0/src/storage/Makefile.in --- libpinyin-2.3.0/src/storage/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/src/storage/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,9 +113,15 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libstorage_la_LIBADD = -am__libstorage_la_SOURCES_DIST = phrase_index.cpp \ +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libstorage_a_AR = $(AR) $(ARFLAGS) +libstorage_a_LIBADD = +am__libstorage_a_SOURCES_DIST = phrase_index.cpp \ phrase_large_table2.cpp phrase_large_table3.cpp ngram.cpp \ tag_utility.cpp chewing_key.cpp pinyin_parser2.cpp \ zhuyin_parser2.cpp phonetic_key_matrix.cpp \ @@ -124,31 +130,20 @@ chewing_large_table2_bdb.cpp ngram_kyotodb.cpp \ phrase_large_table3_kyotodb.cpp \ chewing_large_table2_kyotodb.cpp -@BERKELEYDB_TRUE@am__objects_1 = libstorage_la-ngram_bdb.lo \ -@BERKELEYDB_TRUE@ libstorage_la-phrase_large_table3_bdb.lo \ -@BERKELEYDB_TRUE@ libstorage_la-chewing_large_table2_bdb.lo -@KYOTOCABINET_TRUE@am__objects_2 = libstorage_la-ngram_kyotodb.lo \ -@KYOTOCABINET_TRUE@ libstorage_la-phrase_large_table3_kyotodb.lo \ -@KYOTOCABINET_TRUE@ libstorage_la-chewing_large_table2_kyotodb.lo -am_libstorage_la_OBJECTS = libstorage_la-phrase_index.lo \ - libstorage_la-phrase_large_table2.lo \ - libstorage_la-phrase_large_table3.lo libstorage_la-ngram.lo \ - libstorage_la-tag_utility.lo libstorage_la-chewing_key.lo \ - libstorage_la-pinyin_parser2.lo \ - libstorage_la-zhuyin_parser2.lo \ - libstorage_la-phonetic_key_matrix.lo \ - libstorage_la-chewing_large_table.lo \ - libstorage_la-chewing_large_table2.lo \ - libstorage_la-table_info.lo $(am__objects_1) $(am__objects_2) -libstorage_la_OBJECTS = $(am_libstorage_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -libstorage_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(libstorage_la_CXXFLAGS) $(CXXFLAGS) $(libstorage_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +@BERKELEYDB_TRUE@am__objects_1 = ngram_bdb.$(OBJEXT) \ +@BERKELEYDB_TRUE@ phrase_large_table3_bdb.$(OBJEXT) \ +@BERKELEYDB_TRUE@ chewing_large_table2_bdb.$(OBJEXT) +@KYOTOCABINET_TRUE@am__objects_2 = ngram_kyotodb.$(OBJEXT) \ +@KYOTOCABINET_TRUE@ phrase_large_table3_kyotodb.$(OBJEXT) \ +@KYOTOCABINET_TRUE@ chewing_large_table2_kyotodb.$(OBJEXT) +am_libstorage_a_OBJECTS = phrase_index.$(OBJEXT) \ + phrase_large_table2.$(OBJEXT) phrase_large_table3.$(OBJEXT) \ + ngram.$(OBJEXT) tag_utility.$(OBJEXT) chewing_key.$(OBJEXT) \ + pinyin_parser2.$(OBJEXT) zhuyin_parser2.$(OBJEXT) \ + phonetic_key_matrix.$(OBJEXT) chewing_large_table.$(OBJEXT) \ + chewing_large_table2.$(OBJEXT) table_info.$(OBJEXT) \ + $(am__objects_1) $(am__objects_2) +libstorage_a_OBJECTS = $(am_libstorage_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -164,27 +159,27 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libstorage_la-chewing_key.Plo \ - ./$(DEPDIR)/libstorage_la-chewing_large_table.Plo \ - ./$(DEPDIR)/libstorage_la-chewing_large_table2.Plo \ - ./$(DEPDIR)/libstorage_la-chewing_large_table2_bdb.Plo \ - ./$(DEPDIR)/libstorage_la-chewing_large_table2_kyotodb.Plo \ - ./$(DEPDIR)/libstorage_la-ngram.Plo \ - ./$(DEPDIR)/libstorage_la-ngram_bdb.Plo \ - ./$(DEPDIR)/libstorage_la-ngram_kyotodb.Plo \ - ./$(DEPDIR)/libstorage_la-phonetic_key_matrix.Plo \ - ./$(DEPDIR)/libstorage_la-phrase_index.Plo \ - ./$(DEPDIR)/libstorage_la-phrase_large_table2.Plo \ - ./$(DEPDIR)/libstorage_la-phrase_large_table3.Plo \ - ./$(DEPDIR)/libstorage_la-phrase_large_table3_bdb.Plo \ - ./$(DEPDIR)/libstorage_la-phrase_large_table3_kyotodb.Plo \ - ./$(DEPDIR)/libstorage_la-pinyin_parser2.Plo \ - ./$(DEPDIR)/libstorage_la-table_info.Plo \ - ./$(DEPDIR)/libstorage_la-tag_utility.Plo \ - ./$(DEPDIR)/libstorage_la-zhuyin_parser2.Plo +am__depfiles_remade = ./$(DEPDIR)/chewing_key.Po \ + ./$(DEPDIR)/chewing_large_table.Po \ + ./$(DEPDIR)/chewing_large_table2.Po \ + ./$(DEPDIR)/chewing_large_table2_bdb.Po \ + ./$(DEPDIR)/chewing_large_table2_kyotodb.Po \ + ./$(DEPDIR)/ngram.Po ./$(DEPDIR)/ngram_bdb.Po \ + ./$(DEPDIR)/ngram_kyotodb.Po \ + ./$(DEPDIR)/phonetic_key_matrix.Po ./$(DEPDIR)/phrase_index.Po \ + ./$(DEPDIR)/phrase_large_table2.Po \ + ./$(DEPDIR)/phrase_large_table3.Po \ + ./$(DEPDIR)/phrase_large_table3_bdb.Po \ + ./$(DEPDIR)/phrase_large_table3_kyotodb.Po \ + ./$(DEPDIR)/pinyin_parser2.Po ./$(DEPDIR)/table_info.Po \ + ./$(DEPDIR)/tag_utility.Po ./$(DEPDIR)/zhuyin_parser2.Po am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ @@ -201,8 +196,8 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(libstorage_la_SOURCES) -DIST_SOURCES = $(am__libstorage_la_SOURCES_DIST) +SOURCES = $(libstorage_a_SOURCES) +DIST_SOURCES = $(am__libstorage_a_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -277,6 +272,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -391,7 +387,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I$(top_srcdir)/src/include \ +AM_CPPFLAGS = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CFLAGS@ @@ -434,10 +430,8 @@ bdb_utils.h \ kyotodb_utils.h -noinst_LTLIBRARIES = libstorage.la -libstorage_la_CXXFLAGS = "-fPIC" -libstorage_la_LDFLAGS = -static -libstorage_la_SOURCES = phrase_index.cpp phrase_large_table2.cpp \ +noinst_LIBRARIES = libstorage.a +libstorage_a_SOURCES = phrase_index.cpp phrase_large_table2.cpp \ phrase_large_table3.cpp ngram.cpp tag_utility.cpp \ chewing_key.cpp pinyin_parser2.cpp zhuyin_parser2.cpp \ phonetic_key_matrix.cpp chewing_large_table.cpp \ @@ -477,19 +471,13 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libstorage.la: $(libstorage_la_OBJECTS) $(libstorage_la_DEPENDENCIES) $(EXTRA_libstorage_la_DEPENDENCIES) - $(AM_V_CXXLD)$(libstorage_la_LINK) $(libstorage_la_OBJECTS) $(libstorage_la_LIBADD) $(LIBS) +libstorage.a: $(libstorage_a_OBJECTS) $(libstorage_a_DEPENDENCIES) $(EXTRA_libstorage_a_DEPENDENCIES) + $(AM_V_at)-rm -f libstorage.a + $(AM_V_AR)$(libstorage_a_AR) libstorage.a $(libstorage_a_OBJECTS) $(libstorage_a_LIBADD) + $(AM_V_at)$(RANLIB) libstorage.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -497,24 +485,24 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-chewing_key.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-chewing_large_table.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-chewing_large_table2.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-chewing_large_table2_bdb.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-chewing_large_table2_kyotodb.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-ngram.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-ngram_bdb.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-ngram_kyotodb.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-phonetic_key_matrix.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-phrase_index.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-phrase_large_table2.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-phrase_large_table3.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-phrase_large_table3_bdb.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-phrase_large_table3_kyotodb.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-pinyin_parser2.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-table_info.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-tag_utility.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstorage_la-zhuyin_parser2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chewing_key.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chewing_large_table.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chewing_large_table2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chewing_large_table2_bdb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chewing_large_table2_kyotodb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngram.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngram_bdb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngram_kyotodb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phonetic_key_matrix.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phrase_index.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phrase_large_table2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phrase_large_table3.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phrase_large_table3_bdb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phrase_large_table3_kyotodb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pinyin_parser2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table_info.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tag_utility.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zhuyin_parser2.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -543,132 +531,6 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -libstorage_la-phrase_index.lo: phrase_index.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-phrase_index.lo -MD -MP -MF $(DEPDIR)/libstorage_la-phrase_index.Tpo -c -o libstorage_la-phrase_index.lo `test -f 'phrase_index.cpp' || echo '$(srcdir)/'`phrase_index.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-phrase_index.Tpo $(DEPDIR)/libstorage_la-phrase_index.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='phrase_index.cpp' object='libstorage_la-phrase_index.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-phrase_index.lo `test -f 'phrase_index.cpp' || echo '$(srcdir)/'`phrase_index.cpp - -libstorage_la-phrase_large_table2.lo: phrase_large_table2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-phrase_large_table2.lo -MD -MP -MF $(DEPDIR)/libstorage_la-phrase_large_table2.Tpo -c -o libstorage_la-phrase_large_table2.lo `test -f 'phrase_large_table2.cpp' || echo '$(srcdir)/'`phrase_large_table2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-phrase_large_table2.Tpo $(DEPDIR)/libstorage_la-phrase_large_table2.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='phrase_large_table2.cpp' object='libstorage_la-phrase_large_table2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-phrase_large_table2.lo `test -f 'phrase_large_table2.cpp' || echo '$(srcdir)/'`phrase_large_table2.cpp - -libstorage_la-phrase_large_table3.lo: phrase_large_table3.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-phrase_large_table3.lo -MD -MP -MF $(DEPDIR)/libstorage_la-phrase_large_table3.Tpo -c -o libstorage_la-phrase_large_table3.lo `test -f 'phrase_large_table3.cpp' || echo '$(srcdir)/'`phrase_large_table3.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-phrase_large_table3.Tpo $(DEPDIR)/libstorage_la-phrase_large_table3.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='phrase_large_table3.cpp' object='libstorage_la-phrase_large_table3.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-phrase_large_table3.lo `test -f 'phrase_large_table3.cpp' || echo '$(srcdir)/'`phrase_large_table3.cpp - -libstorage_la-ngram.lo: ngram.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-ngram.lo -MD -MP -MF $(DEPDIR)/libstorage_la-ngram.Tpo -c -o libstorage_la-ngram.lo `test -f 'ngram.cpp' || echo '$(srcdir)/'`ngram.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-ngram.Tpo $(DEPDIR)/libstorage_la-ngram.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ngram.cpp' object='libstorage_la-ngram.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-ngram.lo `test -f 'ngram.cpp' || echo '$(srcdir)/'`ngram.cpp - -libstorage_la-tag_utility.lo: tag_utility.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-tag_utility.lo -MD -MP -MF $(DEPDIR)/libstorage_la-tag_utility.Tpo -c -o libstorage_la-tag_utility.lo `test -f 'tag_utility.cpp' || echo '$(srcdir)/'`tag_utility.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-tag_utility.Tpo $(DEPDIR)/libstorage_la-tag_utility.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tag_utility.cpp' object='libstorage_la-tag_utility.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-tag_utility.lo `test -f 'tag_utility.cpp' || echo '$(srcdir)/'`tag_utility.cpp - -libstorage_la-chewing_key.lo: chewing_key.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-chewing_key.lo -MD -MP -MF $(DEPDIR)/libstorage_la-chewing_key.Tpo -c -o libstorage_la-chewing_key.lo `test -f 'chewing_key.cpp' || echo '$(srcdir)/'`chewing_key.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-chewing_key.Tpo $(DEPDIR)/libstorage_la-chewing_key.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='chewing_key.cpp' object='libstorage_la-chewing_key.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-chewing_key.lo `test -f 'chewing_key.cpp' || echo '$(srcdir)/'`chewing_key.cpp - -libstorage_la-pinyin_parser2.lo: pinyin_parser2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-pinyin_parser2.lo -MD -MP -MF $(DEPDIR)/libstorage_la-pinyin_parser2.Tpo -c -o libstorage_la-pinyin_parser2.lo `test -f 'pinyin_parser2.cpp' || echo '$(srcdir)/'`pinyin_parser2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-pinyin_parser2.Tpo $(DEPDIR)/libstorage_la-pinyin_parser2.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pinyin_parser2.cpp' object='libstorage_la-pinyin_parser2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-pinyin_parser2.lo `test -f 'pinyin_parser2.cpp' || echo '$(srcdir)/'`pinyin_parser2.cpp - -libstorage_la-zhuyin_parser2.lo: zhuyin_parser2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-zhuyin_parser2.lo -MD -MP -MF $(DEPDIR)/libstorage_la-zhuyin_parser2.Tpo -c -o libstorage_la-zhuyin_parser2.lo `test -f 'zhuyin_parser2.cpp' || echo '$(srcdir)/'`zhuyin_parser2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-zhuyin_parser2.Tpo $(DEPDIR)/libstorage_la-zhuyin_parser2.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='zhuyin_parser2.cpp' object='libstorage_la-zhuyin_parser2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-zhuyin_parser2.lo `test -f 'zhuyin_parser2.cpp' || echo '$(srcdir)/'`zhuyin_parser2.cpp - -libstorage_la-phonetic_key_matrix.lo: phonetic_key_matrix.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-phonetic_key_matrix.lo -MD -MP -MF $(DEPDIR)/libstorage_la-phonetic_key_matrix.Tpo -c -o libstorage_la-phonetic_key_matrix.lo `test -f 'phonetic_key_matrix.cpp' || echo '$(srcdir)/'`phonetic_key_matrix.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-phonetic_key_matrix.Tpo $(DEPDIR)/libstorage_la-phonetic_key_matrix.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='phonetic_key_matrix.cpp' object='libstorage_la-phonetic_key_matrix.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-phonetic_key_matrix.lo `test -f 'phonetic_key_matrix.cpp' || echo '$(srcdir)/'`phonetic_key_matrix.cpp - -libstorage_la-chewing_large_table.lo: chewing_large_table.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-chewing_large_table.lo -MD -MP -MF $(DEPDIR)/libstorage_la-chewing_large_table.Tpo -c -o libstorage_la-chewing_large_table.lo `test -f 'chewing_large_table.cpp' || echo '$(srcdir)/'`chewing_large_table.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-chewing_large_table.Tpo $(DEPDIR)/libstorage_la-chewing_large_table.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='chewing_large_table.cpp' object='libstorage_la-chewing_large_table.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-chewing_large_table.lo `test -f 'chewing_large_table.cpp' || echo '$(srcdir)/'`chewing_large_table.cpp - -libstorage_la-chewing_large_table2.lo: chewing_large_table2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-chewing_large_table2.lo -MD -MP -MF $(DEPDIR)/libstorage_la-chewing_large_table2.Tpo -c -o libstorage_la-chewing_large_table2.lo `test -f 'chewing_large_table2.cpp' || echo '$(srcdir)/'`chewing_large_table2.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-chewing_large_table2.Tpo $(DEPDIR)/libstorage_la-chewing_large_table2.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='chewing_large_table2.cpp' object='libstorage_la-chewing_large_table2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-chewing_large_table2.lo `test -f 'chewing_large_table2.cpp' || echo '$(srcdir)/'`chewing_large_table2.cpp - -libstorage_la-table_info.lo: table_info.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-table_info.lo -MD -MP -MF $(DEPDIR)/libstorage_la-table_info.Tpo -c -o libstorage_la-table_info.lo `test -f 'table_info.cpp' || echo '$(srcdir)/'`table_info.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-table_info.Tpo $(DEPDIR)/libstorage_la-table_info.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='table_info.cpp' object='libstorage_la-table_info.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-table_info.lo `test -f 'table_info.cpp' || echo '$(srcdir)/'`table_info.cpp - -libstorage_la-ngram_bdb.lo: ngram_bdb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-ngram_bdb.lo -MD -MP -MF $(DEPDIR)/libstorage_la-ngram_bdb.Tpo -c -o libstorage_la-ngram_bdb.lo `test -f 'ngram_bdb.cpp' || echo '$(srcdir)/'`ngram_bdb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-ngram_bdb.Tpo $(DEPDIR)/libstorage_la-ngram_bdb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ngram_bdb.cpp' object='libstorage_la-ngram_bdb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-ngram_bdb.lo `test -f 'ngram_bdb.cpp' || echo '$(srcdir)/'`ngram_bdb.cpp - -libstorage_la-phrase_large_table3_bdb.lo: phrase_large_table3_bdb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-phrase_large_table3_bdb.lo -MD -MP -MF $(DEPDIR)/libstorage_la-phrase_large_table3_bdb.Tpo -c -o libstorage_la-phrase_large_table3_bdb.lo `test -f 'phrase_large_table3_bdb.cpp' || echo '$(srcdir)/'`phrase_large_table3_bdb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-phrase_large_table3_bdb.Tpo $(DEPDIR)/libstorage_la-phrase_large_table3_bdb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='phrase_large_table3_bdb.cpp' object='libstorage_la-phrase_large_table3_bdb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-phrase_large_table3_bdb.lo `test -f 'phrase_large_table3_bdb.cpp' || echo '$(srcdir)/'`phrase_large_table3_bdb.cpp - -libstorage_la-chewing_large_table2_bdb.lo: chewing_large_table2_bdb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-chewing_large_table2_bdb.lo -MD -MP -MF $(DEPDIR)/libstorage_la-chewing_large_table2_bdb.Tpo -c -o libstorage_la-chewing_large_table2_bdb.lo `test -f 'chewing_large_table2_bdb.cpp' || echo '$(srcdir)/'`chewing_large_table2_bdb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-chewing_large_table2_bdb.Tpo $(DEPDIR)/libstorage_la-chewing_large_table2_bdb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='chewing_large_table2_bdb.cpp' object='libstorage_la-chewing_large_table2_bdb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-chewing_large_table2_bdb.lo `test -f 'chewing_large_table2_bdb.cpp' || echo '$(srcdir)/'`chewing_large_table2_bdb.cpp - -libstorage_la-ngram_kyotodb.lo: ngram_kyotodb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-ngram_kyotodb.lo -MD -MP -MF $(DEPDIR)/libstorage_la-ngram_kyotodb.Tpo -c -o libstorage_la-ngram_kyotodb.lo `test -f 'ngram_kyotodb.cpp' || echo '$(srcdir)/'`ngram_kyotodb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-ngram_kyotodb.Tpo $(DEPDIR)/libstorage_la-ngram_kyotodb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ngram_kyotodb.cpp' object='libstorage_la-ngram_kyotodb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-ngram_kyotodb.lo `test -f 'ngram_kyotodb.cpp' || echo '$(srcdir)/'`ngram_kyotodb.cpp - -libstorage_la-phrase_large_table3_kyotodb.lo: phrase_large_table3_kyotodb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-phrase_large_table3_kyotodb.lo -MD -MP -MF $(DEPDIR)/libstorage_la-phrase_large_table3_kyotodb.Tpo -c -o libstorage_la-phrase_large_table3_kyotodb.lo `test -f 'phrase_large_table3_kyotodb.cpp' || echo '$(srcdir)/'`phrase_large_table3_kyotodb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-phrase_large_table3_kyotodb.Tpo $(DEPDIR)/libstorage_la-phrase_large_table3_kyotodb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='phrase_large_table3_kyotodb.cpp' object='libstorage_la-phrase_large_table3_kyotodb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-phrase_large_table3_kyotodb.lo `test -f 'phrase_large_table3_kyotodb.cpp' || echo '$(srcdir)/'`phrase_large_table3_kyotodb.cpp - -libstorage_la-chewing_large_table2_kyotodb.lo: chewing_large_table2_kyotodb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -MT libstorage_la-chewing_large_table2_kyotodb.lo -MD -MP -MF $(DEPDIR)/libstorage_la-chewing_large_table2_kyotodb.Tpo -c -o libstorage_la-chewing_large_table2_kyotodb.lo `test -f 'chewing_large_table2_kyotodb.cpp' || echo '$(srcdir)/'`chewing_large_table2_kyotodb.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libstorage_la-chewing_large_table2_kyotodb.Tpo $(DEPDIR)/libstorage_la-chewing_large_table2_kyotodb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='chewing_large_table2_kyotodb.cpp' object='libstorage_la-chewing_large_table2_kyotodb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstorage_la_CXXFLAGS) $(CXXFLAGS) -c -o libstorage_la-chewing_large_table2_kyotodb.lo `test -f 'chewing_large_table2_kyotodb.cpp' || echo '$(srcdir)/'`chewing_large_table2_kyotodb.cpp - mostlyclean-libtool: -rm -f *.lo @@ -783,7 +645,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-am: Makefile $(LIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(libpinyinincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -820,28 +682,28 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libstorage_la-chewing_key.Plo - -rm -f ./$(DEPDIR)/libstorage_la-chewing_large_table.Plo - -rm -f ./$(DEPDIR)/libstorage_la-chewing_large_table2.Plo - -rm -f ./$(DEPDIR)/libstorage_la-chewing_large_table2_bdb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-chewing_large_table2_kyotodb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-ngram.Plo - -rm -f ./$(DEPDIR)/libstorage_la-ngram_bdb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-ngram_kyotodb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phonetic_key_matrix.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_index.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_large_table2.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_large_table3.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_large_table3_bdb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_large_table3_kyotodb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-pinyin_parser2.Plo - -rm -f ./$(DEPDIR)/libstorage_la-table_info.Plo - -rm -f ./$(DEPDIR)/libstorage_la-tag_utility.Plo - -rm -f ./$(DEPDIR)/libstorage_la-zhuyin_parser2.Plo + -rm -f ./$(DEPDIR)/chewing_key.Po + -rm -f ./$(DEPDIR)/chewing_large_table.Po + -rm -f ./$(DEPDIR)/chewing_large_table2.Po + -rm -f ./$(DEPDIR)/chewing_large_table2_bdb.Po + -rm -f ./$(DEPDIR)/chewing_large_table2_kyotodb.Po + -rm -f ./$(DEPDIR)/ngram.Po + -rm -f ./$(DEPDIR)/ngram_bdb.Po + -rm -f ./$(DEPDIR)/ngram_kyotodb.Po + -rm -f ./$(DEPDIR)/phonetic_key_matrix.Po + -rm -f ./$(DEPDIR)/phrase_index.Po + -rm -f ./$(DEPDIR)/phrase_large_table2.Po + -rm -f ./$(DEPDIR)/phrase_large_table3.Po + -rm -f ./$(DEPDIR)/phrase_large_table3_bdb.Po + -rm -f ./$(DEPDIR)/phrase_large_table3_kyotodb.Po + -rm -f ./$(DEPDIR)/pinyin_parser2.Po + -rm -f ./$(DEPDIR)/table_info.Po + -rm -f ./$(DEPDIR)/tag_utility.Po + -rm -f ./$(DEPDIR)/zhuyin_parser2.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -887,24 +749,24 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libstorage_la-chewing_key.Plo - -rm -f ./$(DEPDIR)/libstorage_la-chewing_large_table.Plo - -rm -f ./$(DEPDIR)/libstorage_la-chewing_large_table2.Plo - -rm -f ./$(DEPDIR)/libstorage_la-chewing_large_table2_bdb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-chewing_large_table2_kyotodb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-ngram.Plo - -rm -f ./$(DEPDIR)/libstorage_la-ngram_bdb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-ngram_kyotodb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phonetic_key_matrix.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_index.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_large_table2.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_large_table3.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_large_table3_bdb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-phrase_large_table3_kyotodb.Plo - -rm -f ./$(DEPDIR)/libstorage_la-pinyin_parser2.Plo - -rm -f ./$(DEPDIR)/libstorage_la-table_info.Plo - -rm -f ./$(DEPDIR)/libstorage_la-tag_utility.Plo - -rm -f ./$(DEPDIR)/libstorage_la-zhuyin_parser2.Plo + -rm -f ./$(DEPDIR)/chewing_key.Po + -rm -f ./$(DEPDIR)/chewing_large_table.Po + -rm -f ./$(DEPDIR)/chewing_large_table2.Po + -rm -f ./$(DEPDIR)/chewing_large_table2_bdb.Po + -rm -f ./$(DEPDIR)/chewing_large_table2_kyotodb.Po + -rm -f ./$(DEPDIR)/ngram.Po + -rm -f ./$(DEPDIR)/ngram_bdb.Po + -rm -f ./$(DEPDIR)/ngram_kyotodb.Po + -rm -f ./$(DEPDIR)/phonetic_key_matrix.Po + -rm -f ./$(DEPDIR)/phrase_index.Po + -rm -f ./$(DEPDIR)/phrase_large_table2.Po + -rm -f ./$(DEPDIR)/phrase_large_table3.Po + -rm -f ./$(DEPDIR)/phrase_large_table3_bdb.Po + -rm -f ./$(DEPDIR)/phrase_large_table3_kyotodb.Po + -rm -f ./$(DEPDIR)/pinyin_parser2.Po + -rm -f ./$(DEPDIR)/table_info.Po + -rm -f ./$(DEPDIR)/tag_utility.Po + -rm -f ./$(DEPDIR)/zhuyin_parser2.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -926,7 +788,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-generic clean-libtool clean-noinstLIBRARIES \ cscopelist-am ctags ctags-am distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ diff -Nru libpinyin-2.3.0/src/storage/ngram_bdb.cpp libpinyin-2.6.0/src/storage/ngram_bdb.cpp --- libpinyin-2.3.0/src/storage/ngram_bdb.cpp 2019-01-17 07:20:32.000000000 +0000 +++ libpinyin-2.6.0/src/storage/ngram_bdb.cpp 2020-10-14 02:43:34.000000000 +0000 @@ -199,6 +199,10 @@ assert(key.size == sizeof(phrase_token_t)); phrase_token_t * token = (phrase_token_t *)key.data; g_array_append_val(items, *token); + + /* Initialize our DBTs. */ + memset(&key, 0, sizeof(DBT)); + memset(&data, 0, sizeof(DBT)); } assert (ret == DB_NOTFOUND); diff -Nru libpinyin-2.3.0/src/storage/ngram.cpp libpinyin-2.6.0/src/storage/ngram.cpp --- libpinyin-2.3.0/src/storage/ngram.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/ngram.cpp 2020-08-21 07:18:25.000000000 +0000 @@ -283,15 +283,17 @@ MemoryChunk & merged_chunk = merged->m_chunk; + merged_chunk.set_size(0); + if (NULL == system) { - merged_chunk.set_chunk(user->m_chunk.begin(), - user->m_chunk.size(), NULL); + merged_chunk.set_content(0, user->m_chunk.begin(), + user->m_chunk.size()); return true; } if (NULL == user) { - merged_chunk.set_chunk(system->m_chunk.begin(), - system->m_chunk.size(), NULL); + merged_chunk.set_content(0, system->m_chunk.begin(), + system->m_chunk.size()); return true; } diff -Nru libpinyin-2.3.0/src/storage/ngram_kyotodb.cpp libpinyin-2.6.0/src/storage/ngram_kyotodb.cpp --- libpinyin-2.3.0/src/storage/ngram_kyotodb.cpp 2019-01-17 07:20:32.000000000 +0000 +++ libpinyin-2.6.0/src/storage/ngram_kyotodb.cpp 2020-09-27 10:55:32.000000000 +0000 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "kyotodb_utils.h" @@ -50,16 +50,20 @@ } -/* Use ProtoHashDB for load_db/save_db methods. */ +/* Use StashDB for load_db/save_db methods. */ bool Bigram::load_db(const char * dbfile){ reset(); /* create in-memory db. */ - m_db = new ProtoHashDB; + m_db = new StashDB; if ( !m_db->open("-", BasicDB::OREADER|BasicDB::OWRITER|BasicDB::OCREATE) ) return false; + if (!m_db->load_snapshot(dbfile, NULL)) + return false; + +#if 0 /* load db into memory. */ BasicDB * tmp_db = new HashDB; if (!tmp_db->open(dbfile, BasicDB::OREADER)) @@ -70,6 +74,7 @@ tmp_db->close(); delete tmp_db; +#endif return true; } @@ -80,6 +85,10 @@ if ( ret != 0 && errno != ENOENT) return false; + if (!m_db->dump_snapshot(dbfile, NULL)) + return false; + +#if 0 BasicDB * tmp_db = new HashDB; if ( !tmp_db->open(dbfile, BasicDB::OWRITER|BasicDB::OCREATE) ) @@ -91,6 +100,7 @@ tmp_db->synchronize(); tmp_db->close(); delete tmp_db; +#endif return true; } diff -Nru libpinyin-2.3.0/src/storage/phrase_index.cpp libpinyin-2.6.0/src/storage/phrase_index.cpp --- libpinyin-2.3.0/src/storage/phrase_index.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/phrase_index.cpp 2020-11-26 03:02:14.000000000 +0000 @@ -527,8 +527,13 @@ phrase_token_t cur_token = 0; while (!feof(infile)){ +#ifdef __APPLE__ + int num = fscanf(infile, "%255s %255[^ \t] %u %ld", + pinyin, phrase, &token, &freq); +#else int num = fscanf(infile, "%255s %255s %u %ld", pinyin, phrase, &token, &freq); +#endif if (4 != num) continue; diff -Nru libpinyin-2.3.0/src/storage/phrase_large_table2.cpp libpinyin-2.6.0/src/storage/phrase_large_table2.cpp --- libpinyin-2.3.0/src/storage/phrase_large_table2.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/phrase_large_table2.cpp 2020-11-26 03:02:14.000000000 +0000 @@ -472,8 +472,13 @@ size_t freq; while (!feof(infile)) { +#ifdef __APPLE__ + int num = fscanf(infile, "%255s %255[^ \t] %u %ld", + pinyin, phrase, &token, &freq); +#else int num = fscanf(infile, "%255s %255s %u %ld", pinyin, phrase, &token, &freq); +#endif if (4 != num) continue; diff -Nru libpinyin-2.3.0/src/storage/phrase_large_table3_bdb.cpp libpinyin-2.6.0/src/storage/phrase_large_table3_bdb.cpp --- libpinyin-2.3.0/src/storage/phrase_large_table3_bdb.cpp 2019-01-17 07:20:32.000000000 +0000 +++ libpinyin-2.6.0/src/storage/phrase_large_table3_bdb.cpp 2020-10-14 02:44:26.000000000 +0000 @@ -302,6 +302,10 @@ db_data.size = entry.m_chunk.size(); int ret = cursorp->put(cursorp, &db_key, &db_data, DB_CURRENT); assert(ret == 0); + + /* Initialize our DBTs. */ + memset(&db_key, 0, sizeof(DBT)); + memset(&db_data, 0, sizeof(DBT)); } assert(ret == DB_NOTFOUND); diff -Nru libpinyin-2.3.0/src/storage/phrase_large_table3.cpp libpinyin-2.6.0/src/storage/phrase_large_table3.cpp --- libpinyin-2.3.0/src/storage/phrase_large_table3.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/phrase_large_table3.cpp 2020-11-26 03:02:14.000000000 +0000 @@ -128,8 +128,13 @@ size_t freq; while (!feof(infile)) { +#ifdef __APPLE__ + int num = fscanf(infile, "%255s %255[^ \t] %u %ld", + pinyin, phrase, &token, &freq); +#else int num = fscanf(infile, "%255s %255s %u %ld", pinyin, phrase, &token, &freq); +#endif if (4 != num) continue; diff -Nru libpinyin-2.3.0/src/storage/phrase_large_table3_kyotodb.cpp libpinyin-2.6.0/src/storage/phrase_large_table3_kyotodb.cpp --- libpinyin-2.3.0/src/storage/phrase_large_table3_kyotodb.cpp 2019-01-17 07:20:32.000000000 +0000 +++ libpinyin-2.6.0/src/storage/phrase_large_table3_kyotodb.cpp 2020-09-27 10:55:32.000000000 +0000 @@ -20,7 +20,7 @@ #include "phrase_large_table3.h" #include -#include +#include #include "kyotodb_utils.h" @@ -30,7 +30,7 @@ PhraseLargeTable3::PhraseLargeTable3() { /* create in-memory db. */ - m_db = new ProtoTreeDB; + m_db = new GrassDB; assert(m_db->open("-", BasicDB::OREADER|BasicDB::OWRITER|BasicDB::OCREATE)); m_entry = new PhraseTableEntry; @@ -75,11 +75,15 @@ m_entry = new PhraseTableEntry; /* create in-memory db. */ - m_db = new ProtoTreeDB; + m_db = new GrassDB; if (!m_db->open("-", BasicDB::OREADER|BasicDB::OWRITER|BasicDB::OCREATE)) return false; + if (!m_db->load_snapshot(filename, NULL)) + return false; + +#if 0 /* load db into memory. */ BasicDB * tmp_db = new TreeDB; if (!tmp_db->open(filename, BasicDB::OREADER)) @@ -90,6 +94,7 @@ tmp_db->close(); delete tmp_db; +#endif return true; } @@ -99,6 +104,10 @@ if ( ret != 0 && errno != ENOENT) return false; + if (!m_db->dump_snapshot(new_filename, NULL)) + return false; + +#if 0 BasicDB * tmp_db = new TreeDB; if (!tmp_db->open(new_filename, BasicDB::OWRITER|BasicDB::OCREATE)) return false; @@ -109,6 +118,7 @@ tmp_db->synchronize(); tmp_db->close(); delete tmp_db; +#endif return true; } diff -Nru libpinyin-2.3.0/src/storage/pinyin_custom2.h libpinyin-2.6.0/src/storage/pinyin_custom2.h --- libpinyin-2.3.0/src/storage/pinyin_custom2.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/pinyin_custom2.h 2020-07-24 02:26:21.000000000 +0000 @@ -28,7 +28,7 @@ /** * PinyinTableFlag: */ -enum PinyinTableFlag{ +typedef enum{ IS_PINYIN = 1U << 1, IS_ZHUYIN = 1U << 2, PINYIN_INCOMPLETE = 1U << 3, @@ -38,7 +38,7 @@ USE_DIVIDED_TABLE = 1U << 7, USE_RESPLIT_TABLE = 1U << 8, DYNAMIC_ADJUST = 1U << 9 -}; +} PinyinTableFlag; /** * PinyinAmbiguity2: @@ -46,7 +46,7 @@ * The enums of pinyin ambiguities. * */ -enum PinyinAmbiguity2{ +typedef enum{ PINYIN_AMB_C_CH = 1U << 10, PINYIN_AMB_S_SH = 1U << 11, PINYIN_AMB_Z_ZH = 1U << 12, @@ -58,7 +58,7 @@ PINYIN_AMB_EN_ENG = 1U << 18, PINYIN_AMB_IN_ING = 1U << 19, PINYIN_AMB_ALL = 0x3FFU << 10 -}; +} PinyinAmbiguity2; /** * PinyinCorrection2: @@ -67,7 +67,7 @@ * */ -enum PinyinCorrection2{ +typedef enum{ PINYIN_CORRECT_GN_NG = 1U << 21, PINYIN_CORRECT_MG_NG = 1U << 22, PINYIN_CORRECT_IOU_IU = 1U << 23, @@ -77,37 +77,35 @@ PINYIN_CORRECT_V_U = 1U << 27, PINYIN_CORRECT_ON_ONG = 1U << 28, PINYIN_CORRECT_ALL = 0xFFU << 21 -}; +} PinyinCorrection2; /** - * PinyinCorrection2: + * ZhuyinCorrection2: * - * The enums of pinyin corrections. + * The enums of zhuyin corrections. * */ -enum ZhuyinCorrection2{ +typedef enum{ ZHUYIN_CORRECT_HSU = 1U << 29, ZHUYIN_CORRECT_ETEN26 = 1U << 30, ZHUYIN_CORRECT_SHUFFLE = 1U << 31, ZHUYIN_CORRECT_ALL = 0x7U << 29 -}; +} ZhuyinCorrection2; /** * @brief enums of Full Pinyin Schemes. */ -enum FullPinyinScheme -{ +typedef enum{ FULL_PINYIN_HANYU = 1, FULL_PINYIN_LUOMA = 2, FULL_PINYIN_SECONDARY_ZHUYIN = 3, FULL_PINYIN_DEFAULT = FULL_PINYIN_HANYU -}; +} FullPinyinScheme; /** * @brief enums of Double Pinyin Schemes. */ -enum DoublePinyinScheme -{ +typedef enum{ DOUBLE_PINYIN_ZRM = 1, DOUBLE_PINYIN_MS = 2, DOUBLE_PINYIN_ZIGUANG = 3, @@ -116,13 +114,12 @@ DOUBLE_PINYIN_XHE = 6, DOUBLE_PINYIN_CUSTOMIZED = 30, /* for user's keyboard */ DOUBLE_PINYIN_DEFAULT = DOUBLE_PINYIN_MS -}; +} DoublePinyinScheme; /** * @brief enums of Zhuyin Schemes. */ -enum ZhuyinScheme -{ +typedef enum{ ZHUYIN_STANDARD = 1, ZHUYIN_HSU = 2, ZHUYIN_IBM = 3, @@ -133,7 +130,7 @@ ZHUYIN_HSU_DVORAK = 8, ZHUYIN_DACHEN_CP26 = 9, ZHUYIN_DEFAULT = ZHUYIN_STANDARD -}; +} ZhuyinScheme; G_END_DECLS diff -Nru libpinyin-2.3.0/src/storage/pinyin_parser2.cpp libpinyin-2.6.0/src/storage/pinyin_parser2.cpp --- libpinyin-2.3.0/src/storage/pinyin_parser2.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/pinyin_parser2.cpp 2020-08-14 12:48:45.000000000 +0000 @@ -66,6 +66,7 @@ ChewingKeyRest m_key_rest; gint16 m_num_keys; gint16 m_parsed_len; + gint16 m_distance; gint16 m_last_step; /* constructor */ @@ -73,6 +74,7 @@ parse_value_t(){ m_num_keys = 0; m_parsed_len = 0; + m_distance = 0; m_last_step = -1; } }; @@ -121,7 +123,8 @@ const pinyin_index_item_t * index, size_t len, const char * pinyin, - ChewingKey & key){ + ChewingKey & key, + gint16 & distance){ pinyin_index_item_t item; memset(&item, 0, sizeof(item)); item.m_pinyin_input = pinyin; @@ -141,6 +144,7 @@ return false; key = content_table[index->m_table_index].m_chewing_key; + distance = index->m_distance; assert(key.get_table_index() == index->m_table_index); return true; } @@ -159,6 +163,7 @@ bool FullPinyinParser2::parse_one_key (pinyin_option_t options, ChewingKey & key, + gint16 & distance, const char * pinyin, int len) const { /* "'" are not accepted in parse_one_key. */ gchar * input = g_strndup(pinyin, len); @@ -189,7 +194,7 @@ /* Note: optimize here? */ input[parsed_len] = '\0'; if (!search_pinyin_index2(options, m_pinyin_index, m_pinyin_index_len, - input, key)) { + input, key, distance)) { g_free(input); return false; } @@ -239,6 +244,7 @@ nextstep->m_key_rest = ChewingKeyRest(); nextstep->m_num_keys = curstep->m_num_keys; nextstep->m_parsed_len = curstep->m_parsed_len + 1; + nextstep->m_distance = curstep->m_distance; nextstep->m_last_step = i; next_sep = 0; continue; @@ -265,13 +271,14 @@ nextstep = &g_array_index(m_parse_steps, parse_value_t, n); /* gen next step */ + gint16 distance = 0; const char * onepinyin = input + m; gint16 onepinyinlen = n - m; value = parse_value_t(); ChewingKey key; ChewingKeyRest rest; bool parsed = parse_one_key - (options, key, onepinyin, onepinyinlen); + (options, key, distance, onepinyin, onepinyinlen); rest.m_raw_begin = m; rest.m_raw_end = n; if (!parsed) continue; @@ -281,6 +288,7 @@ value.m_key = key; value.m_key_rest = rest; value.m_num_keys = curstep->m_num_keys + 1; value.m_parsed_len = curstep->m_parsed_len + onepinyinlen; + value.m_distance = curstep->m_distance + distance; value.m_last_step = m; /* save next step */ @@ -297,21 +305,26 @@ /* handle with the same pinyin length and the number of keys */ if (value.m_parsed_len == nextstep->m_parsed_len && - value.m_num_keys == nextstep->m_num_keys) { + value.m_num_keys == nextstep->m_num_keys && + value.m_distance < nextstep->m_distance) + *nextstep = value; -#if 0 - /* prefer the 'a' at the end of clause, - * ex: "zheyanga$" -> "zhe'yang'a$". - */ - if (value.m_parsed_len == len && - (nextstep->m_key.m_initial != CHEWING_ZERO_INITIAL && - nextstep->m_key.m_final == CHEWING_A) && - (value.m_key.m_initial == CHEWING_ZERO_INITIAL && - value.m_key.m_middle == CHEWING_ZERO_MIDDLE && - value.m_key.m_final == CHEWING_A)) - *nextstep = value; +#if 1 + /* prefer the 'a' at the end of clause, + * ex: "zheyanga$" -> "zhe'yang'a$". + */ + if (value.m_parsed_len == len && + (value.m_parsed_len == nextstep->m_parsed_len && + value.m_num_keys == nextstep->m_num_keys && + value.m_distance == nextstep->m_distance) && + (nextstep->m_key.m_initial != CHEWING_ZERO_INITIAL && + nextstep->m_key.m_middle == CHEWING_ZERO_MIDDLE && + nextstep->m_key.m_final == CHEWING_A) && + (value.m_key.m_initial == CHEWING_ZERO_INITIAL && + value.m_key.m_middle == CHEWING_ZERO_MIDDLE && + value.m_key.m_final == CHEWING_A)) + *nextstep = value; #endif - } } } } @@ -391,6 +404,7 @@ bool DoublePinyinParser2::parse_one_key(pinyin_option_t options, ChewingKey & key, + gint16 & distance, const char *str, int len) const { options &= ~(PINYIN_CORRECT_ALL|PINYIN_AMB_ALL); @@ -537,9 +551,10 @@ i = std_lite::min(maximum_len - parsed_len, (int)max_double_pinyin_length); + gint16 distance = 0; ChewingKey key; ChewingKeyRest key_rest; for (; i > 0; --i) { - bool success = parse_one_key(options, key, cur_str, i); + bool success = parse_one_key(options, key, distance, cur_str, i); if (success) break; } @@ -607,6 +622,7 @@ bool PinyinDirectParser2::parse_one_key(pinyin_option_t options, ChewingKey & key, + gint16 & distance, const char *str, int len) const { /* "'" are not accepted in parse_one_key. */ gchar * input = g_strndup(str, len); @@ -637,7 +653,7 @@ /* Note: optimize here? */ input[parsed_len] = '\0'; if (!search_pinyin_index2(options, m_pinyin_index, m_pinyin_index_len, - input, key)) { + input, key, distance)) { g_free(input); return false; } @@ -663,8 +679,6 @@ g_array_set_size(keys, 0); g_array_set_size(key_rests, 0); - ChewingKey key; ChewingKeyRest key_rest; - int parsed_len = 0; int i = 0, cur = 0, next = 0; while (cur < len) { @@ -675,7 +689,9 @@ } next = i; - if (parse_one_key(options, key, str + cur, next - cur)) { + gint16 distance = 0; + ChewingKey key; ChewingKeyRest key_rest; + if (parse_one_key(options, key, distance, str + cur, next - cur)) { key_rest.m_raw_begin = cur; key_rest.m_raw_end = next; /* save the pinyin. */ diff -Nru libpinyin-2.3.0/src/storage/pinyin_parser2.h libpinyin-2.6.0/src/storage/pinyin_parser2.h --- libpinyin-2.3.0/src/storage/pinyin_parser2.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/pinyin_parser2.h 2020-07-27 02:14:48.000000000 +0000 @@ -42,6 +42,7 @@ const char * m_pinyin_input; guint32 m_flags; guint16 m_table_index; + guint16 m_distance; } pinyin_index_item_t; typedef struct { @@ -114,7 +115,7 @@ * Parse only one struct ChewingKey from a string. * */ - virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, const char *str, int len) const = 0; + virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, gint16 & distance, const char *str, int len) const = 0; /** * PhoneticParser2::parse: @@ -156,7 +157,7 @@ g_array_free(m_parse_steps, TRUE); } - virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, const char *str, int len) const; + virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, gint16 & distance, const char *str, int len) const; /* Note: * the parse method will use dynamic programming to drive parse_one_key. @@ -195,7 +196,7 @@ virtual ~DoublePinyinParser2() {} - virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, const char *str, int len) const; + virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, gint16 & distance, const char *str, int len) const; virtual int parse(pinyin_option_t options, ChewingKeyVector & keys, ChewingKeyRestVector & key_rests, const char *str, int len) const; @@ -215,7 +216,7 @@ virtual ~PinyinDirectParser2() {} - virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, const char *str, int len) const; + virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, gint16 & distance, const char *str, int len) const; virtual int parse(pinyin_option_t options, ChewingKeyVector & keys, ChewingKeyRestVector & key_rests, const char *str, int len) const; }; diff -Nru libpinyin-2.3.0/src/storage/pinyin_parser_table.h libpinyin-2.6.0/src/storage/pinyin_parser_table.h --- libpinyin-2.3.0/src/storage/pinyin_parser_table.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/pinyin_parser_table.h 2020-11-10 02:28:08.000000000 +0000 @@ -7,666 +7,666 @@ namespace pinyin{ const pinyin_index_item_t pinyin_index[] = { -{"a", IS_ZHUYIN|IS_PINYIN, 1}, -{"agn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 4}, -{"ai", IS_ZHUYIN|IS_PINYIN, 2}, -{"amg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 4}, -{"an", IS_ZHUYIN|IS_PINYIN, 3}, -{"ang", IS_ZHUYIN|IS_PINYIN, 4}, -{"ao", IS_ZHUYIN|IS_PINYIN, 5}, -{"b", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 6}, -{"ba", IS_ZHUYIN|IS_PINYIN, 7}, -{"bagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 10}, -{"bai", IS_ZHUYIN|IS_PINYIN, 8}, -{"bamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 10}, -{"ban", IS_ZHUYIN|IS_PINYIN, 9}, -{"bang", IS_ZHUYIN|IS_PINYIN, 10}, -{"bao", IS_ZHUYIN|IS_PINYIN, 11}, -{"begn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 14}, -{"bei", IS_ZHUYIN|IS_PINYIN, 12}, -{"bemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 14}, -{"ben", IS_ZHUYIN|IS_PINYIN, 13}, -{"beng", IS_ZHUYIN|IS_PINYIN, 14}, -{"bi", IS_ZHUYIN|IS_PINYIN, 15}, -{"bian", IS_ZHUYIN|IS_PINYIN, 16}, -{"biao", IS_ZHUYIN|IS_PINYIN, 17}, -{"bie", IS_ZHUYIN|IS_PINYIN, 18}, -{"bign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 20}, -{"bimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 20}, -{"bin", IS_ZHUYIN|IS_PINYIN, 19}, -{"bing", IS_ZHUYIN|IS_PINYIN, 20}, -{"bo", IS_ZHUYIN|IS_PINYIN, 21}, -{"bu", IS_ZHUYIN|IS_PINYIN, 22}, -{"c", IS_PINYIN|PINYIN_INCOMPLETE, 23}, -{"ca", IS_ZHUYIN|IS_PINYIN, 24}, -{"cagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 27}, -{"cai", IS_ZHUYIN|IS_PINYIN, 25}, -{"camg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 27}, -{"can", IS_ZHUYIN|IS_PINYIN, 26}, -{"cang", IS_ZHUYIN|IS_PINYIN, 27}, -{"cao", IS_ZHUYIN|IS_PINYIN, 28}, -{"ce", IS_ZHUYIN|IS_PINYIN, 29}, -{"cegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 31}, -{"cemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 31}, -{"cen", IS_ZHUYIN|IS_PINYIN, 30}, -{"ceng", IS_ZHUYIN|IS_PINYIN, 31}, -{"ch", IS_PINYIN|PINYIN_INCOMPLETE, 32}, -{"cha", IS_ZHUYIN|IS_PINYIN, 33}, -{"chagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 36}, -{"chai", IS_ZHUYIN|IS_PINYIN, 34}, -{"chamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 36}, -{"chan", IS_ZHUYIN|IS_PINYIN, 35}, -{"chang", IS_ZHUYIN|IS_PINYIN, 36}, -{"chao", IS_ZHUYIN|IS_PINYIN, 37}, -{"che", IS_ZHUYIN|IS_PINYIN, 38}, -{"chegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 40}, -{"chemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 40}, -{"chen", IS_ZHUYIN|IS_PINYIN, 39}, -{"cheng", IS_ZHUYIN|IS_PINYIN, 40}, -{"chi", IS_ZHUYIN|IS_PINYIN, 41}, -{"chogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 42}, -{"chomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 42}, -{"chon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 42}, -{"chong", IS_ZHUYIN|IS_PINYIN, 42}, -{"chou", IS_ZHUYIN|IS_PINYIN, 43}, -{"chu", IS_ZHUYIN|IS_PINYIN, 44}, -{"chuagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 48}, -{"chuai", IS_ZHUYIN|IS_PINYIN, 46}, -{"chuamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 48}, -{"chuan", IS_ZHUYIN|IS_PINYIN, 47}, -{"chuang", IS_ZHUYIN|IS_PINYIN, 48}, -{"chuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 49}, -{"chuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 50}, -{"chui", IS_ZHUYIN|IS_PINYIN, 49}, -{"chun", IS_ZHUYIN|IS_PINYIN, 50}, -{"chuo", IS_ZHUYIN|IS_PINYIN, 51}, -{"ci", IS_ZHUYIN|IS_PINYIN, 52}, -{"cogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 53}, -{"comg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 53}, -{"con", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 53}, -{"cong", IS_ZHUYIN|IS_PINYIN, 53}, -{"cou", IS_ZHUYIN|IS_PINYIN, 54}, -{"cu", IS_ZHUYIN|IS_PINYIN, 55}, -{"cuan", IS_ZHUYIN|IS_PINYIN, 56}, -{"cuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 57}, -{"cuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 58}, -{"cui", IS_ZHUYIN|IS_PINYIN, 57}, -{"cun", IS_ZHUYIN|IS_PINYIN, 58}, -{"cuo", IS_ZHUYIN|IS_PINYIN, 59}, -{"d", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 60}, -{"da", IS_ZHUYIN|IS_PINYIN, 61}, -{"dagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 64}, -{"dai", IS_ZHUYIN|IS_PINYIN, 62}, -{"damg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 64}, -{"dan", IS_ZHUYIN|IS_PINYIN, 63}, -{"dang", IS_ZHUYIN|IS_PINYIN, 64}, -{"dao", IS_ZHUYIN|IS_PINYIN, 65}, -{"de", IS_ZHUYIN|IS_PINYIN, 66}, -{"degn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 69}, -{"dei", IS_ZHUYIN|IS_PINYIN, 67}, -{"demg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 69}, -{"deng", IS_ZHUYIN|IS_PINYIN, 69}, -{"di", IS_ZHUYIN|IS_PINYIN, 70}, -{"dia", IS_ZHUYIN|IS_PINYIN, 71}, -{"dian", IS_ZHUYIN|IS_PINYIN, 72}, -{"diao", IS_ZHUYIN|IS_PINYIN, 73}, -{"die", IS_ZHUYIN|IS_PINYIN, 74}, -{"dign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 76}, -{"dimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 76}, -{"ding", IS_ZHUYIN|IS_PINYIN, 76}, -{"diou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 77}, -{"diu", IS_ZHUYIN|IS_PINYIN, 77}, -{"dogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 78}, -{"domg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 78}, -{"don", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 78}, -{"dong", IS_ZHUYIN|IS_PINYIN, 78}, -{"dou", IS_ZHUYIN|IS_PINYIN, 79}, -{"du", IS_ZHUYIN|IS_PINYIN, 80}, -{"duan", IS_ZHUYIN|IS_PINYIN, 81}, -{"duei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 82}, -{"duen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 83}, -{"dui", IS_ZHUYIN|IS_PINYIN, 82}, -{"dun", IS_ZHUYIN|IS_PINYIN, 83}, -{"duo", IS_ZHUYIN|IS_PINYIN, 84}, -{"e", IS_ZHUYIN|IS_PINYIN, 85}, -{"egn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 88}, -{"ei", IS_ZHUYIN|IS_PINYIN, 86}, -{"emg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 88}, -{"en", IS_ZHUYIN|IS_PINYIN, 87}, -{"er", IS_ZHUYIN|IS_PINYIN, 89}, -{"f", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 90}, -{"fa", IS_ZHUYIN|IS_PINYIN, 91}, -{"fagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 93}, -{"famg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 93}, -{"fan", IS_ZHUYIN|IS_PINYIN, 92}, -{"fang", IS_ZHUYIN|IS_PINYIN, 93}, -{"fegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 97}, -{"fei", IS_ZHUYIN|IS_PINYIN, 95}, -{"femg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 97}, -{"fen", IS_ZHUYIN|IS_PINYIN, 96}, -{"feng", IS_ZHUYIN|IS_PINYIN, 97}, -{"fo", IS_ZHUYIN|IS_PINYIN, 98}, -{"fou", IS_ZHUYIN|IS_PINYIN, 99}, -{"fu", IS_ZHUYIN|IS_PINYIN, 100}, -{"g", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 101}, -{"ga", IS_ZHUYIN|IS_PINYIN, 102}, -{"gagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 105}, -{"gai", IS_ZHUYIN|IS_PINYIN, 103}, -{"gamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 105}, -{"gan", IS_ZHUYIN|IS_PINYIN, 104}, -{"gang", IS_ZHUYIN|IS_PINYIN, 105}, -{"gao", IS_ZHUYIN|IS_PINYIN, 106}, -{"ge", IS_ZHUYIN|IS_PINYIN, 107}, -{"gegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 110}, -{"gei", IS_ZHUYIN|IS_PINYIN, 108}, -{"gemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 110}, -{"gen", IS_ZHUYIN|IS_PINYIN, 109}, -{"geng", IS_ZHUYIN|IS_PINYIN, 110}, -{"gogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 111}, -{"gomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 111}, -{"gon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 111}, -{"gong", IS_ZHUYIN|IS_PINYIN, 111}, -{"gou", IS_ZHUYIN|IS_PINYIN, 112}, -{"gu", IS_ZHUYIN|IS_PINYIN, 113}, -{"gua", IS_ZHUYIN|IS_PINYIN, 114}, -{"guagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 117}, -{"guai", IS_ZHUYIN|IS_PINYIN, 115}, -{"guamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 117}, -{"guan", IS_ZHUYIN|IS_PINYIN, 116}, -{"guang", IS_ZHUYIN|IS_PINYIN, 117}, -{"guei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 118}, -{"guen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 119}, -{"gui", IS_ZHUYIN|IS_PINYIN, 118}, -{"gun", IS_ZHUYIN|IS_PINYIN, 119}, -{"guo", IS_ZHUYIN|IS_PINYIN, 120}, -{"h", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 121}, -{"ha", IS_ZHUYIN|IS_PINYIN, 122}, -{"hagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 125}, -{"hai", IS_ZHUYIN|IS_PINYIN, 123}, -{"hamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 125}, -{"han", IS_ZHUYIN|IS_PINYIN, 124}, -{"hang", IS_ZHUYIN|IS_PINYIN, 125}, -{"hao", IS_ZHUYIN|IS_PINYIN, 126}, -{"he", IS_ZHUYIN|IS_PINYIN, 127}, -{"hegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 130}, -{"hei", IS_ZHUYIN|IS_PINYIN, 128}, -{"hemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 130}, -{"hen", IS_ZHUYIN|IS_PINYIN, 129}, -{"heng", IS_ZHUYIN|IS_PINYIN, 130}, -{"hogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 131}, -{"homg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 131}, -{"hon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 131}, -{"hong", IS_ZHUYIN|IS_PINYIN, 131}, -{"hou", IS_ZHUYIN|IS_PINYIN, 132}, -{"hu", IS_ZHUYIN|IS_PINYIN, 133}, -{"hua", IS_ZHUYIN|IS_PINYIN, 134}, -{"huagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 137}, -{"huai", IS_ZHUYIN|IS_PINYIN, 135}, -{"huamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 137}, -{"huan", IS_ZHUYIN|IS_PINYIN, 136}, -{"huang", IS_ZHUYIN|IS_PINYIN, 137}, -{"huei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 138}, -{"huen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 139}, -{"hui", IS_ZHUYIN|IS_PINYIN, 138}, -{"hun", IS_ZHUYIN|IS_PINYIN, 139}, -{"huo", IS_ZHUYIN|IS_PINYIN, 140}, -{"j", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 141}, -{"ji", IS_ZHUYIN|IS_PINYIN, 142}, -{"jia", IS_ZHUYIN|IS_PINYIN, 143}, -{"jiagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 145}, -{"jiamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 145}, -{"jian", IS_ZHUYIN|IS_PINYIN, 144}, -{"jiang", IS_ZHUYIN|IS_PINYIN, 145}, -{"jiao", IS_ZHUYIN|IS_PINYIN, 146}, -{"jie", IS_ZHUYIN|IS_PINYIN, 147}, -{"jign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 149}, -{"jimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 149}, -{"jin", IS_ZHUYIN|IS_PINYIN, 148}, -{"jing", IS_ZHUYIN|IS_PINYIN, 149}, -{"jiogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 150}, -{"jiomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 150}, -{"jion", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 150}, -{"jiong", IS_ZHUYIN|IS_PINYIN, 150}, -{"jiou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 151}, -{"jiu", IS_ZHUYIN|IS_PINYIN, 151}, -{"ju", IS_ZHUYIN|IS_PINYIN, 152}, -{"juan", IS_ZHUYIN|IS_PINYIN, 153}, -{"jue", IS_ZHUYIN|IS_PINYIN, 154}, -{"juen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 155}, -{"jun", IS_ZHUYIN|IS_PINYIN, 155}, -{"jv", IS_PINYIN|PINYIN_CORRECT_V_U, 152}, -{"jvan", IS_PINYIN|PINYIN_CORRECT_V_U, 153}, -{"jve", IS_PINYIN|PINYIN_CORRECT_V_U, 154}, -{"jvn", IS_PINYIN|PINYIN_CORRECT_V_U, 155}, -{"k", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 156}, -{"ka", IS_ZHUYIN|IS_PINYIN, 157}, -{"kagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 160}, -{"kai", IS_ZHUYIN|IS_PINYIN, 158}, -{"kamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 160}, -{"kan", IS_ZHUYIN|IS_PINYIN, 159}, -{"kang", IS_ZHUYIN|IS_PINYIN, 160}, -{"kao", IS_ZHUYIN|IS_PINYIN, 161}, -{"ke", IS_ZHUYIN|IS_PINYIN, 162}, -{"kegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 165}, -{"kemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 165}, -{"ken", IS_ZHUYIN|IS_PINYIN, 164}, -{"keng", IS_ZHUYIN|IS_PINYIN, 165}, -{"kogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 166}, -{"komg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 166}, -{"kon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 166}, -{"kong", IS_ZHUYIN|IS_PINYIN, 166}, -{"kou", IS_ZHUYIN|IS_PINYIN, 167}, -{"ku", IS_ZHUYIN|IS_PINYIN, 168}, -{"kua", IS_ZHUYIN|IS_PINYIN, 169}, -{"kuagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 172}, -{"kuai", IS_ZHUYIN|IS_PINYIN, 170}, -{"kuamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 172}, -{"kuan", IS_ZHUYIN|IS_PINYIN, 171}, -{"kuang", IS_ZHUYIN|IS_PINYIN, 172}, -{"kuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 173}, -{"kuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 174}, -{"kui", IS_ZHUYIN|IS_PINYIN, 173}, -{"kun", IS_ZHUYIN|IS_PINYIN, 174}, -{"kuo", IS_ZHUYIN|IS_PINYIN, 175}, -{"l", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 176}, -{"la", IS_ZHUYIN|IS_PINYIN, 177}, -{"lagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 180}, -{"lai", IS_ZHUYIN|IS_PINYIN, 178}, -{"lamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 180}, -{"lan", IS_ZHUYIN|IS_PINYIN, 179}, -{"lang", IS_ZHUYIN|IS_PINYIN, 180}, -{"lao", IS_ZHUYIN|IS_PINYIN, 181}, -{"le", IS_ZHUYIN|IS_PINYIN, 182}, -{"legn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 185}, -{"lei", IS_ZHUYIN|IS_PINYIN, 183}, -{"lemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 185}, -{"leng", IS_ZHUYIN|IS_PINYIN, 185}, -{"li", IS_ZHUYIN|IS_PINYIN, 186}, -{"lia", IS_ZHUYIN|IS_PINYIN, 187}, -{"liagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 189}, -{"liamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 189}, -{"lian", IS_ZHUYIN|IS_PINYIN, 188}, -{"liang", IS_ZHUYIN|IS_PINYIN, 189}, -{"liao", IS_ZHUYIN|IS_PINYIN, 190}, -{"lie", IS_ZHUYIN|IS_PINYIN, 191}, -{"lign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 193}, -{"limg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 193}, -{"lin", IS_ZHUYIN|IS_PINYIN, 192}, -{"ling", IS_ZHUYIN|IS_PINYIN, 193}, -{"liou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 194}, -{"liu", IS_ZHUYIN|IS_PINYIN, 194}, -{"lo", IS_ZHUYIN|IS_PINYIN, 195}, -{"logn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 196}, -{"lomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 196}, -{"lon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 196}, -{"long", IS_ZHUYIN|IS_PINYIN, 196}, -{"lou", IS_ZHUYIN|IS_PINYIN, 197}, -{"lu", IS_ZHUYIN|IS_PINYIN, 198}, -{"luan", IS_ZHUYIN|IS_PINYIN, 199}, -{"lue", IS_PINYIN|PINYIN_CORRECT_UE_VE, 203}, -{"luen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 200}, -{"lun", IS_ZHUYIN|IS_PINYIN, 200}, -{"luo", IS_ZHUYIN|IS_PINYIN, 201}, -{"lv", IS_ZHUYIN|IS_PINYIN, 202}, -{"lve", IS_ZHUYIN|IS_PINYIN, 203}, -{"m", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 204}, -{"ma", IS_ZHUYIN|IS_PINYIN, 205}, -{"magn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 208}, -{"mai", IS_ZHUYIN|IS_PINYIN, 206}, -{"mamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 208}, -{"man", IS_ZHUYIN|IS_PINYIN, 207}, -{"mang", IS_ZHUYIN|IS_PINYIN, 208}, -{"mao", IS_ZHUYIN|IS_PINYIN, 209}, -{"me", IS_ZHUYIN|IS_PINYIN, 210}, -{"megn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 213}, -{"mei", IS_ZHUYIN|IS_PINYIN, 211}, -{"memg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 213}, -{"men", IS_ZHUYIN|IS_PINYIN, 212}, -{"meng", IS_ZHUYIN|IS_PINYIN, 213}, -{"mi", IS_ZHUYIN|IS_PINYIN, 214}, -{"mian", IS_ZHUYIN|IS_PINYIN, 215}, -{"miao", IS_ZHUYIN|IS_PINYIN, 216}, -{"mie", IS_ZHUYIN|IS_PINYIN, 217}, -{"mign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 219}, -{"mimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 219}, -{"min", IS_ZHUYIN|IS_PINYIN, 218}, -{"ming", IS_ZHUYIN|IS_PINYIN, 219}, -{"miou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 220}, -{"miu", IS_ZHUYIN|IS_PINYIN, 220}, -{"mo", IS_ZHUYIN|IS_PINYIN, 221}, -{"mou", IS_ZHUYIN|IS_PINYIN, 222}, -{"mu", IS_ZHUYIN|IS_PINYIN, 223}, -{"n", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 224}, -{"na", IS_ZHUYIN|IS_PINYIN, 225}, -{"nagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 228}, -{"nai", IS_ZHUYIN|IS_PINYIN, 226}, -{"namg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 228}, -{"nan", IS_ZHUYIN|IS_PINYIN, 227}, -{"nang", IS_ZHUYIN|IS_PINYIN, 228}, -{"nao", IS_ZHUYIN|IS_PINYIN, 229}, -{"ne", IS_ZHUYIN|IS_PINYIN, 230}, -{"negn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 233}, -{"nei", IS_ZHUYIN|IS_PINYIN, 231}, -{"nemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 233}, -{"nen", IS_ZHUYIN|IS_PINYIN, 232}, -{"neng", IS_ZHUYIN|IS_PINYIN, 233}, -{"ng", IS_ZHUYIN|IS_PINYIN, 234}, -{"ni", IS_ZHUYIN|IS_PINYIN, 235}, -{"niagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 238}, -{"niamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 238}, -{"nian", IS_ZHUYIN|IS_PINYIN, 237}, -{"niang", IS_ZHUYIN|IS_PINYIN, 238}, -{"niao", IS_ZHUYIN|IS_PINYIN, 239}, -{"nie", IS_ZHUYIN|IS_PINYIN, 240}, -{"nign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 242}, -{"nimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 242}, -{"nin", IS_ZHUYIN|IS_PINYIN, 241}, -{"ning", IS_ZHUYIN|IS_PINYIN, 242}, -{"niou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 243}, -{"niu", IS_ZHUYIN|IS_PINYIN, 243}, -{"nogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 244}, -{"nomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 244}, -{"non", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 244}, -{"nong", IS_ZHUYIN|IS_PINYIN, 244}, -{"nou", IS_ZHUYIN|IS_PINYIN, 245}, -{"nu", IS_ZHUYIN|IS_PINYIN, 246}, -{"nuan", IS_ZHUYIN|IS_PINYIN, 247}, -{"nue", IS_PINYIN|PINYIN_CORRECT_UE_VE, 251}, -{"nuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 248}, -{"nuo", IS_ZHUYIN|IS_PINYIN, 249}, -{"nv", IS_ZHUYIN|IS_PINYIN, 250}, -{"nve", IS_ZHUYIN|IS_PINYIN, 251}, -{"o", IS_ZHUYIN|IS_PINYIN, 252}, -{"ou", IS_ZHUYIN|IS_PINYIN, 253}, -{"p", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 254}, -{"pa", IS_ZHUYIN|IS_PINYIN, 255}, -{"pagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 258}, -{"pai", IS_ZHUYIN|IS_PINYIN, 256}, -{"pamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 258}, -{"pan", IS_ZHUYIN|IS_PINYIN, 257}, -{"pang", IS_ZHUYIN|IS_PINYIN, 258}, -{"pao", IS_ZHUYIN|IS_PINYIN, 259}, -{"pegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 262}, -{"pei", IS_ZHUYIN|IS_PINYIN, 260}, -{"pemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 262}, -{"pen", IS_ZHUYIN|IS_PINYIN, 261}, -{"peng", IS_ZHUYIN|IS_PINYIN, 262}, -{"pi", IS_ZHUYIN|IS_PINYIN, 263}, -{"pian", IS_ZHUYIN|IS_PINYIN, 264}, -{"piao", IS_ZHUYIN|IS_PINYIN, 265}, -{"pie", IS_ZHUYIN|IS_PINYIN, 266}, -{"pign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 268}, -{"pimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 268}, -{"pin", IS_ZHUYIN|IS_PINYIN, 267}, -{"ping", IS_ZHUYIN|IS_PINYIN, 268}, -{"po", IS_ZHUYIN|IS_PINYIN, 269}, -{"pou", IS_ZHUYIN|IS_PINYIN, 270}, -{"pu", IS_ZHUYIN|IS_PINYIN, 271}, -{"q", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 272}, -{"qi", IS_ZHUYIN|IS_PINYIN, 273}, -{"qia", IS_ZHUYIN|IS_PINYIN, 274}, -{"qiagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 276}, -{"qiamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 276}, -{"qian", IS_ZHUYIN|IS_PINYIN, 275}, -{"qiang", IS_ZHUYIN|IS_PINYIN, 276}, -{"qiao", IS_ZHUYIN|IS_PINYIN, 277}, -{"qie", IS_ZHUYIN|IS_PINYIN, 278}, -{"qign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 280}, -{"qimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 280}, -{"qin", IS_ZHUYIN|IS_PINYIN, 279}, -{"qing", IS_ZHUYIN|IS_PINYIN, 280}, -{"qiogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 281}, -{"qiomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 281}, -{"qion", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 281}, -{"qiong", IS_ZHUYIN|IS_PINYIN, 281}, -{"qiou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 282}, -{"qiu", IS_ZHUYIN|IS_PINYIN, 282}, -{"qu", IS_ZHUYIN|IS_PINYIN, 283}, -{"quan", IS_ZHUYIN|IS_PINYIN, 284}, -{"que", IS_ZHUYIN|IS_PINYIN, 285}, -{"quen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 286}, -{"qun", IS_ZHUYIN|IS_PINYIN, 286}, -{"qv", IS_PINYIN|PINYIN_CORRECT_V_U, 283}, -{"qvan", IS_PINYIN|PINYIN_CORRECT_V_U, 284}, -{"qve", IS_PINYIN|PINYIN_CORRECT_V_U, 285}, -{"qvn", IS_PINYIN|PINYIN_CORRECT_V_U, 286}, -{"r", IS_PINYIN|PINYIN_INCOMPLETE, 287}, -{"ragn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 289}, -{"ramg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 289}, -{"ran", IS_ZHUYIN|IS_PINYIN, 288}, -{"rang", IS_ZHUYIN|IS_PINYIN, 289}, -{"rao", IS_ZHUYIN|IS_PINYIN, 290}, -{"re", IS_ZHUYIN|IS_PINYIN, 291}, -{"regn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 293}, -{"remg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 293}, -{"ren", IS_ZHUYIN|IS_PINYIN, 292}, -{"reng", IS_ZHUYIN|IS_PINYIN, 293}, -{"ri", IS_ZHUYIN|IS_PINYIN, 294}, -{"rogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 295}, -{"romg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 295}, -{"ron", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 295}, -{"rong", IS_ZHUYIN|IS_PINYIN, 295}, -{"rou", IS_ZHUYIN|IS_PINYIN, 296}, -{"ru", IS_ZHUYIN|IS_PINYIN, 297}, -{"ruan", IS_ZHUYIN|IS_PINYIN, 299}, -{"ruei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 300}, -{"ruen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 301}, -{"rui", IS_ZHUYIN|IS_PINYIN, 300}, -{"run", IS_ZHUYIN|IS_PINYIN, 301}, -{"ruo", IS_ZHUYIN|IS_PINYIN, 302}, -{"s", IS_PINYIN|PINYIN_INCOMPLETE, 303}, -{"sa", IS_ZHUYIN|IS_PINYIN, 304}, -{"sagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 307}, -{"sai", IS_ZHUYIN|IS_PINYIN, 305}, -{"samg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 307}, -{"san", IS_ZHUYIN|IS_PINYIN, 306}, -{"sang", IS_ZHUYIN|IS_PINYIN, 307}, -{"sao", IS_ZHUYIN|IS_PINYIN, 308}, -{"se", IS_ZHUYIN|IS_PINYIN, 309}, -{"segn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 311}, -{"semg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 311}, -{"sen", IS_ZHUYIN|IS_PINYIN, 310}, -{"seng", IS_ZHUYIN|IS_PINYIN, 311}, -{"sh", IS_PINYIN|PINYIN_INCOMPLETE, 312}, -{"sha", IS_ZHUYIN|IS_PINYIN, 313}, -{"shagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 316}, -{"shai", IS_ZHUYIN|IS_PINYIN, 314}, -{"shamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 316}, -{"shan", IS_ZHUYIN|IS_PINYIN, 315}, -{"shang", IS_ZHUYIN|IS_PINYIN, 316}, -{"shao", IS_ZHUYIN|IS_PINYIN, 317}, -{"she", IS_ZHUYIN|IS_PINYIN, 318}, -{"shegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 321}, -{"shei", IS_ZHUYIN|IS_PINYIN, 319}, -{"shemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 321}, -{"shen", IS_ZHUYIN|IS_PINYIN, 320}, -{"sheng", IS_ZHUYIN|IS_PINYIN, 321}, -{"shi", IS_ZHUYIN|IS_PINYIN, 322}, -{"shou", IS_ZHUYIN|IS_PINYIN, 323}, -{"shu", IS_ZHUYIN|IS_PINYIN, 324}, -{"shua", IS_ZHUYIN|IS_PINYIN, 325}, -{"shuagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 328}, -{"shuai", IS_ZHUYIN|IS_PINYIN, 326}, -{"shuamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 328}, -{"shuan", IS_ZHUYIN|IS_PINYIN, 327}, -{"shuang", IS_ZHUYIN|IS_PINYIN, 328}, -{"shuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 329}, -{"shuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 330}, -{"shui", IS_ZHUYIN|IS_PINYIN, 329}, -{"shun", IS_ZHUYIN|IS_PINYIN, 330}, -{"shuo", IS_ZHUYIN|IS_PINYIN, 331}, -{"si", IS_ZHUYIN|IS_PINYIN, 332}, -{"sogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 333}, -{"somg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 333}, -{"son", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 333}, -{"song", IS_ZHUYIN|IS_PINYIN, 333}, -{"sou", IS_ZHUYIN|IS_PINYIN, 334}, -{"su", IS_ZHUYIN|IS_PINYIN, 335}, -{"suan", IS_ZHUYIN|IS_PINYIN, 336}, -{"suei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 337}, -{"suen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 338}, -{"sui", IS_ZHUYIN|IS_PINYIN, 337}, -{"sun", IS_ZHUYIN|IS_PINYIN, 338}, -{"suo", IS_ZHUYIN|IS_PINYIN, 339}, -{"t", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 340}, -{"ta", IS_ZHUYIN|IS_PINYIN, 341}, -{"tagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 344}, -{"tai", IS_ZHUYIN|IS_PINYIN, 342}, -{"tamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 344}, -{"tan", IS_ZHUYIN|IS_PINYIN, 343}, -{"tang", IS_ZHUYIN|IS_PINYIN, 344}, -{"tao", IS_ZHUYIN|IS_PINYIN, 345}, -{"te", IS_ZHUYIN|IS_PINYIN, 346}, -{"tegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 347}, -{"temg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 347}, -{"teng", IS_ZHUYIN|IS_PINYIN, 347}, -{"ti", IS_ZHUYIN|IS_PINYIN, 348}, -{"tian", IS_ZHUYIN|IS_PINYIN, 349}, -{"tiao", IS_ZHUYIN|IS_PINYIN, 350}, -{"tie", IS_ZHUYIN|IS_PINYIN, 351}, -{"tign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 352}, -{"timg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 352}, -{"ting", IS_ZHUYIN|IS_PINYIN, 352}, -{"togn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 353}, -{"tomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 353}, -{"ton", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 353}, -{"tong", IS_ZHUYIN|IS_PINYIN, 353}, -{"tou", IS_ZHUYIN|IS_PINYIN, 354}, -{"tu", IS_ZHUYIN|IS_PINYIN, 355}, -{"tuan", IS_ZHUYIN|IS_PINYIN, 356}, -{"tuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 357}, -{"tuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 358}, -{"tui", IS_ZHUYIN|IS_PINYIN, 357}, -{"tun", IS_ZHUYIN|IS_PINYIN, 358}, -{"tuo", IS_ZHUYIN|IS_PINYIN, 359}, -{"w", IS_PINYIN|PINYIN_INCOMPLETE, 360}, -{"wa", IS_ZHUYIN|IS_PINYIN, 361}, -{"wagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 364}, -{"wai", IS_ZHUYIN|IS_PINYIN, 362}, -{"wamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 364}, -{"wan", IS_ZHUYIN|IS_PINYIN, 363}, -{"wang", IS_ZHUYIN|IS_PINYIN, 364}, -{"wegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 367}, -{"wei", IS_ZHUYIN|IS_PINYIN, 365}, -{"wemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 367}, -{"wen", IS_ZHUYIN|IS_PINYIN, 366}, -{"weng", IS_ZHUYIN|IS_PINYIN, 367}, -{"wo", IS_ZHUYIN|IS_PINYIN, 368}, -{"wu", IS_ZHUYIN|IS_PINYIN, 369}, -{"x", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 370}, -{"xi", IS_ZHUYIN|IS_PINYIN, 371}, -{"xia", IS_ZHUYIN|IS_PINYIN, 372}, -{"xiagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 374}, -{"xiamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 374}, -{"xian", IS_ZHUYIN|IS_PINYIN, 373}, -{"xiang", IS_ZHUYIN|IS_PINYIN, 374}, -{"xiao", IS_ZHUYIN|IS_PINYIN, 375}, -{"xie", IS_ZHUYIN|IS_PINYIN, 376}, -{"xign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 378}, -{"ximg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 378}, -{"xin", IS_ZHUYIN|IS_PINYIN, 377}, -{"xing", IS_ZHUYIN|IS_PINYIN, 378}, -{"xiogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 379}, -{"xiomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 379}, -{"xion", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 379}, -{"xiong", IS_ZHUYIN|IS_PINYIN, 379}, -{"xiou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 380}, -{"xiu", IS_ZHUYIN|IS_PINYIN, 380}, -{"xu", IS_ZHUYIN|IS_PINYIN, 381}, -{"xuan", IS_ZHUYIN|IS_PINYIN, 382}, -{"xue", IS_ZHUYIN|IS_PINYIN, 383}, -{"xuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 384}, -{"xun", IS_ZHUYIN|IS_PINYIN, 384}, -{"xv", IS_PINYIN|PINYIN_CORRECT_V_U, 381}, -{"xvan", IS_PINYIN|PINYIN_CORRECT_V_U, 382}, -{"xve", IS_PINYIN|PINYIN_CORRECT_V_U, 383}, -{"xvn", IS_PINYIN|PINYIN_CORRECT_V_U, 384}, -{"y", IS_PINYIN|PINYIN_INCOMPLETE, 385}, -{"ya", IS_ZHUYIN|IS_PINYIN, 386}, -{"yagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 389}, -{"yamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 389}, -{"yan", IS_ZHUYIN|IS_PINYIN, 388}, -{"yang", IS_ZHUYIN|IS_PINYIN, 389}, -{"yao", IS_ZHUYIN|IS_PINYIN, 390}, -{"ye", IS_ZHUYIN|IS_PINYIN, 391}, -{"yi", IS_ZHUYIN|IS_PINYIN, 392}, -{"yign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 394}, -{"yimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 394}, -{"yin", IS_ZHUYIN|IS_PINYIN, 393}, -{"ying", IS_ZHUYIN|IS_PINYIN, 394}, -{"yo", IS_ZHUYIN|IS_PINYIN, 395}, -{"yogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 396}, -{"yomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 396}, -{"yon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 396}, -{"yong", IS_ZHUYIN|IS_PINYIN, 396}, -{"you", IS_ZHUYIN|IS_PINYIN, 397}, -{"yu", IS_ZHUYIN|IS_PINYIN, 398}, -{"yuan", IS_ZHUYIN|IS_PINYIN, 399}, -{"yue", IS_ZHUYIN|IS_PINYIN, 400}, -{"yuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 401}, -{"yun", IS_ZHUYIN|IS_PINYIN, 401}, -{"yv", IS_PINYIN|PINYIN_CORRECT_V_U, 398}, -{"yvan", IS_PINYIN|PINYIN_CORRECT_V_U, 399}, -{"yve", IS_PINYIN|PINYIN_CORRECT_V_U, 400}, -{"yvn", IS_PINYIN|PINYIN_CORRECT_V_U, 401}, -{"z", IS_PINYIN|PINYIN_INCOMPLETE, 402}, -{"za", IS_ZHUYIN|IS_PINYIN, 403}, -{"zagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 406}, -{"zai", IS_ZHUYIN|IS_PINYIN, 404}, -{"zamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 406}, -{"zan", IS_ZHUYIN|IS_PINYIN, 405}, -{"zang", IS_ZHUYIN|IS_PINYIN, 406}, -{"zao", IS_ZHUYIN|IS_PINYIN, 407}, -{"ze", IS_ZHUYIN|IS_PINYIN, 408}, -{"zegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 411}, -{"zei", IS_ZHUYIN|IS_PINYIN, 409}, -{"zemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 411}, -{"zen", IS_ZHUYIN|IS_PINYIN, 410}, -{"zeng", IS_ZHUYIN|IS_PINYIN, 411}, -{"zh", IS_PINYIN|PINYIN_INCOMPLETE, 412}, -{"zha", IS_ZHUYIN|IS_PINYIN, 413}, -{"zhagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 416}, -{"zhai", IS_ZHUYIN|IS_PINYIN, 414}, -{"zhamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 416}, -{"zhan", IS_ZHUYIN|IS_PINYIN, 415}, -{"zhang", IS_ZHUYIN|IS_PINYIN, 416}, -{"zhao", IS_ZHUYIN|IS_PINYIN, 417}, -{"zhe", IS_ZHUYIN|IS_PINYIN, 418}, -{"zhegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 421}, -{"zhemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 421}, -{"zhen", IS_ZHUYIN|IS_PINYIN, 420}, -{"zheng", IS_ZHUYIN|IS_PINYIN, 421}, -{"zhi", IS_ZHUYIN|IS_PINYIN, 422}, -{"zhogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 423}, -{"zhomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 423}, -{"zhon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 423}, -{"zhong", IS_ZHUYIN|IS_PINYIN, 423}, -{"zhou", IS_ZHUYIN|IS_PINYIN, 424}, -{"zhu", IS_ZHUYIN|IS_PINYIN, 425}, -{"zhua", IS_ZHUYIN|IS_PINYIN, 426}, -{"zhuagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 429}, -{"zhuai", IS_ZHUYIN|IS_PINYIN, 427}, -{"zhuamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 429}, -{"zhuan", IS_ZHUYIN|IS_PINYIN, 428}, -{"zhuang", IS_ZHUYIN|IS_PINYIN, 429}, -{"zhuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 430}, -{"zhuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 431}, -{"zhui", IS_ZHUYIN|IS_PINYIN, 430}, -{"zhun", IS_ZHUYIN|IS_PINYIN, 431}, -{"zhuo", IS_ZHUYIN|IS_PINYIN, 432}, -{"zi", IS_ZHUYIN|IS_PINYIN, 433}, -{"zogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 434}, -{"zomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 434}, -{"zon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 434}, -{"zong", IS_ZHUYIN|IS_PINYIN, 434}, -{"zou", IS_ZHUYIN|IS_PINYIN, 435}, -{"zu", IS_ZHUYIN|IS_PINYIN, 436}, -{"zuan", IS_ZHUYIN|IS_PINYIN, 437}, -{"zuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 438}, -{"zuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 439}, -{"zui", IS_ZHUYIN|IS_PINYIN, 438}, -{"zun", IS_ZHUYIN|IS_PINYIN, 439}, -{"zuo", IS_ZHUYIN|IS_PINYIN, 440} +{"a", IS_ZHUYIN|IS_PINYIN, 1, 0}, +{"agn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 4, 1}, +{"ai", IS_ZHUYIN|IS_PINYIN, 2, 0}, +{"amg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 4, 1}, +{"an", IS_ZHUYIN|IS_PINYIN, 3, 0}, +{"ang", IS_ZHUYIN|IS_PINYIN, 4, 0}, +{"ao", IS_ZHUYIN|IS_PINYIN, 5, 0}, +{"b", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 6, 0}, +{"ba", IS_ZHUYIN|IS_PINYIN, 7, 0}, +{"bagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 10, 1}, +{"bai", IS_ZHUYIN|IS_PINYIN, 8, 0}, +{"bamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 10, 1}, +{"ban", IS_ZHUYIN|IS_PINYIN, 9, 0}, +{"bang", IS_ZHUYIN|IS_PINYIN, 10, 0}, +{"bao", IS_ZHUYIN|IS_PINYIN, 11, 0}, +{"begn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 14, 1}, +{"bei", IS_ZHUYIN|IS_PINYIN, 12, 0}, +{"bemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 14, 1}, +{"ben", IS_ZHUYIN|IS_PINYIN, 13, 0}, +{"beng", IS_ZHUYIN|IS_PINYIN, 14, 0}, +{"bi", IS_ZHUYIN|IS_PINYIN, 15, 0}, +{"bian", IS_ZHUYIN|IS_PINYIN, 16, 0}, +{"biao", IS_ZHUYIN|IS_PINYIN, 17, 0}, +{"bie", IS_ZHUYIN|IS_PINYIN, 18, 0}, +{"bign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 20, 1}, +{"bimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 20, 1}, +{"bin", IS_ZHUYIN|IS_PINYIN, 19, 0}, +{"bing", IS_ZHUYIN|IS_PINYIN, 20, 0}, +{"bo", IS_ZHUYIN|IS_PINYIN, 21, 0}, +{"bu", IS_ZHUYIN|IS_PINYIN, 22, 0}, +{"c", IS_PINYIN|PINYIN_INCOMPLETE, 23, 0}, +{"ca", IS_ZHUYIN|IS_PINYIN, 24, 0}, +{"cagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 27, 1}, +{"cai", IS_ZHUYIN|IS_PINYIN, 25, 0}, +{"camg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 27, 1}, +{"can", IS_ZHUYIN|IS_PINYIN, 26, 0}, +{"cang", IS_ZHUYIN|IS_PINYIN, 27, 0}, +{"cao", IS_ZHUYIN|IS_PINYIN, 28, 0}, +{"ce", IS_ZHUYIN|IS_PINYIN, 29, 0}, +{"cegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 31, 1}, +{"cemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 31, 1}, +{"cen", IS_ZHUYIN|IS_PINYIN, 30, 0}, +{"ceng", IS_ZHUYIN|IS_PINYIN, 31, 0}, +{"ch", IS_PINYIN|PINYIN_INCOMPLETE, 32, 0}, +{"cha", IS_ZHUYIN|IS_PINYIN, 33, 0}, +{"chagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 36, 1}, +{"chai", IS_ZHUYIN|IS_PINYIN, 34, 0}, +{"chamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 36, 1}, +{"chan", IS_ZHUYIN|IS_PINYIN, 35, 0}, +{"chang", IS_ZHUYIN|IS_PINYIN, 36, 0}, +{"chao", IS_ZHUYIN|IS_PINYIN, 37, 0}, +{"che", IS_ZHUYIN|IS_PINYIN, 38, 0}, +{"chegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 40, 1}, +{"chemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 40, 1}, +{"chen", IS_ZHUYIN|IS_PINYIN, 39, 0}, +{"cheng", IS_ZHUYIN|IS_PINYIN, 40, 0}, +{"chi", IS_ZHUYIN|IS_PINYIN, 41, 0}, +{"chogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 42, 1}, +{"chomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 42, 1}, +{"chon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 42, 1}, +{"chong", IS_ZHUYIN|IS_PINYIN, 42, 0}, +{"chou", IS_ZHUYIN|IS_PINYIN, 43, 0}, +{"chu", IS_ZHUYIN|IS_PINYIN, 44, 0}, +{"chuagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 48, 1}, +{"chuai", IS_ZHUYIN|IS_PINYIN, 46, 0}, +{"chuamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 48, 1}, +{"chuan", IS_ZHUYIN|IS_PINYIN, 47, 0}, +{"chuang", IS_ZHUYIN|IS_PINYIN, 48, 0}, +{"chuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 49, 1}, +{"chuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 50, 1}, +{"chui", IS_ZHUYIN|IS_PINYIN, 49, 0}, +{"chun", IS_ZHUYIN|IS_PINYIN, 50, 0}, +{"chuo", IS_ZHUYIN|IS_PINYIN, 51, 0}, +{"ci", IS_ZHUYIN|IS_PINYIN, 52, 0}, +{"cogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 53, 1}, +{"comg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 53, 1}, +{"con", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 53, 1}, +{"cong", IS_ZHUYIN|IS_PINYIN, 53, 0}, +{"cou", IS_ZHUYIN|IS_PINYIN, 54, 0}, +{"cu", IS_ZHUYIN|IS_PINYIN, 55, 0}, +{"cuan", IS_ZHUYIN|IS_PINYIN, 56, 0}, +{"cuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 57, 1}, +{"cuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 58, 1}, +{"cui", IS_ZHUYIN|IS_PINYIN, 57, 0}, +{"cun", IS_ZHUYIN|IS_PINYIN, 58, 0}, +{"cuo", IS_ZHUYIN|IS_PINYIN, 59, 0}, +{"d", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 60, 0}, +{"da", IS_ZHUYIN|IS_PINYIN, 61, 0}, +{"dagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 64, 1}, +{"dai", IS_ZHUYIN|IS_PINYIN, 62, 0}, +{"damg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 64, 1}, +{"dan", IS_ZHUYIN|IS_PINYIN, 63, 0}, +{"dang", IS_ZHUYIN|IS_PINYIN, 64, 0}, +{"dao", IS_ZHUYIN|IS_PINYIN, 65, 0}, +{"de", IS_ZHUYIN|IS_PINYIN, 66, 0}, +{"degn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 69, 1}, +{"dei", IS_ZHUYIN|IS_PINYIN, 67, 0}, +{"demg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 69, 1}, +{"deng", IS_ZHUYIN|IS_PINYIN, 69, 0}, +{"di", IS_ZHUYIN|IS_PINYIN, 70, 0}, +{"dia", IS_ZHUYIN|IS_PINYIN, 71, 0}, +{"dian", IS_ZHUYIN|IS_PINYIN, 72, 0}, +{"diao", IS_ZHUYIN|IS_PINYIN, 73, 0}, +{"die", IS_ZHUYIN|IS_PINYIN, 74, 0}, +{"dign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 76, 1}, +{"dimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 76, 1}, +{"ding", IS_ZHUYIN|IS_PINYIN, 76, 0}, +{"diou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 77, 1}, +{"diu", IS_ZHUYIN|IS_PINYIN, 77, 0}, +{"dogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 78, 1}, +{"domg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 78, 1}, +{"don", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 78, 1}, +{"dong", IS_ZHUYIN|IS_PINYIN, 78, 0}, +{"dou", IS_ZHUYIN|IS_PINYIN, 79, 0}, +{"du", IS_ZHUYIN|IS_PINYIN, 80, 0}, +{"duan", IS_ZHUYIN|IS_PINYIN, 81, 0}, +{"duei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 82, 1}, +{"duen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 83, 1}, +{"dui", IS_ZHUYIN|IS_PINYIN, 82, 0}, +{"dun", IS_ZHUYIN|IS_PINYIN, 83, 0}, +{"duo", IS_ZHUYIN|IS_PINYIN, 84, 0}, +{"e", IS_ZHUYIN|IS_PINYIN, 85, 0}, +{"egn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 88, 1}, +{"ei", IS_ZHUYIN|IS_PINYIN, 86, 0}, +{"emg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 88, 1}, +{"en", IS_ZHUYIN|IS_PINYIN, 87, 0}, +{"er", IS_ZHUYIN|IS_PINYIN, 89, 0}, +{"f", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 90, 0}, +{"fa", IS_ZHUYIN|IS_PINYIN, 91, 0}, +{"fagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 93, 1}, +{"famg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 93, 1}, +{"fan", IS_ZHUYIN|IS_PINYIN, 92, 0}, +{"fang", IS_ZHUYIN|IS_PINYIN, 93, 0}, +{"fegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 97, 1}, +{"fei", IS_ZHUYIN|IS_PINYIN, 95, 0}, +{"femg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 97, 1}, +{"fen", IS_ZHUYIN|IS_PINYIN, 96, 0}, +{"feng", IS_ZHUYIN|IS_PINYIN, 97, 0}, +{"fo", IS_ZHUYIN|IS_PINYIN, 98, 0}, +{"fou", IS_ZHUYIN|IS_PINYIN, 99, 0}, +{"fu", IS_ZHUYIN|IS_PINYIN, 100, 0}, +{"g", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 101, 0}, +{"ga", IS_ZHUYIN|IS_PINYIN, 102, 0}, +{"gagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 105, 1}, +{"gai", IS_ZHUYIN|IS_PINYIN, 103, 0}, +{"gamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 105, 1}, +{"gan", IS_ZHUYIN|IS_PINYIN, 104, 0}, +{"gang", IS_ZHUYIN|IS_PINYIN, 105, 0}, +{"gao", IS_ZHUYIN|IS_PINYIN, 106, 0}, +{"ge", IS_ZHUYIN|IS_PINYIN, 107, 0}, +{"gegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 110, 1}, +{"gei", IS_ZHUYIN|IS_PINYIN, 108, 0}, +{"gemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 110, 1}, +{"gen", IS_ZHUYIN|IS_PINYIN, 109, 0}, +{"geng", IS_ZHUYIN|IS_PINYIN, 110, 0}, +{"gogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 111, 1}, +{"gomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 111, 1}, +{"gon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 111, 1}, +{"gong", IS_ZHUYIN|IS_PINYIN, 111, 0}, +{"gou", IS_ZHUYIN|IS_PINYIN, 112, 0}, +{"gu", IS_ZHUYIN|IS_PINYIN, 113, 0}, +{"gua", IS_ZHUYIN|IS_PINYIN, 114, 0}, +{"guagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 117, 1}, +{"guai", IS_ZHUYIN|IS_PINYIN, 115, 0}, +{"guamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 117, 1}, +{"guan", IS_ZHUYIN|IS_PINYIN, 116, 0}, +{"guang", IS_ZHUYIN|IS_PINYIN, 117, 0}, +{"guei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 118, 1}, +{"guen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 119, 1}, +{"gui", IS_ZHUYIN|IS_PINYIN, 118, 0}, +{"gun", IS_ZHUYIN|IS_PINYIN, 119, 0}, +{"guo", IS_ZHUYIN|IS_PINYIN, 120, 0}, +{"h", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 121, 0}, +{"ha", IS_ZHUYIN|IS_PINYIN, 122, 0}, +{"hagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 125, 1}, +{"hai", IS_ZHUYIN|IS_PINYIN, 123, 0}, +{"hamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 125, 1}, +{"han", IS_ZHUYIN|IS_PINYIN, 124, 0}, +{"hang", IS_ZHUYIN|IS_PINYIN, 125, 0}, +{"hao", IS_ZHUYIN|IS_PINYIN, 126, 0}, +{"he", IS_ZHUYIN|IS_PINYIN, 127, 0}, +{"hegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 130, 1}, +{"hei", IS_ZHUYIN|IS_PINYIN, 128, 0}, +{"hemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 130, 1}, +{"hen", IS_ZHUYIN|IS_PINYIN, 129, 0}, +{"heng", IS_ZHUYIN|IS_PINYIN, 130, 0}, +{"hogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 131, 1}, +{"homg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 131, 1}, +{"hon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 131, 1}, +{"hong", IS_ZHUYIN|IS_PINYIN, 131, 0}, +{"hou", IS_ZHUYIN|IS_PINYIN, 132, 0}, +{"hu", IS_ZHUYIN|IS_PINYIN, 133, 0}, +{"hua", IS_ZHUYIN|IS_PINYIN, 134, 0}, +{"huagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 137, 1}, +{"huai", IS_ZHUYIN|IS_PINYIN, 135, 0}, +{"huamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 137, 1}, +{"huan", IS_ZHUYIN|IS_PINYIN, 136, 0}, +{"huang", IS_ZHUYIN|IS_PINYIN, 137, 0}, +{"huei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 138, 1}, +{"huen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 139, 1}, +{"hui", IS_ZHUYIN|IS_PINYIN, 138, 0}, +{"hun", IS_ZHUYIN|IS_PINYIN, 139, 0}, +{"huo", IS_ZHUYIN|IS_PINYIN, 140, 0}, +{"j", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 141, 0}, +{"ji", IS_ZHUYIN|IS_PINYIN, 142, 0}, +{"jia", IS_ZHUYIN|IS_PINYIN, 143, 0}, +{"jiagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 145, 1}, +{"jiamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 145, 1}, +{"jian", IS_ZHUYIN|IS_PINYIN, 144, 0}, +{"jiang", IS_ZHUYIN|IS_PINYIN, 145, 0}, +{"jiao", IS_ZHUYIN|IS_PINYIN, 146, 0}, +{"jie", IS_ZHUYIN|IS_PINYIN, 147, 0}, +{"jign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 149, 1}, +{"jimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 149, 1}, +{"jin", IS_ZHUYIN|IS_PINYIN, 148, 0}, +{"jing", IS_ZHUYIN|IS_PINYIN, 149, 0}, +{"jiogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 150, 1}, +{"jiomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 150, 1}, +{"jion", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 150, 1}, +{"jiong", IS_ZHUYIN|IS_PINYIN, 150, 0}, +{"jiou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 151, 1}, +{"jiu", IS_ZHUYIN|IS_PINYIN, 151, 0}, +{"ju", IS_ZHUYIN|IS_PINYIN, 152, 0}, +{"juan", IS_ZHUYIN|IS_PINYIN, 153, 0}, +{"jue", IS_ZHUYIN|IS_PINYIN, 154, 0}, +{"juen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 155, 1}, +{"jun", IS_ZHUYIN|IS_PINYIN, 155, 0}, +{"jv", IS_PINYIN|PINYIN_CORRECT_V_U, 152, 1}, +{"jvan", IS_PINYIN|PINYIN_CORRECT_V_U, 153, 1}, +{"jve", IS_PINYIN|PINYIN_CORRECT_V_U, 154, 1}, +{"jvn", IS_PINYIN|PINYIN_CORRECT_V_U, 155, 1}, +{"k", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 156, 0}, +{"ka", IS_ZHUYIN|IS_PINYIN, 157, 0}, +{"kagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 160, 1}, +{"kai", IS_ZHUYIN|IS_PINYIN, 158, 0}, +{"kamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 160, 1}, +{"kan", IS_ZHUYIN|IS_PINYIN, 159, 0}, +{"kang", IS_ZHUYIN|IS_PINYIN, 160, 0}, +{"kao", IS_ZHUYIN|IS_PINYIN, 161, 0}, +{"ke", IS_ZHUYIN|IS_PINYIN, 162, 0}, +{"kegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 165, 1}, +{"kemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 165, 1}, +{"ken", IS_ZHUYIN|IS_PINYIN, 164, 0}, +{"keng", IS_ZHUYIN|IS_PINYIN, 165, 0}, +{"kogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 166, 1}, +{"komg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 166, 1}, +{"kon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 166, 1}, +{"kong", IS_ZHUYIN|IS_PINYIN, 166, 0}, +{"kou", IS_ZHUYIN|IS_PINYIN, 167, 0}, +{"ku", IS_ZHUYIN|IS_PINYIN, 168, 0}, +{"kua", IS_ZHUYIN|IS_PINYIN, 169, 0}, +{"kuagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 172, 1}, +{"kuai", IS_ZHUYIN|IS_PINYIN, 170, 0}, +{"kuamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 172, 1}, +{"kuan", IS_ZHUYIN|IS_PINYIN, 171, 0}, +{"kuang", IS_ZHUYIN|IS_PINYIN, 172, 0}, +{"kuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 173, 1}, +{"kuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 174, 1}, +{"kui", IS_ZHUYIN|IS_PINYIN, 173, 0}, +{"kun", IS_ZHUYIN|IS_PINYIN, 174, 0}, +{"kuo", IS_ZHUYIN|IS_PINYIN, 175, 0}, +{"l", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 176, 0}, +{"la", IS_ZHUYIN|IS_PINYIN, 177, 0}, +{"lagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 180, 1}, +{"lai", IS_ZHUYIN|IS_PINYIN, 178, 0}, +{"lamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 180, 1}, +{"lan", IS_ZHUYIN|IS_PINYIN, 179, 0}, +{"lang", IS_ZHUYIN|IS_PINYIN, 180, 0}, +{"lao", IS_ZHUYIN|IS_PINYIN, 181, 0}, +{"le", IS_ZHUYIN|IS_PINYIN, 182, 0}, +{"legn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 185, 1}, +{"lei", IS_ZHUYIN|IS_PINYIN, 183, 0}, +{"lemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 185, 1}, +{"leng", IS_ZHUYIN|IS_PINYIN, 185, 0}, +{"li", IS_ZHUYIN|IS_PINYIN, 186, 0}, +{"lia", IS_ZHUYIN|IS_PINYIN, 187, 0}, +{"liagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 189, 1}, +{"liamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 189, 1}, +{"lian", IS_ZHUYIN|IS_PINYIN, 188, 0}, +{"liang", IS_ZHUYIN|IS_PINYIN, 189, 0}, +{"liao", IS_ZHUYIN|IS_PINYIN, 190, 0}, +{"lie", IS_ZHUYIN|IS_PINYIN, 191, 0}, +{"lign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 193, 1}, +{"limg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 193, 1}, +{"lin", IS_ZHUYIN|IS_PINYIN, 192, 0}, +{"ling", IS_ZHUYIN|IS_PINYIN, 193, 0}, +{"liou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 194, 1}, +{"liu", IS_ZHUYIN|IS_PINYIN, 194, 0}, +{"lo", IS_ZHUYIN|IS_PINYIN, 195, 0}, +{"logn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 196, 1}, +{"lomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 196, 1}, +{"lon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 196, 1}, +{"long", IS_ZHUYIN|IS_PINYIN, 196, 0}, +{"lou", IS_ZHUYIN|IS_PINYIN, 197, 0}, +{"lu", IS_ZHUYIN|IS_PINYIN, 198, 0}, +{"luan", IS_ZHUYIN|IS_PINYIN, 199, 0}, +{"lue", IS_PINYIN|PINYIN_CORRECT_UE_VE, 203, 1}, +{"luen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 200, 1}, +{"lun", IS_ZHUYIN|IS_PINYIN, 200, 0}, +{"luo", IS_ZHUYIN|IS_PINYIN, 201, 0}, +{"lv", IS_ZHUYIN|IS_PINYIN, 202, 0}, +{"lve", IS_ZHUYIN|IS_PINYIN, 203, 0}, +{"m", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 204, 0}, +{"ma", IS_ZHUYIN|IS_PINYIN, 205, 0}, +{"magn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 208, 1}, +{"mai", IS_ZHUYIN|IS_PINYIN, 206, 0}, +{"mamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 208, 1}, +{"man", IS_ZHUYIN|IS_PINYIN, 207, 0}, +{"mang", IS_ZHUYIN|IS_PINYIN, 208, 0}, +{"mao", IS_ZHUYIN|IS_PINYIN, 209, 0}, +{"me", IS_ZHUYIN|IS_PINYIN, 210, 0}, +{"megn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 213, 1}, +{"mei", IS_ZHUYIN|IS_PINYIN, 211, 0}, +{"memg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 213, 1}, +{"men", IS_ZHUYIN|IS_PINYIN, 212, 0}, +{"meng", IS_ZHUYIN|IS_PINYIN, 213, 0}, +{"mi", IS_ZHUYIN|IS_PINYIN, 214, 0}, +{"mian", IS_ZHUYIN|IS_PINYIN, 215, 0}, +{"miao", IS_ZHUYIN|IS_PINYIN, 216, 0}, +{"mie", IS_ZHUYIN|IS_PINYIN, 217, 0}, +{"mign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 219, 1}, +{"mimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 219, 1}, +{"min", IS_ZHUYIN|IS_PINYIN, 218, 0}, +{"ming", IS_ZHUYIN|IS_PINYIN, 219, 0}, +{"miou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 220, 1}, +{"miu", IS_ZHUYIN|IS_PINYIN, 220, 0}, +{"mo", IS_ZHUYIN|IS_PINYIN, 221, 0}, +{"mou", IS_ZHUYIN|IS_PINYIN, 222, 0}, +{"mu", IS_ZHUYIN|IS_PINYIN, 223, 0}, +{"n", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 224, 0}, +{"na", IS_ZHUYIN|IS_PINYIN, 225, 0}, +{"nagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 228, 1}, +{"nai", IS_ZHUYIN|IS_PINYIN, 226, 0}, +{"namg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 228, 1}, +{"nan", IS_ZHUYIN|IS_PINYIN, 227, 0}, +{"nang", IS_ZHUYIN|IS_PINYIN, 228, 0}, +{"nao", IS_ZHUYIN|IS_PINYIN, 229, 0}, +{"ne", IS_ZHUYIN|IS_PINYIN, 230, 0}, +{"negn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 233, 1}, +{"nei", IS_ZHUYIN|IS_PINYIN, 231, 0}, +{"nemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 233, 1}, +{"nen", IS_ZHUYIN|IS_PINYIN, 232, 0}, +{"neng", IS_ZHUYIN|IS_PINYIN, 233, 0}, +{"ng", IS_ZHUYIN|IS_PINYIN, 234, 0}, +{"ni", IS_ZHUYIN|IS_PINYIN, 235, 0}, +{"niagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 238, 1}, +{"niamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 238, 1}, +{"nian", IS_ZHUYIN|IS_PINYIN, 237, 0}, +{"niang", IS_ZHUYIN|IS_PINYIN, 238, 0}, +{"niao", IS_ZHUYIN|IS_PINYIN, 239, 0}, +{"nie", IS_ZHUYIN|IS_PINYIN, 240, 0}, +{"nign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 242, 1}, +{"nimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 242, 1}, +{"nin", IS_ZHUYIN|IS_PINYIN, 241, 0}, +{"ning", IS_ZHUYIN|IS_PINYIN, 242, 0}, +{"niou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 243, 1}, +{"niu", IS_ZHUYIN|IS_PINYIN, 243, 0}, +{"nogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 244, 1}, +{"nomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 244, 1}, +{"non", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 244, 1}, +{"nong", IS_ZHUYIN|IS_PINYIN, 244, 0}, +{"nou", IS_ZHUYIN|IS_PINYIN, 245, 0}, +{"nu", IS_ZHUYIN|IS_PINYIN, 246, 0}, +{"nuan", IS_ZHUYIN|IS_PINYIN, 247, 0}, +{"nue", IS_PINYIN|PINYIN_CORRECT_UE_VE, 251, 1}, +{"nuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 248, 1}, +{"nuo", IS_ZHUYIN|IS_PINYIN, 249, 0}, +{"nv", IS_ZHUYIN|IS_PINYIN, 250, 0}, +{"nve", IS_ZHUYIN|IS_PINYIN, 251, 0}, +{"o", IS_ZHUYIN|IS_PINYIN, 252, 0}, +{"ou", IS_ZHUYIN|IS_PINYIN, 253, 0}, +{"p", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 254, 0}, +{"pa", IS_ZHUYIN|IS_PINYIN, 255, 0}, +{"pagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 258, 1}, +{"pai", IS_ZHUYIN|IS_PINYIN, 256, 0}, +{"pamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 258, 1}, +{"pan", IS_ZHUYIN|IS_PINYIN, 257, 0}, +{"pang", IS_ZHUYIN|IS_PINYIN, 258, 0}, +{"pao", IS_ZHUYIN|IS_PINYIN, 259, 0}, +{"pegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 262, 1}, +{"pei", IS_ZHUYIN|IS_PINYIN, 260, 0}, +{"pemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 262, 1}, +{"pen", IS_ZHUYIN|IS_PINYIN, 261, 0}, +{"peng", IS_ZHUYIN|IS_PINYIN, 262, 0}, +{"pi", IS_ZHUYIN|IS_PINYIN, 263, 0}, +{"pian", IS_ZHUYIN|IS_PINYIN, 264, 0}, +{"piao", IS_ZHUYIN|IS_PINYIN, 265, 0}, +{"pie", IS_ZHUYIN|IS_PINYIN, 266, 0}, +{"pign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 268, 1}, +{"pimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 268, 1}, +{"pin", IS_ZHUYIN|IS_PINYIN, 267, 0}, +{"ping", IS_ZHUYIN|IS_PINYIN, 268, 0}, +{"po", IS_ZHUYIN|IS_PINYIN, 269, 0}, +{"pou", IS_ZHUYIN|IS_PINYIN, 270, 0}, +{"pu", IS_ZHUYIN|IS_PINYIN, 271, 0}, +{"q", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 272, 0}, +{"qi", IS_ZHUYIN|IS_PINYIN, 273, 0}, +{"qia", IS_ZHUYIN|IS_PINYIN, 274, 0}, +{"qiagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 276, 1}, +{"qiamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 276, 1}, +{"qian", IS_ZHUYIN|IS_PINYIN, 275, 0}, +{"qiang", IS_ZHUYIN|IS_PINYIN, 276, 0}, +{"qiao", IS_ZHUYIN|IS_PINYIN, 277, 0}, +{"qie", IS_ZHUYIN|IS_PINYIN, 278, 0}, +{"qign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 280, 1}, +{"qimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 280, 1}, +{"qin", IS_ZHUYIN|IS_PINYIN, 279, 0}, +{"qing", IS_ZHUYIN|IS_PINYIN, 280, 0}, +{"qiogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 281, 1}, +{"qiomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 281, 1}, +{"qion", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 281, 1}, +{"qiong", IS_ZHUYIN|IS_PINYIN, 281, 0}, +{"qiou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 282, 1}, +{"qiu", IS_ZHUYIN|IS_PINYIN, 282, 0}, +{"qu", IS_ZHUYIN|IS_PINYIN, 283, 0}, +{"quan", IS_ZHUYIN|IS_PINYIN, 284, 0}, +{"que", IS_ZHUYIN|IS_PINYIN, 285, 0}, +{"quen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 286, 1}, +{"qun", IS_ZHUYIN|IS_PINYIN, 286, 0}, +{"qv", IS_PINYIN|PINYIN_CORRECT_V_U, 283, 1}, +{"qvan", IS_PINYIN|PINYIN_CORRECT_V_U, 284, 1}, +{"qve", IS_PINYIN|PINYIN_CORRECT_V_U, 285, 1}, +{"qvn", IS_PINYIN|PINYIN_CORRECT_V_U, 286, 1}, +{"r", IS_PINYIN|PINYIN_INCOMPLETE, 287, 0}, +{"ragn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 289, 1}, +{"ramg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 289, 1}, +{"ran", IS_ZHUYIN|IS_PINYIN, 288, 0}, +{"rang", IS_ZHUYIN|IS_PINYIN, 289, 0}, +{"rao", IS_ZHUYIN|IS_PINYIN, 290, 0}, +{"re", IS_ZHUYIN|IS_PINYIN, 291, 0}, +{"regn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 293, 1}, +{"remg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 293, 1}, +{"ren", IS_ZHUYIN|IS_PINYIN, 292, 0}, +{"reng", IS_ZHUYIN|IS_PINYIN, 293, 0}, +{"ri", IS_ZHUYIN|IS_PINYIN, 294, 0}, +{"rogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 295, 1}, +{"romg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 295, 1}, +{"ron", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 295, 1}, +{"rong", IS_ZHUYIN|IS_PINYIN, 295, 0}, +{"rou", IS_ZHUYIN|IS_PINYIN, 296, 0}, +{"ru", IS_ZHUYIN|IS_PINYIN, 297, 0}, +{"ruan", IS_ZHUYIN|IS_PINYIN, 299, 0}, +{"ruei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 300, 1}, +{"ruen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 301, 1}, +{"rui", IS_ZHUYIN|IS_PINYIN, 300, 0}, +{"run", IS_ZHUYIN|IS_PINYIN, 301, 0}, +{"ruo", IS_ZHUYIN|IS_PINYIN, 302, 0}, +{"s", IS_PINYIN|PINYIN_INCOMPLETE, 303, 0}, +{"sa", IS_ZHUYIN|IS_PINYIN, 304, 0}, +{"sagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 307, 1}, +{"sai", IS_ZHUYIN|IS_PINYIN, 305, 0}, +{"samg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 307, 1}, +{"san", IS_ZHUYIN|IS_PINYIN, 306, 0}, +{"sang", IS_ZHUYIN|IS_PINYIN, 307, 0}, +{"sao", IS_ZHUYIN|IS_PINYIN, 308, 0}, +{"se", IS_ZHUYIN|IS_PINYIN, 309, 0}, +{"segn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 311, 1}, +{"semg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 311, 1}, +{"sen", IS_ZHUYIN|IS_PINYIN, 310, 0}, +{"seng", IS_ZHUYIN|IS_PINYIN, 311, 0}, +{"sh", IS_PINYIN|PINYIN_INCOMPLETE, 312, 0}, +{"sha", IS_ZHUYIN|IS_PINYIN, 313, 0}, +{"shagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 316, 1}, +{"shai", IS_ZHUYIN|IS_PINYIN, 314, 0}, +{"shamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 316, 1}, +{"shan", IS_ZHUYIN|IS_PINYIN, 315, 0}, +{"shang", IS_ZHUYIN|IS_PINYIN, 316, 0}, +{"shao", IS_ZHUYIN|IS_PINYIN, 317, 0}, +{"she", IS_ZHUYIN|IS_PINYIN, 318, 0}, +{"shegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 321, 1}, +{"shei", IS_ZHUYIN|IS_PINYIN, 319, 0}, +{"shemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 321, 1}, +{"shen", IS_ZHUYIN|IS_PINYIN, 320, 0}, +{"sheng", IS_ZHUYIN|IS_PINYIN, 321, 0}, +{"shi", IS_ZHUYIN|IS_PINYIN, 322, 0}, +{"shou", IS_ZHUYIN|IS_PINYIN, 323, 0}, +{"shu", IS_ZHUYIN|IS_PINYIN, 324, 0}, +{"shua", IS_ZHUYIN|IS_PINYIN, 325, 0}, +{"shuagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 328, 1}, +{"shuai", IS_ZHUYIN|IS_PINYIN, 326, 0}, +{"shuamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 328, 1}, +{"shuan", IS_ZHUYIN|IS_PINYIN, 327, 0}, +{"shuang", IS_ZHUYIN|IS_PINYIN, 328, 0}, +{"shuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 329, 1}, +{"shuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 330, 1}, +{"shui", IS_ZHUYIN|IS_PINYIN, 329, 0}, +{"shun", IS_ZHUYIN|IS_PINYIN, 330, 0}, +{"shuo", IS_ZHUYIN|IS_PINYIN, 331, 0}, +{"si", IS_ZHUYIN|IS_PINYIN, 332, 0}, +{"sogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 333, 1}, +{"somg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 333, 1}, +{"son", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 333, 1}, +{"song", IS_ZHUYIN|IS_PINYIN, 333, 0}, +{"sou", IS_ZHUYIN|IS_PINYIN, 334, 0}, +{"su", IS_ZHUYIN|IS_PINYIN, 335, 0}, +{"suan", IS_ZHUYIN|IS_PINYIN, 336, 0}, +{"suei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 337, 1}, +{"suen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 338, 1}, +{"sui", IS_ZHUYIN|IS_PINYIN, 337, 0}, +{"sun", IS_ZHUYIN|IS_PINYIN, 338, 0}, +{"suo", IS_ZHUYIN|IS_PINYIN, 339, 0}, +{"t", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 340, 0}, +{"ta", IS_ZHUYIN|IS_PINYIN, 341, 0}, +{"tagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 344, 1}, +{"tai", IS_ZHUYIN|IS_PINYIN, 342, 0}, +{"tamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 344, 1}, +{"tan", IS_ZHUYIN|IS_PINYIN, 343, 0}, +{"tang", IS_ZHUYIN|IS_PINYIN, 344, 0}, +{"tao", IS_ZHUYIN|IS_PINYIN, 345, 0}, +{"te", IS_ZHUYIN|IS_PINYIN, 346, 0}, +{"tegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 347, 1}, +{"temg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 347, 1}, +{"teng", IS_ZHUYIN|IS_PINYIN, 347, 0}, +{"ti", IS_ZHUYIN|IS_PINYIN, 348, 0}, +{"tian", IS_ZHUYIN|IS_PINYIN, 349, 0}, +{"tiao", IS_ZHUYIN|IS_PINYIN, 350, 0}, +{"tie", IS_ZHUYIN|IS_PINYIN, 351, 0}, +{"tign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 352, 1}, +{"timg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 352, 1}, +{"ting", IS_ZHUYIN|IS_PINYIN, 352, 0}, +{"togn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 353, 1}, +{"tomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 353, 1}, +{"ton", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 353, 1}, +{"tong", IS_ZHUYIN|IS_PINYIN, 353, 0}, +{"tou", IS_ZHUYIN|IS_PINYIN, 354, 0}, +{"tu", IS_ZHUYIN|IS_PINYIN, 355, 0}, +{"tuan", IS_ZHUYIN|IS_PINYIN, 356, 0}, +{"tuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 357, 1}, +{"tuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 358, 1}, +{"tui", IS_ZHUYIN|IS_PINYIN, 357, 0}, +{"tun", IS_ZHUYIN|IS_PINYIN, 358, 0}, +{"tuo", IS_ZHUYIN|IS_PINYIN, 359, 0}, +{"w", IS_PINYIN|PINYIN_INCOMPLETE, 360, 0}, +{"wa", IS_ZHUYIN|IS_PINYIN, 361, 0}, +{"wagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 364, 1}, +{"wai", IS_ZHUYIN|IS_PINYIN, 362, 0}, +{"wamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 364, 1}, +{"wan", IS_ZHUYIN|IS_PINYIN, 363, 0}, +{"wang", IS_ZHUYIN|IS_PINYIN, 364, 0}, +{"wegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 367, 1}, +{"wei", IS_ZHUYIN|IS_PINYIN, 365, 0}, +{"wemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 367, 1}, +{"wen", IS_ZHUYIN|IS_PINYIN, 366, 0}, +{"weng", IS_ZHUYIN|IS_PINYIN, 367, 0}, +{"wo", IS_ZHUYIN|IS_PINYIN, 368, 0}, +{"wu", IS_ZHUYIN|IS_PINYIN, 369, 0}, +{"x", IS_ZHUYIN|IS_PINYIN|PINYIN_INCOMPLETE|ZHUYIN_INCOMPLETE, 370, 0}, +{"xi", IS_ZHUYIN|IS_PINYIN, 371, 0}, +{"xia", IS_ZHUYIN|IS_PINYIN, 372, 0}, +{"xiagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 374, 1}, +{"xiamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 374, 1}, +{"xian", IS_ZHUYIN|IS_PINYIN, 373, 0}, +{"xiang", IS_ZHUYIN|IS_PINYIN, 374, 0}, +{"xiao", IS_ZHUYIN|IS_PINYIN, 375, 0}, +{"xie", IS_ZHUYIN|IS_PINYIN, 376, 0}, +{"xign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 378, 1}, +{"ximg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 378, 1}, +{"xin", IS_ZHUYIN|IS_PINYIN, 377, 0}, +{"xing", IS_ZHUYIN|IS_PINYIN, 378, 0}, +{"xiogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 379, 1}, +{"xiomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 379, 1}, +{"xion", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 379, 1}, +{"xiong", IS_ZHUYIN|IS_PINYIN, 379, 0}, +{"xiou", IS_PINYIN|PINYIN_CORRECT_IOU_IU, 380, 1}, +{"xiu", IS_ZHUYIN|IS_PINYIN, 380, 0}, +{"xu", IS_ZHUYIN|IS_PINYIN, 381, 0}, +{"xuan", IS_ZHUYIN|IS_PINYIN, 382, 0}, +{"xue", IS_ZHUYIN|IS_PINYIN, 383, 0}, +{"xuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 384, 1}, +{"xun", IS_ZHUYIN|IS_PINYIN, 384, 0}, +{"xv", IS_PINYIN|PINYIN_CORRECT_V_U, 381, 1}, +{"xvan", IS_PINYIN|PINYIN_CORRECT_V_U, 382, 1}, +{"xve", IS_PINYIN|PINYIN_CORRECT_V_U, 383, 1}, +{"xvn", IS_PINYIN|PINYIN_CORRECT_V_U, 384, 1}, +{"y", IS_PINYIN|PINYIN_INCOMPLETE, 385, 0}, +{"ya", IS_ZHUYIN|IS_PINYIN, 386, 0}, +{"yagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 389, 1}, +{"yamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 389, 1}, +{"yan", IS_ZHUYIN|IS_PINYIN, 388, 0}, +{"yang", IS_ZHUYIN|IS_PINYIN, 389, 0}, +{"yao", IS_ZHUYIN|IS_PINYIN, 390, 0}, +{"ye", IS_ZHUYIN|IS_PINYIN, 391, 0}, +{"yi", IS_ZHUYIN|IS_PINYIN, 392, 0}, +{"yign", IS_PINYIN|PINYIN_CORRECT_GN_NG, 394, 1}, +{"yimg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 394, 1}, +{"yin", IS_ZHUYIN|IS_PINYIN, 393, 0}, +{"ying", IS_ZHUYIN|IS_PINYIN, 394, 0}, +{"yo", IS_ZHUYIN|IS_PINYIN, 395, 0}, +{"yogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 396, 1}, +{"yomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 396, 1}, +{"yon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 396, 1}, +{"yong", IS_ZHUYIN|IS_PINYIN, 396, 0}, +{"you", IS_ZHUYIN|IS_PINYIN, 397, 0}, +{"yu", IS_ZHUYIN|IS_PINYIN, 398, 0}, +{"yuan", IS_ZHUYIN|IS_PINYIN, 399, 0}, +{"yue", IS_ZHUYIN|IS_PINYIN, 400, 0}, +{"yuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 401, 1}, +{"yun", IS_ZHUYIN|IS_PINYIN, 401, 0}, +{"yv", IS_PINYIN|PINYIN_CORRECT_V_U, 398, 1}, +{"yvan", IS_PINYIN|PINYIN_CORRECT_V_U, 399, 1}, +{"yve", IS_PINYIN|PINYIN_CORRECT_V_U, 400, 1}, +{"yvn", IS_PINYIN|PINYIN_CORRECT_V_U, 401, 1}, +{"z", IS_PINYIN|PINYIN_INCOMPLETE, 402, 0}, +{"za", IS_ZHUYIN|IS_PINYIN, 403, 0}, +{"zagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 406, 1}, +{"zai", IS_ZHUYIN|IS_PINYIN, 404, 0}, +{"zamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 406, 1}, +{"zan", IS_ZHUYIN|IS_PINYIN, 405, 0}, +{"zang", IS_ZHUYIN|IS_PINYIN, 406, 0}, +{"zao", IS_ZHUYIN|IS_PINYIN, 407, 0}, +{"ze", IS_ZHUYIN|IS_PINYIN, 408, 0}, +{"zegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 411, 1}, +{"zei", IS_ZHUYIN|IS_PINYIN, 409, 0}, +{"zemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 411, 1}, +{"zen", IS_ZHUYIN|IS_PINYIN, 410, 0}, +{"zeng", IS_ZHUYIN|IS_PINYIN, 411, 0}, +{"zh", IS_PINYIN|PINYIN_INCOMPLETE, 412, 0}, +{"zha", IS_ZHUYIN|IS_PINYIN, 413, 0}, +{"zhagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 416, 1}, +{"zhai", IS_ZHUYIN|IS_PINYIN, 414, 0}, +{"zhamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 416, 1}, +{"zhan", IS_ZHUYIN|IS_PINYIN, 415, 0}, +{"zhang", IS_ZHUYIN|IS_PINYIN, 416, 0}, +{"zhao", IS_ZHUYIN|IS_PINYIN, 417, 0}, +{"zhe", IS_ZHUYIN|IS_PINYIN, 418, 0}, +{"zhegn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 421, 1}, +{"zhemg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 421, 1}, +{"zhen", IS_ZHUYIN|IS_PINYIN, 420, 0}, +{"zheng", IS_ZHUYIN|IS_PINYIN, 421, 0}, +{"zhi", IS_ZHUYIN|IS_PINYIN, 422, 0}, +{"zhogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 423, 1}, +{"zhomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 423, 1}, +{"zhon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 423, 1}, +{"zhong", IS_ZHUYIN|IS_PINYIN, 423, 0}, +{"zhou", IS_ZHUYIN|IS_PINYIN, 424, 0}, +{"zhu", IS_ZHUYIN|IS_PINYIN, 425, 0}, +{"zhua", IS_ZHUYIN|IS_PINYIN, 426, 0}, +{"zhuagn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 429, 1}, +{"zhuai", IS_ZHUYIN|IS_PINYIN, 427, 0}, +{"zhuamg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 429, 1}, +{"zhuan", IS_ZHUYIN|IS_PINYIN, 428, 0}, +{"zhuang", IS_ZHUYIN|IS_PINYIN, 429, 0}, +{"zhuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 430, 1}, +{"zhuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 431, 1}, +{"zhui", IS_ZHUYIN|IS_PINYIN, 430, 0}, +{"zhun", IS_ZHUYIN|IS_PINYIN, 431, 0}, +{"zhuo", IS_ZHUYIN|IS_PINYIN, 432, 0}, +{"zi", IS_ZHUYIN|IS_PINYIN, 433, 0}, +{"zogn", IS_PINYIN|PINYIN_CORRECT_GN_NG, 434, 1}, +{"zomg", IS_PINYIN|PINYIN_CORRECT_MG_NG, 434, 1}, +{"zon", IS_PINYIN|PINYIN_CORRECT_ON_ONG, 434, 1}, +{"zong", IS_ZHUYIN|IS_PINYIN, 434, 0}, +{"zou", IS_ZHUYIN|IS_PINYIN, 435, 0}, +{"zu", IS_ZHUYIN|IS_PINYIN, 436, 0}, +{"zuan", IS_ZHUYIN|IS_PINYIN, 437, 0}, +{"zuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 438, 1}, +{"zuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 439, 1}, +{"zui", IS_ZHUYIN|IS_PINYIN, 438, 0}, +{"zun", IS_ZHUYIN|IS_PINYIN, 439, 0}, +{"zuo", IS_ZHUYIN|IS_PINYIN, 440, 0} }; const pinyin_index_item_t luoma_pinyin_index[] = { diff -Nru libpinyin-2.3.0/src/storage/special_table.h libpinyin-2.6.0/src/storage/special_table.h --- libpinyin-2.3.0/src/storage/special_table.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/special_table.h 2020-11-10 02:28:09.000000000 +0000 @@ -41,6 +41,7 @@ {{"chu", "nan"}, {ChewingKey(CHEWING_CH, CHEWING_U, CHEWING_ZERO_FINAL), ChewingKey(CHEWING_N, CHEWING_ZERO_MIDDLE, CHEWING_AN)}, 100, {"chun", "an"}, {ChewingKey(CHEWING_CH, CHEWING_U, CHEWING_EN), ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_AN)}, 100}, {{"dan", "gan"}, {ChewingKey(CHEWING_D, CHEWING_ZERO_MIDDLE, CHEWING_AN), ChewingKey(CHEWING_G, CHEWING_ZERO_MIDDLE, CHEWING_AN)}, 0, {"dang", "an"}, {ChewingKey(CHEWING_D, CHEWING_ZERO_MIDDLE, CHEWING_ANG), ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_AN)}, 100}, {{"e", "nai"}, {ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_E), ChewingKey(CHEWING_N, CHEWING_ZERO_MIDDLE, CHEWING_AI)}, 0, {"en", "ai"}, {ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_EN), ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_AI)}, 100}, +{{"e", "nen"}, {ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_E), ChewingKey(CHEWING_N, CHEWING_ZERO_MIDDLE, CHEWING_EN)}, 100, {"en", "en"}, {ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_EN), ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_EN)}, 300}, {{"fa", "nan"}, {ChewingKey(CHEWING_F, CHEWING_ZERO_MIDDLE, CHEWING_A), ChewingKey(CHEWING_N, CHEWING_ZERO_MIDDLE, CHEWING_AN)}, 100, {"fan", "an"}, {ChewingKey(CHEWING_F, CHEWING_ZERO_MIDDLE, CHEWING_AN), ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_AN)}, 100}, {{"fan", "gai"}, {ChewingKey(CHEWING_F, CHEWING_ZERO_MIDDLE, CHEWING_AN), ChewingKey(CHEWING_G, CHEWING_ZERO_MIDDLE, CHEWING_AI)}, 0, {"fang", "ai"}, {ChewingKey(CHEWING_F, CHEWING_ZERO_MIDDLE, CHEWING_ANG), ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_AI)}, 100}, {{"fan", "gan"}, {ChewingKey(CHEWING_F, CHEWING_ZERO_MIDDLE, CHEWING_AN), ChewingKey(CHEWING_G, CHEWING_ZERO_MIDDLE, CHEWING_AN)}, 100, {"fang", "an"}, {ChewingKey(CHEWING_F, CHEWING_ZERO_MIDDLE, CHEWING_ANG), ChewingKey(CHEWING_ZERO_INITIAL, CHEWING_ZERO_MIDDLE, CHEWING_AN)}, 100}, diff -Nru libpinyin-2.3.0/src/storage/table_info.cpp libpinyin-2.6.0/src/storage/table_info.cpp --- libpinyin-2.3.0/src/storage/table_info.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/table_info.cpp 2020-09-28 01:20:48.000000000 +0000 @@ -116,6 +116,16 @@ assert(FALSE); } +static TABLE_DATABASE_FORMAT_TYPE to_table_database_format_type(const char * str) { + if (0 == strcmp("BerkeleyDB", str)) + return BERKELEY_DB_FORMAT; + + if (0 == strcmp("KyotoCabinet", str)) + return KYOTO_CABINET_FORMAT; + + assert(FALSE); +} + static TABLE_TARGET to_table_target(const char * str) { if (0 == strcmp("default", str)) return DEFAULT_TABLE; @@ -161,6 +171,16 @@ #undef HANDLE +static const char * from_table_database_format_type(const TABLE_DATABASE_FORMAT_TYPE format) { + if (format == BERKELEY_DB_FORMAT) + return "BerkeleyDB"; + + if (format == KYOTO_CABINET_FORMAT) + return "KyotoCabinet"; + + assert(FALSE); +} + bool SystemTableInfo2::load(const char * filename) { reset(); @@ -196,9 +216,13 @@ TABLE_PHONETIC_TYPE type = PINYIN_TABLE; char str[256]; - num = fscanf(input, "source table format:%255s", str); + num = fscanf(input, "source table format:%255s\n", str); type = to_table_phonetic_type(str); + TABLE_DATABASE_FORMAT_TYPE format = UNKNOWN_FORMAT; + num = fscanf(input, "database format:%255s\n", str); + format = to_table_database_format_type (str); + #if 0 printf("binver:%d modelver:%d lambda:%f\n", binver, modelver, lambda); printf("type:%d\n", type); @@ -211,6 +235,8 @@ /* Note: support pinyin and zhuyin table now. */ assert(PINYIN_TABLE == type || ZHUYIN_TABLE == type); m_table_phonetic_type = type; + assert(BERKELEY_DB_FORMAT == format || KYOTO_CABINET_FORMAT == format); + m_table_database_format_type = format; int index = 0; char tableinfo[256], dictstr[256]; @@ -309,12 +335,19 @@ return false; } + TABLE_DATABASE_FORMAT_TYPE format = UNKNOWN_FORMAT; + char str[256]; + num = fscanf(input, "database format:%255s\n", str); + if (EOF != num) + format = to_table_database_format_type (str); + #if 0 printf("binver:%d modelver:%d\n", binver, modelver); #endif m_binary_format_version = binver; m_model_data_version = modelver; + m_table_database_format_type = format; fclose(input); @@ -334,6 +367,8 @@ fprintf(output, "binary format version:%d\n", m_binary_format_version); fprintf(output, "model data version:%d\n", m_model_data_version); + fprintf(output, "database format:%s\n", + from_table_database_format_type (m_table_database_format_type)); fclose(output); @@ -349,11 +384,15 @@ if (sysinfo->m_model_data_version != m_model_data_version) return false; + if (sysinfo->m_table_database_format_type != m_table_database_format_type) + return false; + return true; } bool UserTableInfo::make_conform(const SystemTableInfo2 * sysinfo) { m_binary_format_version = sysinfo->m_binary_format_version; m_model_data_version = sysinfo->m_model_data_version; + m_table_database_format_type = sysinfo->m_table_database_format_type; return true; } diff -Nru libpinyin-2.3.0/src/storage/table_info.h libpinyin-2.6.0/src/storage/table_info.h --- libpinyin-2.3.0/src/storage/table_info.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/table_info.h 2020-09-25 11:08:12.000000000 +0000 @@ -32,6 +32,12 @@ } TABLE_PHONETIC_TYPE; typedef enum { + UNKNOWN_FORMAT, + BERKELEY_DB_FORMAT, + KYOTO_CABINET_FORMAT, +} TABLE_DATABASE_FORMAT_TYPE; + +typedef enum { DEFAULT_TABLE, ADDON_TABLE, } TABLE_TARGET; @@ -62,6 +68,7 @@ gfloat m_lambda; TABLE_PHONETIC_TYPE m_table_phonetic_type; + TABLE_DATABASE_FORMAT_TYPE m_table_database_format_type; pinyin_table_info_t m_default_tables[PHRASE_INDEX_LIBRARY_COUNT]; @@ -90,6 +97,7 @@ private: int m_binary_format_version; int m_model_data_version; + TABLE_DATABASE_FORMAT_TYPE m_table_database_format_type; private: void reset(); diff -Nru libpinyin-2.3.0/src/storage/zhuyin_parser2.cpp libpinyin-2.6.0/src/storage/zhuyin_parser2.cpp --- libpinyin-2.3.0/src/storage/zhuyin_parser2.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/zhuyin_parser2.cpp 2020-07-27 02:14:48.000000000 +0000 @@ -160,6 +160,7 @@ bool ZhuyinSimpleParser2::parse_one_key(pinyin_option_t options, ChewingKey & key, + gint16 & distance, const char * str, int len) const { options &= ~PINYIN_AMB_ALL; unsigned char tone = CHEWING_ZERO_TONE; @@ -240,9 +241,10 @@ i = std_lite::min(maximum_len - parsed_len, (int)max_chewing_length); + gint16 distance = 0; ChewingKey key; ChewingKeyRest key_rest; for (; i > 0; --i) { - bool success = parse_one_key(options, key, cur_str, i); + bool success = parse_one_key(options, key, distance, cur_str, i); if (success) break; } @@ -331,6 +333,7 @@ bool ZhuyinDiscreteParser2::parse_one_key(pinyin_option_t options, ChewingKey & key, + gint16 & distance, const char * str, int len) const { if (0 == len) return false; @@ -430,9 +433,10 @@ i = std_lite::min(maximum_len - parsed_len, (int)max_chewing_length); + gint16 distance = 0; ChewingKey key; ChewingKeyRest key_rest; for (; i > 0; --i) { - bool success = parse_one_key(options, key, cur_str, i); + bool success = parse_one_key(options, key, distance, cur_str, i); if (success) break; } @@ -567,6 +571,7 @@ bool ZhuyinDaChenCP26Parser2::parse_one_key(pinyin_option_t options, ChewingKey & key, + gint16 & distance, const char *str, int len) const { if (0 == len) return false; @@ -731,15 +736,16 @@ /* maximum forward match for chewing. */ int parsed_len = 0; const char * cur_str = NULL; - ChewingKey key; ChewingKeyRest key_rest; while (parsed_len < maximum_len) { cur_str = str + parsed_len; i = std_lite::min(maximum_len - parsed_len, (int)max_chewing_dachen26_length); + gint16 distance = 0; + ChewingKey key; ChewingKeyRest key_rest; for (; i > 0; --i) { - bool success = parse_one_key(options, key, cur_str, i); + bool success = parse_one_key(options, key, distance, cur_str, i); if (success) break; } @@ -851,6 +857,7 @@ bool ZhuyinDirectParser2::parse_one_key(pinyin_option_t options, ChewingKey & key, + gint16 & distance, const char *str, int len) const { options &= ~PINYIN_AMB_ALL; /* by default, chewing will use the first tone. */ @@ -910,8 +917,6 @@ g_array_set_size(keys, 0); g_array_set_size(key_rests, 0); - ChewingKey key; ChewingKeyRest key_rest; - int parsed_len = 0; int i = 0, cur = 0, next = 0; while (cur < len) { @@ -922,7 +927,9 @@ } next = i; - if (parse_one_key(options, key, str + cur, next - cur)) { + gint16 distance = 0; + ChewingKey key; ChewingKeyRest key_rest; + if (parse_one_key(options, key, distance, str + cur, next - cur)) { #if 0 /* as direct parser handles data source, assume the data is correct when loading. */ diff -Nru libpinyin-2.3.0/src/storage/zhuyin_parser2.h libpinyin-2.6.0/src/storage/zhuyin_parser2.h --- libpinyin-2.3.0/src/storage/zhuyin_parser2.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/storage/zhuyin_parser2.h 2020-07-27 02:14:48.000000000 +0000 @@ -98,7 +98,7 @@ virtual ~ZhuyinSimpleParser2() {} - virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, const char *str, int len) const; + virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, gint16 & distance, const char *str, int len) const; virtual int parse(pinyin_option_t options, ChewingKeyVector & keys, ChewingKeyRestVector & key_rests, const char *str, int len) const; @@ -142,7 +142,7 @@ virtual ~ZhuyinDiscreteParser2() {} - virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, const char *str, int len) const; + virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, gint16 & distance, const char *str, int len) const; virtual int parse(pinyin_option_t options, ChewingKeyVector & keys, ChewingKeyRestVector & key_rests, const char *str, int len) const; @@ -167,7 +167,7 @@ virtual ~ZhuyinDaChenCP26Parser2() {} - virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, const char *str, int len) const; + virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, gint16 & distance, const char *str, int len) const; virtual int parse(pinyin_option_t options, ChewingKeyVector & keys, ChewingKeyRestVector & key_rests, const char *str, int len) const; @@ -187,7 +187,7 @@ virtual ~ZhuyinDirectParser2() {} - virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, const char *str, int len) const; + virtual bool parse_one_key(pinyin_option_t options, ChewingKey & key, gint16 & distance, const char *str, int len) const; virtual int parse(pinyin_option_t options, ChewingKeyVector & keys, ChewingKeyRestVector & key_rests, const char *str, int len) const; }; diff -Nru libpinyin-2.3.0/src/zhuyin.cpp libpinyin-2.6.0/src/zhuyin.cpp --- libpinyin-2.3.0/src/zhuyin.cpp 2019-01-17 07:27:48.000000000 +0000 +++ libpinyin-2.6.0/src/zhuyin.cpp 2020-08-18 03:41:11.000000000 +0000 @@ -1007,9 +1007,10 @@ /* disable the pinyin correction options. */ options &= ~PINYIN_CORRECT_ALL; + gint16 distance = 0; int pinyin_len = strlen(onepinyin); bool retval = context->m_full_pinyin_parser->parse_one_key - (options, *onekey, onepinyin, pinyin_len); + (options, *onekey, distance, onepinyin, pinyin_len); return retval; } @@ -1047,9 +1048,10 @@ zhuyin_context_t * & context = instance->m_context; zhuyin_option_t options = context->m_options; + gint16 distance = 0; int chewing_len = strlen(onechewing); bool retval = context->m_chewing_parser->parse_one_key - (options, *onekey, onechewing, chewing_len ); + (options, *onekey, distance, onechewing, chewing_len); return retval; } @@ -1944,6 +1946,28 @@ return true; } +/* find the first zero ChewingKey "'". */ +static size_t _compute_zero_start(PhoneticKeyMatrix & matrix, size_t offset) { + ChewingKey key; ChewingKeyRest key_rest; + const ChewingKey zero_key; + + ssize_t index = offset - 1; + for (; index > 0; --index) { + const size_t size = matrix.get_column_size(index); + + if (1 != size) + break; + + matrix.get_item(index, 0, key, key_rest); + if (zero_key == key) + offset = index; + else + break; + } + + return offset; +} + /* when lookup offset: get the previous non-zero ChewingKey. */ bool zhuyin_get_zhuyin_offset(zhuyin_instance_t * instance, @@ -1960,6 +1984,7 @@ break; } + offset = _compute_zero_start(matrix, offset); _check_offset(matrix, offset); *poffset = offset; @@ -1991,6 +2016,7 @@ break; } + offset = _compute_zero_start(matrix, offset); _check_offset(matrix, left); *pleft = left; @@ -2007,6 +2033,7 @@ size_t right = offset; ChewingKey key; ChewingKeyRest key_rest; + const ChewingKey zero_key; for (size_t index = right; index < matrix.size() - 1; ++index) { const size_t size = matrix.get_column_size(index); @@ -2014,7 +2041,10 @@ break; matrix.get_item(index, 0, key, key_rest); - break; + if (zero_key == key) + right = index + 1; + else + break; } if (0 == matrix.get_column_size(right)) diff -Nru libpinyin-2.3.0/src/zhuyin.h libpinyin-2.6.0/src/zhuyin.h --- libpinyin-2.3.0/src/zhuyin.h 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/src/zhuyin.h 2020-09-07 03:48:16.000000000 +0000 @@ -594,7 +594,7 @@ * */ bool zhuyin_get_zhuyin_key(zhuyin_instance_t * instance, - guint index, + size_t index, ChewingKey ** key); /** @@ -608,7 +608,7 @@ * */ bool zhuyin_get_zhuyin_key_rest(zhuyin_instance_t * instance, - guint index, + size_t index, ChewingKeyRest ** key_rest); /** diff -Nru libpinyin-2.3.0/test-driver libpinyin-2.6.0/test-driver --- libpinyin-2.3.0/test-driver 2019-02-22 07:54:28.000000000 +0000 +++ libpinyin-2.6.0/test-driver 2020-11-30 08:42:40.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru libpinyin-2.3.0/tests/include/Makefile.am libpinyin-2.6.0/tests/include/Makefile.am --- libpinyin-2.3.0/tests/include/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/tests/include/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff -Nru libpinyin-2.3.0/tests/include/Makefile.in libpinyin-2.6.0/tests/include/Makefile.in --- libpinyin-2.3.0/tests/include/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/tests/include/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -398,6 +398,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -512,7 +513,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff -Nru libpinyin-2.3.0/tests/lookup/Makefile.am libpinyin-2.6.0/tests/lookup/Makefile.am --- libpinyin-2.3.0/tests/lookup/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/tests/lookup/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -14,14 +14,19 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/tests \ @GLIB2_CFLAGS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +LDADD = \ + ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ \ + $(NULL) noinst_PROGRAMS = test_pinyin_lookup \ test_phrase_lookup diff -Nru libpinyin-2.3.0/tests/lookup/Makefile.in libpinyin-2.6.0/tests/lookup/Makefile.in --- libpinyin-2.3.0/tests/lookup/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/tests/lookup/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -107,7 +107,8 @@ am_test_phrase_lookup_OBJECTS = test_phrase_lookup.$(OBJEXT) test_phrase_lookup_OBJECTS = $(am_test_phrase_lookup_OBJECTS) test_phrase_lookup_LDADD = $(LDADD) -test_phrase_lookup_DEPENDENCIES = ../../src/libpinyin_internal.la +test_phrase_lookup_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -115,7 +116,8 @@ am_test_pinyin_lookup_OBJECTS = test_pinyin_lookup.$(OBJEXT) test_pinyin_lookup_OBJECTS = $(am_test_pinyin_lookup_OBJECTS) test_pinyin_lookup_LDADD = $(LDADD) -test_pinyin_lookup_DEPENDENCIES = ../../src/libpinyin_internal.la +test_pinyin_lookup_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -199,6 +201,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -313,14 +316,20 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/tests \ @GLIB2_CFLAGS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +LDADD = \ + ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ \ + $(NULL) + test_pinyin_lookup_SOURCES = test_pinyin_lookup.cpp test_phrase_lookup_SOURCES = test_phrase_lookup.cpp all: all-am diff -Nru libpinyin-2.3.0/tests/Makefile.am libpinyin-2.6.0/tests/Makefile.am --- libpinyin-2.3.0/tests/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/tests/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -23,7 +23,7 @@ ACLOCAL = aclocal -I $(ac_aux_dir) -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff -Nru libpinyin-2.3.0/tests/Makefile.in libpinyin-2.6.0/tests/Makefile.in --- libpinyin-2.3.0/tests/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/tests/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -253,6 +253,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -371,7 +372,7 @@ SUBDIRS = include storage lookup MAINTAINERCLEANFILES = Makefile.in CLEANFILES = *.bak -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff -Nru libpinyin-2.3.0/tests/storage/Makefile.am libpinyin-2.6.0/tests/storage/Makefile.am --- libpinyin-2.3.0/tests/storage/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/tests/storage/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -14,14 +14,19 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/tests \ @GLIB2_CFLAGS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +LDADD = \ + ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ \ + $(NULL) TESTS = test_phrase_index_logger \ test_ngram \ diff -Nru libpinyin-2.3.0/tests/storage/Makefile.in libpinyin-2.6.0/tests/storage/Makefile.in --- libpinyin-2.3.0/tests/storage/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/tests/storage/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -112,7 +112,8 @@ am_test_chewing_table_OBJECTS = test_chewing_table.$(OBJEXT) test_chewing_table_OBJECTS = $(am_test_chewing_table_OBJECTS) test_chewing_table_LDADD = $(LDADD) -test_chewing_table_DEPENDENCIES = ../../src/libpinyin_internal.la +test_chewing_table_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -120,38 +121,46 @@ am_test_flexible_ngram_OBJECTS = test_flexible_ngram.$(OBJEXT) test_flexible_ngram_OBJECTS = $(am_test_flexible_ngram_OBJECTS) test_flexible_ngram_LDADD = $(LDADD) -test_flexible_ngram_DEPENDENCIES = ../../src/libpinyin_internal.la +test_flexible_ngram_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_test_matrix_OBJECTS = test_matrix.$(OBJEXT) test_matrix_OBJECTS = $(am_test_matrix_OBJECTS) test_matrix_LDADD = $(LDADD) -test_matrix_DEPENDENCIES = ../../src/libpinyin_internal.la +test_matrix_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_test_ngram_OBJECTS = test_ngram.$(OBJEXT) test_ngram_OBJECTS = $(am_test_ngram_OBJECTS) test_ngram_LDADD = $(LDADD) -test_ngram_DEPENDENCIES = ../../src/libpinyin_internal.la +test_ngram_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_test_parser2_OBJECTS = test_parser2.$(OBJEXT) test_parser2_OBJECTS = $(am_test_parser2_OBJECTS) test_parser2_LDADD = $(LDADD) -test_parser2_DEPENDENCIES = ../../src/libpinyin_internal.la +test_parser2_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_test_phrase_index_OBJECTS = test_phrase_index.$(OBJEXT) test_phrase_index_OBJECTS = $(am_test_phrase_index_OBJECTS) test_phrase_index_LDADD = $(LDADD) -test_phrase_index_DEPENDENCIES = ../../src/libpinyin_internal.la +test_phrase_index_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_test_phrase_index_logger_OBJECTS = \ test_phrase_index_logger.$(OBJEXT) test_phrase_index_logger_OBJECTS = \ $(am_test_phrase_index_logger_OBJECTS) test_phrase_index_logger_LDADD = $(LDADD) test_phrase_index_logger_DEPENDENCIES = \ - ../../src/libpinyin_internal.la + ../../src/libpinyin_internal.a ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a am_test_phrase_table_OBJECTS = test_phrase_table.$(OBJEXT) test_phrase_table_OBJECTS = $(am_test_phrase_table_OBJECTS) test_phrase_table_LDADD = $(LDADD) -test_phrase_table_DEPENDENCIES = ../../src/libpinyin_internal.la +test_phrase_table_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_test_table_info_OBJECTS = test_table_info.$(OBJEXT) test_table_info_OBJECTS = $(am_test_table_info_OBJECTS) test_table_info_LDADD = $(LDADD) -test_table_info_DEPENDENCIES = ../../src/libpinyin_internal.la +test_table_info_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -453,6 +462,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -567,14 +577,20 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/tests \ @GLIB2_CFLAGS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +LDADD = \ + ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ \ + $(NULL) + test_phrase_index_SOURCES = test_phrase_index.cpp test_phrase_index_logger_SOURCES = test_phrase_index_logger.cpp test_phrase_table_SOURCES = test_phrase_table.cpp diff -Nru libpinyin-2.3.0/tests/storage/test_ngram.cpp libpinyin-2.6.0/tests/storage/test_ngram.cpp --- libpinyin-2.3.0/tests/storage/test_ngram.cpp 2019-01-17 07:28:53.000000000 +0000 +++ libpinyin-2.6.0/tests/storage/test_ngram.cpp 2020-09-27 10:55:43.000000000 +0000 @@ -75,8 +75,8 @@ printf("item:%d\n", *token); } - assert(bigram.load_db("/tmp/test.db")); - assert(bigram.save_db("/tmp/test.db")); + assert(bigram.save_db("/tmp/snapshot.db")); + assert(bigram.load_db("/tmp/snapshot.db")); g_array_free(items, TRUE); diff -Nru libpinyin-2.3.0/utils/Makefile.in libpinyin-2.6.0/utils/Makefile.in --- libpinyin-2.3.0/utils/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/utils/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -203,6 +203,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ diff -Nru libpinyin-2.3.0/utils/segment/Makefile.am libpinyin-2.6.0/utils/segment/Makefile.am --- libpinyin-2.3.0/utils/segment/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/utils/segment/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -16,14 +16,17 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/storage \ - -I$(top_srcdir)/src/lookup \ - -I$(top_srcdir)/utils \ - @GLIB2_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/storage \ + -I$(top_srcdir)/src/lookup \ + -I$(top_srcdir)/utils \ + @GLIB2_CFLAGS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +LDADD = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ noinst_PROGRAMS = spseg ngseg mergeseq diff -Nru libpinyin-2.3.0/utils/segment/Makefile.in libpinyin-2.6.0/utils/segment/Makefile.in --- libpinyin-2.3.0/utils/segment/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/utils/segment/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -106,7 +106,8 @@ am_mergeseq_OBJECTS = mergeseq.$(OBJEXT) mergeseq_OBJECTS = $(am_mergeseq_OBJECTS) mergeseq_LDADD = $(LDADD) -mergeseq_DEPENDENCIES = ../../src/libpinyin_internal.la +mergeseq_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -114,11 +115,13 @@ am_ngseg_OBJECTS = ngseg.$(OBJEXT) ngseg_OBJECTS = $(am_ngseg_OBJECTS) ngseg_LDADD = $(LDADD) -ngseg_DEPENDENCIES = ../../src/libpinyin_internal.la +ngseg_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_spseg_OBJECTS = spseg.$(OBJEXT) spseg_OBJECTS = $(am_spseg_OBJECTS) spseg_LDADD = $(LDADD) -spseg_DEPENDENCIES = ../../src/libpinyin_internal.la +spseg_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -201,6 +204,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -316,14 +320,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/storage \ - -I$(top_srcdir)/src/lookup \ - -I$(top_srcdir)/utils \ - @GLIB2_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/storage \ + -I$(top_srcdir)/src/lookup \ + -I$(top_srcdir)/utils \ + @GLIB2_CFLAGS@ + +LDADD = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ spseg_SOURCES = spseg.cpp ngseg_SOURCES = ngseg.cpp mergeseq_SOURCES = mergeseq.cpp diff -Nru libpinyin-2.3.0/utils/storage/gen_binary_files.cpp libpinyin-2.6.0/utils/storage/gen_binary_files.cpp --- libpinyin-2.3.0/utils/storage/gen_binary_files.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/utils/storage/gen_binary_files.cpp 2020-09-27 08:06:21.000000000 +0000 @@ -98,13 +98,12 @@ SystemTableInfo2 system_table_info; - gchar * filename = g_build_filename(table_dir, SYSTEM_TABLE_INFO, NULL); + const gchar * filename = SYSTEM_TABLE_INFO; bool retval = system_table_info.load(filename); if (!retval) { fprintf(stderr, "load table.conf failed.\n"); exit(ENOENT); } - g_free(filename); const pinyin_table_info_t * phrase_files = system_table_info.get_default_tables(); diff -Nru libpinyin-2.3.0/utils/storage/import_interpolation.cpp libpinyin-2.6.0/utils/storage/import_interpolation.cpp --- libpinyin-2.3.0/utils/storage/import_interpolation.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/utils/storage/import_interpolation.cpp 2020-09-27 08:06:39.000000000 +0000 @@ -255,13 +255,12 @@ SystemTableInfo2 system_table_info; - gchar * filename = g_build_filename(table_dir, SYSTEM_TABLE_INFO, NULL); + const gchar * filename = SYSTEM_TABLE_INFO; bool retval = system_table_info.load(filename); if (!retval) { fprintf(stderr, "load table.conf failed.\n"); exit(ENOENT); } - g_free(filename); PhraseLargeTable3 phrase_table; diff -Nru libpinyin-2.3.0/utils/storage/Makefile.am libpinyin-2.6.0/utils/storage/Makefile.am --- libpinyin-2.3.0/utils/storage/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/utils/storage/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -14,14 +14,19 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/utils \ @GLIB2_CFLAGS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +LDADD = \ + ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ \ + $(NULL) bin_PROGRAMS = gen_binary_files \ import_interpolation diff -Nru libpinyin-2.3.0/utils/storage/Makefile.in libpinyin-2.6.0/utils/storage/Makefile.in --- libpinyin-2.3.0/utils/storage/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/utils/storage/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -109,7 +109,8 @@ am_export_interpolation_OBJECTS = export_interpolation.$(OBJEXT) export_interpolation_OBJECTS = $(am_export_interpolation_OBJECTS) export_interpolation_LDADD = $(LDADD) -export_interpolation_DEPENDENCIES = ../../src/libpinyin_internal.la +export_interpolation_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -117,19 +118,23 @@ am_gen_binary_files_OBJECTS = gen_binary_files.$(OBJEXT) gen_binary_files_OBJECTS = $(am_gen_binary_files_OBJECTS) gen_binary_files_LDADD = $(LDADD) -gen_binary_files_DEPENDENCIES = ../../src/libpinyin_internal.la +gen_binary_files_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_gen_pinyin_table_OBJECTS = gen_pinyin_table.$(OBJEXT) gen_pinyin_table_OBJECTS = $(am_gen_pinyin_table_OBJECTS) gen_pinyin_table_LDADD = $(LDADD) -gen_pinyin_table_DEPENDENCIES = ../../src/libpinyin_internal.la +gen_pinyin_table_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_gen_zhuyin_table_OBJECTS = gen_zhuyin_table.$(OBJEXT) gen_zhuyin_table_OBJECTS = $(am_gen_zhuyin_table_OBJECTS) gen_zhuyin_table_LDADD = $(LDADD) -gen_zhuyin_table_DEPENDENCIES = ../../src/libpinyin_internal.la +gen_zhuyin_table_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_import_interpolation_OBJECTS = import_interpolation.$(OBJEXT) import_interpolation_OBJECTS = $(am_import_interpolation_OBJECTS) import_interpolation_LDADD = $(LDADD) -import_interpolation_DEPENDENCIES = ../../src/libpinyin_internal.la +import_interpolation_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -219,6 +224,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -333,14 +339,20 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/utils \ @GLIB2_CFLAGS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +LDADD = \ + ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ \ + $(NULL) + gen_binary_files_SOURCES = gen_binary_files.cpp import_interpolation_SOURCES = import_interpolation.cpp export_interpolation_SOURCES = export_interpolation.cpp diff -Nru libpinyin-2.3.0/utils/training/gen_unigram.cpp libpinyin-2.6.0/utils/training/gen_unigram.cpp --- libpinyin-2.3.0/utils/training/gen_unigram.cpp 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/utils/training/gen_unigram.cpp 2020-09-27 08:06:05.000000000 +0000 @@ -93,13 +93,12 @@ SystemTableInfo2 system_table_info; - gchar * filename = g_build_filename(table_dir, SYSTEM_TABLE_INFO, NULL); + const gchar * filename = SYSTEM_TABLE_INFO; bool retval = system_table_info.load(filename); if (!retval) { fprintf(stderr, "load table.conf failed.\n"); exit(ENOENT); } - g_free(filename); const pinyin_table_info_t * phrase_files = system_table_info.get_default_tables(); diff -Nru libpinyin-2.3.0/utils/training/Makefile.am libpinyin-2.6.0/utils/training/Makefile.am --- libpinyin-2.3.0/utils/training/Makefile.am 2018-05-28 08:15:28.000000000 +0000 +++ libpinyin-2.6.0/utils/training/Makefile.am 2020-07-24 02:26:21.000000000 +0000 @@ -16,14 +16,17 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/storage \ - -I$(top_srcdir)/src/lookup \ - -I$(top_srcdir)/utils \ - @GLIB2_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/storage \ + -I$(top_srcdir)/src/lookup \ + -I$(top_srcdir)/utils \ + @GLIB2_CFLAGS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +LDADD = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ noinst_HEADERS = k_mixture_model.h diff -Nru libpinyin-2.3.0/utils/training/Makefile.in libpinyin-2.6.0/utils/training/Makefile.in --- libpinyin-2.3.0/utils/training/Makefile.in 2019-03-05 05:44:47.000000000 +0000 +++ libpinyin-2.6.0/utils/training/Makefile.in 2020-12-15 03:49:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -118,7 +118,8 @@ am_estimate_interpolation_OBJECTS = estimate_interpolation.$(OBJEXT) estimate_interpolation_OBJECTS = $(am_estimate_interpolation_OBJECTS) estimate_interpolation_LDADD = $(LDADD) -estimate_interpolation_DEPENDENCIES = ../../src/libpinyin_internal.la +estimate_interpolation_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -129,57 +130,69 @@ $(am_estimate_k_mixture_model_OBJECTS) estimate_k_mixture_model_LDADD = $(LDADD) estimate_k_mixture_model_DEPENDENCIES = \ - ../../src/libpinyin_internal.la + ../../src/libpinyin_internal.a ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a am_eval_correction_rate_OBJECTS = eval_correction_rate.$(OBJEXT) eval_correction_rate_OBJECTS = $(am_eval_correction_rate_OBJECTS) eval_correction_rate_LDADD = $(LDADD) -eval_correction_rate_DEPENDENCIES = ../../src/libpinyin_internal.la +eval_correction_rate_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_export_k_mixture_model_OBJECTS = export_k_mixture_model.$(OBJEXT) export_k_mixture_model_OBJECTS = $(am_export_k_mixture_model_OBJECTS) export_k_mixture_model_LDADD = $(LDADD) -export_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.la +export_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_gen_deleted_ngram_OBJECTS = gen_deleted_ngram.$(OBJEXT) gen_deleted_ngram_OBJECTS = $(am_gen_deleted_ngram_OBJECTS) gen_deleted_ngram_LDADD = $(LDADD) -gen_deleted_ngram_DEPENDENCIES = ../../src/libpinyin_internal.la +gen_deleted_ngram_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_gen_k_mixture_model_OBJECTS = gen_k_mixture_model.$(OBJEXT) gen_k_mixture_model_OBJECTS = $(am_gen_k_mixture_model_OBJECTS) gen_k_mixture_model_LDADD = $(LDADD) -gen_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.la +gen_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_gen_ngram_OBJECTS = gen_ngram.$(OBJEXT) gen_ngram_OBJECTS = $(am_gen_ngram_OBJECTS) gen_ngram_LDADD = $(LDADD) -gen_ngram_DEPENDENCIES = ../../src/libpinyin_internal.la +gen_ngram_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_gen_unigram_OBJECTS = gen_unigram.$(OBJEXT) gen_unigram_OBJECTS = $(am_gen_unigram_OBJECTS) gen_unigram_LDADD = $(LDADD) -gen_unigram_DEPENDENCIES = ../../src/libpinyin_internal.la +gen_unigram_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_import_k_mixture_model_OBJECTS = import_k_mixture_model.$(OBJEXT) import_k_mixture_model_OBJECTS = $(am_import_k_mixture_model_OBJECTS) import_k_mixture_model_LDADD = $(LDADD) -import_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.la +import_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_k_mixture_model_to_interpolation_OBJECTS = \ k_mixture_model_to_interpolation.$(OBJEXT) k_mixture_model_to_interpolation_OBJECTS = \ $(am_k_mixture_model_to_interpolation_OBJECTS) k_mixture_model_to_interpolation_LDADD = $(LDADD) k_mixture_model_to_interpolation_DEPENDENCIES = \ - ../../src/libpinyin_internal.la + ../../src/libpinyin_internal.a ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a am_merge_k_mixture_model_OBJECTS = merge_k_mixture_model.$(OBJEXT) merge_k_mixture_model_OBJECTS = $(am_merge_k_mixture_model_OBJECTS) merge_k_mixture_model_LDADD = $(LDADD) -merge_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.la +merge_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_prune_k_mixture_model_OBJECTS = prune_k_mixture_model.$(OBJEXT) prune_k_mixture_model_OBJECTS = $(am_prune_k_mixture_model_OBJECTS) prune_k_mixture_model_LDADD = $(LDADD) -prune_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.la +prune_k_mixture_model_DEPENDENCIES = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a ../../src/lookup/liblookup.a am_validate_k_mixture_model_OBJECTS = \ validate_k_mixture_model.$(OBJEXT) validate_k_mixture_model_OBJECTS = \ $(am_validate_k_mixture_model_OBJECTS) validate_k_mixture_model_LDADD = $(LDADD) validate_k_mixture_model_DEPENDENCIES = \ - ../../src/libpinyin_internal.la + ../../src/libpinyin_internal.a ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -291,6 +304,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATABASE_FORMAT = @DATABASE_FORMAT@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -406,14 +420,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/storage \ - -I$(top_srcdir)/src/lookup \ - -I$(top_srcdir)/utils \ - @GLIB2_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/storage \ + -I$(top_srcdir)/src/lookup \ + -I$(top_srcdir)/utils \ + @GLIB2_CFLAGS@ + +LDADD = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ -LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ noinst_HEADERS = k_mixture_model.h gen_ngram_SOURCES = gen_ngram.cpp gen_deleted_ngram_SOURCES = gen_deleted_ngram.cpp