合并分支 'mengxia' 到 'caorunzhe'

Mengxia

查看合并请求 !212

Book/Chapter5/Figures/fig-4-gram.tex

-%%%------------------------------------------------------------------------------------------------------------
 \begin{tikzpicture}
 \begin{tikzpicture}
 \begin{scope}
 \begin{scope}
 \node [anchor=west] (w0) at (0,0) {\footnotesize{$w_{i-3}$}};
 \node [anchor=west] (w0) at (0,0) {\footnotesize{$w_{i-3}$}};
@@ -7,11 +6,13 @@
 \node [anchor=north] (index0) at ([yshift=0.5em]w0.south) {\tiny(index)};
 \node [anchor=north] (index0) at ([yshift=0.5em]w0.south) {\tiny(index)};
 \node [anchor=north] (index1) at ([yshift=0.5em]w1.south) {\tiny(index)};
 \node [anchor=north] (index1) at ([yshift=0.5em]w1.south) {\tiny(index)};
 \node [anchor=north] (index2) at ([yshift=0.5em]w2.south) {\tiny(index)};
 \node [anchor=north] (index2) at ([yshift=0.5em]w2.south) {\tiny(index)};
-\node [anchor=south,draw,inner sep=3pt] (e0) at ([yshift=1em]w0.north) {\tiny{$\textbf{e}_0=w_{i-3} \textbf{C}$}};
-\node [anchor=south,draw,inner sep=3pt] (e1) at ([yshift=1em]w1.north) {\tiny{$\textbf{e}_1=w_{i-2} \textbf{C}$}};
-\node [anchor=south,draw,inner sep=3pt] (e2) at ([yshift=1em]w2.north) {\tiny{$\textbf{e}_2=w_{i-1} \textbf{C}$}};
-\node [anchor=south,draw,minimum width=9em,inner sep=3pt] (h0) at ([yshift=1.5em]e1.north) {\tiny{$\textbf{h}_0=\textrm{Tanh}([\textbf{e}_0,\textbf{e}_1,\textbf{e}_2] \textbf{H} + \textbf{d})$}};
-\node [anchor=south,draw,minimum width=9em,inner sep=3pt] (h1) at ([yshift=1.5em]h0.north) {\tiny{$\textbf{y}=\textrm{Softmax}(\textbf{h}_0 \textbf{U})$}};
+
+\node [anchor=south,draw,inner sep=3pt,fill=blue!20!white] (e0) at ([yshift=1em]w0.north) {\tiny{$\textbf{e}_0=w_{i-3} \textbf{C}$}};
+\node [anchor=south,draw,inner sep=3pt,fill=blue!20!white] (e1) at ([yshift=1em]w1.north) {\tiny{$\textbf{e}_1=w_{i-2} \textbf{C}$}};
+\node [anchor=south,draw,inner sep=3pt,fill=blue!20!white] (e2) at ([yshift=1em]w2.north) {\tiny{$\textbf{e}_2=w_{i-1} \textbf{C}$}};
+
+\node [anchor=south,draw,minimum width=9em,inner sep=3pt,fill=orange!20!white] (h0) at ([yshift=1.5em]e1.north) {\tiny{$\textbf{h}_0=\textrm{Tanh}([\textbf{e}_0,\textbf{e}_1,\textbf{e}_2] \textbf{H} + \textbf{d})$}};
+\node [anchor=south,draw,minimum width=9em,inner sep=3pt,fill=orange!20!white] (h1) at ([yshift=1.5em]h0.north) {\tiny{$\textbf{y}=\textrm{Softmax}(\textbf{h}_0 \textbf{U})$}};
 \node [anchor=south] (ylabel) at ([yshift=1em]h1.north) {\footnotesize{$\textrm{P}(w_i|w_{i-3}w_{i-2}w_{i-1})$}};
 \node [anchor=south] (ylabel) at ([yshift=1em]h1.north) {\footnotesize{$\textrm{P}(w_i|w_{i-3}w_{i-2}w_{i-1})$}};
 
 
 \draw [->,line width=1pt] ([yshift=0.1em]w0.north) -- ([yshift=-0.1em]e0.south);
 \draw [->,line width=1pt] ([yshift=0.1em]w0.north) -- ([yshift=-0.1em]e0.south);
