Arreglado el punto los más fracasados

template/templateTP.log

@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.14159265-2.6-1.40.15 (TeX Live 2015/dev/Debian) (preloaded format=pdflatex 2016.9.3)  4 SEP 2016 19:37
+This is pdfTeX, Version 3.14159265-2.6-1.40.15 (TeX Live 2015/dev/Debian) (preloaded format=pdflatex 2016.9.3)  4 SEP 2016 19:41
 entering extended mode
  restricted \write18 enabled.
  %&-line parsing enabled.
@@ -349,51 +349,7 @@ File: umsb.fd 2013/01/14 v3.01 AMS symbols B
 
 {/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map}]) (./tipos/jjoo.tex [2]) [3
 ]
-Overfull \hbox (112.60155pt too wide) in paragraph at lines 170--170
- []\OT1/cmtt/m/n/10 asegura $\OML/cmm/m/it/10 noGanaronMedallas \OT1/cmr/m/n/10
- : (\OMS/cmsy/m/n/10 8\OML/cmm/m/it/10 x \OMS/cmsy/m/n/10   \OT1/cmr/m/n/10 [\O
-ML/cmm/m/it/10 noGanoMedallas\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 atl; comp\OT1/cm
-r/m/n/10 )\OMS/cmsy/m/n/10 j\OML/cmm/m/it/10 atl \OMS/cmsy/m/n/10   \OML/cmm/m/
-it/10 result; comp \OMS/cmsy/m/n/10   \OML/cmm/m/it/10 todasLasCompetencias\OT1
-/cmr/m/n/10 (\OML/cmm/m/it/10 j\OT1/cmr/m/n/10 )\OML/cmm/m/it/10 ; finalizada\O
-T1/cmr/m/n/10 (\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 )])\OML/cmm/m/it/10 x\OT1/c
-mr/m/n/10 ;$\OT1/cmr/bx/n/10 ; 
- []
-
-
-Overfull \hbox (136.28015pt too wide) in paragraph at lines 172--172
- []\OT1/cmtt/m/n/10 asegura $\OT1/cmr/m/n/10 (\OMS/cmsy/m/n/10 8\OML/cmm/m/it/1
-0 x \OMS/cmsy/m/n/10   \OML/cmm/m/it/10 result; y \OMS/cmsy/m/n/10   \OML/cmm/m
-/it/10 atletas\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\OT1/cmr/m/n/10 )\OML/cmm/m/it
-/10 ; nacionalidad\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 y\OT1/cmr/m/n/10 ) == \OML/
-cmm/m/it/10 p\OT1/cmr/m/n/10 )\OML/cmm/m/it/10 competenciasEnLasQueParticipo\OT
-1/cmr/m/n/10 (\OML/cmm/m/it/10 j; x\OT1/cmr/m/n/10 ) \OML/cmm/m/it/10 >\OT1/cmr
-/m/n/10 = \OML/cmm/m/it/10 competenciasEnLasQueParticipo\OT1/cmr/m/n/10 (\OML/c
-mm/m/it/10 j; y\OT1/cmr/m/n/10 )$\OT1/cmr/bx/n/10 ; 
- []
-
-
-Overfull \hbox (66.19606pt too wide) in paragraph at lines 174--174
- []\OT1/cmtt/m/n/10 aux competenciasEnLasQueParticipo \OT1/cmr/m/n/10 (j: JJOO,
- a:Atleta) : $\U/msb/m/n/10 Z$ \OT1/cmr/m/n/10 = $\OML/cmm/m/it/10 long\OT1/cmr
-/m/n/10 ([\OML/cmm/m/it/10 z\OMS/cmsy/m/n/10 j\OML/cmm/m/it/10 z \OMS/cmsy/m/n/
-10   \OML/cmm/m/it/10 todasLasCompetencias\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\O
-T1/cmr/m/n/10 )\OML/cmm/m/it/10 ; en\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 a; partic
-ipantes\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 z\OT1/cmr/m/n/10 ))])$\OT1/cmr/bx/n/10
- ; 
- []
-
-
-Overfull \hbox (0.29204pt too wide) in paragraph at lines 175--175
- []\OT1/cmtt/m/n/10 aux noGanoMedallas \OT1/cmr/m/n/10 (atl: Atle-ta, comp: Com
--pe-ten-cia) : Bool = $\OML/cmm/m/it/10 ciaNumber\OT1/cmr/m/n/10 (\OML/cmm/m/it
-/10 ranking\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 )[0]) \OMS/cms
-y/m/n/10 6\OT1/cmr/m/n/10 = \OML/cmm/m/it/10 ciaNumber\OT1/cmr/m/n/10 (\OML/cmm
-/m/it/10 atl\OT1/cmr/m/n/10 ) \OMS/cmsy/m/n/10 ^
- []
-
-
-Overfull \hbox (11.40186pt too wide) in paragraph at lines 186--186
+Overfull \hbox (11.40186pt too wide) in paragraph at lines 192--192
  \OML/cmm/m/it/10 anoNacimiento\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 x\OT1/cmr/m/n/
 10 ) == \OML/cmm/m/it/10 anoNacimiento\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 a\OT1/c
 mr/m/n/10 ) \OMS/cmsy/m/n/10 ^ \OML/cmm/m/it/10 nacionalidad\OT1/cmr/m/n/10 (\O
@@ -405,7 +361,7 @@ T1/cmr/m/n/10 ) ==
  []
 
 
