inewave 1.10.1__py3-none-any.whl → 1.10.3__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.1"
+__version__ = "1.10.3"
 
 from . import newave  # noqa
 from . import nwlistcf  # noqa

inewave/newave/modelos/sistema.py

@@ -285,7 +285,7 @@ class BlocoIntercambioSubsistema(Section):
                     self.data = converte_tabela_em_df()
                 break
             # Confere se é uma linha de subsistema ou tabela
-            if len(linha) < 30:
+            if len(linha.strip()) < 30:
                 dados = self.__linha_subsis.read(linha)
                 subsis_de_atual = (
                     subsis_de_atual if dados[0] is None else dados[0]
@@ -575,7 +575,7 @@ class BlocoGeracaoUsinasNaoSimuladas(Section):
                     self.data = converte_tabela_em_df()
                 break
             # Confere se é uma linha de subsistema ou tabela
-            if len(linha) < 30:
+            if len(linha.strip()) < 30:
                 dados = self.__linha_subsis.read(linha)
                 subsis_atual = dados[0]
                 bloco_atual = dados[1]

inewave/nwlistop/modelos/nwlistopdat.py

@@ -1,8 +1,9 @@
-from cfinterface.components.section import Section
-from cfinterface.components.line import Line
+from typing import IO, Any, Dict, List
+
 from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.line import Line
 from cfinterface.components.literalfield import LiteralField
-from typing import List, Dict, IO, Any
+from cfinterface.components.section import Section
 
 
 class BlocoDadosNwlistop(Section):
@@ -25,19 +26,15 @@ class BlocoDadosNwlistop(Section):
     def __init__(self, previous=None, next=None, data=None) -> None:
         super().__init__(previous, next, data)
         self.__linha_opcao = Line([IntegerField(1, 1)])
-        self.__linha_arquivo = Line(
-            [LiteralField(29, 0), LiteralField(40, 30)]
-        )
-        self.__linha_series_op1 = Line(
-            [IntegerField(4, 1), IntegerField(4, 6)]
-        )
+        self.__linha_arquivo = Line([LiteralField(29, 0), LiteralField(40, 30)])
+        self.__linha_series_op1 = Line([IntegerField(4, 1), IntegerField(4, 6)])
         self.__linha_periodos = Line([IntegerField(3, 1), IntegerField(3, 5)])
-        self.__linha_variaveis_op2 = Line(
-            [IntegerField(2, 1 + 3 * i) for i in range(21)]
-        )
-        self.__linha_uhes_op2 = Line(
-            [IntegerField(3, 1 + 4 * i) for i in range(16)]
-        )
+        self.__linha_variaveis_op2 = Line([
+            IntegerField(2, 1 + 3 * i) for i in range(21)
+        ])
+        self.__linha_uhes_op2 = Line([
+            IntegerField(3, 1 + 4 * i) for i in range(16)
+        ])
         self.data: Dict[str, Any] = {}
         self.__comentarios: List[List[str]] = []
 
@@ -45,12 +42,10 @@ class BlocoDadosNwlistop(Section):
         if not isinstance(o, BlocoDadosNwlistop):
             return False
         bloco: BlocoDadosNwlistop = o
-        if not all(
-            [
-                isinstance(self.data, dict),
-                isinstance(o.data, dict),
-            ]
-        ):
+        if not all([
+            isinstance(self.data, dict),
+            isinstance(o.data, dict),
+        ]):
             return False
         else:
             return self.data == bloco.data
@@ -162,7 +157,7 @@ class BlocoDadosNwlistop(Section):
         for c in self.__comentarios[1]:
             file.write(c)
         # Escreve as séries
-        file.write(self.__linha_periodos.write(self.data["series"]))
+        file.write(self.__linha_series_op1.write(self.data["series"]))
 
     # Override
     def __write_op2(self, file: IO, *args, **kwargs):
@@ -178,17 +173,17 @@ class BlocoDadosNwlistop(Section):
         for c in self.__comentarios[1]:
             file.write(c)
         # Escreve as séries
-        file.write(self.__linha_periodos.write(self.data["variaveis_ree"]))
+        file.write(self.__linha_variaveis_op2.write(self.data["variaveis_ree"]))
         # Escreve as linhas de cabeçalho para variáveis individualizadas
         for c in self.__comentarios[2]:
             file.write(c)
         # Escreve as séries
-        file.write(self.__linha_periodos.write(self.data["variaveis_uhe"]))
+        file.write(self.__linha_variaveis_op2.write(self.data["variaveis_uhe"]))
         # Escreve as linhas de cabeçalho para usinas
         for c in self.__comentarios[3]:
             file.write(c)
         # Escreve as séries
-        file.write(self.__linha_periodos.write(self.data["uhes"]))
+        file.write(self.__linha_uhes_op2.write(self.data["uhes"]))
 
     # Override
     def __write_op4(self, file: IO, *args, **kwargs):

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

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

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

@@ -1,4 +1,4 @@
-inewave/__init__.py,sha256=r4u9i9Hht0EMarrDRzIq5xsDGMVX7MXW9PIkt68DcvA,236
+inewave/__init__.py,sha256=dVljpD7h1gRAVUNk04SzzzNVmaCOpjrq3lPunv7_g1w,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
@@ -144,7 +144,7 @@ inewave/newave/modelos/ree.py,sha256=6VaJhSKutVlaPtQDTZcf1S7JHR0hNhEsPgsh_MzyegA
 inewave/newave/modelos/sar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/selcor.py,sha256=v2ASlI61CKebh5eCOeA5Ce3GLzFDAYJ9Bsm0whKqq-4,2069
 inewave/newave/modelos/shist.py,sha256=wy_E1onlbfrCFvWcpNhnUt3WAGmPJ2FSUbkywvH1b2c,3376
-inewave/newave/modelos/sistema.py,sha256=T6FYm05CkNzhwzjx_8O5cJwGvAoSRmHJYf41neDs7Eg,23091
+inewave/newave/modelos/sistema.py,sha256=5DCUta3ef69SHD6AdwVFW3bYU-i7doVNQl1v5XEUyUk,23107
 inewave/newave/modelos/tecno.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/term.py,sha256=cL5356rYRHPf1zsXzoGzrPa1MtncMAOhwP-U27s2o8E,4760
 inewave/newave/modelos/vazaob.py,sha256=_G5Kd1PD7C5DU2aV_Xam67GpaqJTEvXCWuhiAO_POyw,2901
@@ -451,7 +451,7 @@ inewave/nwlistop/modelos/merclsin.py,sha256=arrMiDrPb3z7CqoT0ndCW0GZgJec6oa0by3y
 inewave/nwlistop/modelos/mevmin.py,sha256=xv2rpx4GqK3fs_b9F8fNcwepmkqZkFw6lhheAghRZj0,693
 inewave/nwlistop/modelos/mevminm.py,sha256=xv2rpx4GqK3fs_b9F8fNcwepmkqZkFw6lhheAghRZj0,693
 inewave/nwlistop/modelos/mevminsin.py,sha256=xv2rpx4GqK3fs_b9F8fNcwepmkqZkFw6lhheAghRZj0,693
-inewave/nwlistop/modelos/nwlistopdat.py,sha256=CLteMOIPb7hOMYDhxZ_dXrWHoKVKOsCyyZttGcI5C1Y,6989
+inewave/nwlistop/modelos/nwlistopdat.py,sha256=svwmrXzLZjN5yD1UUWyUEsNlSUiwWah7N1lCHQvNQs8,6924
 inewave/nwlistop/modelos/perdf.py,sha256=HGMOZGIJLbfLSMin-K_5wzGUsUInA--KShyaTkv0Whc,638
 inewave/nwlistop/modelos/perdfm.py,sha256=HGMOZGIJLbfLSMin-K_5wzGUsUInA--KShyaTkv0Whc,638
 inewave/nwlistop/modelos/perdfsin.py,sha256=HGMOZGIJLbfLSMin-K_5wzGUsUInA--KShyaTkv0Whc,638
@@ -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.1.dist-info/METADATA,sha256=NqwgcoiWszd_S-eI1CwC8YDbHX-ntuSbfGnnM5XuTeo,3743
-inewave-1.10.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-inewave-1.10.1.dist-info/licenses/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.10.1.dist-info/RECORD,,
+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,,