Parcourir la source

arreglados errores en el 15

Martu il y a 10 ans
Parent
commit
e74c48ea97
3 fichiers modifiés avec 128 ajouts et 81 suppressions
  1. 86 32
      template/templateTP.log
  2. BIN
      template/templateTP.pdf
  3. 42 49
      template/templateTP.tex

+ 86 - 32
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:22
+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
 entering extended mode
 entering extended mode
  restricted \write18 enabled.
  restricted \write18 enabled.
  %&-line parsing enabled.
  %&-line parsing enabled.
@@ -211,7 +211,10 @@ Package color Info: Driver file: pdftex.def on input line 137.
 \c@exercise=\count102
 \c@exercise=\count102
 \c@consigna=\count103
 \c@consigna=\count103
 )
 )
-(./templateTP.aux)
+(./templateTP.aux
+LaTeX Info: Redefining \. on input line 6.
+LaTeX Info: Redefining \% on input line 6.
+)
 \openout1 = `templateTP.aux'.
 \openout1 = `templateTP.aux'.
 
 
 LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 17.
 LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 17.
@@ -390,7 +393,82 @@ y/m/n/10 6\OT1/cmr/m/n/10 = \OML/cmm/m/it/10 ciaNumber\OT1/cmr/m/n/10 (\OML/cmm
  []
  []
 
 
 
 
-Overfull \hbox (4.11461pt too wide) in paragraph at lines 189--190
+Overfull \hbox (11.40186pt too wide) in paragraph at lines 186--186
+ \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
+ML/cmm/m/it/10 x\OT1/cmr/m/n/10 ) == \OML/cmm/m/it/10 p \OMS/cmsy/m/n/10 ^ \OML
+/cmm/m/it/10 deportes\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 x\OT1/cmr/m/n/10 ) == \O
+ML/cmm/m/it/10 deportes\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 a\OT1/cmr/m/n/10 ) \OM
+S/cmsy/m/n/10 ^ \OML/cmm/m/it/10 capacidad\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 x\O
+T1/cmr/m/n/10 ) ==
+ []
+
+
+Overfull \hbox (195.24945pt too wide) in paragraph at lines 213--213
+ []\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
+msy/m/n/10   \OT1/cmr/m/n/10 [0\OML/cmm/m/it/10 ::\OMS/cmsy/m/n/10 j\OML/cmm/m/
+it/10 cronograma\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; dia\OT1/cmr/m/n/10 ) \OMS/
+cmsy/m/n/10 ^^@ \OT1/cmr/m/n/10 1\OMS/cmsy/m/n/10 j\OT1/cmr/m/n/10 ]\OML/cmm/m/
+it/10 ; finalizada\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 cronograma\OT1/cmr/m/n/10 (
+\OML/cmm/m/it/10 j; dia\OT1/cmr/m/n/10 )))\OML/cmm/m/it/10 leDioPositivo\OT1/cm
+r/m/n/10 (\OML/cmm/m/it/10 cronograma\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; dia\O
+T1/cmr/m/n/10 )[\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 ]\OML/cmm/m/it/10 ; atl\OT
+1/cmr/m/n/10 ) ==
+ []
+
+
+Overfull \hbox (100.3108pt too wide) in paragraph at lines 216--216
+ []\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
+T1/cmr/m/n/10 )]\OML/cmm/m/it/10 ; comp \OMS/cmsy/m/n/10   \OML/cmm/m/it/10 cro
+nograma\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; dia\OT1/cmr/m/n/10 )\OML/cmm/m/it/1
+0 ; atl \OMS/cmsy/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 )\OML/cmm/m/it/10 ; finalizada\OT1/cmr/m/n/10 (\OML/c
+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
+ []\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
+T1/cmr/m/n/10 )]\OML/cmm/m/it/10 ; comp \OMS/cmsy/m/n/10   \OML/cmm/m/it/10 cro
+nograma\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; dia\OT1/cmr/m/n/10 )\OML/cmm/m/it/1
+0 ; atl \OMS/cmsy/m/n/10   \OML/cmm/m/it/10 lesTocoControlAntiDopping\OT1/cmr/m
+/n/10 (\OML/cmm/m/it/10 comp\OT1/cmr/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 )]$\OT1/cmr/bx/n/10 ; 
+ []
+
+
+Overfull \hbox (29.38405pt too wide) in paragraph at lines 222--222
+ []\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
+/cmr/m/n/10 )]\OML/cmm/m/it/10 ; comp \OMS/cmsy/m/n/10   \OML/cmm/m/it/10 crono
+grama\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; dia\OT1/cmr/m/n/10 )\OML/cmm/m/it/10 
+; atl \OMS/cmsy/m/n/10   \OML/cmm/m/it/10 participantes\OT1/cmr/m/n/10 (\OML/cm
+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
+ \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
+m/m/it/10 x\OT1/cmr/m/n/10 ) == \OML/cmm/m/it/10 sexo\OT1/cmr/m/n/10 (\OML/cmm/
+m/it/10 a\OT1/cmr/m/n/10 ) \OMS/cmsy/m/n/10 ^ \OML/cmm/m/it/10 anoNacimiento\OT
+1/cmr/m/n/10 (\OML/cmm/m/it/10 x\OT1/cmr/m/n/10 ) == \OML/cmm/m/it/10 anoNacimi
+ento\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 a\OT1/cmr/m/n/10 ) \OMS/cmsy/m/n/10 ^ \OM
+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
  \OT1/cmtt/m/n/10 asegura $\OML/cmm/m/it/10 esElPeor \OT1/cmr/m/n/10 : \OML/cmm
  \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/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
 m/m/it/10 deportesEnLosQueGano\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; result\OT1/c
