From 6a97b319270721f7deb9c9ddbbd8573b898c696f Mon Sep 17 00:00:00 2001 From: fce15 <fce15@inf.ufpr.br> Date: Sat, 12 Dec 2015 00:09:36 -0200 Subject: [PATCH] Deixando Mais Legivel --- Arquivos/Estruturas.h | 4 ++-- Arquivos/Loteria | Bin 13813 -> 13888 bytes Arquivos/Main.c | 4 +++- Arquivos/Vetor.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Arquivos/Estruturas.h b/Arquivos/Estruturas.h index 6ac3e15..76e7186 100644 --- a/Arquivos/Estruturas.h +++ b/Arquivos/Estruturas.h @@ -4,5 +4,5 @@ #include <stdlib.h> #include <stdbool.h> #include <sys/time.h> -#define TAM 10 //tamanho do vetor -#define NUMMAX 5 //constante que tem o máximo de valores +#define TAM 20 //tamanho do vetor +#define NUMMAX 50 //constante que tem o máximo de valores diff --git a/Arquivos/Loteria b/Arquivos/Loteria index 6f3be512a0e027261422176357cf6e6f01e7ac94..c44e47857b1274600c8c210159a22cf60ff2d6c1 100755 GIT binary patch delta 5250 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 BV88$X delta 4976 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 E09g<*V*mgE diff --git a/Arquivos/Main.c b/Arquivos/Main.c index dc9e274..37a98f6 100644 --- a/Arquivos/Main.c +++ b/Arquivos/Main.c @@ -5,11 +5,12 @@ int main () { int Vetor[TAM], Escolhidos[4]; int comando, Ordena; - + for (;;) { printf ("1 - Jogar\n2 - Comparar Algortimos\n"); scanf ("%d", &comando); switch (comando) { case 1: + printf ("Digite 4 Valores de 1 a 50\n"); LerDados (Escolhidos); GeraVetor (Vetor); //Sorteia o Algoritmo para Ordenar o Vetor @@ -50,4 +51,5 @@ int main () { TempoQuickSortRecursivo (Vetor); TempoQuickSortIterativo (Vetor); } + } } diff --git a/Arquivos/Vetor.c b/Arquivos/Vetor.c index 365ff39..ff965fe 100644 --- a/Arquivos/Vetor.c +++ b/Arquivos/Vetor.c @@ -15,7 +15,7 @@ void GeraVetor (int *Vetor) { srand (time(NULL)); for (i=0; i < TAM; i++) - Vetor[i] = rand () % NUMMAX; + Vetor[i] = (rand () % NUMMAX) + 1; } //Função que imprime o vetor -- GitLab