合并分支 'master' 到 'caorunzhe'

Master

查看合并请求 !155

Chapter6/chapter6.tex

@@ -93,7 +93,7 @@
 
 \begin{eqnarray}
 \funp{P}(m|\vectorn{t}) & \equiv & \varepsilon \label{eq:s-len-gen-prob} \\
-\funp{P}(s_j|a_1^{j},s_1^{j-1},m,\vectorn{t}) & \equiv & f(s_j|t_{a_j}) 
+\funp{P}(s_j|a_1^{j},s_1^{j-1},m,\vectorn{t}) & \equiv & f(s_j|t_{a_j})
 \label{eq:s-word-gen-prob}
 \end{eqnarray}
 
@@ -471,7 +471,7 @@ p_0+p_1                            & = & 1 \label{eq:6-21}
 \sectionnewpage
 \section{小结及深入阅读}
 
-\parinterval {\color{red}差一段小结}
+本章在IBM模型1的基础上进一步介绍了IBM模型2-5以及HMM模型。同时，本章引入了两个新的概念\ \dash\ 扭曲度和繁衍率。它们都是机器翻译中的经典概念，也经常出现在机器翻译的建模中。另一方面，通过对上述模型的分析，本章进一步探讨建模中的若干基础问题，例如，如何把翻译问题分解为若干步骤，并建立合理的模型解释这些步骤；如何对复杂问题进行化简，以得到可以计算的模型等等。这些思想也在很多自然语言处理问题中被使用。此外，关于扭曲度和繁衍率还有一些问题值得关注：
 
 \begin{itemize}
 \vspace{0.5em}

Chapter7/Figures/figure-example-of-n-gram-1.tex

@@ -8,11 +8,11 @@
 红 $\to$ red & 0.8 \\
 红 $\to$ black & 0.1 \\
 茶 $\to$ tea & 0.8\\
-我 喜欢 $\to$ I like & 0.3\\
-我 喜欢 $\to$ I liked & 0.2\\
-绿 茶 $\to$ green tea & 0.5\\
-绿 茶 $\to$ the green tea & 0.1\\
-红 茶 $\to$ black tea & 0.7\\
+我/喜欢 $\to$ I like & 0.3\\
+我/喜欢 $\to$ I liked & 0.2\\
+绿/茶 $\to$ green tea & 0.5\\
+绿/茶 $\to$ the green tea & 0.1\\
+红/茶 $\to$ black tea & 0.7\\
 ... & 
 \end{tabular}
 }

Chapter7/Figures/figure-example-of-vocabulary-translation-probability.tex

@@ -39,10 +39,10 @@
 \node[align=center,elementnode,minimum size=0.3cm,inner sep=0.1pt,fill=blue!50] (la4) at (a41) {};
 \node[align=center,elementnode,minimum size=0.3cm,inner sep=0.1pt,fill=blue!50] (la5) at (a30) {};
 
-\node[anchor=west] (f1) at ([xshift=3em,yshift=0.8em]a43.east) {\small{$\funp{P}_{\textrm{lex}}(\bar{t}|\bar{s})=w(t_1|s_1)\times$}};
-\node[anchor=north] (f2) at ([xshift=5.2em]f1.south) {\small{$\frac{1}{2}(w(t_2|s_2)+w(t_4|s_2))\times$}};
-\node[anchor=north west] (f3) at (f2.south west) {\small{$w(N|s_3)\times$}};
-\node[anchor=north west] (f4) at (f3.south west) {\small{$w(t_4|s_4)\times$}};
+\node[anchor=west] (f1) at ([xshift=3em,yshift=0.8em]a43.east) {\small{$\funp{P}_{\textrm{lex}}(\bar{t}|\bar{s})=\sigma (t_1|s_1)\times$}};
+\node[anchor=north] (f2) at ([xshift=5.2em]f1.south) {\small{$\frac{1}{2}(\sigma (t_2|s_2)+\sigma (t_4|s_2))\times$}};
+\node[anchor=north west] (f3) at (f2.south west) {\small{$\sigma (N|s_3)\times$}};
+\node[anchor=north west] (f4) at (f3.south west) {\small{$\sigma (t_4|s_4)\times$}};
 
 \end{scope}
 

Chapter7/Figures/figure-example-of-zh2en-translation-base-phrase.tex

@@ -7,12 +7,12 @@
 {\small
 
 \node[anchor=north,fill=green!20] (s1) at (0,0) {进口};
-\node [anchor=north,fill=red!20] (s2) at ([xshift=4em,yshift=0em]s1.north) {大幅度};
-\node[anchor=north,fill=blue!20] (s3) at ([xshift=4.5em,yshift=0em]s2.north) {下降 了};
+\node [anchor=west,fill=red!20] (s2) at ([xshift=1em,yshift=0em]s1.east) {大幅度};
+\node[anchor=west,fill=blue!20] (s3) at ([xshift=1em,yshift=0em]s2.east) {下降\ \ \ 了};
 
 \node[anchor=west,fill=green!20] (t1) at ([xshift=0em,yshift=-4em]s1.west) {The imports have};
-\node[anchor=north,fill=red!20] (t2) at ([xshift=8em,yshift=0em]t1.north) {drastically};
-\node[anchor=north,fill=blue!20] (t3) at ([xshift=5.7em,yshift=0em]t2.north) {fallen};
+\node[anchor=west,fill=red!20] (t2) at ([xshift=1em,yshift=0em]t1.east) {drastically};
+\node[anchor=west,fill=blue!20] (t3) at ([xshift=1em,yshift=0em]t2.east) {fallen};
 
 \path[<->, thick] (s1.south) edge (t1.north);
 \path[<->, thick] (s2.south) edge (t2.north);

Chapter7/Figures/figure-function-image-about-weight-and-Bleu.tex

@@ -20,8 +20,8 @@
 \draw[thick,dotted] ([xshift=4em]x0.center) -- ([xshift=4em,yshift=3.6em]x0.center);
 }
 \node[anchor=north] (zero) at ([yshift=0.1em]x0.south) {\small{0}};