-Overfull \hbox (195.24945pt too wide) in paragraph at lines 213--213
+Overfull \hbox (195.24945pt too wide) in paragraph at lines 219--219
  []\OT1/cmtt/m/n/10 asegura $\OMS/cmsy/m/n/10 8\OT1/cmr/m/n/10 (\OML/cmm/m/it/1
 0 dia \OMS/cmsy/m/n/10   \OT1/cmr/m/n/10 [1\OML/cmm/m/it/10 ::jornadaActual\OT1
 /cmr/m/n/10 (\OML/cmm/m/it/10 j\OT1/cmr/m/n/10 )]\OML/cmm/m/it/10 ; comp \OMS/c
@@ -420,7 +376,7 @@ T1/cmr/m/n/10 )[\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 ]\OML/cmm/m/it/10 ; atl\OT
  []
 
 
-Overfull \hbox (100.3108pt too wide) in paragraph at lines 216--216
+Overfull \hbox (100.3108pt too wide) in paragraph at lines 222--222
  []\OT1/cmtt/m/n/10 aux rankComp \OT1/cmr/m/n/10 (j: JJOO) : [Atle-ta] = $= [\O
 ML/cmm/m/it/10 atl\OMS/cmsy/m/n/10 j\OML/cmm/m/it/10 dia \OMS/cmsy/m/n/10   \OT
 1/cmr/m/n/10 [1\OML/cmm/m/it/10 ::cantDias\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\O
@@ -432,7 +388,7 @@ mm/m/it/10 comp\OT1/cmr/m/n/10 )]$\OT1/cmr/bx/n/10 ;
  []
 
 
-Overfull \hbox (191.657pt too wide) in paragraph at lines 219--219
+Overfull \hbox (191.657pt too wide) in paragraph at lines 225--225
  []\OT1/cmtt/m/n/10 aux doppComp \OT1/cmr/m/n/10 (j: JJOO) : [Atle-ta] = $= [\O
 ML/cmm/m/it/10 atl\OMS/cmsy/m/n/10 j\OML/cmm/m/it/10 dia \OMS/cmsy/m/n/10   \OT
 1/cmr/m/n/10 [1\OML/cmm/m/it/10 ::cantDias\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\O
@@ -444,7 +400,7 @@ cmr/m/n/10 (\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 )]$\OT1/cmr/bx/n/10 ;
  []
 
 
-Overfull \hbox (29.38405pt too wide) in paragraph at lines 222--222
+Overfull \hbox (29.38405pt too wide) in paragraph at lines 228--228
  []\OT1/cmtt/m/n/10 aux partComp \OT1/cmr/m/n/10 (j: JJOO) : [Atle-ta] = $[\OML
 /cmm/m/it/10 atl\OMS/cmsy/m/n/10 j\OML/cmm/m/it/10 dia \OMS/cmsy/m/n/10   \OT1/
 cmr/m/n/10 [1\OML/cmm/m/it/10 ::cantDias\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\OT1
@@ -455,7 +411,7 @@ m/m/it/10 comp\OT1/cmr/m/n/10 )]$\OT1/cmr/bx/n/10 ;
  []
 
 
-Overfull \hbox (11.50313pt too wide) in paragraph at lines 230--230
+Overfull \hbox (11.50313pt too wide) in paragraph at lines 236--236
  \OT1/cmr/m/n/10 (\OML/cmm/m/it/10 nombre\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 x\OT
 1/cmr/m/n/10 ) == \OML/cmm/m/it/10 nombre\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 a\OT
 1/cmr/m/n/10 ) \OMS/cmsy/m/n/10 ^ \OML/cmm/m/it/10 sexo\OT1/cmr/m/n/10 (\OML/cm
@@ -468,7 +424,7 @@ L/cmm/m/it/10 nacionalidad\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 x\OT1/cmr/m/n/10 )
  []
 
 