@@ -37,17 +38,7 @@
 }
 }
 \end{pgfonlayer}
 \end{pgfonlayer}
 
 
-{
-\node [anchor=south,draw,inner sep=3pt,fill=blue!20!white] (e0) at ([yshift=1em]w0.north) {\tiny{$\textbf{e}_0=w_{i-3} \textbf{C}$}};
-\node [anchor=south,draw,inner sep=3pt,fill=blue!20!white] (e1) at ([yshift=1em]w1.north) {\tiny{$\textbf{e}_1=w_{i-2} \textbf{C}$}};
-\node [anchor=south,draw,inner sep=3pt,fill=blue!20!white] (e2) at ([yshift=1em]w2.north) {\tiny{$\textbf{e}_2=w_{i-1} \textbf{C}$}};
-}
-{
-\node [anchor=south,draw,minimum width=9em,inner sep=3pt,fill=orange!20!white] (h0) at ([yshift=1.5em]e1.north) {\tiny{$\textbf{h}_0=\textrm{Tanh}([\textbf{e}_0,\textbf{e}_1,\textbf{e}_2] \textbf{H} + \textbf{d})$}};
-\node [anchor=south,draw,minimum width=9em,inner sep=3pt,fill=orange!20!white] (h1) at ([yshift=1.5em]h0.north) {\tiny{$\textbf{y}=\textrm{Softmax}(\textbf{h}_0 \textbf{U})$}};
-}
 
 
-\end{scope}
-\end{tikzpicture}
-%%%------------------------------------------------------------------------------------------------------------
 
 
+\end{scope}
+\end{tikzpicture}
\ No newline at end of file

Book/Chapter5/Figures/fig-rnn-LM.tex

-%%%------------------------------------------------------------------------------------------------------------
 \begin{tikzpicture}
 \begin{tikzpicture}
 \begin{scope}
 \begin{scope}
 \tikzstyle{rnnnode} = [draw,inner sep=5pt,minimum width=4em,minimum height=1.5em,fill=green!30!white,blur shadow={shadow xshift=1pt,shadow yshift=-1pt}]
 \tikzstyle{rnnnode} = [draw,inner sep=5pt,minimum width=4em,minimum height=1.5em,fill=green!30!white,blur shadow={shadow xshift=1pt,shadow yshift=-1pt}]
