合并分支 'master' 到 'caorunzhe'

Master

查看合并请求 !811

Chapter17/Figures/figure-cache.tex

@@ -15,7 +15,7 @@
 
 \node[anchor=south,font=\footnotesize,inner sep=0pt] at ([yshift=0.1em]key.north){key};
 \node[anchor=south,font=\footnotesize,inner sep=0pt] at ([yshift=0.2em]value.north){value};
-\node[anchor=south,font=\footnotesize,inner sep=0pt] (cache)at ([yshift=2em,xshift=1.5em]key.north){\small\bfnew{Cache}};
+\node[anchor=south,font=\footnotesize,inner sep=0pt] (cache)at ([yshift=2em,xshift=1.5em]key.north){\small\bfnew{缓存}};
 
 \node[draw,anchor=east,minimum size=1.8em,fill=orange!15] (dt) at ([yshift=2.1em,xshift=-4em]key.west){${\mathbi{d}}_{t}$};
 \node[anchor=north,font=\footnotesize] (readlab) at ([xshift=2.8em,yshift=0.3em]dt.north){\red{读取}};

Chapter17/Figures/figure-layer.tex

@@ -4,7 +4,7 @@
 
 \foreach \x in {1,2,3,4}
 	\node[draw,inner sep=0pt,minimum height=1em,minimum width=1.6em,fill=red!30,rounded corners=1pt] (c1_\x) at (0em+2em*\x, 0em){};
-\node[anchor=north] (hpre) at ([yshift=1.8em]c1_1.north) {${\mathbi{h}}^ {\textrm{pre}j}$};
+\node[anchor=north] (hpre) at ([yshift=1.8em]c1_1.north) {${\mathbi{h}}^ {\textrm{pre}k}$};
 \foreach \x in {1,2,3}
 	\node[draw,inner sep=0pt,minimum height=1em,minimum width=1.6em,fill=red!30,rounded corners=1pt] (c2_\x) at (11em+2em*\x, 0em){};
 \node[anchor=north] (hpre) at ([yshift=1.8em]c2_1.north) {${\mathbi{h}}^ {\textrm{pre}1}$};
@@ -29,7 +29,7 @@
 \node[draw,fill=orange!30,inner sep=0pt, minimum size=1.2em, circle] (add3) at (10em, 5.2em){};
 \node[anchor=north] (cond) at ([xshift=-1em,yshift=0.5em]add3.north) {${\mathbi{d}}$};
 \node[anchor=north] (cons1) at ([xshift=-1em,yshift=0.5em]add2.north) {${\mathbi{s}}^1$};
-\node[anchor=north] (consj) at ([xshift=-1em,yshift=0.5em]add1.north) {${\mathbi{s}}^j$};
+\node[anchor=north] (consj) at ([xshift=-1em,yshift=0.5em]add1.north) {${\mathbi{s}}^k$};
 \begin{pgfonlayer}{background}
 \node[draw,rounded corners=2pt,drop shadow,fill=white, minimum width=8.3em][fit=(c1_1)(c1_4)](box1){};
 \node[draw,rounded corners=2pt,drop shadow,fill=white,minimum width=6.4em][fit=(c2_1)(c2_3)](box2){};
@@ -67,8 +67,8 @@
 \draw[->,thick] ([yshift=0.1em]sigma.90) -- ([yshift=-0.1em]n2.-90);
 \draw[->,thick] ([yshift=0.1em]n2.90) -- node[right]{$ \widetilde{\mathbi{h}}_{\textrm{t}}$}([yshift=2em]n2.90);
 
-\draw[decorate,decoration={brace, mirror},gray, thick] ([yshift=-2em]hh.-180) -- node[font=\scriptsize,text=black,below]{前几句}([yshift=-2em]box2.0);
-\draw[decorate,decoration={brace, mirror},gray, thick] ([yshift=-2em]box3.-180) -- node[font=\scriptsize,text=black,below]{当前句}([yshift=-2em]box3.0);
+\draw[decorate,decoration={brace, mirror},gray, thick] ([yshift=-2em]hh.-180) -- node[font=\scriptsize,text=black,below]{前几个句子}([yshift=-2em]box2.0);
+\draw[decorate,decoration={brace, mirror},gray, thick] ([yshift=-2em]box3.-180) -- node[font=\scriptsize,text=black,below]{当前句子}([yshift=-2em]box3.0);
 \draw[->, thick, rounded corners=2pt] ([yshift=0.1em]add3.90) -- ([yshift=2.1em]add3.90) -- ([xshift=-0.1em]sigma.180);
 
 

Chapter17/Figures/figure-multiencoder.tex

@@ -6,21 +6,22 @@
 \tikzstyle{every node}=[scale=0.7]
 \node(encoder_c)[coder]{\large{编码器}};
 \node(encoder_s)[coder, right of = encoder_c, xshift=3.5cm, fill=red!25]{\large{编码器}};
-\node(h_pre)[above of = encoder_c, yshift=1.3cm,scale=1.3]{${\mathbi{h}}_{pre}$};
+\node(h_pre)[above of = encoder_c, yshift=1.3cm,scale=1.3]{${\mathbi{h}}_{\rm pre}$};
 \node(h)[above of = encoder_s, yshift=1.3cm,scale=1.3]{$\mathbi{h}$};
 \node(cir)[circle,very thick, right of = h, draw=black!90,minimum width=0.5cm,xshift=1.1cm]{};
 \draw[-,very thick,draw=black!90]([xshift=0.04cm]cir.west)--([xshift=-0.04cm]cir.east);
 \draw[-,very thick,draw=black!90]([yshift=-0.04cm]cir.north)--([yshift=0.04cm]cir.south);
