From 53a182c525cb60b6cdea4998b85e9a451a13359c Mon Sep 17 00:00:00 2001 From: Luis Rodrigues Date: Sat, 15 Nov 2025 21:22:00 +0000 Subject: [PATCH] =?UTF-8?q?adi=C3=A7=C3=A3o=20de=20anota=C3=A7=C3=B5es=20d?= =?UTF-8?q?e=20tipo=20de=20variaveis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/__pycache__/__init__.cpython-312.pyc | Bin 162 -> 172 bytes modules/__pycache__/agente.cpython-312.pyc | Bin 2010 -> 2459 bytes modules/__pycache__/gui.cpython-312.pyc | Bin 1401 -> 6341 bytes modules/estrategia.py | 4 ++-- modules/mapa.py | 12 ++++++------ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/__pycache__/__init__.cpython-312.pyc b/modules/__pycache__/__init__.cpython-312.pyc index 2dac02e8260ecce2f232d8d60829e70be4b7582d..951f5a943b9bb8550ad7f588e35c0a3b0b9f7670 100644 GIT binary patch delta 37 rcmZ3)xQ3DYG%qg~0}!0!doYpPn9+Npy%c9bQGQlxa!G#i#0W0{yV(mN delta 27 hcmZ3(xQLPaG%qg~0}xb9yFHQHn9*^fz0|~HPXJ;C2W$WU diff --git a/modules/__pycache__/agente.cpython-312.pyc b/modules/__pycache__/agente.cpython-312.pyc index ef0a1de5f47b061bd4ab67b0a443130e844a2cdc..50828dfdc110c749c94b4b1c038442b291ed31ea 100644 GIT binary patch literal 2459 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 DUFaoG diff --git a/modules/estrategia.py b/modules/estrategia.py index 8d0a00f..e0f9ce6 100644 --- a/modules/estrategia.py +++ b/modules/estrategia.py @@ -19,14 +19,14 @@ lista_estrategias: dict[str, float] = {} def carregarFicheirosEstrategias(pasta_estrategias: str) -> None: - lista_ficheiros: list = os.listdir(pasta_estrategias) + lista_ficheiros: list[str] = os.listdir(pasta_estrategias) for ficheiro_json in lista_ficheiros: with open(f"{pasta_estrategias}/{ficheiro_json}", "r") as ficheiro: dados = json.load(ficheiro) lista_estrategias.update(dados) -def listaNomesEstrategias() -> list: +def listaNomesEstrategias() -> list[str]: return list(lista_estrategias.keys()) diff --git a/modules/mapa.py b/modules/mapa.py index a5fe0cb..32f2d06 100644 --- a/modules/mapa.py +++ b/modules/mapa.py @@ -1,9 +1,9 @@ # funções associadas a operações com o Mapa -import random -from modules import agente +#import random +#from modules import agente from modules.agente import Agente -import modules.estrategia as ModEstrategia +#import modules.estrategia as ModEstrategia class Mapa: @@ -12,7 +12,7 @@ class Mapa: listas, e cada posição guarda um objecto 'Agente' ''' dimensao: tuple[int, int] - mundo: list + mundo: list[list[Agente | None]] id_mapa: int def __init__(self, dimensao: tuple[int, int], aleatorio: bool = False): @@ -25,10 +25,10 @@ class Mapa: return f'Dados Mapa ({self.id_mapa})\n \ \tdimensao: {self.dimensao[0]} x {self.dimensao[1]}' - def inicializar(self) -> list: + def inicializar(self) -> list[list[Agente | None]]: # inicializar mundo for _ in range(0, self.dimensao[0]): - mundo_tmp: list = [] + mundo_tmp: list[Agente | None] = [] for _ in range(0, self.dimensao[1]): mundo_tmp.append(None) self.mundo.append(mundo_tmp)