合并分支 'caorunzhe' 到 'master'

Caorunzhe

查看合并请求 !392

Chapter11/Figures/figure-convolution-kernel.tex

@@ -38,16 +38,22 @@
 %\node[] (sub2) at ([xshift=0cm,yshift=-0.1cm]sub.south) {$k$：卷积核窗口的宽度};
 %\node[] (sub3) at ([xshift=-0.2cm,yshift=-0.1cm]sub2.south) {$o$：卷积核深度\qquad \qquad };
 
-\node[inner sep=2pt,fill=green!5,draw=ugreen,dotted,very thick,align=center] (sub) at ([xshift=3.8cm,yshift=2cm]num9_9.east) {
-\begin{tabular}{r l}
-$q$：& 卷积核窗口的长度 \\
-$k$：& 卷积核窗口的宽度 \\
-$o$： & 卷积核深度 
-\end{tabular}};
-
-\node[minimum width = 1.8cm] (sub) at ([xshift=-5.5cm,yshift=2cm]num9_9.east) {};
-
-\draw[decorate,decoration={brace,mirror,raise=0pt,amplitude=0.3cm},black,thick] ([yshift=0.4cm]num1_1.west) -- node[att,xshift=-0.5cm]{\large $q$} ([yshift=-0.4cm]num3_3.west);
-\draw[decorate,decoration={brace,raise=0pt,amplitude=0.3cm},black,thick] ([xshift=-0.4cm]num1.north) -- node[att,yshift=0.5cm]{\large $k$}([xshift=0.4cm]num7.north);
-\draw[decorate,decoration={brace,mirror,raise=0pt,amplitude=0.3cm},black,thick] ([xshift=0.4cm]num9_9.south) -- node[att,xshift=0.4cm,yshift=-0.3cm]{\large $o$}([xshift=0.4cm]num9.south);
+%\node[inner sep=2pt,fill=green!5,draw=ugreen,dotted,very thick,align=center] (sub) at ([xshift=3.8cm,yshift=2cm]num9_9.east) {
+%\begin{tabular}{r l}
+%$q$：& 卷积核窗口的长度 \\
+%$k$：& 卷积核窗口的宽度 \\
+%$o$： & 卷积核深度 
+%\end{tabular}};
+
+\node[] (sub) at ([xshift=3.3cm,yshift=2cm]num1_1.east) {:卷积核窗口的长度};
+\node[] (sub2) at ([xshift=-3.9cm,yshift=-2.15cm]num1.north) {度宽的口窗核积卷:};
+\node[] (sub3) at ([xshift=2.9cm,yshift=0.25cm]num9_9.south) {:卷积核深度};
+
+%\node[minimum width = 1.8cm] (sub) at ([xshift=-5.5cm,yshift=2cm]num9_9.east) {};
+
+\draw[decorate,decoration={brace,mirror,raise=0pt,amplitude=0.3cm},black,thick] ([yshift=0.4cm,xshift=-0.1cm]num1_1.west) -- node[att,xshift=-0.5cm]{$q$} ([yshift=-0.4cm,xshift=-0.1cm]num3_3.west);
+\draw[decorate,decoration={brace,raise=0pt,amplitude=0.3cm},black,thick] ([xshift=-0.4cm,yshift=0.1cm]num1.north) -- node[att,yshift=0.5cm]{$k$}([xshift=0.4cm,yshift=0.1cm]num7.north);
+\draw[decorate,decoration={brace,mirror,raise=0pt,amplitude=0.3cm},black,thick] ([xshift=0.5cm,yshift=0.00cm]num9_9.south) -- node[att,xshift=0.5cm,yshift=-0.3cm]{$o$}([xshift=0.5cm,yshift=0.00cm]num9.south);
+
+
 \end{tikzpicture}
\ No newline at end of file

Chapter11/Figures/figure-deep-vs-light.tex

 
 \begin{tikzpicture}
 	\tikzstyle{every node}=[scale=1.5]
-	\tikzstyle{unit} = [inner sep=0pt, minimum size=1em,draw,thick]
+	\tikzstyle{unit} = [inner sep=0pt, minimum size=1em,draw,very thick]
 	\tikzstyle{vuale} = [inner sep=0pt,font=\tiny]
 
 	

