From cdd6ad8a188930108be6f01090c2b9b24275b142 Mon Sep 17 00:00:00 2001 From: Pedro Folloni Pesserl <fpesserl7@gmail.com> Date: Thu, 1 Dec 2022 02:06:29 -0300 Subject: [PATCH] fix union function temporarily --- tp4/lib_conjunto.c | 37 ++++++++++++++++++++++--------------- tp4/tp4 | Bin 30696 -> 30520 bytes tp4/tp4.c | 6 +++--- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/tp4/lib_conjunto.c b/tp4/lib_conjunto.c index 9bc64e2..c5416df 100644 --- a/tp4/lib_conjunto.c +++ b/tp4/lib_conjunto.c @@ -138,23 +138,30 @@ conjunto_t *uniao_cjt(conjunto_t *c1, conjunto_t *c2) { conjunto_t **menor_cjt = cardinalidade_cjt(c1) < cardinalidade_cjt(c2) ? &c1 : &c2; conjunto_t **maior_cjt = cardinalidade_cjt(c1) > cardinalidade_cjt(c2) ? &c1 : &c2; - while (c1->ptr < cardinalidade_cjt(c1) && c2->ptr < cardinalidade_cjt(c2)) { - if (c1->v[c1->ptr] == c2->v[c2->ptr]) { - insere_cjt(uniao, c1->v[c1->ptr]); - c1->ptr++; - c2->ptr++; - } else { - if (c1->v[c1->ptr] < c2->v[c2->ptr]) { - insere_cjt(uniao, c1->v[c1->ptr]); - c1->ptr++; - } else { - insere_cjt(uniao, c2->v[c2->ptr]); - c2->ptr++; - } - } - } + /* while (c1->ptr < cardinalidade_cjt(c1) && c2->ptr < cardinalidade_cjt(c2)) { */ + /* if (c1->v[c1->ptr] == c2->v[c2->ptr]) { */ + /* insere_cjt(uniao, c1->v[c1->ptr]); */ + /* c1->ptr++; */ + /* c2->ptr++; */ + /* } else { */ + /* if (c1->v[c1->ptr] < c2->v[c2->ptr]) { */ + /* insere_cjt(uniao, c1->v[c1->ptr]); */ + /* c1->ptr++; */ + /* } else { */ + /* insere_cjt(uniao, c2->v[c2->ptr]); */ + /* c2->ptr++; */ + /* } */ + /* } */ + /* } */ + + /* TODO: arrumar isso aqui de cima ^ e apagar isso aqui de baixo v */ int i; + for (i = 0; i < cardinalidade_cjt(*menor_cjt); i++) { + insere_cjt(uniao, c1->v[i]); + insere_cjt(uniao, c2->v[i]); + } + for (i = cardinalidade_cjt(*menor_cjt); i < cardinalidade_cjt(*maior_cjt); i++) { insere_cjt(uniao, (*maior_cjt)->v[i]); } diff --git a/tp4/tp4 b/tp4/tp4 index 3368d0f7bc516f8fba91116e43a75ad81f92b3a1..0487535f0ba3e7e14013526730e2a1787577a66d 100755 GIT binary patch delta 5482 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 LFN$%pSH2toFQW1J delta 5782 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 diff --git a/tp4/tp4.c b/tp4/tp4.c index b4c89ee..9f4e3ec 100644 --- a/tp4/tp4.c +++ b/tp4/tp4.c @@ -23,7 +23,7 @@ conjunto_t **le_vetor_conjuntos(int *tam, int max) { int n, m; scanf("%d", &n); while (n) { - if ( !(vetor_c[*tam] = cria_cjt(10)) ) + if ( !(vetor_c[*tam] = cria_cjt(15)) ) return NULL; insere_cjt(vetor_c[*tam], n); scanf("%d", &m); @@ -47,7 +47,7 @@ conjunto_t **libera_vetor_conjuntos(conjunto_t **vetor_c, int tam) { conjunto_t *acha_solucao(conjunto_t **herois, conjunto_t *missao, conjunto_t **equipes, int tam_equipes) { conjunto_t *menor; - menor = cria_cjt(10); + menor = cria_cjt(15); conjunto_t *uniao_old; conjunto_t *uniao; int i, j; @@ -59,8 +59,8 @@ conjunto_t *acha_solucao(conjunto_t **herois, conjunto_t *missao, conjunto_t **e uniao_old = uniao; uniao = uniao_cjt(uniao, herois[equipes[i]->v[j] - 1]); uniao_old = destroi_cjt(uniao_old); - } /* realiza a uniao de todos os conjuntos de habilidades de heroi referenciados no conjunto equipe da posicao atual do vetor de equipes. */ + } if (contido_cjt(missao, uniao)) { if (vazio_cjt(menor) || cardinalidade_cjt(equipes[i]) < cardinalidade_cjt(menor)) { menor = destroi_cjt(menor); -- GitLab