合并分支 'caorunzhe' 到 'master'

chapter5 bug fix

查看合并请求 !212

Chapter5/Figures/figure-alignment-of-all-words-in-zh-en-sentence.tex

@@ -13,7 +13,7 @@
     \draw [-] (s1.south) -- (t0.north);
     \draw [-] (s1.south) -- (t0.north);
     \draw [-] (s2.south) -- (t0.north);
     \draw [-] (s2.south) -- (t0.north);
    {
    {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     }
     }
@@ -29,7 +29,7 @@
     \draw [-] (s1.south) -- (t0.north);
     \draw [-] (s1.south) -- (t0.north);
     \draw [-] (s2.south) -- (t1.north);
     \draw [-] (s2.south) -- (t1.north);
     {
     {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     }
     }
@@ -45,7 +45,7 @@
     \draw [-] (s1.south) -- (t0.north);
     \draw [-] (s1.south) -- (t0.north);
     \draw [-] (s2.south) -- (t2.north);
     \draw [-] (s2.south) -- (t2.north);
     {
     {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     }
     }
@@ -61,7 +61,7 @@
     \draw [-] (s1.south) -- ([yshift=-0.2em]t1.north);
     \draw [-] (s1.south) -- ([yshift=-0.2em]t1.north);
     \draw [-] (s2.south) -- (t0.north);
     \draw [-] (s2.south) -- (t0.north);
     {
     {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     }
     }
@@ -77,7 +77,7 @@
     \draw [-] (s1.south) -- ([yshift=-0.2em]t1.north);
     \draw [-] (s1.south) -- ([yshift=-0.2em]t1.north);
     \draw [-] (s2.south) -- ([yshift=-0.2em]t1.north);
     \draw [-] (s2.south) -- ([yshift=-0.2em]t1.north);
     {
     {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     }
     }
@@ -93,7 +93,7 @@
     \draw [-] (s1.south) -- ([yshift=-0.2em]t1.north);
     \draw [-] (s1.south) -- ([yshift=-0.2em]t1.north);
     \draw [-] (s2.south) -- (t2.north);
     \draw [-] (s2.south) -- (t2.north);
     {
     {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     }
     }
@@ -109,7 +109,7 @@
     \draw [-] (s1.south) -- (t2.north);
     \draw [-] (s1.south) -- (t2.north);
     \draw [-] (s2.south) -- (t0.north);
     \draw [-] (s2.south) -- (t0.north);
     {
     {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     }
     }
@@ -125,7 +125,7 @@
     \draw [-] (s1.south) -- (t2.north);
     \draw [-] (s1.south) -- (t2.north);
     \draw [-] (s2.south) -- (t1.north);
     \draw [-] (s2.south) -- (t1.north);
    {
    {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\small{+}};
     }
     }
@@ -141,9 +141,9 @@
     \draw [-] (s1.south) -- (t2.north);
     \draw [-] (s1.south) -- (t2.north);
     \draw [-] (s2.south) -- (t2.north);
     \draw [-] (s2.south) -- (t2.north);
     {
     {
-    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P(}}};
+    \node [anchor=south east,inner sep=0pt] (p) at (t0.north west) {\small{{\color{ugreen} P\;(}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
     \node [anchor=south west,inner sep=0pt] (p2) at ([yshift=0.2em]t2.north east) {\small{{\color{ugreen} )}}};
-    \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\normalsize{= \ P($\mathbf{s}|\mathbf{t}$)}};
+    \node [anchor=west] (eq) at ([xshift=0.7em]p2.east) {\normalsize{= \ P\,($\mathbf{s}|\mathbf{t}$)}};
     }
     }
     }
     }
     \end{scope}
     \end{scope}

Chapter5/Figures/figure-greedy-mt-decoding-pseudo-code.tex