-\node[anchor=north] (wx) at ([xshift=4em,yshift=0.1em]x0.south) {\small{$w_x$}};
-\node[anchor=north] (wi) at ([xshift=8em,yshift=0.1em]x0.south) {\small{$w_i$}};
+\node[anchor=north] (wx) at ([xshift=4em,yshift=0.1em]x0.south) {\small{$\lambda_x$}};
+\node[anchor=north] (wi) at ([xshift=8em,yshift=0.1em]x0.south) {\small{$\lambda_i$}};
 
 
 \end{scope}
@@ -33,8 +33,8 @@
 \draw[->,thick] (x0.center) -- ([yshift=5.6em]x0.center);
 
 \node[anchor=north] (zero) at ([yshift=0.1em]x0.south) {\small{0}};
-\node[anchor=north] (wx) at ([xshift=4em,yshift=0.1em]x0.south) {\small{$w_x$}};
-\node[anchor=north] (wi) at ([xshift=8em,yshift=0.1em]x0.south) {\small{$w_i$}};
+\node[anchor=north] (wx) at ([xshift=4em,yshift=0.1em]x0.south) {\small{$\lambda_x$}};
+\node[anchor=north] (wi) at ([xshift=8em,yshift=0.1em]x0.south) {\small{$\lambda_i$}};
 
 {
 \draw[thick] ([yshift=2em]x0.center) -- ([xshift=4em,yshift=2em]x0.center);
@@ -42,12 +42,12 @@
 
 \draw[thick,dotted] ([xshift=4em]x0.center) -- ([xshift=4em,yshift=5.5em]x0.center);
 
-\node[anchor=north] (e1) at ([xshift=2em,yshift=3em]x0.north) {\small{$d^*=d_1$}};
-\node[anchor=north] (e2) at ([xshift=6.2em,yshift=5em]x0.north) {\small{$d^*=d_2$}};
+\node[anchor=north] (e1) at ([xshift=2em,yshift=3em]x0.north) {\small{$\hat{d}=d_1$}};
+\node[anchor=north] (e2) at ([xshift=6.2em,yshift=5em]x0.north) {\small{$\hat{d}=d_2$}};
 
 \node[anchor=north,rotate=90] (e2) at ([xshift=-1.3em,yshift=4em]x0.south) {\small{BLEU}};
 \draw[decorate,decoration={brace,amplitude=0.4em},red,thick] ([xshift=4em,yshift=0.5em]x0.south) -- ([xshift=8.2em,yshift=0.5em]x0.south);
-\node[anchor=north] (wi) at ([xshift=6.1em,yshift=2.1em]x0.south) {\footnotesize{\red{挑选$w_i$}}};
+\node[anchor=north] (wi) at ([xshift=6.1em,yshift=2.1em]x0.south) {\footnotesize{\red{挑选$\hat{\lambda}_i$}}};
 }
 \end{scope}
 \end{tikzpicture}

Chapter7/Figures/figure-three-types-of-reorder-method-in-msd.tex

@@ -54,7 +54,7 @@
 {
 \node [anchor=west] (p1line1) at ([xshift=3.5em,yshift=0.5em]a75.east) {\footnotesize{M(monotone)：单调调序}};
 \node [anchor=north west] (p1line2) at ([xshift=0,yshift=-1em]p1line1.south west) {\footnotesize{S(swap)： 与前面一个短语}};
-\node [anchor=north west] (p1line3) at ([xshift=3.5em]p1line2.south west) {\footnotesize{位置进行交换}};
+\node [anchor=north west] (p1line3) at ([xshift=3.8em]p1line2.south west) {\footnotesize{位置进行交换}};
 \node [anchor=north west] (p1line4) at ([xshift=-3.5em,yshift=-1em]p1line3.south west) {\footnotesize{D(discontinuous)：非连续调序}};
 
 \node [anchor=east] (p1line5) at ([xshift=0em,yshift=3em]p1line4.east) {};

mt-book-xelatex.tex

@@ -134,9 +134,9 @@
 %\include{Chapter1/chapter1}
 %\include{Chapter2/chapter2}
 %\include{Chapter3/chapter3}
-\include{Chapter4/chapter4}
+%\include{Chapter4/chapter4}
 %\include{Chapter5/chapter5}
-%\include{Chapter6/chapter6}
+\include{Chapter6/chapter6}
 %\include{Chapter7/chapter7}
 %\include{Chapter8/chapter8}
 %\include{Chapter9/chapter9}
@@ -149,7 +149,7 @@
 %\include{Chapter16/chapter16}
 %\include{Chapter17/chapter17}
 %\include{Chapter18/chapter18}
-%\include{ChapterAppend/chapterappend}  
+%\include{ChapterAppend/chapterappend}
 
 
 %----------------------------------------------------------------------------------------