diff --git a/predictor_pol/candidatos.json b/predictor_pol/candidatos.json index cd13cd7..41af296 100644 --- a/predictor_pol/candidatos.json +++ b/predictor_pol/candidatos.json @@ -1,153 +1,10 @@ [ - { - "party": "Frente Amplio", - "candidates": [ - { - "name": "Carolina Cosse", - "id": 3 - }, - { - "name": "Daniel Martínez", - "id": 4 - }, - { - "name": "Mario Bergara", - "id": 2 - }, - { - "name": "Óscar Andrade", - "id": 1 - } - ] - }, - { - "party": "La Alternativa", - "candidates": [ - { - "name": "Pablo Mieres", - "id": 18 - } - ] - }, - { - "party": "Partido Colorado", - "candidates": [ - { - "name": "Edgardo Martínez Zimarioff", - "id": 14 - }, - { - "name": "Ernesto Talvi", - "id": 17 - }, - { - "name": "Héctor Rovira", - "id": 15 - }, - { - "name": "José Amorín Batlle", - "id": 12 - }, - { - "name": "Julio María Sanguinetti", - "id": 16 - }, - { - "name": "Pedro Etchegaray", - "id": 13 - } - ] - }, - { - "party": "Partido Ecologista Radical Intransigente", - "candidates": [ - { - "name": "César Vega", - "id": 21 - } - ] - }, - { - "party": "Partido Digital", - "candidates": [ - { - "name": "Justin Graside", - "id": 23 - } - ] - }, - { - "party": "Partido de la Gente", - "candidates": [ - { - "name": "Edgardo Novick", - "id": 20 - } - ] - }, - { - "party": "Partido Nacional", - "candidates": [ - { - "name": "Carlos Iafigliola", - "id": 8 - }, - { - "name": "Enrique Antía", - "id": 6 - }, - { - "name": "Jorge Larrañaga", - "id": 10 - }, - { - "name": "Juan Sartori", - "id": 11 - }, - { - "name": "Luis Lacalle Pou", - "id": 9 - }, - { - "name": "Verónica Alonso", - "id": 5 - } - ] - }, - { - "party": "Partido de los Trabajadores", - "candidates": [ - { - "name": "Rafael Fernández", - "id": 22 - } - ] - }, - { - "party": "Partido Verde Animalista", - "candidates": [ - { - "name": "Gustavo Salle", - "id": 24 - } - ] - }, - { - "party": "Unidad Popular", - "candidates": [ - { - "name": "Gonzalo Abella", - "id": 19 - } - ] - }, - { - "party": "Partido de Todos", - "candidates": [ - { - "name": "Carlos Techera", - "id": 25 - } - ] - } + { + "name": "Daniel Martínez", + "id": 4 + }, + { + "name": "Luis Lacalle Pou", + "id": 9 + } ] diff --git a/predictor_pol/flask_app.py b/predictor_pol/flask_app.py index 55aa225..71bafb9 100644 --- a/predictor_pol/flask_app.py +++ b/predictor_pol/flask_app.py @@ -86,7 +86,7 @@ def main(): return render_template( "success.html", predicted_candidate_name=predictions["candidate_name"], - candidatos=CANDIDATOS, + candidates=CANDIDATOS, ) else: # Esto también @@ -125,10 +125,9 @@ def predict(responses): candidate_id = candidate_model.predict(df) candidate_name = "" - for party in CANDIDATOS: - for candidate in party["candidates"]: - if candidate["id"] == candidate_id: - candidate_name = candidate["name"] + for candidate in CANDIDATOS: + if candidate["id"] == candidate_id: + candidate_name = candidate["name"] return {"candidate_id": candidate_id, "candidate_name": candidate_name} diff --git a/predictor_pol/load_data.py b/predictor_pol/load_data.py index 6bcd774..26a2ecb 100644 --- a/predictor_pol/load_data.py +++ b/predictor_pol/load_data.py @@ -21,14 +21,7 @@ QUESTIONS_COUNT = sum([len(category["questions"]) for category in PREGUNTAS]) with open(PATH + "candidatos.json") as f: - CANDIDATOS = [] - file_parties = json.load(f) - for party in file_parties: - CANDIDATOS.append({"party": party["party"].title(), "candidates": []}) - for candidate in party["candidates"]: - CANDIDATOS[-1]["candidates"].append( - {"name": candidate["name"].title(), "id": candidate["id"]} - ) + CANDIDATOS = json.load(f) with open(PATH + "respuestas.json") as f: RESPUESTAS = json.load(f) diff --git a/predictor_pol/templates/main.html b/predictor_pol/templates/main.html index b4133ac..8a8a5bd 100644 --- a/predictor_pol/templates/main.html +++ b/predictor_pol/templates/main.html @@ -1,7 +1,7 @@ - Recomendación de candidato 2019 + Recomendación de candidato - Ballotage @@ -13,13 +13,13 @@

aquienvoto.uy

-

Recomendación de candidato

+

Ballotage - Recomendación de candidato

¿A quién votan los más parecidos a vos?