@@ -8,10 +8,10 @@
 \node [anchor=north west,inner sep=2pt,align=left] (line4) at ([yshift=-1pt]line3.south west) {\textrm{3: \textbf{for} $i$ in $[1,m]$ \textbf{do}}};
 \node [anchor=north west,inner sep=2pt,align=left] (line4) at ([yshift=-1pt]line3.south west) {\textrm{3: \textbf{for} $i$ in $[1,m]$ \textbf{do}}};
 \node [anchor=north west,inner sep=2pt,align=left] (line5) at ([yshift=-1pt]line4.south west) {\textrm{4: \hspace{1em} $h = \phi$}};
 \node [anchor=north west,inner sep=2pt,align=left] (line5) at ([yshift=-1pt]line4.south west) {\textrm{4: \hspace{1em} $h = \phi$}};
 \node [anchor=north west,inner sep=2pt,align=left] (line6) at ([yshift=-1pt]line5.south west) {\textrm{5: \hspace{1em} \textbf{foreach} $j$ in $[1,m]$ \textbf{do}}};
 \node [anchor=north west,inner sep=2pt,align=left] (line6) at ([yshift=-1pt]line5.south west) {\textrm{5: \hspace{1em} \textbf{foreach} $j$ in $[1,m]$ \textbf{do}}};
-\node [anchor=north west,inner sep=2pt,align=left] (line7) at ([yshift=-1pt]line6.south west) {\textrm{6: \hspace{2em} \textbf{if} $used[j]=$ \textbf{true} \textbf{then}}};
+\node [anchor=north west,inner sep=2pt,align=left] (line7) at ([yshift=-1pt]line6.south west) {\textrm{6: \hspace{2em} \textbf{if} $used[j]=$ \textbf{false} \textbf{then}}};
 \node [anchor=north west,inner sep=2pt,align=left] (line8) at ([yshift=-1pt]line7.south west) {\textrm{7: \hspace{3em} $h = h \cup \textrm{\textsc{Join}}(best,\pi[j])$}};
 \node [anchor=north west,inner sep=2pt,align=left] (line8) at ([yshift=-1pt]line7.south west) {\textrm{7: \hspace{3em} $h = h \cup \textrm{\textsc{Join}}(best,\pi[j])$}};
 \node [anchor=north west,inner sep=2pt,align=left] (line9) at ([yshift=-1pt]line8.south west) {\textrm{8: \hspace{1em} $best = \textrm{\textsc{PruneForTop1}}(h)$}};
 \node [anchor=north west,inner sep=2pt,align=left] (line9) at ([yshift=-1pt]line8.south west) {\textrm{8: \hspace{1em} $best = \textrm{\textsc{PruneForTop1}}(h)$}};
-\node [anchor=north west,inner sep=2pt,align=left] (line10) at ([yshift=-1pt]line9.south west) {\textrm{9: \hspace{1em} $used[best.j] = \textrm{\textsc{\textbf{true}}}$}};
+\node [anchor=north west,inner sep=2pt,align=left] (line10) at ([yshift=-1pt]line9.south west) {\textrm{9: \hspace{1em} $used[best.j] = \textrm{\textbf{true}}$}};
 \node [anchor=north west,inner sep=2pt,align=left] (line11) at ([yshift=-1pt]line10.south west) {\textrm{10: \textbf{return} $best.translatoin$}};
 \node [anchor=north west,inner sep=2pt,align=left] (line11) at ([yshift=-1pt]line10.south west) {\textrm{10: \textbf{return} $best.translatoin$}};
 
 
 \node [anchor=south west,inner sep=2pt,align=left] (head1) at ([yshift=1pt]line1.north west) {输出: 找的最佳译文};
 \node [anchor=south west,inner sep=2pt,align=left] (head1) at ([yshift=1pt]line1.north west) {输出: 找的最佳译文};

Chapter5/Figures/figure-translation-pipeline.tex

@@ -47,8 +47,8 @@
 }
 }
 {
 {
 \node [anchor=north west] (label1) at ([xshift=0.6em,yshift=0.0em]sent-1.south east) {{分析}};
 \node [anchor=north west] (label1) at ([xshift=0.6em,yshift=0.0em]sent-1.south east) {{分析}};
-\node [anchor=north west] (label2) at ([yshift=-1.8em]label1.south west) {{转换}};
-\node [anchor=north west] (label3) at ([yshift=-1.3em]label2.south west) {{生成}};
+\node [anchor=north west] (label2) at ([yshift=-1.5em]label1.south west) {{转换}};
+\node [anchor=north west] (label3) at ([yshift=-1.1em]label2.south west) {{生成}};
 }
 }
 {\scriptsize
 {\scriptsize
 		\begin{scope}
 		\begin{scope}