@@ -401,7 +479,7 @@ msy/m/n/10
  []
  []
 
 
 
 
-Overfull \hbox (92.09532pt too wide) in paragraph at lines 189--190
+Overfull \hbox (92.09532pt too wide) in paragraph at lines 241--242
  \OML/cmm/m/it/10 todasLasCompetencias\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\OT1/c
  \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\
 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 (\
 OT1/cmr/m/n/10 ) \OMS/cmsy/m/n/10 ^ j\OML/cmm/m/it/10 ranking\OT1/cmr/m/n/10 (\
@@ -414,7 +492,7 @@ x/n/10 ;
  []
  []
 
 
 
 
-Overfull \hbox (136.8026pt too wide) in paragraph at lines 193--193
+Overfull \hbox (136.8026pt too wide) in paragraph at lines 245--245
  []\OT1/cmtt/m/n/10 aux deportesEnLosQueGanoOro \OT1/cmr/m/n/10 (j: JJOO, a: At
  []\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
 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
  categoria\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 ))\OMS/cmsy/m/n
@@ -424,38 +502,14 @@ lizada\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 comp\OT1/cmr/m/n/10 ) \OMS/cmsy/m/n/10
 ^
 ^
  []
  []
 
 
-[4]
-Overfull \hbox (34.03499pt too wide) in paragraph at lines 254--254
- \OML/cmm/m/it/10 mismos\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 participantes\OT1/cmr
-/m/n/10 (\OML/cmm/m/it/10 cronograma\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; jornad
-aActual\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\OT1/cmr/m/n/10 ))[\OML/cmm/m/it/10 i
-\OT1/cmr/m/n/10 ])\OML/cmm/m/it/10 ; participantes\OT1/cmr/m/n/10 (\OML/cmm/m/i
-t/10 cronograma\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 pre\OT1/cmr/m/n/10 (\OML/cmm/m
-/it/10 j\OT1/cmr/m/n/10 )\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 i\OT1/cmr/m/n/10 ]))$\OT1/cmr/
-bx/n/10 ; 
- []
-
-
-Overfull \hbox (33.25468pt too wide) in paragraph at lines 266--266
- \OMS/cmsy/m/n/10 j\OML/cmm/m/it/10 listaDoping\OT1/cmr/m/n/10 (\OML/cmm/m/it/1
-0 c; atletas\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 c\OT1/cmr/m/n/10 ))\OMS/cmsy/m/n/
-10 j ^^C \OT1/cmr/m/n/10 20 \OMS/cmsy/m/n/10 ^^T []\OT1/cmr/m/n/10 ([\OMS/cmsy/
-m/n/10 j\OML/cmm/m/it/10 lesTocoControlAntiDoping\OT1/cmr/m/n/10 (\OML/cmm/m/it
-/10 comp\OT1/cmr/m/n/10 )\OMS/cmsy/m/n/10 jj\OML/cmm/m/it/10 comp \OMS/cmsy/m/n
-/10   \OML/cmm/m/it/10 cronograma\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j; jornadaAc
-tual\OT1/cmr/m/n/10 (\OML/cmm/m/it/10 j\OT1/cmr/m/n/10 ))])$\OT1/cmr/bx/n/10 ; 
-
- []
-
-(./auxiliaresTipos.tex) [5] (./templateTP.aux
+[4] (./auxiliaresTipos.tex) [5] (./templateTP.aux
 LaTeX Info: Redefining \. on input line 6.
 LaTeX Info: Redefining \. on input line 6.
 LaTeX Info: Redefining \% on input line 6.
 LaTeX Info: Redefining \% on input line 6.
 ) ) 
 ) ) 
 Here is how much of TeX's memory you used:
 Here is how much of TeX's memory you used:
  3624 strings out of 494958
  3624 strings out of 494958
  49091 string characters out of 6179387
  49091 string characters out of 6179387
