doc update to 3.3.2

liyijincom · Apr 28, 2016 · f0d2e1f · f0d2e1f
1 parent ba8dd43
commit f0d2e1f
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -5,11 +5,14 @@
 新闻
 ----
 
-语言技术平台3.3.1版 发布
-* [修复] 修复了3.3.0版本模型加载的bug
-* [增加] 提供 Windows 下的`ltp_test`和`xxx_cmdline`二进制下载，无需再手工编译
+语言技术平台 3.3.2 版发布
+* [修复] 修复了 3.3.1 版本的一些 bug
 
-语言技术平台3.3.0版 发布
+语言技术平台 3.3.1 版发布
+* [修复] 修复了 3.3.0 版本模型加载的 bug
+* [增加] 提供 Windows 下的 `ltp_test` 和 `xxx_cmdline` 二进制下载，无需再手工编译
+
+语言技术平台 3.3.0 版发布
 * [增加] 词性标注模型加入微博数据，使得在开放域上的词性标注性能更好(+3.3 precision)
 * [增加] 依存句法分析模型加入微博数据，使得在开放域上的句法分析性能更好(+3 UAS)
 * [增加] 依存句法分析算法切换到transition-based neural network parser，速度从40 tokens/s提升到8000 tokens/s。同时通过加入聚类特征以及优化训练算法，（在新闻领域）准确率也得到小幅提升(+0.2 UAS)