-Overfull \hbox (4.11461pt too wide) in paragraph at lines 241--242
+Overfull \hbox (4.11461pt too wide) in paragraph at lines 247--248
  \OT1/cmtt/m/n/10 asegura $\OML/cmm/m/it/10 esElPeor \OT1/cmr/m/n/10 : \OML/cmm
 /m/it/10 existe\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 dep \OMS/cmsy/m/n/10   \OML/cm
 m/m/it/10 deportesEnLosQueGano\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; result\OT1/c
@@ -479,7 +435,7 @@ msy/m/n/10
  []
 
 
-Overfull \hbox (92.09532pt too wide) in paragraph at lines 241--242
+Overfull \hbox (92.09532pt too wide) in paragraph at lines 247--248
  \OML/cmm/m/it/10 todasLasCompetencias\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\OT1/c
 mr/m/n/10 )\OML/cmm/m/it/10 ; finalizada\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 comp\
 OT1/cmr/m/n/10 ) \OMS/cmsy/m/n/10 ^ j\OML/cmm/m/it/10 ranking\OT1/cmr/m/n/10 (\
@@ -492,7 +448,7 @@ x/n/10 ;
  []
 
 
-Overfull \hbox (136.8026pt too wide) in paragraph at lines 245--245
+Overfull \hbox (136.8026pt too wide) in paragraph at lines 251--251
  []\OT1/cmtt/m/n/10 aux deportesEnLosQueGanoOro \OT1/cmr/m/n/10 (j: JJOO, a: At
 le-ta) : [De-por-tes] = $[\OML/cmm/m/it/10 prm\OT1/cmr/m/n/10 (\OML/cmm/m/it/10
  categoria\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 ))\OMS/cmsy/m/n
@@ -502,7 +458,7 @@ lizada\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 ) \OMS/cmsy/m/n/10
 ^
  []
 
-[4] (./auxiliaresTipos.tex) [5] (./templateTP.aux
+[4] (./auxiliaresTipos.tex [5]) [6] (./templateTP.aux
 LaTeX Info: Redefining \. on input line 6.
 LaTeX Info: Redefining \% on input line 6.
 ) ) 
@@ -527,10 +483,10 @@ s/cm/cmss10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/c
 msy10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy7.p
 fb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmtt10.pfb></u
 sr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/symbols/msbm10.pfb>
-Output written on templateTP.pdf (5 pages, 164080 bytes).
+Output written on templateTP.pdf (6 pages, 164540 bytes).
 PDF statistics:
- 76 PDF objects out of 1000 (max. 8388607)
- 54 compressed objects within 1 object stream
+ 79 PDF objects out of 1000 (max. 8388607)
+ 56 compressed objects within 1 object stream
  0 named destinations out of 1000 (max. 500000)
  1 words of extra memory for PDF output out of 10000 (max. 10000000)
 

template/templateTP.tex

@@ -119,6 +119,7 @@
 \end{problema}
 
 \begin{problema}{medallero}{j: JJOO}{[(Pais, [\ent])]}
+	%Written by martu
 	\asegura{mismos(result, sacarSinMedallas(crearMedallero(j)))}
 	\asegura{medalleroOrdenado(result)}
 	\aux{listaNacionalidadesAtletas}{j: JJOO}{[Pais]}{[nacionalidad(at) | at \leftarrow atletas(j)]}
@@ -167,12 +168,17 @@
 
 
 \begin{problema}{losMasFracasados}{j: JJOO, p: Pais}{[Atleta]}