Chapter11/Figures/figure-dimension-transformation.tex

-\tikzstyle{num} = [minimum width = 0.6cm,minimum height = 0.6cm,draw,fill=green!2]
+\tikzstyle{num} = [minimum width = 0.6cm,minimum height = 0.6cm,draw,fill=green!10]
 \begin{tikzpicture}[node distance = 0]
 
 \node[num] at (0,0){1};
@@ -89,7 +89,7 @@
 \node[] at (5.7,-1) {\small{卷积核：3$\times$3}};
 \node[] (out) at (10,-1) {\small{输出：4$\times$4}};
 
-\node[font=\footnotesize,dashed,draw=teal,very thick,fill=green!5,align=center] at ([yshift=3cm,xshift=1.5cm]out.east) {*\ \ ：表示\\卷积计算};
+%\node[font=\footnotesize,dashed,draw=teal,very thick,fill=green!5,align=center] at ([yshift=3cm,xshift=1.5cm]out.east) {*\ \ ：表示\\卷积计算};
 \node[] at ([yshift=-0.3cm,xshift=-2.3cm]in.east) {\ \ \ \ \ };
 
 \end{tikzpicture}
\ No newline at end of file

Chapter11/Figures/figure-image-convolution.tex

@@ -29,8 +29,8 @@
 	\node[font=\footnotesize] at (8.8em,4.8em) {卷积核};
 	\node[font=\footnotesize] (out) at (15.2em,4.8em) {输出};
 
-	\node[font=\footnotesize,dashed,draw=cyan,very thick,fill=cyan!5,align=center] at ([yshift=-0.3cm,xshift=1.8cm]out.east) {*\ \ ：表示\\卷积计算};
-	\node[] at ([yshift=-0.3cm,xshift=-2.3cm]in.east) {\ \ \ \ \ };
+	%\node[font=\footnotesize,dashed,draw=cyan,very thick,fill=cyan!5,align=center] at ([yshift=-0.3cm,xshift=1.8cm]out.east) {*\ \ ：表示\\卷积计算};
+	%\node[] at ([yshift=-0.3cm,xshift=-2.3cm]in.east) {\ \ \ \ \ };
 	
 	\node at (5.6em, 1.6em) {*};
 	\node at (12em, 1.6em) {=};

Chapter11/Figures/figure-padding-and-conv.tex

-\tikzstyle{num} = [minimum width = 0.6cm,minimum height = 0.6cm,draw,fill=green!2]
+\tikzstyle{num} = [minimum width = 0.6cm,minimum height = 0.6cm,draw,fill=green!10]
 \tikzstyle{pad} = [minimum width = 0.6cm,minimum height = 0.6cm,draw,fill=blue!10]
 \begin{tikzpicture}[node distance = 0]
 
@@ -74,8 +74,8 @@
 \node[pad] at (3,3.6){0};
 \node[pad] at (3.6,3.6){0};
 
-\node[minimum width = 1.8cm,minimum height = 1.8cm,draw=teal,line width=0.1cm] at (0,3) {};
-\node[minimum width = 1.8cm,minimum height = 1.8cm,draw=orange!80,line width=0.08cm] at (0.6,2.4) {};
+\node[minimum width = 1.8cm,minimum height = 1.8cm,draw=purple!40,line width=0.08cm,fill=purple!40,fill opacity=0.5,align=center] at (0,3) {};
+\node[minimum width = 1.8cm,minimum height = 1.8cm,draw=orange!40,line width=0.08cm,fill=orange!40,fill opacity=0.5] at (0.6,2.4) {};
 
 %\fill (4.55,1.5) circle (2pt);
 \node [] at (4.55,1.5) {*};
@@ -138,16 +138,16 @@
 \node[num] at (10.8,3){2};
 \node[num] at (11.4,3){4};
 