@@ -40,7 +43,7 @@
 ---
 
 * [百度云](http://pan.baidu.com/share/link?shareid=1988562907&uk=2738088569)
-* 当前模型版本3.3.1
+* 当前模型版本 3.3.1
 
 开源协议
 -------
@@ -49,6 +52,6 @@
 
 2. 除上述机构以外的企事业单位，如申请使用该平台，需付费。
 
-3. 凡涉及付费问题，请发邮件到car@ir.hit.edu.cn洽商。
+3. 凡涉及付费问题，请发邮件到 car@ir.hit.edu.cn 洽商。
 
-4. 如果您在LTP基础上发表论文或取得科研成果，请您在发表论文和申报成果时声明“使用了哈工大社会计算与信息检索研究中心研制的语言技术平台（LTP）”，参考文献中加入以下论文： Wanxiang Che, Zhenghua Li, Ting Liu. LTP: A Chinese Language Technology Platform. In Proceedings of the Coling 2010:Demonstrations. 2010.08, pp13-16, Beijing, China. 同时，发信给[email protected]，说明发表论文或申报成果的题目、出处等。
+4. 如果您在 LTP 基础上发表论文或取得科研成果，请您在发表论文和申报成果时声明“使用了哈工大社会计算与信息检索研究中心研制的语言技术平台（LTP）”，参考文献中加入以下论文： Wanxiang Che, Zhenghua Li, Ting Liu. LTP: A Chinese Language Technology Platform. In Proceedings of the Coling 2010:Demonstrations. 2010.08, pp13-16, Beijing, China. 同时，发信给[email protected]，说明发表论文或申报成果的题目、出处等。
diff --git a/doc/ltpserver.rst b/doc/ltpserver.rst
@@ -14,7 +14,7 @@ ltp_server只提供Linux版本
 
 LTP Server在轻量级服务器程序mongoose基础上开发。在编译LTP源码之后，运行`./bin/ltp_server`就可以启动LTP Server。::
 
-    ltp_server in LTP 3.3.1 - (C) 2012-2015 HIT-SCIR
+    ltp_server in LTP 3.3.2 - (C) 2012-2016 HIT-SCIR
     The HTTP server frontend for Language Technology Platform.
     
     usage: ./ltp_server <options>

diff --git a/doc/ltptest.rst b/doc/ltptest.rst
@@ -34,8 +34,8 @@ ltp_test主程序
 
 :file:`ltp_test` 是一个整合LTP中各模块的命令行工具。它完成加载模型，依照指定方法执行分析的功能。:file:`ltp_test` 加载的模型通过配置文件指定。编译后运行::
 
-    $ ./bin/ltp_test 
-    ltp_test in LTP 3.3.1 - (C) 2012-2015 HIT-SCIR
+    $ ./bin/ltp_test
+    ltp_test in LTP 3.3.2 - (C) 2012-2016 HIT-SCIR
     The console application for Language Technology Platform.
     
     usage: ./ltp_test <options>

diff --git a/doc/news.rst b/doc/news.rst
@@ -1,17 +1,21 @@
 新闻
 =====
 
-语言技术平台3.3.1版 发布
+语言技术平台 3.3.2 版发布
 
-* [修复] 修复了3.3.0版本模型加载的bug
-* [增加] 提供 Windows 下的`ltp_test`和`xxx_cmdline`二进制下载，无需再手工编译
+* [修复] 修复了 3.3.1 版本一些 bug
 
-语言技术平台3.3.0版 发布
+语言技术平台 3.3.1 版发布
+
+* [修复] 修复了 3.3.0 版本模型加载的 bug
+* [增加] 提供 Windows 下的 `ltp_test` 和 `xxx_cmdline` 二进制下载，无需再手工编译
+
+语言技术平台 3.3.0 版发布
 
 * [增加] 词性标注模型加入微博数据，使得在开放域上的词性标注性能更好(+3.3 precision)
 * [增加] 依存句法分析模型加入微博数据，使得在开放域上的句法分析性能更好(+3 UAS)
-* [增加] 依存句法分析算法切换到transition-based neural network parser，速度从40 tokens/s提升到8000 tokens/s。同时通过加入聚类特征以及优化训练算法，（在新闻领域）准确率也得到小幅提升(+0.2 UAS)
-* [增加] `ltp_test`默认支持多线程，线程数可配置。
+* [增加] 依存句法分析算法切换到 transition-based neural network parser，速度从 40 tokens/s 提升到 8000 tokens/s。同时通过加入聚类特征以及优化训练算法，（在新闻领域）准确率也得到小幅提升(+0.2 UAS)
+* [增加] `ltp_test` 默认支持多线程，线程数可配置。
 * [增加] 新加入子模块命令行程序，`cws_cmdline`，`pos_cmdline`，`par_cmdline`，`ner_cmdline`，使用户可以很容易替换中间模块，从而实现语言分析的组合。
 * [修改] 优化了训练套件的交互方式
 * [增加] 添加模型验证，单元测试模块。
diff --git a/doc/theory.rst b/doc/theory.rst
@@ -105,7 +105,7 @@
 个性化分词模型的训练同样可以通过分词训练套件 :file:`otcws` 来实现。::
 
     $ ./tools/train/otcws customized-learn
-    otcws(customized-learn) in LTP 3.3.0 - (C) 2012-2015 HIT-SCIR
+    otcws(customized-learn) in LTP 3.3.2 - (C) 2012-2016 HIT-SCIR
     Customized training suite for Chinese word segmentation
 
     usage: ./otcws learn <options>
@@ -132,7 +132,7 @@
 个性化分词模型的训练同样可以通过分词训练套件 :file:`otcws` 来实现。::
 
     $ ./tools/train/otcws customized-test
-    otcws(customized-test) in LTP 3.3.0 - (C) 2012-2015 HIT-SCIR
+    otcws(customized-test) in LTP 3.3.2 - (C) 2012-2016 HIT-SCIR
     Customized testing suite for Chinese word segmentation
 
     usage: ./otcws test <options>

diff --git a/doc/train.rst b/doc/train.rst
@@ -11,7 +11,7 @@ otcws是ltp分词模型的训练套件，用户可以使用otcws训练获得ltp
 编译之后，在tools/train下面会产生名为otcws的二进制程序。运行可见::
 
     $ ./tools/train/otcws 
-    otcws in LTP 3.3.0 - (C) 2012-2015 HIT-SCIR
+    otcws in LTP 3.3.2 - (C) 2012-2016 HIT-SCIR
     Training and testing suite for Chinese word segmentation
 
     usage: ./otcws [learn|customized-learn|test|customized-test|dump] <options>
@@ -24,7 +24,7 @@ otcws是ltp分词模型的训练套件，用户可以使用otcws训练获得ltp
 如果进行模型训练(learn)，::
 
     $ ./tools/train/otcws learn
-    otcws(learn) in LTP 3.3.0 - (C) 2012-2015 HIT-SCIR
+    otcws(learn) in LTP 3.3.2 - (C) 2012-2016 HIT-SCIR
     Training suite for Chinese word segmentation
     
     usage: ./otcws learn <options>
@@ -62,7 +62,7 @@ otcws是ltp分词模型的训练套件，用户可以使用otcws训练获得ltp
 如果进行模型测试(test)，::
 
     $ ./tools/train/otcws test
-    otcws(test) in LTP 3.3.0 - (C) 2012-2015 HIT-SCIR
+    otcws(test) in LTP 3.3.2 - (C) 2012-2016 HIT-SCIR
     Testing suite for Chinese word segmentation
     
     usage: ./otcws test <options>
@@ -97,7 +97,7 @@ otpos是ltp分词模型的训练套件，用户可以使用otpos训练获得ltp
 编译之后，在tools/train下面会产生名为otpos的二进制程序。otpos的使用方法与otcws非常相似，同名参数含义也完全相同。其中不同之处在于词性标注模块的外部词典含义与分词的外部词典含义不同。::
 
     $ ./tools/train/otpos test
-    otpos(test) in LTP 3.3.0 - (C) 2012-2015 HIT-SCIR
+    otpos(test) in LTP 3.3.2 - (C) 2012-2016 HIT-SCIR
     Testing suite for Part of Speech Tagging
 
     usage: ./otpos test <options>
@@ -144,7 +144,7 @@ nndepparser是ltp神经网络依存句法分析模型的训练套件，用户可
 运行./nndepparser learn，可见如下参数::
 
     $ ./tools/train/nndepparser learn
-    nndepparser(learn) in ltp 3.3.0 - (c) 2012-2015 hit-scir
+    nndepparser(learn) in ltp 3.3.2 - (c) 2012-2016 hit-scir
     training suite for neural network parser
     usage: ./nndepparser learn <options>
 

diff --git a/src/config.h b/src/config.h
@@ -1,7 +1,8 @@
 #ifndef __LTP_CONFIG_H__
 #define __LTP_CONFIG_H__
 
-#define LTP_VERSION "3.3.1"
+#define LTP_VERSION "3.3.2"
+#define LTP_COPYRIGHT "(C) 2012-2016 HIT-SCIR"
 
 #define BOOST_ALL_NO_LIB
 

diff --git a/src/console/cws_cmdline.cpp b/src/console/cws_cmdline.cpp
@@ -49,7 +49,7 @@ void multithreaded_segment( void * args) {
 }
 
 int main(int argc, char ** argv) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " <options>\n\n";
   usage += "options";

diff --git a/src/console/ltp_test.cpp b/src/console/ltp_test.cpp
@@ -60,7 +60,7 @@ void multithreaded_ltp( void * args) {
 }
 
 int main(int argc, char *argv[]) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " <options>\n\n";
   usage += "options";

diff --git a/src/console/ner_cmdline.cpp b/src/console/ner_cmdline.cpp
@@ -59,7 +59,7 @@ void multithreaded_recognize( void * args) {
 }
 
 int main(int argc, char * argv[]) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " <options>\n\n";
   usage += "options";

diff --git a/src/console/par_cmdline.cpp b/src/console/par_cmdline.cpp
@@ -61,7 +61,7 @@ void multithreaded_parse( void * args) {
 }
 
 int main(int argc, char * argv[]) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " <options>\n\n";
   usage += "options";

diff --git a/src/console/pos_cmdline.cpp b/src/console/pos_cmdline.cpp
@@ -58,7 +58,7 @@ void multithreaded_postag( void * args) {
 }
 
 int main(int argc, char ** argv) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " <options>\n\n";
   usage += "options";

diff --git a/src/ner/otner.cpp b/src/ner/otner.cpp
@@ -15,7 +15,8 @@ using boost::program_options::parse_command_line;
 using ltp::ner::NamedEntityRecognizerFrontend;
 
 int learn(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(learn) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(learn) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
+
   usage += "Training suite for " DESCRIPTION "\n";
   usage += "usage: ./" EXECUTABLE " learn <options>\n\n";
   usage += "options";
@@ -83,7 +84,7 @@ int learn(int argc, const char* argv[]) {
 }
 
 int test(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(test) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(test) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " test <options>\n\n";
   usage += "options";
@@ -139,7 +140,7 @@ int test(int argc, const char* argv[]) {
 }
 
 int dump(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(dump) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(dump) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Model visualization suite for " DESCRIPTION "\n";
   usage += "usage: ./" EXECUTABLE " dump <options>\n\n";
   usage += "options";
@@ -173,7 +174,7 @@ int dump(int argc, const char* argv[]) {
 }
 
 int main(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Training and testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " [learn|test|dump] <options>";
 

diff --git a/src/parser.n/main.cpp b/src/parser.n/main.cpp
@@ -19,7 +19,7 @@ using ltp::depparser::LearnOption;
 using ltp::depparser::TestOption;
 
 int test(int argc, char** argv) {
-  std::string usage = EXECUTABLE "(test) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(test) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " test <options>\n\n";
   usage += "options:";
@@ -54,7 +54,7 @@ int test(int argc, char** argv) {
 }
 
 int learn(int argc, char** argv) {
-  std::string usage = EXECUTABLE "(learn) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(learn) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Training suite for " DESCRIPTION "\n";
   usage += "usage: ./" EXECUTABLE " learn <options>\n\n";
   usage += "options:";
@@ -132,7 +132,7 @@ int learn(int argc, char** argv) {
 }
 
 int main(int argc, char** argv) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Training and testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " [learn|test] <options>";
 

diff --git a/src/postagger/otpos.cpp b/src/postagger/otpos.cpp
@@ -15,7 +15,7 @@ using boost::program_options::parse_command_line;
 using ltp::postagger::PostaggerFrontend;
 
 int learn(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(learn) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(learn) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Training suite for " DESCRIPTION "\n";
   usage += "usage: ./" EXECUTABLE " learn <options>\n\n";
   usage += "options:";
@@ -80,7 +80,7 @@ int learn(int argc, const char* argv[]) {
 }
 
 int test(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(test) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(test) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " test <options>\n\n";
   usage += "options:";
@@ -139,7 +139,7 @@ int test(int argc, const char* argv[]) {
 }
 
 int dump(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(dump) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(dump) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Model visualization suite for " DESCRIPTION "\n";
   usage += "usage: ./" EXECUTABLE " dump <options>\n\n";
   usage += "options:";
@@ -173,7 +173,7 @@ int dump(int argc, const char* argv[]) {
 }
 
 int main(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Training and testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " [learn|test|dump] <options>";
 

diff --git a/src/segmentor/otcws.cpp b/src/segmentor/otcws.cpp
@@ -17,7 +17,7 @@ using ltp::segmentor::SegmentorFrontend;
 using ltp::segmentor::CustomizedSegmentorFrontend;
 
 int learn(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(learn) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(learn) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Training suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " learn <options>\n\n";
   usage += "options";
@@ -88,7 +88,7 @@ int learn(int argc, const char* argv[]) {
 }
 
 int test(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(test) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(test) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " test <options>\n\n";
   usage += "options";
@@ -147,7 +147,7 @@ int test(int argc, const char* argv[]) {
 }
 
 int dump(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(dump) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(dump) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Model visualization suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " dump <options>\n\n";
   usage += "options";
@@ -181,7 +181,7 @@ int dump(int argc, const char* argv[]) {
 }
 
 int customized_learn(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE "(customized-learn) in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE "(customized-learn) in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Customized training suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " learn <options>\n\n";
   usage += "options";
@@ -260,7 +260,7 @@ int customized_learn(int argc, const char* argv[]) {
 
 int customized_test(int argc, const char* argv[]) {
   std::string usage = EXECUTABLE "(customized-test) in LTP " LTP_VERSION
-    " - (C) 2012-2015 HIT-SCIR\n";
+    " - " LTP_COPYRIGHT "\n";
   usage += "Customized testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " test <options>\n\n";
   usage += "options";
@@ -325,7 +325,7 @@ int customized_test(int argc, const char* argv[]) {
 }
 
 int main(int argc, const char* argv[]) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += "Training and testing suite for " DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE;
   usage += " [learn|customized-learn|test|customized-test|dump] <options>";

diff --git a/src/server/ltp_server.cpp b/src/server/ltp_server.cpp
@@ -35,7 +35,7 @@ static void signal_handler(int sig_num) {
 }
 
 int main(int argc, char *argv[]) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " <options>\n\n";
   usage += "options";

diff --git a/src/unittest/model_validation.cpp b/src/unittest/model_validation.cpp
@@ -181,7 +181,7 @@ bool test_parser_model(const std::string& filename) {
 #define DESCRIPTION "model validation suite."
 
 int main(int argc, char* argv[]) {
-  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - (C) 2012-2015 HIT-SCIR\n";
+  std::string usage = EXECUTABLE " in LTP " LTP_VERSION " - " LTP_COPYRIGHT "\n";
   usage += DESCRIPTION "\n\n";
   usage += "usage: ./" EXECUTABLE " <options>\n\n";
   usage += "options";