From 09d3d57fa942e33da6614d563cbb600c7967d077 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Sat, 18 Mar 2023 17:59:19 +0000 Subject: [PATCH] TPC4 Fix listas sem funcao --- TPC4/alunos.csv | 2 +- TPC4/alunos.json | 21 ++++++++++++++++++--- TPC4/main.py | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/TPC4/alunos.csv b/TPC4/alunos.csv index e88adf6..cdcc571 100644 --- a/TPC4/alunos.csv +++ b/TPC4/alunos.csv @@ -1,4 +1,4 @@ -Número,Nome,Curso,Notas{3,5}::sum,,,,, +Número,Nome,Curso,Notas{3,5},,,,, 3162,Cândido Faísca,Teatro,12,13,14,, 7777,Cristiano Ronaldo,Desporto,17,12,20,11,12 264,Marcelo Sousa,Ciência Política,18,19,19,20, diff --git a/TPC4/alunos.json b/TPC4/alunos.json index 894748b..bf78698 100644 --- a/TPC4/alunos.json +++ b/TPC4/alunos.json @@ -3,18 +3,33 @@ "Número": "3162", "Nome": "Cândido Faísca", "Curso": "Teatro", - "Notas_sum": 39 + "Notas": [ + "12", + "13", + "14" + ] }, { "Número": "7777", "Nome": "Cristiano Ronaldo", "Curso": "Desporto", - "Notas_sum": 72 + "Notas": [ + "17", + "12", + "20", + "11", + "12" + ] }, { "Número": "264", "Nome": "Marcelo Sousa", "Curso": "Ciência Política", - "Notas_sum": 76 + "Notas": [ + "18", + "19", + "19", + "20" + ] } ] \ No newline at end of file diff --git a/TPC4/main.py b/TPC4/main.py index 9c4b10d..b9b1a8f 100644 --- a/TPC4/main.py +++ b/TPC4/main.py @@ -54,7 +54,7 @@ def read_header(file: str) -> list[Field]: if max_size is None: max_size = min_size # Check if the list has a valid function - if function not in valid_functions: + if function is not None and function not in valid_functions: raise ValueError(f"Invalid function: {function}") parsed_headers.append( ListField(name, int(min_size), int(max_size), function)