@@ -28,10 +27,10 @@
 \draw [->,thick] ([yshift=0.1em]e4.north)--([yshift=-0.1em]node14.south);
 \draw [->,thick] ([yshift=0.1em]e4.north)--([yshift=-0.1em]node14.south);
 
 
 {
 {
-\node [anchor=south,rnnnode] (node21) at ([yshift=1.5em]node11.north) {\scriptsize{RNN Cell}};
-\node [anchor=south,rnnnode] (node22) at ([yshift=1.5em]node12.north) {\scriptsize{RNN Cell}};
-\node [anchor=south,rnnnode] (node23) at ([yshift=1.5em]node13.north) {\scriptsize{RNN Cell}};
-\node [anchor=south,rnnnode] (node24) at ([yshift=1.5em]node14.north) {\scriptsize{RNN Cell}};
+\node [anchor=south,rnnnode,fill=blue!30!white] (node21) at ([yshift=1.5em]node11.north) {\scriptsize{Softmax($\cdot$)}};
+\node [anchor=south,rnnnode,fill=blue!30!white] (node22) at ([yshift=1.5em]node12.north) {\scriptsize{Softmax($\cdot$)}};
+\node [anchor=south,rnnnode,fill=blue!30!white] (node23) at ([yshift=1.5em]node13.north) {\scriptsize{Softmax($\cdot$)}};
+\node [anchor=south,rnnnode,fill=blue!30!white] (node24) at ([yshift=1.5em]node14.north) {\scriptsize{Softmax($\cdot$)}};
 
 
 \node [anchor=south,rnnnode,fill=blue!30!white] (node31) at ([yshift=1.5em]node21.north) {\scriptsize{Softmax($\cdot$)}};
 \node [anchor=south,rnnnode,fill=blue!30!white] (node31) at ([yshift=1.5em]node21.north) {\scriptsize{Softmax($\cdot$)}};
 \node [anchor=south,rnnnode,fill=blue!30!white] (node32) at ([yshift=1.5em]node22.north) {\scriptsize{Softmax($\cdot$)}};
 \node [anchor=south,rnnnode,fill=blue!30!white] (node32) at ([yshift=1.5em]node22.north) {\scriptsize{Softmax($\cdot$)}};
@@ -40,13 +39,6 @@
 }
 }
 
 
 {
 {
-\node [anchor=south,rnnnode,fill=blue!30!white] (node21) at ([yshift=1.5em]node11.north) {\scriptsize{Softmax($\cdot$)}};
-\node [anchor=south,rnnnode,fill=blue!30!white] (node22) at ([yshift=1.5em]node12.north) {\scriptsize{Softmax($\cdot$)}};
-\node [anchor=south,rnnnode,fill=blue!30!white] (node23) at ([yshift=1.5em]node13.north) {\scriptsize{Softmax($\cdot$)}};
-\node [anchor=south,rnnnode,fill=blue!30!white] (node24) at ([yshift=1.5em]node14.north) {\scriptsize{Softmax($\cdot$)}};
-}
-
-{
 \draw [->,thick] ([yshift=0.1em]node31.north)--([yshift=1em]node31.north) node[pos=1,above] {\scriptsize{$\textrm{P}(w_2)$}};
 \draw [->,thick] ([yshift=0.1em]node31.north)--([yshift=1em]node31.north) node[pos=1,above] {\scriptsize{$\textrm{P}(w_2)$}};
 \draw [->,thick] ([yshift=0.1em]node32.north)--([yshift=1em]node32.north) node[pos=1,above] {\scriptsize{$\textrm{P}(w_3|w_2)$}};
 \draw [->,thick] ([yshift=0.1em]node32.north)--([yshift=1em]node32.north) node[pos=1,above] {\scriptsize{$\textrm{P}(w_3|w_2)$}};
 \draw [->,thick] ([yshift=0.1em]node33.north)--([yshift=1em]node33.north) node[pos=1,above] {\scriptsize{$\textrm{P}(w_4|w_2 w_3)$}};
 \draw [->,thick] ([yshift=0.1em]node33.north)--([yshift=1em]node33.north) node[pos=1,above] {\scriptsize{$\textrm{P}(w_4|w_2 w_3)$}};
@@ -64,7 +56,7 @@
 \draw [->,thick] ([xshift=0.1em]node24.east)--([xshift=1em]node24.east);
 \draw [->,thick] ([xshift=0.1em]node24.east)--([xshift=1em]node24.east);
 }
 }
 
 