-\node(last)[below of = encoder_c, yshift=-1.3cm]{\large{前一句}};
-\node(current)[below of = encoder_s, yshift=-1.3cm]{\large{当前句}};
+\node(last)[below of = encoder_c, yshift=-1.3cm]{\large{前一个句子}};
+\node(current)[below of = encoder_s, yshift=-1.3cm]{\large{当前句子}};
 \node(attention_left)[attention, above of = encoder_c, xshift=2.4cm,yshift=3.1cm]{\large{注意力机制}};
 \node(d)[above of = attention_left, yshift=1.1cm,scale=1.3]{$\mathbi{d}$};
 \node(ground)[rectangle, thick, rounded corners, minimum width=5cm, minimum height=5.5cm, right of = encoder_s, xshift=4.4cm,yshift=2.2cm, draw=black!70, fill=gray!10]{};
 \node(decoder)[above of = encoder_s, xshift=3.1cm]{\large{解码器}};
 \node(attention_right)[attention, right of = attention_left, xshift=5.4cm,yshift=-0.4cm]{\large{注意力机制}};
-\node(target)[right of = current, xshift=5.3cm]{\large{目标句}};
+\node(target)[right of = current, xshift=5.3cm]{\large{目标语言句子（位置$j$之前）}};
 \node(point_below)[right of = encoder_s, xshift=5.3cm]{\Huge{...}};
 \node(point_above)[above of = attention_right, yshift=1.8cm]{\Huge{...}};
+\node(target_above)[above of = attention_right, yshift=3.3cm]{\large{目标语言句子}};
 
 \draw[->, very thick](last)to([yshift=-0.05cm]encoder_c.south);
 \draw[->, very thick](current)to([yshift=-0.05cm]encoder_s.south);

Chapter17/Figures/figure-the-encoder-explicitly-incorporates-semantic-information.tex

@@ -12,8 +12,8 @@
 \node(tree)[word, below of = sky, yshift=-0.75cm, fill=blue!15]{tree};
 \node(cir)[circle,thick, minimum width=0.6cm, xshift=8cm,  draw=black]{};
 \node(decoder)[rectangle, rounded corners, minimum height=2.2em,minimum width=4.3em, right of = cir,xshift=3cm, draw=black, fill=blue!25]{\large{解码器}};
-\node(yn_1)[below of = decoder,yshift=-2cm,scale=1.2]{$\rm y_{{<}_{n-1}}$};
-\node(yn_2)[above of = decoder,yshift=2cm,scale=1.2]{$\rm y_{n-1}$(bank)};
+\node(yn_1)[below of = decoder,yshift=-2cm,scale=1.2]{$y_{<j}$};
+\node(yn_2)[above of = decoder,yshift=2cm,scale=1.2]{$y_{j}$};
 
 \draw[->, thick]([xshift=0.1cm]figure.east)to([xshift=2cm]figure.east);
 \draw[-,thick]([xshift=-0.03cm]cir.east)to([xshift=0.03cm]cir.west);

Chapter17/Figures/figure-twodecoding.tex

@@ -9,17 +9,17 @@
 \node(encoder_left)[encoder, above of = decoder_left, yshift=1.6cm]{\normalsize{编码器}};
 \node(encoder_right)[encoder, above of = decoder_right, yshift=1.6cm]{\normalsize{编码器}};
 \node(text_left)[below of = encoder_left, yshift=1.5cm]{\normalsize{前文}};
-\node(text_right)[below of = encoder_right, yshift=1.5cm]{\normalsize{源语}};
+\node(text_right)[below of = encoder_right, yshift=1.5cm]{\normalsize{源语言句子}};
 \node(text_top)[above of = decoder_right, yshift=-1.6cm]{\normalsize{句子级翻译结果}};
-\node(title_1)[above of = text_left, xshift=1.1cm, yshift=3cm]{\large\bfnew{一阶段解码}};
+\node(title_1)[above of = text_left, xshift=1.1cm, yshift=3cm]{\large\bfnew{一阶段翻译}};
 \node(ground2)[rectangle,very thick,rounded corners,minimum width=5cm,minimum height=5.8cm,right of = decoder_right,xshift=5.3cm,yshift=1.6cm,draw=black,dashed]{};
 \node(ground1)[rectangle,thick,rounded corners,minimum width=3.3cm,minimum height=5cm,right of = decoder_right,xshift=4.8cm,yshift=1.58cm,draw=black,fill=yellow!15]{};
 \node(attention_below)[attention, right of = decoder_right, xshift=4.8cm]{\normalsize{注意力机制}};
 \node(attention_above)[attention, above of = attention_below, yshift=1.6cm]{\normalsize{注意力机制}};
 \node(ffn)[attention, above of = attention_above, yshift=1.6cm, fill=blue!8]{\normalsize{前馈神经网络}};
 \node(n)[right of = attention_above, xshift=2.4cm,scale=1.5]{$\times N$};
-\node(text_2)[above of = ffn, yshift=1.9cm]{\normalsize{上下文修正结果}};
-\node(title_2)[right of = title_1, xshift=6.3cm]{\large\bfnew{二阶段解码}};
+\node(text_2)[above of = ffn, yshift=1.9cm]{\normalsize{基于上下文的修正结果}};
+\node(title_2)[right of = title_1, xshift=6.3cm]{\large\bfnew{二阶段翻译}};
 %\node(text_rright)[right of = text_right, xshift=5.5cm]{\normalsize{句子级翻译结果}};
 
 \draw[->,very thick]([yshift=-0.1cm]text_left.south)to(encoder_left.north);