-	\asegura{noGanaronMedallas: (\forall x \leftarrow [noGanoMedallas(atl, comp) | atl \leftarrow result, comp \leftarrow todasLasCompetencias(j), finalizada(comp)]) x;}
-	\asegura{todosDelPais: (\forall x \leftarrow result) nacionalidad(x) == p;}
-	\asegura{(\forall x \leftarrow result, y \leftarrow atletas(j), nacionalidad(y)==p) competenciasEnLasQueParticipo(j, x) >= competenciasEnLasQueParticipo(j, y)}
-
-	\aux{competenciasEnLasQueParticipo}{j: JJOO, a:Atleta}{\ent}{long([z | z\leftarrow todasLasCompetencias(j), en(a, participantes(z))])}
-	\aux{noGanoMedallas}{atl: Atleta, comp: Competencia}{Bool}{ciaNumber(ranking(comp)[0]) \neq ciaNumber(atl) \wedge ciaNumber(ranking(comp)[1]) \neq ciaNumber(atl) \wedge ciaNumber(ranking(comp)[2]) \neq ciaNumber(atl)}
+	%Fixed by martu
+	\asegura{noGanaronMedallas: (\forall x \leftarrow [noGanoMedallas(atl, comp)\newline
+		| atl \leftarrow result, comp \leftarrow todasLasCompetencias(j), finalizada(comp)]) x}
+	\asegura{todosDelPais: (\forall x \leftarrow result) nacionalidad(x) == p}
+	\asegura{(\forall x \leftarrow result, y \leftarrow atletas(j), nacionalidad(y)==p)\newline
+		competenciasEnLasQueParticipo(j, x) >= competenciasEnLasQueParticipo(j, y)}
+	\aux{competenciasEnLasQueParticipo}{j: JJOO, a:Atleta}{\ent}{\newline
+		long([z | z\leftarrow todasLasCompetencias(j), en(a, participantes(z))])}
+	\aux{noGanoMedallas}{atl: Atleta, comp: Competencia}{Bool}{\newline
+	ciaNumber(ranking(comp)[0]) \neq ciaNumber(atl) \wedge ciaNumber(ranking(comp)[1]) \neq ciaNumber(atl)\newline
+	\wedge ciaNumber(ranking(comp)[2]) \neq ciaNumber(atl)}
 \end{problema}
 
 \begin{problema}{liuSong}{j: JJOO, a: Atleta, p: Pa\'is}{}
@@ -286,12 +292,7 @@
 \end{problema}
 
 \begin{problema}{transcurrirDia}{j: JJOO}{}
-	%//Modificar:
-	%// * Resultados (AKA Ranking) de la competencias ( dados por capacidades )
-	%// * Realizar antidoping a un atleta de cada competencia (al azar)
-	%// * El control antidoping le da positivo a lo sumo a 5% de los controles
-	%\requiere{cantDias(j) > 1}
-	%\requiere{jornadaActual(j) < cantDias(j)}
+	%Fixed by martu
 	\modifica{j}
 	\asegura{cantDias(j) == cantDias(pre(j))}
 	\asegura{jornadaActual(j) == jornadaActual(pre(j))+1}
@@ -299,19 +300,14 @@
 	\asegura{mismos(atletas(j),atletas(pre(j)))}
 	\asegura{(\forall dia \leftarrow [1..jornadaActual(j))-1])\newline mismos(cronograma(j,dia), cronograma(pre(j),dia))}
 	\asegura{|cronograma(j,jornadaActual(j))|==|cronograma(pre(j),jornadaActual(j))|}
-
-	%Cambian las competencias de jornadaActual
 	\asegura{(\forall i \leftarrow [0, |cronograma(j, jornadaActual(j))|-1])\newline
 		categoria(cronograma(j,jornadaActual(j))[i]) == categoria(cronograma(pre(j),jornadaActual(j))[i])}
 	\asegura{(\forall i \leftarrow [0, |cronograma(j, jornadaActual(j))| -1])\newline
 		mismos(participantes(cronograma(j,jornadaActual(j))[i]),\newline
 		participantes(cronograma(pre(j),jornadaActual(j))[i]))}
-
-	%Esta no compila
 	\asegura{(\forall c \leftarrow cronograma(j, jornadaActual(j)))\newline
 		finalizada(c) == True \wedge incluida(ranking(c), participantes(c))\newline
 		\wedge (\forall x \leftarrow [0..|ranking(c)|-2]) capacidadEnOrden(x,c)}
-
 	\asegura{asegura (\forall c \leftarrow cronograma(j, jornadaActual(j)))\newline
 		(|lesTocoControlAntiDoping(c)|==1 \wedge lesTocoControlAntiDoping(c)[0] \in atletas(c))\newline
 		\vee (|lesTocoControlAntiDoping(c)|==0 \wedge |atletas(c)| == 0)}
@@ -319,10 +315,8 @@
 	\asegura{(\forall c \leftarrow cronograma(j, jornadaActual(j)))\newline
 		|listaDoping(c,atletas(c))|*20 \leq \newline \sum([long(lesTocoControlAntiDoping(comp))
 		| comp \leftarrow cronograma(j,jornadaActual(j))])}
-
 	\aux{capacidadEnOrden}{x: \ent, c:Competencia}{Bool}{\newline
 	capacidad(ranking(c)[x], prm(categoria(c))) \geq capacidad(ranking(c)[x + 1], prm(categoria(c)))}
-
 	\aux{listaDoping}{c:Competencia, a:[Atleta]}{[Atleta]}{[x|x \leftarrow a, leDioPositivo(c, x)]}
 \end{problema}