diff --git a/.gitignore b/.gitignore index 67a333a..043fbbc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ *.toc */auto/ *.synctex.gz +*.pdf +*.bbl +*.blg +main.pdf diff --git a/beamer/articulos-latex.pdf b/beamer/articulos-latex.pdf index cc134f9..c9131e0 100644 Binary files a/beamer/articulos-latex.pdf and b/beamer/articulos-latex.pdf differ diff --git a/beamer/articulos-latex.tex b/beamer/articulos-latex.tex index 6cc36cc..a97e513 100644 --- a/beamer/articulos-latex.tex +++ b/beamer/articulos-latex.tex @@ -237,19 +237,36 @@ Algunos de los paquetes básicos son: \end{columns} \end{frame} %======= Día 2 ========= -\section{Día 2: Sección Introducción } -% +++++++++++++++++++ -\subsection{Revisando una introducción} +\section{Día 2: Sección Metodología} + \begin{frame} + \frametitle{Que incluir en la metodología} + \begin{columns} + \column{0.5\textwidth} + \includegraphics[width=1.8in]{structure-2} + \column{0.5\textwidth} + \begin{itemize} + \item<1-> Materialesd y metodos, or Procedimeinto, Experimentos, Simulación, Metodología o Modelo + \item<2->Indica que se hizo y/o utilizo; para replicar los resultados + \item<3->El lector debe aprender del reporte + \item<4-> Normalmente la sección se acompaña de un esquema + \end{itemize} + \end{columns} + \end{frame} + +%+++++++++++++++++++ +\subsection{Revisando metodología} \begin{frame} - \frametitle{Introducción de ejemplo} - \includegraphics[width=4.5in]{1introduction} + \frametitle{Empezando por el final} + \includegraphics[width=4.5in]{methodology} \end{frame} \begin{frame} - \frametitle{Nuestra introducción} + \frametitle{Nuestra metodología} \centering \includegraphics[width=4.5in]{mistakes} -\end{frame} +\end{frame}% +++++++++++++++++++ %+++++++++++++++++++ + + %+++++++++++++++++++ \subsection{Bibliografía} \begin{frame}{Entorno bibliografía} diff --git a/beamer/methodology.png b/beamer/methodology.png new file mode 100644 index 0000000..c397216 Binary files /dev/null and b/beamer/methodology.png differ diff --git a/beamer/structure-2.png b/beamer/structure-2.png new file mode 100644 index 0000000..4c68597 Binary files /dev/null and b/beamer/structure-2.png differ diff --git a/examples/0-hello/main.tex b/examples/day-1/1-hello/main.tex similarity index 100% rename from examples/0-hello/main.tex rename to examples/day-1/1-hello/main.tex diff --git a/examples/1-estructura/main.tex b/examples/day-1/2-estructura/main.tex similarity index 100% rename from examples/1-estructura/main.tex rename to examples/day-1/2-estructura/main.tex diff --git a/examples/1-estructura/metodologia.jpg b/examples/day-1/2-estructura/metodologia.jpg similarity index 100% rename from examples/1-estructura/metodologia.jpg rename to examples/day-1/2-estructura/metodologia.jpg diff --git a/examples/day-1/3-metodologia/main.tex b/examples/day-1/3-metodologia/main.tex new file mode 100644 index 0000000..d7ec5a6 --- /dev/null +++ b/examples/day-1/3-metodologia/main.tex @@ -0,0 +1,38 @@ +\documentclass{article} + +\usepackage{tikz} +\usetikzlibrary{shapes,arrows} +\begin{document} + +% 1: +\tikzstyle{block} = [draw, fill=gray!20, rectangle, + minimum height=3em, minimum width=6em] +\tikzstyle{sum} = [draw, fill=gray!20, circle, node distance=1cm] +\tikzstyle{input} = [coordinate] +\tikzstyle{output} = [coordinate] +\tikzstyle{pinstyle} = [pin edge={to-,thin,black}] + +% The block diagram code is probably more verbose than necessary +\begin{tikzpicture}[auto, node distance=2cm,>=latex'] + %2: We start by placing the blocks + \node [input, name=input] {}; + \node [sum, right of=input] (sum) {}; + \node [block, right of=sum] (controller) {Controller}; + \node [block, right of=controller, pin={[pinstyle]above:Disturbances}, + node distance=3cm] (system) {System}; + %3: We draw an edge between the controller and system block to + % calculate the coordinate u. We need it to place the measurement block. + \draw [->] (controller) -- node[name=u] {$u$} (system); + \node [output, right of=system] (output) {}; + \node [block, below of=u] (measurements) {Measurements}; + + %4: Once the nodes are placed, connecting them is easy. + \draw [draw,->] (input) -- node {$r$} (sum); + \draw [->] (sum) -- node {$e$} (controller); + \draw [->] (system) -- node [name=y] {$y$}(output); + \draw [->] (y) |- (measurements); + \draw [->] (measurements) -| node[pos=0.99] {$-$} + node [near end] {$y_m$} (sum); +\end{tikzpicture} + +\end{document} \ No newline at end of file diff --git a/examples/day-2/1-bibliografia/main.tex b/examples/day-2/1-bibliografia/main.tex new file mode 100644 index 0000000..bcc08ec --- /dev/null +++ b/examples/day-2/1-bibliografia/main.tex @@ -0,0 +1,73 @@ +\documentclass{article} +\usepackage[spanish]{babel} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{float} +\usepackage{amsmath} +\usepackage{blindtext} +\usepackage{graphicx} +\title{Mi reporte de prácticas de la metería X} +\author{Gerardo Marx} + + + +\begin{document} +\maketitle{} +\newpage + +\tableofcontents +\newpage + +\section{Introducción} +\blindtext[1] + +\section{Metodología} +\blindtext[1] + +En la figura \ref{fig:metal} + +\begin{figure}[H] +\centering +\includegraphics[width=3in]{metalografia} +\caption{Metalografía de acero xxxx.} +\label{fig:metal} +\end{figure} + +\section{Desarrollo} +\blindtext[1] + +\section{Resultados} +\blindtext[1] + +En \autoref{fig:metal2} \cite{rim1994complete} + +\begin{figure}[H] +\centering +\includegraphics[scale=0.25]{metalografia} +\caption{Texto de la figura} +\label{fig:metal2} +\end{figure} +\section{Conclusiones} +\blindtext[1] + +Según \cite{patashnik1984bibtex} es posible considerar. + +\bibliographystyle{ieeetr} +\bibliography{refs} + + + + + + + + + + + + + + + + +\end{document} \ No newline at end of file diff --git a/examples/day-2/1-bibliografia/metalografia.jpg b/examples/day-2/1-bibliografia/metalografia.jpg new file mode 100644 index 0000000..4dd2ff1 Binary files /dev/null and b/examples/day-2/1-bibliografia/metalografia.jpg differ diff --git a/examples/day-2/1-bibliografia/refs.bib b/examples/day-2/1-bibliografia/refs.bib new file mode 100644 index 0000000..f726039 --- /dev/null +++ b/examples/day-2/1-bibliografia/refs.bib @@ -0,0 +1,17 @@ +@article{rim1994complete, + title={A complete DC and AC analysis of three-phase controlled-current PWM rectifier using circuit DQ transformation}, + author={Rim, Chun T and Choi, Nam S and Cho, Guk C and Cho, Gyu H}, + journal={IEEE Transactions on Power Electronics}, + volume={9}, + number={4}, + pages={390--396}, + year={1994}, + publisher={IEEE} +} + +@article{patashnik1984bibtex, + title={BIBTEX 101}, + author={Patashnik, Oren}, + year={1984} +} + diff --git a/examples/day-2/2-diagrama/main.tex b/examples/day-2/2-diagrama/main.tex new file mode 100644 index 0000000..ad235e9 --- /dev/null +++ b/examples/day-2/2-diagrama/main.tex @@ -0,0 +1,27 @@ +\documentclass{article} +\usepackage{tikz} +\usetikzlibrary{shapes,arrows} +\usepackage{graphicx} + + +\begin{document} + +% 1: +\tikzstyle{block} = [draw, fill=gray!20, rectangle, + minimum height=3em, minimum width=6em] +\tikzstyle{sum} = [draw, fill=gray!20, circle, node distance=1cm] +\tikzstyle{input} = [coordinate] +\tikzstyle{output} = [coordinate] +\tikzstyle{pinstyle} = [pin edge={to-,thin,black}] + +% The block diagram code is probably more verbose than necessary +\begin{tikzpicture}[auto, node distance=2cm,>=latex'] + %2: We start by placing the blocks + \node [input, name=input] {}; + \node [sum, right of=input] (sum) {}; + \node [block, right of=sum] (controller) {Texto}; + \node [block, right of=controller] (element) {Some}; +\end{tikzpicture} + + +\end{document} diff --git a/examples/2-introduccion/main-op2.tex b/examples/day-3/4-introduccion/main-op2.tex similarity index 100% rename from examples/2-introduccion/main-op2.tex rename to examples/day-3/4-introduccion/main-op2.tex diff --git a/examples/2-introduccion/main.tex b/examples/day-3/4-introduccion/main.tex similarity index 100% rename from examples/2-introduccion/main.tex rename to examples/day-3/4-introduccion/main.tex diff --git a/examples/2-introduccion/referencias.bib b/examples/day-3/4-introduccion/referencias.bib similarity index 100% rename from examples/2-introduccion/referencias.bib rename to examples/day-3/4-introduccion/referencias.bib diff --git a/examples/archivos-referencias/bibliography.txt b/examples/day-3/archivos-referencias/bibliography.txt similarity index 100% rename from examples/archivos-referencias/bibliography.txt rename to examples/day-3/archivos-referencias/bibliography.txt diff --git a/examples/archivos-referencias/referencias.bib b/examples/day-3/archivos-referencias/referencias.bib similarity index 100% rename from examples/archivos-referencias/referencias.bib rename to examples/day-3/archivos-referencias/referencias.bib