Skip to content

Commit

Permalink
transcurrir dia avanzado
Browse files Browse the repository at this point in the history
  • Loading branch information
nlasso committed Jun 18, 2012
1 parent f694148 commit e342e3b
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 6 deletions.
7 changes: 4 additions & 3 deletions TP3/cbproject/TP3Grupo4Borbotones.depend
Expand Up @@ -49,11 +49,12 @@
<fstream>
"interfaz.h"

1339700021 source:/home/nlasso/Documents/Facultad/Algo1/Borbotones/TP3/atleta.cpp
1339997477 source:/home/nlasso/Documents/Facultad/Algo1/Borbotones/TP3/atleta.cpp
"atleta.h"
<string>
<fstream>

1339364843 /home/nlasso/Documents/Facultad/Algo1/Borbotones/TP3/atleta.h
1339997477 /home/nlasso/Documents/Facultad/Algo1/Borbotones/TP3/atleta.h
"tipos.h"
"lista.h"

Expand Down Expand Up @@ -93,7 +94,7 @@
<fstream>
"interfaz.h"

1339995851 source:/home/nlasso/Documents/Facultad/Algo1/Borbotones/TP3/jjoo.cpp
1339998626 source:/home/nlasso/Documents/Facultad/Algo1/Borbotones/TP3/jjoo.cpp
"competencia.h"
"atleta.h"
"jjoo.h"
Expand Down
Binary file modified TP3/cbproject/bin/Debug/TP3Grupo4Borbotones
Binary file not shown.
Binary file added TP3/cbproject/obj/Debug/atleta.o
Binary file not shown.
Binary file added TP3/cbproject/obj/Debug/competencia.o
Binary file not shown.
Binary file added TP3/cbproject/obj/Debug/interfaz.o
Binary file not shown.
Binary file added TP3/cbproject/obj/Debug/jjoo.o
Binary file not shown.
Binary file added TP3/cbproject/obj/Debug/ojota.o
Binary file not shown.
7 changes: 4 additions & 3 deletions TP3/jjoo.cpp
Expand Up @@ -1170,11 +1170,12 @@ void JJOO::transcurrirDia()
while(competenciasActuales.longitud() > i){
Competencia comp = competenciasActuales.iesimo(i);
if(!comp.finalizada()){
comp.finalizar(this->crearRanking(comp.participantes(),comp.categoria().first),this->crearControl(comp.participantes().iesimo(0),true));
competenciasModificadas.agregar(comp);
Competencia nuevaComp(comp.categoria().first,comp.categoria().second,comp.participantes());
nuevaComp.finalizar(this->crearRanking(nuevaComp.participantes(),nuevaComp.categoria().first),this->crearControl(nuevaComp.participantes().iesimo(0),true));
competenciasModificadas.agregarAtras(nuevaComp);
}
else{
competenciasModificadas.agregar(competenciasActuales.iesimo(i));
competenciasModificadas.agregarAtras(competenciasActuales.iesimo(i));
}
i++;
}
Expand Down

0 comments on commit e342e3b

Please sign in to comment.