diff --git a/memoria/capitulos/capitulo4.tex b/memoria/capitulos/capitulo4.tex index 0f6cb10..1e1de6b 100644 --- a/memoria/capitulos/capitulo4.tex +++ b/memoria/capitulos/capitulo4.tex @@ -224,4 +224,19 @@ \subsection{Módulo python de Friis} \subsection{Aplicación de Friis} \label{subsec:friis-app} +La última sección relacionada con las señales se centro en integrar el módulo previo, en una interfaz gráfica amigable para el usuario. La idea era estudiar, en tiempo real, como evolucionaba la señal cuando alguno de sus parametros, en la ecuación de Friis, era modificado.\\ + +Para llevarlo a cabo, se empleó la librería \textbf{matplotlib}, debido a la enorme cantidad de herramientas de las que dispone, así como de su sencillez a la hora de crear nuevas aplicaciones. Funciona de manera que se generan eventos que son gestionados en \emph{``callbacks''}, es decir, se generan bucles asociados a dichos eventos, que reaccionan a cambios en la interfaz generada. En nuestro caso, la estructura base consta de una figura, sobre la que se agregan todos los elementos, entre los que encontramos los mapas de calor o \emph{``heatmap''} en forma de plots, las barras de acción o \emph{``sliders''}, botones, entre otros elementos que se explicarán más adelante.\\ + +Inicialmente, se optó por representar un mapa de calor con una barra de color asociada a los distintos valores de la señal. Además, se integraron sliders correspondientes a cada valor presente en la ecuación de Friis, tal y como se muestra a continuación:\\ + +(imagen app inicial)\\ + +El problema fue, que al actualizar los valores, también lo hacía la representación, por lo que no se apreciaba el efecto de los cambios en el plot. Por ello, se agregaron dos mapas de calor, uno con el máximo y el mínimo fijados a mano (donde sí se aprecian los cambios), y el anterior mencionado. Para elegir cual usar, se agregó una casilla marcable. Además, se incluyeron dos variables relevantes a la hora de modelar, el \textbf{tamaño del mapa} y la \textbf{resolución}, manejadas a través de \emph{``sliders''}, los cuales a su vez se activan al pulsar un botón de \textbf{SET}, que recarga la interfaz. Además, se ajustó los saltos de valores para que fueran coherentes en el resto de barras de acción, tal y como se puede apreciar a continuación:\\ + +(imagen app final)\\ + +\section{Integración conjunta} +\label{sec:integration} + ToDo... \ No newline at end of file diff --git a/memoria/memoria.aux b/memoria/memoria.aux index 68a3418..a52c95d 100644 --- a/memoria/memoria.aux +++ b/memoria/memoria.aux @@ -282,31 +282,33 @@ \newlabel{cod:c2c_app}{{4.2}{24}{Main de center to center app}{code.caption.38}{}} \@writefile{toc}{\contentsline {subsection}{\numberline {4.2.3}Aplicación de Friis}{25}{subsection.4.2.3}\protected@file@percent } \newlabel{subsec:friis-app}{{4.2.3}{25}{Aplicación de Friis}{subsection.4.2.3}{}} -\@writefile{toc}{\contentsline {chapter}{\numberline {5}Conclusiones}{26}{chapter.5}\protected@file@percent } +\@writefile{toc}{\contentsline {section}{\numberline {4.3}Integración conjunta}{26}{section.4.3}\protected@file@percent } +\newlabel{sec:integration}{{4.3}{26}{Integración conjunta}{section.4.3}{}} +\@writefile{toc}{\contentsline {chapter}{\numberline {5}Conclusiones}{27}{chapter.5}\protected@file@percent } \@writefile{lof}{\addvspace {10\p@ }} \@writefile{lot}{\addvspace {10\p@ }} \@writefile{locode}{\addvspace {10\p@ }} \@writefile{lomyequation}{\addvspace {10\p@ }} -\newlabel{cap:capitulo5}{{5}{26}{Conclusiones}{chapter.5}{}} -\@writefile{toc}{\contentsline {section}{\numberline {5.1}Objetivos cumplidos}{26}{section.5.1}\protected@file@percent } -\newlabel{sec:objetivos_cumplidos}{{5.1}{26}{Objetivos cumplidos}{section.5.1}{}} -\@writefile{toc}{\contentsline {section}{\numberline {5.2}Requisitos satisfechos}{26}{section.5.2}\protected@file@percent } -\newlabel{sec:requisitos_satisfechos}{{5.2}{26}{Requisitos satisfechos}{section.5.2}{}} -\@writefile{toc}{\contentsline {section}{\numberline {5.3}Balance global y competencias adquiridas}{26}{section.5.3}\protected@file@percent } -\newlabel{sec:balance_global_competencias_adquiridas}{{5.3}{26}{Balance global y competencias adquiridas}{section.5.3}{}} -\@writefile{toc}{\contentsline {section}{\numberline {5.4}Líneas futuras}{26}{section.5.4}\protected@file@percent } -\newlabel{sec:lineas_futuras}{{5.4}{26}{Líneas futuras}{section.5.4}{}} -\@writefile{toc}{\contentsline {chapter}{\numberline {6}Anexo}{27}{chapter.6}\protected@file@percent } +\newlabel{cap:capitulo5}{{5}{27}{Conclusiones}{chapter.5}{}} +\@writefile{toc}{\contentsline {section}{\numberline {5.1}Objetivos cumplidos}{27}{section.5.1}\protected@file@percent } +\newlabel{sec:objetivos_cumplidos}{{5.1}{27}{Objetivos cumplidos}{section.5.1}{}} +\@writefile{toc}{\contentsline {section}{\numberline {5.2}Requisitos satisfechos}{27}{section.5.2}\protected@file@percent } +\newlabel{sec:requisitos_satisfechos}{{5.2}{27}{Requisitos satisfechos}{section.5.2}{}} +\@writefile{toc}{\contentsline {section}{\numberline {5.3}Balance global y competencias adquiridas}{27}{section.5.3}\protected@file@percent } +\newlabel{sec:balance_global_competencias_adquiridas}{{5.3}{27}{Balance global y competencias adquiridas}{section.5.3}{}} +\@writefile{toc}{\contentsline {section}{\numberline {5.4}Líneas futuras}{27}{section.5.4}\protected@file@percent } +\newlabel{sec:lineas_futuras}{{5.4}{27}{Líneas futuras}{section.5.4}{}} +\@writefile{toc}{\contentsline {chapter}{\numberline {6}Anexo}{28}{chapter.6}\protected@file@percent } \@writefile{lof}{\addvspace {10\p@ }} \@writefile{lot}{\addvspace {10\p@ }} \@writefile{locode}{\addvspace {10\p@ }} \@writefile{lomyequation}{\addvspace {10\p@ }} -\newlabel{cap:anexo}{{6}{27}{Anexo}{chapter.6}{}} +\newlabel{cap:anexo}{{6}{28}{Anexo}{chapter.6}{}} \citation{*} \bibstyle{unsrt} \bibdata{bibliografia} -\@writefile{lot}{\contentsline {table}{\numberline {6.1}{\ignorespaces Anexo con las fuentes de donde se han obtenido las imágenes para este proyecto\relax }}{28}{table.caption.40}\protected@file@percent } -\newlabel{cuadro:anexo_imagenes_fuentes}{{6.1}{28}{Anexo con las fuentes de donde se han obtenido las imágenes para este proyecto\relax }{table.caption.40}{}} +\@writefile{lot}{\contentsline {table}{\numberline {6.1}{\ignorespaces Anexo con las fuentes de donde se han obtenido las imágenes para este proyecto\relax }}{29}{table.caption.40}\protected@file@percent } +\newlabel{cuadro:anexo_imagenes_fuentes}{{6.1}{29}{Anexo con las fuentes de donde se han obtenido las imágenes para este proyecto\relax }{table.caption.40}{}} \bibcite{rae-robotica}{{1}{}{{}}{{}}} \bibcite{revista-de-robots}{{2}{}{{}}{{}}} \bibcite{industrial-robot}{{3}{}{{}}{{}}} @@ -317,7 +319,7 @@ \bibcite{kettering-bug}{{8}{}{{}}{{}}} \bibcite{queen-bee}{{9}{}{{}}{{}}} \bibcite{operation-aphrodite}{{10}{}{{}}{{}}} -\@writefile{toc}{\contentsline {chapter}{Bibliograf\'{\i }a}{29}{appendix*.41}\protected@file@percent } +\@writefile{toc}{\contentsline {chapter}{Bibliograf\'{\i }a}{30}{appendix*.41}\protected@file@percent } \bibcite{uas-definicion}{{11}{}{{}}{{}}} \bibcite{gcs-definicion}{{12}{}{{}}{{}}} \bibcite{data-link-definicion}{{13}{}{{}}{{}}} diff --git a/memoria/memoria.log b/memoria/memoria.log index f9b2566..3fc6233 100644 --- a/memoria/memoria.log +++ b/memoria/memoria.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.20 (TeX Live 2019/Debian) (preloaded format=pdflatex 2023.7.19) 25 AUG 2023 12:08 +This is pdfTeX, Version 3.14159265-2.6-1.40.20 (TeX Live 2019/Debian) (preloaded format=pdflatex 2023.7.19) 28 AUG 2023 19:03 entering extended mode restricted \write18 enabled. %&-line parsing enabled. @@ -623,7 +623,7 @@ LaTeX Info: Redefining \nameref on input line 26. Package newfloat Info: `float' package detected. (./portada/indice.tex (./portada/portada.tex - + File: imagenes/cap1/logo_urjc.jpg Graphic file (type jpg) Package pdftex.def Info: imagenes/cap1/logo_urjc.jpg used on input line 7. @@ -746,13 +746,13 @@ Underfull \hbox (badness 10000) in paragraph at lines 7--8 [] - + File: imagenes/cap1/1_industrial_robot.jpeg Graphic file (type jpg) Package pdftex.def Info: imagenes/cap1/1_industrial_robot.jpeg used on input l ine 19. (pdftex.def) Requested size: 170.7792pt x 113.81102pt. - + File: imagenes/cap1/2_mobile_robot.jpeg Graphic file (type jpg) Package pdftex.def Info: imagenes/cap1/2_mobile_robot.jpeg used on input line @@ -777,7 +777,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 33--34 [] - + File: imagenes/cap1/3_robot.png Graphic file (type png) Package pdftex.def Info: imagenes/cap1/3_robot.png used on input line 37. @@ -798,19 +798,19 @@ Underfull \hbox (badness 10000) in paragraph at lines 50--51 [] - + File: imagenes/cap1/4_kettering_bug.jpeg Graphic file (type jpg) Package pdftex.def Info: imagenes/cap1/4_kettering_bug.jpeg used on input line 54. (pdftex.def) Requested size: 94.83955pt x 71.13188pt. - + File: imagenes/cap1/5_queen_bee.jpeg Graphic file (type jpg) Package pdftex.def Info: imagenes/cap1/5_queen_bee.jpeg used on input line 56. (pdftex.def) Requested size: 177.65408pt x 71.13188pt. - + File: imagenes/cap1/6_aphrodite.jpeg Graphic file (type jpg) Package pdftex.def Info: imagenes/cap1/6_aphrodite.jpeg used on input line 58. @@ -827,7 +827,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 72--73 [] - + File: imagenes/cap1/7_drone_components.jpeg Graphic file (type jpg) Package pdftex.def Info: imagenes/cap1/7_drone_components.jpeg used on input l @@ -854,7 +854,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 89--90 LaTeX Info: Redefining \. on input line 90. LaTeX Info: Redefining \% on input line 90. [4 <./imagenes/cap1/7_drone_components.jpeg>] - + File: imagenes/cap1/8_AI_types.png Graphic file (type png) Package pdftex.def Info: imagenes/cap1/8_AI_types.png used on input line 103. @@ -867,7 +867,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 112--113 LaTeX Info: Redefining \. on input line 113. LaTeX Info: Redefining \% on input line 113. [5 <./imagenes/cap1/8_AI_types.png>] - + File: imagenes/cap1/9_reinforcement.png Graphic file (type png) Package pdftex.def Info: imagenes/cap1/9_reinforcement.png used on input line @@ -890,7 +890,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 132--133 [] - + File: imagenes/cap1/10_friis.png Graphic file (type png) Package pdftex.def Info: imagenes/cap1/10_friis.png used on input line 136. @@ -973,7 +973,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 50--51 [] - + File: imagenes/cap3/1_ros_esquema.png Graphic file (type png) Package pdftex.def Info: imagenes/cap3/1_ros_esquema.png used on input line 56 @@ -993,7 +993,7 @@ S \T1/cmr/m/n/12 12 [] [12 <./imagenes/cap3/1_ros_esquema.png>] - + File: imagenes/cap3/2_gazebo_example.JPEG Graphic file (type jpg) Package pdftex.def Info: imagenes/cap3/2_gazebo_example.JPEG used on input lin @@ -1009,7 +1009,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 82--83 [] - + File: imagenes/cap3/3_rviz_example.png Graphic file (type png) Package pdftex.def Info: imagenes/cap3/3_rviz_example.png used on input line 8 @@ -1034,7 +1034,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 100--101 [] - + File: imagenes/cap3/4_vscode_logo.png Graphic file (type png) Package pdftex.def Info: imagenes/cap3/4_vscode_logo.png used on input line 10 @@ -1073,7 +1073,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 127--128 [] - + File: imagenes/cap3/5_opencv_example.png Graphic file (type png) Package pdftex.def Info: imagenes/cap3/5_opencv_example.png used on input line @@ -1089,7 +1089,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 142--143 [] - + File: imagenes/cap3/6_matplotlib_app.png Graphic file (type png) Package pdftex.def Info: imagenes/cap3/6_matplotlib_app.png used on input line @@ -1114,7 +1114,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 157--158 [] - + File: imagenes/cap3/7_px4_logo.png Graphic file (type png) Package pdftex.def Info: imagenes/cap3/7_px4_logo.png used on input line 161. @@ -1124,7 +1124,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 170--171 [] - + File: imagenes/cap3/8_iris_drone.png Graphic file (type png) Package pdftex.def Info: imagenes/cap3/8_iris_drone.png used on input line 174 @@ -1168,7 +1168,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 20--21 [] - + File: imagenes/cap4/1_px4_drone_gz.png Graphic file (type png) Package pdftex.def Info: imagenes/cap4/1_px4_drone_gz.png used on input line 2 @@ -1202,7 +1202,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 51--52 [] - + File: imagenes/cap4/2_axes_rc.png Graphic file (type png) Package pdftex.def Info: imagenes/cap4/2_axes_rc.png used on input line 55. @@ -1219,7 +1219,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 63--64 [] - + File: imagenes/cap4/3_c2c_gui.png Graphic file (type png) Package pdftex.def Info: imagenes/cap4/3_c2c_gui.png used on input line 67. @@ -1320,17 +1320,49 @@ Underfull \hbox (badness 10000) in paragraph at lines 222--223 [] + +Underfull \hbox (badness 10000) in paragraph at lines 227--228 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 229--230 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 231--232 + + [] + +LaTeX Info: Redefining \. on input line 233. +LaTeX Info: Redefining \% on input line 233. +[25] +Underfull \hbox (badness 10000) in paragraph at lines 233--234 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 235--236 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 237--238 + + [] + ) (./capitulos/capitulo5.tex LaTeX Info: Redefining \. on input line 1. LaTeX Info: Redefining \% on input line 1. - [25] + [26] Cap\'{\i }tulo 5. -) (./anexo.tex [26 +) (./anexo.tex [27 ] Cap\'{\i }tulo 6. -LaTeX Warning: Reference `fig:robots_autonomos' on page 27 undefined on input l +LaTeX Warning: Reference `fig:robots_autonomos' on page 28 undefined on input l ine 16. @@ -1358,7 +1390,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 24--25 [] -LaTeX Warning: Reference `fig:campos_robotica' on page 27 undefined on input li +LaTeX Warning: Reference `fig:campos_robotica' on page 28 undefined on input li ne 28. @@ -1389,7 +1421,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 34--35 [] -LaTeX Warning: Reference `fig:robotica-tacto-bolonia' on page 27 undefined on i +LaTeX Warning: Reference `fig:robotica-tacto-bolonia' on page 28 undefined on i nput line 38. @@ -1398,7 +1430,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 38--39 [] -LaTeX Warning: Reference `fig:AKROD' on page 27 undefined on input line 42. +LaTeX Warning: Reference `fig:AKROD' on page 28 undefined on input line 42. Underfull \hbox (badness 10000) in paragraph at lines 42--43 @@ -1406,7 +1438,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 42--43 [] -LaTeX Warning: Reference `fig:lokomat' on page 27 undefined on input line 46. +LaTeX Warning: Reference `fig:lokomat' on page 28 undefined on input line 46. Underfull \hbox (badness 10000) in paragraph at lines 46--47 @@ -1414,7 +1446,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 46--47 [] -LaTeX Warning: Reference `fig:exoesqueleto_atlas' on page 27 undefined on input +LaTeX Warning: Reference `fig:exoesqueleto_atlas' on page 28 undefined on input line 50. @@ -1429,7 +1461,7 @@ Overfull \hbox (25.19997pt too wide) in paragraph at lines 10--55 [] -LaTeX Warning: Reference `fig:aplicaciones-exoesqueletos' on page 27 undefined +LaTeX Warning: Reference `fig:aplicaciones-exoesqueletos' on page 28 undefined on input line 64. @@ -1455,7 +1487,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 68--69 [] -LaTeX Warning: Reference `fig:exos-flexibles-rigidos' on page 27 undefined on i +LaTeX Warning: Reference `fig:exos-flexibles-rigidos' on page 28 undefined on i nput line 74. @@ -1465,11 +1497,11 @@ Underfull \hbox (badness 10000) in paragraph at lines 74--75 [] -LaTeX Warning: Reference `fig:puntos-clave-imagen' on page 27 undefined on inpu +LaTeX Warning: Reference `fig:puntos-clave-imagen' on page 28 undefined on inpu t line 80. -LaTeX Warning: Reference `fig:logo_stm32cubeide' on page 27 undefined on input +LaTeX Warning: Reference `fig:logo_stm32cubeide' on page 28 undefined on input line 84. @@ -1478,7 +1510,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 84--85 [] -LaTeX Warning: Reference `fig:exos_activo_pasivo' on page 27 undefined on input +LaTeX Warning: Reference `fig:exos_activo_pasivo' on page 28 undefined on input line 88. @@ -1494,7 +1526,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 90--91 [] -LaTeX Warning: Reference `fig:esquema_redes_neuronales' on page 27 undefined on +LaTeX Warning: Reference `fig:esquema_redes_neuronales' on page 28 undefined on input line 94. @@ -1503,15 +1535,15 @@ Underfull \hbox (badness 10000) in paragraph at lines 94--95 [] -LaTeX Warning: Reference `fig:esquema_arbol_decision' on page 27 undefined on i +LaTeX Warning: Reference `fig:esquema_arbol_decision' on page 28 undefined on i nput line 98. -LaTeX Warning: Reference `fig:obtencion_fases_keypoints_movenet' on page 27 und +LaTeX Warning: Reference `fig:obtencion_fases_keypoints_movenet' on page 28 und efined on input line 102. -LaTeX Warning: Reference `fig:esquema_keypoints_mediapipe' on page 27 undefined +LaTeX Warning: Reference `fig:esquema_keypoints_mediapipe' on page 28 undefined on input line 106. @@ -1521,7 +1553,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 106--107 [] -LaTeX Warning: Reference `fig:ejemplos_vision_mediapipe' on page 27 undefined o +LaTeX Warning: Reference `fig:ejemplos_vision_mediapipe' on page 28 undefined o n input line 110. @@ -1535,14 +1567,14 @@ Overfull \hbox (25.19997pt too wide) in paragraph at lines 60--115 [] [] -[27 +[28 ]) No file memoria.ind. (./memoria.bbl LaTeX Info: Redefining \. on input line 1. LaTeX Info: Redefining \% on input line 1. - [28] + [29] Underfull \hbox (badness 10000) in paragraph at lines 9--14 []\T1/cmr/m/n/12 Revista de Robots. \T1/cmr/m/it/12 Robótica. Qué es la [] @@ -1587,7 +1619,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 51--56 -[]queen-[]bee/$[][]\T1/cmr/m/n/12 , [] -[29 +[30 ] Underfull \hbox (badness 1540) in paragraph at lines 64--69 @@ -1615,7 +1647,7 @@ odel\T1/cmr/m/n/12 . [][]$\T1/cmtt/m/n/12 https : / / www . LaTeX Info: Redefining \. on input line 149. LaTeX Info: Redefining \% on input line 149. -[30] +[31] Underfull \hbox (badness 1038) in paragraph at lines 177--180 []\T1/cmr/m/n/12 SohomPramanick. \T1/cmr/m/it/12 History of Python\T1/cmr/m/n/ 12 . [][]$\T1/cmtt/m/n/12 https : / / www . geeksforgeeks . org / @@ -1634,7 +1666,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 223--228 LaTeX Info: Redefining \. on input line 229. LaTeX Info: Redefining \% on input line 229. -[31] +[32] Underfull \hbox (badness 1960) in paragraph at lines 235--239 []\T1/cmr/m/n/12 KattamuriMeghna. \T1/cmr/m/it/12 Python | Introduction to Mat plotlib\T1/cmr/m/n/12 . [][]$\T1/cmtt/m/n/12 https : / / www . @@ -1644,7 +1676,7 @@ plotlib\T1/cmr/m/n/12 . [][]$\T1/cmtt/m/n/12 https : / / www . Package atveryend Info: Empty hook `BeforeClearDocument' on input line 60. LaTeX Info: Redefining \. on input line 60. LaTeX Info: Redefining \% on input line 60. - [32] + [33] Package atveryend Info: Empty hook `AfterLastShipout' on input line 60. (./memoria.aux LaTeX Info: Redefining \. on input line 25. @@ -1653,7 +1685,7 @@ LaTeX Info: Redefining \% on input line 25. Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 60. Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 60. Package rerunfilecheck Info: File `memoria.out' has not changed. -(rerunfilecheck) Checksum: D8577F08610F5DA4B507A0EAD0099714;2592. +(rerunfilecheck) Checksum: 9DD6BFA8149F5B2FBE9197F470D3A2DE;2662. LaTeX Font Warning: Size substitutions with differences @@ -1668,10 +1700,10 @@ LaTeX Warning: There were multiply-defined labels. Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 60. ) Here is how much of TeX's memory you used: - 13881 strings out of 483048 - 202469 string characters out of 5962772 + 13885 strings out of 483048 + 202517 string characters out of 5962772 663405 words of memory out of 5000000 - 28271 multiletter control sequences out of 15000+600000 + 28273 multiletter control sequences out of 15000+600000 566429 words of font info for 79 fonts, out of 8000000 for 9000 91 hyphenation exceptions out of 8191 44i,12n,53p,1069b,1467s stack positions out of 5000i,500n,10000p,200000b,80000s @@ -1696,10 +1728,10 @@ ec/ecrm1440.600pk> -Output written on memoria.pdf (41 pages, 3337085 bytes). +Output written on memoria.pdf (42 pages, 3339581 bytes). PDF statistics: - 1632 PDF objects out of 1728 (max. 8388607) - 928 compressed objects within 10 object streams - 284 named destinations out of 1000 (max. 500000) - 439 words of extra memory for PDF output out of 10000 (max. 10000000) + 1641 PDF objects out of 1728 (max. 8388607) + 936 compressed objects within 10 object streams + 286 named destinations out of 1000 (max. 500000) + 447 words of extra memory for PDF output out of 10000 (max. 10000000) diff --git a/memoria/memoria.lot b/memoria/memoria.lot index aca9c3b..30a6a2e 100644 --- a/memoria/memoria.lot +++ b/memoria/memoria.lot @@ -5,4 +5,4 @@ \addvspace {10\p@ } \addvspace {10\p@ } \addvspace {10\p@ } -\contentsline {table}{\numberline {6.1}{\ignorespaces Anexo con las fuentes de donde se han obtenido las imágenes para este proyecto\relax }}{28}{table.caption.40}% +\contentsline {table}{\numberline {6.1}{\ignorespaces Anexo con las fuentes de donde se han obtenido las imágenes para este proyecto\relax }}{29}{table.caption.40}% diff --git a/memoria/memoria.out b/memoria/memoria.out index 76c88ca..d028268 100644 --- a/memoria/memoria.out +++ b/memoria/memoria.out @@ -32,10 +32,11 @@ \BOOKMARK [2][-]{subsection.4.2.1}{Aproximaci\363n de Friis}{section.4.2}% 32 \BOOKMARK [2][-]{subsection.4.2.2}{M\363dulo python de Friis}{section.4.2}% 33 \BOOKMARK [2][-]{subsection.4.2.3}{Aplicaci\363n de Friis}{section.4.2}% 34 -\BOOKMARK [0][-]{chapter.5}{Conclusiones}{}% 35 -\BOOKMARK [1][-]{section.5.1}{Objetivos cumplidos}{chapter.5}% 36 -\BOOKMARK [1][-]{section.5.2}{Requisitos satisfechos}{chapter.5}% 37 -\BOOKMARK [1][-]{section.5.3}{Balance global y competencias adquiridas}{chapter.5}% 38 -\BOOKMARK [1][-]{section.5.4}{L\355neas futuras}{chapter.5}% 39 -\BOOKMARK [0][-]{chapter.6}{Anexo}{}% 40 -\BOOKMARK [0][-]{appendix*.41}{Bibliograf\355a}{}% 41 +\BOOKMARK [1][-]{section.4.3}{Integraci\363n conjunta}{chapter.4}% 35 +\BOOKMARK [0][-]{chapter.5}{Conclusiones}{}% 36 +\BOOKMARK [1][-]{section.5.1}{Objetivos cumplidos}{chapter.5}% 37 +\BOOKMARK [1][-]{section.5.2}{Requisitos satisfechos}{chapter.5}% 38 +\BOOKMARK [1][-]{section.5.3}{Balance global y competencias adquiridas}{chapter.5}% 39 +\BOOKMARK [1][-]{section.5.4}{L\355neas futuras}{chapter.5}% 40 +\BOOKMARK [0][-]{chapter.6}{Anexo}{}% 41 +\BOOKMARK [0][-]{appendix*.41}{Bibliograf\355a}{}% 42 diff --git a/memoria/memoria.pdf b/memoria/memoria.pdf index 4b07cf5..49ddb2a 100644 Binary files a/memoria/memoria.pdf and b/memoria/memoria.pdf differ diff --git a/memoria/memoria.toc b/memoria/memoria.toc index a1506ad..b575d2f 100644 --- a/memoria/memoria.toc +++ b/memoria/memoria.toc @@ -33,10 +33,11 @@ \contentsline {subsection}{\numberline {4.2.1}Aproximación de Friis}{22}{subsection.4.2.1}% \contentsline {subsection}{\numberline {4.2.2}Módulo python de Friis}{23}{subsection.4.2.2}% \contentsline {subsection}{\numberline {4.2.3}Aplicación de Friis}{25}{subsection.4.2.3}% -\contentsline {chapter}{\numberline {5}Conclusiones}{26}{chapter.5}% -\contentsline {section}{\numberline {5.1}Objetivos cumplidos}{26}{section.5.1}% -\contentsline {section}{\numberline {5.2}Requisitos satisfechos}{26}{section.5.2}% -\contentsline {section}{\numberline {5.3}Balance global y competencias adquiridas}{26}{section.5.3}% -\contentsline {section}{\numberline {5.4}Líneas futuras}{26}{section.5.4}% -\contentsline {chapter}{\numberline {6}Anexo}{27}{chapter.6}% -\contentsline {chapter}{Bibliograf\'{\i }a}{29}{appendix*.41}% +\contentsline {section}{\numberline {4.3}Integración conjunta}{26}{section.4.3}% +\contentsline {chapter}{\numberline {5}Conclusiones}{27}{chapter.5}% +\contentsline {section}{\numberline {5.1}Objetivos cumplidos}{27}{section.5.1}% +\contentsline {section}{\numberline {5.2}Requisitos satisfechos}{27}{section.5.2}% +\contentsline {section}{\numberline {5.3}Balance global y competencias adquiridas}{27}{section.5.3}% +\contentsline {section}{\numberline {5.4}Líneas futuras}{27}{section.5.4}% +\contentsline {chapter}{\numberline {6}Anexo}{28}{chapter.6}% +\contentsline {chapter}{Bibliograf\'{\i }a}{30}{appendix*.41}%