-{
+
 \draw [->,thick] ([yshift=0.1em]node11.north)--([yshift=-0.1em]node21.south);
 \draw [->,thick] ([yshift=0.1em]node11.north)--([yshift=-0.1em]node21.south);
 \draw [->,thick] ([yshift=0.1em]node12.north)--([yshift=-0.1em]node22.south);
 \draw [->,thick] ([yshift=0.1em]node12.north)--([yshift=-0.1em]node22.south);
 \draw [->,thick] ([yshift=0.1em]node13.north)--([yshift=-0.1em]node23.south);
 \draw [->,thick] ([yshift=0.1em]node13.north)--([yshift=-0.1em]node23.south);
@@ -75,9 +67,7 @@
 \draw [->,thick] ([xshift=0.1em]node12.east)--([xshift=-0.1em]node13.west);
 \draw [->,thick] ([xshift=0.1em]node12.east)--([xshift=-0.1em]node13.west);
 \draw [->,thick] ([xshift=0.1em]node13.east)--([xshift=-0.1em]node14.west);
 \draw [->,thick] ([xshift=0.1em]node13.east)--([xshift=-0.1em]node14.west);
 \draw [->,thick] ([xshift=0.1em]node14.east)--([xshift=1em]node14.east);
 \draw [->,thick] ([xshift=0.1em]node14.east)--([xshift=1em]node14.east);
-}
 
 
-\end{scope}
-\end{tikzpicture}
-%%%------------------------------------------------------------------------------------------------------------
 
 
+\end{scope}
+\end{tikzpicture}
\ No newline at end of file

Book/Chapter5/Figures/fig-two-layer-neural-network.tex

@@ -36,8 +36,8 @@
 %% weight and bias
 %% weight and bias
 {\node [anchor=center,rotate=90,fill=white,inner sep=1pt] (b0) at ([yshift=2em,xshift=-0.5em]b.north) {\scriptsize{$b_1$}};}
 {\node [anchor=center,rotate=90,fill=white,inner sep=1pt] (b0) at ([yshift=2em,xshift=-0.5em]b.north) {\scriptsize{$b_1$}};}
 {\node [anchor=center,rotate=-59,fill=white,inner sep=1pt] (w2) at ([yshift=1em,xshift=-1.0em]x1.north) {\scriptsize{$w_1$}};}
 {\node [anchor=center,rotate=-59,fill=white,inner sep=1pt] (w2) at ([yshift=1em,xshift=-1.0em]x1.north) {\scriptsize{$w_1$}};}
-{\node [anchor=center,rotate=62,fill=white,inner sep=1pt] (w21) at ([yshift=1.2em,xshift=0em]n10.north) {\scriptsize{$w'_1$}};}
-{\node [anchor=center,rotate=-62,fill=white,inner sep=1pt] (w22) at ([yshift=1.2em,xshift=-0em]n11.north) {\scriptsize{$w'_2$}};}
+{\node [anchor=center,rotate=62,fill=white,inner sep=1pt] (w21) at ([yshift=1.2em,xshift=-0.2em]n10.north) {\scriptsize{$w'_1$}};}
+{\node [anchor=center,rotate=-62,fill=white,inner sep=1pt] (w22) at ([yshift=1.2em,xshift=0.2em]n11.north) {\scriptsize{$w'_2$}};}
 {\node [anchor=center,rotate=59,fill=white,inner sep=1pt] (b1) at ([yshift=3.4em,xshift=1.5em]b.north) {\scriptsize{$b_2$}};}
 {\node [anchor=center,rotate=59,fill=white,inner sep=1pt] (b1) at ([yshift=3.4em,xshift=1.5em]b.north) {\scriptsize{$b_2$}};}
 {\node [anchor=center,rotate=90,fill=white,inner sep=1pt] (w1) at ([yshift=2em,xshift=0.5em]x1.north) {\scriptsize{$w_2$}};}
 {\node [anchor=center,rotate=90,fill=white,inner sep=1pt] (w1) at ([yshift=2em,xshift=0.5em]x1.north) {\scriptsize{$w_2$}};}
 
 

Book/Chapter5/chapter5.tex

@@ -134,6 +134,7 @@
 %------------------------------------------------------------------------------
 %------------------------------------------------------------------------------
     \begin{figure}[htp]
     \begin{figure}[htp]
     \centering
     \centering
+    \subfigcapskip=8pt
     \subfigure[基于特征工程的机器学习方法做图像分类]{
     \subfigure[基于特征工程的机器学习方法做图像分类]{
     \begin{minipage}{.9\textwidth}
     \begin{minipage}{.9\textwidth}
     \centering
     \centering