inewave 1.10.3__py3-none-any.whl → 1.10.4__py3-none-any.whl

inewave/__init__.py

@@ -6,7 +6,7 @@ inewave é um módulo em Python para manipulação dos arquivos de entrada
 e saída do NEWAVE.
 """
 
-__version__ = "1.10.3"
+__version__ = "1.10.4"
 
 from . import newave  # noqa
 from . import nwlistcf  # noqa

inewave/_utils/formatacao.py

@@ -166,20 +166,34 @@ def formata_df_meses_para_datas_nwlistop(df: pd.DataFrame) -> pd.DataFrame:
     }
     return mapa_formatacao[colunas_identificacao](df)
 
+def converte_anos(anos: List[str]) -> List[int]:
+    """
+    Converte uma lista de anos representados como strings para inteiros.
+    Se o ano for 'PRE', converte para 1; se for 'POS', converte para 9999.
+    """
+    anos_convertidos = []
+    for a in anos:
+        if a == "PRE":
+            anos_convertidos.append(1)
+        elif a == "POS":
+            anos_convertidos.append(9999)
+        else:
+            anos_convertidos.append(int(a))
+    return anos_convertidos
+
+def prepara_vetor_ano_mes_tabela(anos: List[str], meses: List[int]) -> List[datetime]:
+
+    anos_convertidos = converte_anos(anos)
+    return [
+        datetime(year=int(a), month=int(m), day=1) for a, m in zip(anos_convertidos, meses)
+    ]
+
 
 def prepara_vetor_anos_tabela(anos: List[str]) -> List[datetime]:
     # Se tem pré, substitui por 0001
     # Se tem pós, substitui por 9999
     # Repete os valores existentes 12 vezes
-    anos_convertidos: List[int] = []
-    for a in anos:
-        if a == "PRE":
-            a_convertido = 1
-        elif a == "POS":
-            a_convertido = 9999
-        else:
-            a_convertido = int(a)
-        anos_convertidos.append(a_convertido)
+    anos_convertidos = converte_anos(anos)
 
     anos_array = np.array(anos_convertidos).repeat(len(MESES_DF))
     meses = np.tile(np.arange(1, 13), len(anos))

inewave/newave/modelos/ghmin.py

@@ -2,10 +2,14 @@ from cfinterface.components.section import Section
 from cfinterface.components.line import Line
 from cfinterface.components.integerfield import IntegerField
 from cfinterface.components.floatfield import FloatField
-from cfinterface.components.datetimefield import DatetimeField
+from cfinterface.components.literalfield import LiteralField
 from typing import List, IO, Optional
 import pandas as pd  # type: ignore
-from datetime import datetime
+
+from inewave._utils.formatacao import (
+    prepara_valor_ano,
+    prepara_vetor_ano_mes_tabela,
+)
 
 
 class BlocoUHEGhmin(Section):
@@ -22,7 +26,8 @@ class BlocoUHEGhmin(Section):
         self.__linha_uhe = Line(
             [
                 IntegerField(3, 0),
-                DatetimeField(7, 5, format="%m %Y"),
+                LiteralField(2, 5),
+                LiteralField(4, 8),
                 IntegerField(1, 14),
                 FloatField(6, 17, 0),
             ]
@@ -48,7 +53,7 @@ class BlocoUHEGhmin(Section):
         def converte_tabela_em_df():
             df = pd.DataFrame()
             df["codigo_usina"] = codigos
-            df["data"] = datas
+            df["data"] = prepara_vetor_ano_mes_tabela(anos, meses)
             df["patamar"] = patamares
             df["geracao"] = geracoes
             return df
@@ -59,7 +64,8 @@ class BlocoUHEGhmin(Section):
 
         # Variáveis auxiliares
         codigos: List[Optional[int]] = []
-        datas: List[Optional[datetime]] = []
+        meses: List[Optional[str]] = []
+        anos: List[Optional[str]] = []
         patamares: List[Optional[int]] = []
         geracoes: List[Optional[float]] = []
 
@@ -72,9 +78,10 @@ class BlocoUHEGhmin(Section):
                 break
             dados = self.__linha_uhe.read(linha)
             codigos.append(dados[0])
-            datas.append(dados[1])
-            patamares.append(dados[2])
-            geracoes.append(dados[3])
+            meses.append(dados[1])
+            anos.append(dados[2])
+            patamares.append(dados[3])
+            geracoes.append(dados[4])
 
     # Override
     def write(self, file: IO, *args, **kwargs):
@@ -82,8 +89,12 @@ class BlocoUHEGhmin(Section):
             file.write(linha)
         if not isinstance(self.data, pd.DataFrame):
             raise ValueError("Dados do ghmin.dat não foram lidos com sucesso")
+        df_aux = self.data.copy()
+        df_aux['ano'] = df_aux['data'].apply(lambda x: prepara_valor_ano(x.year))
+        df_aux['mes'] = df_aux['data'].apply(lambda x: f"{x.month:2d}")
+        df_aux.drop("data", inplace=True, axis=1)
 
-        for _, linha in self.data.iterrows():
+        for _, linha in df_aux[['codigo_usina','mes','ano','patamar','geracao']].iterrows():
             linha_lida: pd.Series = linha
             dados_linha = linha_lida.tolist()
             file.write(self.__linha_uhe.write(dados_linha))

inewave/newave/modelos/newavetim.py

@@ -51,8 +51,10 @@ class BlocoTemposEtapasTim(Block):
         tempos: List[timedelta] = []
 
         # Leitura das etapas
-        for _ in range(5):
+        while True:
             dados = self.__line.read(file.readline())
+            if not dados or not dados[0].strip("- \t\n"):
+                break
             etapas.append(dados[0].split(":")[0])
             h = int(dados[1].split("h")[0])
             min = int(dados[1].split("h")[1].split("min")[0])

inewave/nwlistop/modelos/mediasusih.py

@@ -44,8 +44,7 @@ class TabelaMediasusih(Section):
             var_name="estagio",
             value_name="valor",
         )
-        df.loc[df["valor"] == "-   ", "valor"] = 0.0
-        df = df.astype({"valor": float})
+        df["valor"] = pd.to_numeric(df["valor"], errors="coerce")
         df["estagio"] = df["estagio"].astype(int)
         df["estagio"] -= df["estagio"].min() - 1
         df = df.pivot_table(

{inewave-1.10.3.dist-info → inewave-1.10.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inewave
-Version: 1.10.3
+Version: 1.10.4
 Summary: inewave
 Project-URL: Documentation, https://rjmalves.github.io/inewave/
 Project-URL: Repository, https://github.com/rjmalves/inewave/

{inewave-1.10.3.dist-info → inewave-1.10.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-inewave/__init__.py,sha256=dVljpD7h1gRAVUNk04SzzzNVmaCOpjrq3lPunv7_g1w,236
+inewave/__init__.py,sha256=4vDxRppIcVG0MZ_cacv6ciAvU2OoLZDCLVF5gPVlI6c,236
 inewave/config.py,sha256=fMgG2sqE_PNz30QCNxkgfPf78SEOAVfV07kGtO1bREE,1106
 inewave/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inewave/_utils/formatacao.py,sha256=-bdNExSg2PGAq7fwMekoPbeLvGYiEjpCR_nlKAGF9xg,5930
+inewave/_utils/formatacao.py,sha256=v7Qo6wb_q43IsLn6YHIKup_-0Q-TSEIvwHsMFWvkFI8,6431
 inewave/libs/__init__.py,sha256=Jz0qQ08srjYGvoynfro6m8fQYAKbnkj-VweNEu8JnVQ,161
 inewave/libs/eolica.py,sha256=YMO1_37PojeUeix-CtkYeba2z66aRkaRR6CE_Cn4sbs,13324
 inewave/libs/restricoes.py,sha256=9CkYGsg6fWSFS7RoyIqKlqxfaCwcNxFJrUS8Qknz4xg,16485
@@ -122,13 +122,13 @@ inewave/newave/modelos/expt.py,sha256=TgfHkVhZUbBcvRgctjxHgRHqcm_57BecXY5wKb1ZrX
 inewave/newave/modelos/forward.py,sha256=f3YDCMcl45DOYVa41XtI3A9Ko9pPmeI-_epu5ov3m4o,88425
 inewave/newave/modelos/forwarh.py,sha256=46jHcPDTBftWm8Q23zzJwiXIoSnxAuQLMBzkA4BQq6s,8231
 inewave/newave/modelos/gee.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inewave/newave/modelos/ghmin.py,sha256=53Bno60jYq2BttvuRNMJ0ccOqA3dzPKUsrLAz9gPg-o,2962
+inewave/newave/modelos/ghmin.py,sha256=RKkZBTGjh8ovcxVhYnvVXvcxYFsqNHIO4C8YOpCyJPI,3438
 inewave/newave/modelos/gtminpat.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/hidr.py,sha256=ga3luPn4E7GDY5dl9UrnbIt2DUU1m1cs4EognfLsg2c,15773
 inewave/newave/modelos/itaipu.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/manutt.py,sha256=16sztv-hOdVUUeL2J5F9vBagZnII9-F-IGQJpiAkTK4,3781
 inewave/newave/modelos/modif.py,sha256=uXNRcO03dwqCeoJ1kBSNWAiaYJLLqIDThAeqsym20Uo,17159
-inewave/newave/modelos/newavetim.py,sha256=irKwGBH-3V1A5wKWI4NCjx_yQ0j4iCg1WAjEl-vqVj0,2979
+inewave/newave/modelos/newavetim.py,sha256=5oCqu2rL0A3sok2k8NoqaHhhEPFWz1_DXWYxoG9VFe0,3052
 inewave/newave/modelos/nwv_avl_evap.py,sha256=22oXfDH9R-I1HwAiaQgm7x21zDWGWVySWYsLfdvGlHg,1228
 inewave/newave/modelos/nwv_cortes_evap.py,sha256=nAgdZ-TdWPmokcG1qANgoKtfwyq3waIFclKcY7WyWtQ,1292
 inewave/newave/modelos/nwv_eco_evap.py,sha256=vog9Lw4cqxx66Gmqext086cEsL-Tz5_4pG6wJFSoO90,1235
@@ -444,7 +444,7 @@ inewave/nwlistop/modelos/mediasrhq.py,sha256=hv9jZHw8wL3p-YL1fY-oym2EO5N4ooPbADD
 inewave/nwlistop/modelos/mediasrhv.py,sha256=38fFijM3Fdr_3GRaq5bESFsFCbgJCuq22EBxz-Htaz4,1736
 inewave/nwlistop/modelos/mediassin.py,sha256=R798woqZQ4p93Jpmt1ji2vNms1UEhkAkAFqv2b-lwUE,1635
 inewave/nwlistop/modelos/mediasusie.py,sha256=_j5osR1diNnwkqxy1wHcnTVW_T0YDHa4YAS8KwBvivw,1725
-inewave/nwlistop/modelos/mediasusih.py,sha256=ZO5GbJytNcDBBOuiEEMHor7666VTqU6jh_6TJAAffRQ,1819
+inewave/nwlistop/modelos/mediasusih.py,sha256=K8dwMu8VVRUtgc_UDcEFavQHynPqhV1DgdEp8lyDBPM,1791
 inewave/nwlistop/modelos/mediasusit.py,sha256=87xjpsy7XS8O40hpDubbsPn-MXKRn2NVXG5k3iYJrzA,1725
 inewave/nwlistop/modelos/mercl.py,sha256=arrMiDrPb3z7CqoT0ndCW0GZgJec6oa0by3yfd9GWWQ,634
 inewave/nwlistop/modelos/merclsin.py,sha256=arrMiDrPb3z7CqoT0ndCW0GZgJec6oa0by3yfd9GWWQ,634
@@ -539,7 +539,7 @@ inewave/nwlistop/modelos/blocos/usina.py,sha256=cQvLVtG1NC8y4lP_to6-YjAKQRGRlaxO
 inewave/nwlistop/modelos/blocos/valoresclassetermicaseriepatamar.py,sha256=0LV0JMFoiuNEQ3n-XVfG2T0sIq_33bnCt6gmwPOTql8,3283
 inewave/nwlistop/modelos/blocos/valoresserie.py,sha256=Q88QBoI3zyU7y0AvHBeSqDBEVAkb3rAa3XpxA51NbF8,2143
 inewave/nwlistop/modelos/blocos/valoresseriepatamar.py,sha256=xnRdor-_2VyR5EbWNSzU_hbABJFtfgKGlznbcRaslGg,2589
-inewave-1.10.3.dist-info/METADATA,sha256=8WCCVwL-O2ZuPKHaMCD7mxLyQm3XVr300lH_CzNbxpg,3743
-inewave-1.10.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-inewave-1.10.3.dist-info/licenses/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.10.3.dist-info/RECORD,,
+inewave-1.10.4.dist-info/METADATA,sha256=hK208dE9CHEbTHkX7bZdlCAuIKFR527ceI7UlhF0hjg,3743
+inewave-1.10.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+inewave-1.10.4.dist-info/licenses/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.10.4.dist-info/RECORD,,