- 127894 words of memory out of 5000000
+ 128894 words of memory out of 5000000
  6769 multiletter control sequences out of 15000+600000
  6769 multiletter control sequences out of 15000+600000
  7923 words of font info for 31 fonts, out of 8000000 for 9000
  7923 words of font info for 31 fonts, out of 8000000 for 9000
  40 hyphenation exceptions out of 8191
  40 hyphenation exceptions out of 8191
@@ -473,7 +527,7 @@ 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
 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
 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>
 sr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/symbols/msbm10.pfb>
-Output written on templateTP.pdf (5 pages, 161930 bytes).
+Output written on templateTP.pdf (5 pages, 164080 bytes).
 PDF statistics:
 PDF statistics:
  76 PDF objects out of 1000 (max. 8388607)
  76 PDF objects out of 1000 (max. 8388607)
  54 compressed objects within 1 object stream
  54 compressed objects within 1 object stream

BIN
template/templateTP.pdf


+ 42 - 49
template/templateTP.tex

@@ -176,67 +176,58 @@
 \end{problema}
 \end{problema}
 
 
 \begin{problema}{liuSong}{j: JJOO, a: Atleta, p: Pa\'is}{}
 \begin{problema}{liuSong}{j: JJOO, a: Atleta, p: Pa\'is}{}
-\requiere{a \in atletas(j)}
-\modifica{j}
-\asegura{ano(j)==ano(pre(j))}
-\asegura{(\forall i  \leftarrow  [0..|atletas(pre(j))|-1], atletas(pre(j))_i!= a)
-	atletas(pre(j))_i==atletas(j)_i}
-
-\asegura{(\forall x  \leftarrow atletas(j), ciaNumber(x)==ciaNumber(a))
-(nombre(x)==nombre(a) \wedge sexo(x)==sexo(a) \wedge anoNacimiento(x)==anoNacimiento(a) \wedge nacionalidad(x)==p \wedge deportes(x)==deportes(a) \wedge capacidad(x)==capacidad(a))}
-
-\asegura{cantDias(j)==cantDias(pre(j))}
-\asegura{jornadaActual(j)==jornadaActual(pre(j))}
-
-\asegura{(\forall d  \leftarrow  [1..cantDias(j)])\newline
-|cronograma(d,j)|==|cronograma(d,pre(j))| \wedge \newline
-(\forall i  \leftarrow  [0..|cronograma(d,j)|-1] )\newline
-categoria(cronograma(d,j)[i])==categoria(cronograma(d,pre(j))[i]) \wedge
-	finalizada(cronograma(d,j)[i])==finalizada(cronograma(d,pre(j))[i])}
-
-
-
-
-\asegura{todosIgualesMenosLiuSong(partComp(j), $part$Comp(pre(j)))}
-\asegura{todoIgualMenosNacionalidad(partComp(j))}
-
-%-> Hay que ver que todos los atletas del ranking de cada competencia sean iguales menos el modificado.
-
+	\requiere{a \in atletas(j)}
+	\modifica{j}
+	\asegura{ano(j)==ano(pre(j))}
+	\asegura{(\forall i  \leftarrow  [0..|atletas(pre(j))|-1], atletas(pre(j))_i!= a)
+		atletas(pre(j))_i==atletas(j)_i}
 
 
-\asegura{todosIgualesMenosLiuSong(rankComp(j), $rank$Comp(pre(j)))}
-\asegura{todoIgualMenosNacionalidad(rankComp(j))}
+	\asegura{(\forall x  \leftarrow atletas(j), ciaNumber(x)==ciaNumber(a))
+	(nombre(x)==nombre(a) \wedge sexo(x)==sexo(a) \wedge anoNacimiento(x)==anoNacimiento(a) \wedge nacionalidad(x)==p \wedge deportes(x)==deportes(a) \wedge capacidad(x)==capacidad(a))}
 
 
-%-> Hay que ver que todos los atletas de lesTocoControlAntidopping de cada competencia sean iguales menos el modificado.
+	\asegura{cantDias(j)==cantDias(pre(j))}
+	\asegura{jornadaActual(j)==jornadaActual(pre(j))}
 
 
+	\asegura{(\forall d  \leftarrow  [1..cantDias(j)])\newline
+	|cronograma(d,j)|==|cronograma(d,pre(j))| \wedge \newline
+	(\forall i  \leftarrow  [0..|cronograma(d,j)|-1] )\newline
+	categoria(cronograma(d,j)[i])==categoria(cronograma(d,pre(j))[i]) \wedge
+		finalizada(cronograma(d,j)[i])==finalizada(cronograma(d,pre(j))[i])}
 
 
-\asegura{todosIgualesMenosLiuSong(doppComp(j), $dopp$Comp(pre(j)))}
-\asegura{todoIgualMenosNacionalidad(doppComp(j))}
+	\asegura{todosIgualesMenosLiuSong(partComp(j), $part$Comp(pre(j)))}
+	\asegura{todoIgualMenosNacionalidad(partComp(j))}
 
 
-%-> Hay que ver que el valor antidopping para cada atleta no haya cambiado.
+	%-> Hay que ver que todos los atletas del ranking de cada competencia sean iguales menos el modificado.
 
 
-\asegura{\forall(dia  \leftarrow  [1..jornadaActual(j)], comp  \leftarrow  [0..|cronograma(j, dia)-1|], finalizada(cronograma(j, dia)))
-	leDioPositivo(cronograma(j, dia)[comp], atl) == leDioPositivo(cronograma(pre(j), dia)[comp], atl)}
+	\asegura{todosIgualesMenosLiuSong(rankComp(j), $rank$Comp(pre(j)))}
+	\asegura{todoIgualMenosNacionalidad(rankComp(j))}
 
 
+	%-> Hay que ver que todos los atletas de lesTocoControlAntidopping de cada competencia sean iguales menos el modificado.
 
 
-\aux{rankComp}{j: JJOO}{[Atleta]}{
-= [atl | dia  \leftarrow  [1..cantDias(j)], comp  \leftarrow  cronograma(j, dia), atl  \leftarrow  ranking(comp), finalizada(comp)]}
-%-> Hay que ver que todos los participantes de cada competencia sean iguales menos el modificado.
-\aux{doppComp}{j: JJOO}{[Atleta]}{
-= [atl | dia  \leftarrow  [1..cantDias(j)], comp  \leftarrow  cronograma(j, dia), atl  \leftarrow  lesTocoControlAntiDopping(comp), finalizada(comp)]}
+	\asegura{todosIgualesMenosLiuSong(doppComp(j), $dopp$Comp(pre(j)))}
+	\asegura{todoIgualMenosNacionalidad(doppComp(j))}
 
 
+	%-> Hay que ver que el valor antidopping para cada atleta no haya cambiado.
 
 
-\aux{partComp}{j: JJOO}{[Atleta]}{
-[atl | dia  \leftarrow  [1..cantDias(j)], comp  \leftarrow  cronograma(j, dia), atl  \leftarrow  participantes(comp)]}
+	\asegura{\forall(dia  \leftarrow  [1..jornadaActual(j)], comp  \leftarrow  [0..|cronograma(j, dia)-1|], finalizada(cronograma(j, dia)))
+		leDioPositivo(cronograma(j, dia)[comp], atl) == leDioPositivo(cronograma(pre(j), dia)[comp], atl)}
 
 
-\aux{todosIgualesMenosLiuSong}{ls : [Atleta], lsOld : [Atleta]}{Bool}{
-	\forall(x  \leftarrow  [0..|ls|-1])\newline
-(ls[x]==lsOld[x]  \vee  ciaNumber(ls)==ciaNumber(a))}
+	\aux{rankComp}{j: JJOO}{[Atleta]}{
+	= [atl | dia  \leftarrow  [1..cantDias(j)], comp  \leftarrow  cronograma(j, dia), atl  \leftarrow  ranking(comp), finalizada(comp)]}
+	%-> Hay que ver que todos los participantes de cada competencia sean iguales menos el modificado.
+	\aux{doppComp}{j: JJOO}{[Atleta]}{
+	= [atl | dia  \leftarrow  [1..cantDias(j)], comp  \leftarrow  cronograma(j, dia), atl  \leftarrow  lesTocoControlAntiDopping(comp), finalizada(comp)]}
 
 
-\aux{todoIgualMenosNacionalidad}{ls: [Atleta]}{Bool}{
-\forall(x  \leftarrow  ls, ciaNumber(x) == ciaNumber(a))\newline
-(nombre(x)==nombre(a) \wedge sexo(x)==sexo(a) \wedge anoNacimiento(x)==anoNacimiento(a) \wedge nacionalidad(x)==p \wedge deportes(x)==deportes(a) \wedge capacidad(x)==capacidad(a))}
+	\aux{partComp}{j: JJOO}{[Atleta]}{
+	[atl | dia  \leftarrow  [1..cantDias(j)], comp  \leftarrow  cronograma(j, dia), atl  \leftarrow  participantes(comp)]}
 
 
+	\aux{todosIgualesMenosLiuSong}{ls : [Atleta], lsOld : [Atleta]}{Bool}{
+		\forall(x  \leftarrow  [0..|ls|-1])\newline
+	(ls[x]==lsOld[x]  \vee  ciaNumber(ls)==ciaNumber(a))}
 
 
+	\aux{todoIgualMenosNacionalidad}{ls: [Atleta]}{Bool}{
+	\forall(x  \leftarrow  ls, ciaNumber(x) == ciaNumber(a))\newline
+	(nombre(x)==nombre(a) \wedge sexo(x)==sexo(a) \wedge anoNacimiento(x)==anoNacimiento(a) \wedge nacionalidad(x)==p \wedge deportes(x)==deportes(a) \wedge capacidad(x)==capacidad(a))}
 
 
 \end{problema}
 \end{problema}
 
 
@@ -313,7 +304,8 @@ categoria(cronograma(d,j)[i])==categoria(cronograma(d,pre(j))[i]) \wedge
 	\asegura{(\forall i \leftarrow [0, |cronograma(j, jornadaActual(j))|-1])\newline
 	\asegura{(\forall i \leftarrow [0, |cronograma(j, jornadaActual(j))|-1])\newline
 		categoria(cronograma(j,jornadaActual(j))[i]) == categoria(cronograma(pre(j),jornadaActual(j))[i])}
 		categoria(cronograma(j,jornadaActual(j))[i]) == categoria(cronograma(pre(j),jornadaActual(j))[i])}
 	\asegura{(\forall i \leftarrow [0, |cronograma(j, jornadaActual(j))| -1])\newline
 	\asegura{(\forall i \leftarrow [0, |cronograma(j, jornadaActual(j))| -1])\newline
-		mismos(participantes(cronograma(j,jornadaActual(j))[i]),participantes(cronograma(pre(j),jornadaActual(j))[i]))}
+		mismos(participantes(cronograma(j,jornadaActual(j))[i]),\newline
+		participantes(cronograma(pre(j),jornadaActual(j))[i]))}
 
 
 	%Esta no compila
 	%Esta no compila
 	\asegura{(\forall c \leftarrow cronograma(j, jornadaActual(j)))\newline
 	\asegura{(\forall c \leftarrow cronograma(j, jornadaActual(j)))\newline
@@ -325,7 +317,8 @@ categoria(cronograma(d,j)[i])==categoria(cronograma(d,pre(j))[i]) \wedge
 		\vee (|lesTocoControlAntiDoping(c)|==0 \wedge |atletas(c)| == 0)}
 		\vee (|lesTocoControlAntiDoping(c)|==0 \wedge |atletas(c)| == 0)}
 
 
 	\asegura{(\forall c \leftarrow cronograma(j, jornadaActual(j)))\newline
 	\asegura{(\forall c \leftarrow cronograma(j, jornadaActual(j)))\newline
-		|listaDoping(c,atletas(c))|*20 \leq \sum([|lesTocoControlAntiDoping(comp)| | comp \leftarrow cronograma(j,jornadaActual(j))])}
+		|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
 	\aux{capacidadEnOrden}{x: \ent, c:Competencia}{Bool}{\newline
 	capacidad(ranking(c)[x], prm(categoria(c))) \geq capacidad(ranking(c)[x + 1], prm(categoria(c)))}
 	capacidad(ranking(c)[x], prm(categoria(c))) \geq capacidad(ranking(c)[x + 1], prm(categoria(c)))}