-\node[minimum width = 0.6cm,minimum height = 0.6cm,draw=teal,line width=0.1cm] at (8.4,3) {};
-\node[minimum width = 0.6cm,minimum height = 0.6cm,draw=orange!80,line width=0.08cm] at (9,2.4) {};
+\node[minimum width = 0.6cm,minimum height = 0.6cm,draw=purple!40,line width=0.08cm,fill=purple!40,fill opacity=0.5] at (8.4,3) {0};
+\node[minimum width = 0.6cm,minimum height = 0.6cm,draw=orange!40,line width=0.08cm,fill=orange!40,fill opacity=0.5] at (9,2.4) {1};
 
 %\draw (1.5,-1.5)node{\small{输入：8$\times$8（填充后）}};
 %\draw (5.7,-1.5)node{\small{卷积核：3$\times$3}};
 %\draw (10,-1.5)node{\small{输出：6$\times$6}};
 \node[] (in) at (1.5,-1.5) {\small{输入：8$\times$8（填充后）}};
-\node[] at (5.7,-1.5) {\small{卷积核：3$\times$3}};
+\node[] at (6,-1.5) {\small{卷积核：3$\times$3}};
 \node[] (out) at (10,-1.5) {\small{输出：6$\times$6}};
 
-\node[font=\footnotesize,dashed,draw=teal,very thick,fill=green!5,align=center] at ([yshift=4cm,xshift=1.8cm]out.east) {*\ \ ：表示\\卷积计算};
+%\node[font=\footnotesize,dashed,draw=teal,very thick,fill=green!5,align=center] at ([yshift=4cm,xshift=1.8cm]out.east) {*\ \ ：表示\\卷积计算};
 \node[] at ([yshift=-0.3cm,xshift=-2.3cm]in.east) {\ \ \ \ \ };
 \end{tikzpicture}
\ No newline at end of file

Chapter11/Figures/figure-standard.tex

 
 \begin{tikzpicture}
 	\tikzstyle{every node}=[scale=1.5]
-	\tikzstyle{unit} = [inner sep=0pt, minimum size=1em,draw,thick]
+	\tikzstyle{unit} = [inner sep=0pt, minimum size=1em,draw,very thick]
 	%, font=\scriptsize
 	\tikzstyle{vuale} = [inner sep=0pt,font=\tiny]
 

Chapter11/chapter11.tex

@@ -92,7 +92,7 @@
 \begin{figure}[htp]
 \centering
 \input{./Chapter11/Figures/figure-image-convolution}
-\caption{图像卷积操作}
+\caption{图像卷积操作（*\ \ 表示卷积计算）}
 \label{fig:11-4}
 \end{figure}
 %----------------------------------------------
@@ -123,7 +123,7 @@
 \begin{figure}[htp]
 \centering
 \input{./Chapter11/Figures/figure-dimension-transformation}
-\caption{卷积操作的维度变换}
+\caption{卷积操作的维度变换（*\ \ 表示卷积计算）}
 \label{fig:11-6}
 \end{figure}
 %----------------------------------------------
@@ -135,7 +135,7 @@
 \begin{figure}[htp]
 \centering
 \input{./Chapter11/Figures/figure-padding-and-conv}
-\caption{填充和卷积操作}
+\caption{填充和卷积操作（*\ \ 表示卷积计算）}
 \label{fig:11-7}
 \end{figure}
 %----------------------------------------------

Chapter16/Figures/figure-cycle-consistency.tex

@@ -5,7 +5,7 @@
 \node [rectangle,inner sep=2pt,font=\scriptsize] (top) at ([yshift=3em,xshift=0em]center.north) {
 \begin{tabular}{c}
 翻译模型 \\
-$\textrm{P}(\mathbf t|\mathbf s)$
+$\textrm{P}(\ \mathbi{y}|\ \mathbi{x})$
 \end{tabular}
 };
 
@@ -24,7 +24,7 @@ The weather is \\so good today.
 \node [rectangle,inner sep=2pt,font=\scriptsize] (down) at ([yshift=-3em,xshift=0em]center.south) {
 \begin{tabular}{c}
 翻译模型 \\
-$\textrm{P}(\mathbf s|\mathbf t)$
+$\textrm{P}(\ \mathbi{x}|\ \mathbi{y})$
 \end{tabular}
 };