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

inewave/newave/modelos/blocos/tabelacsv.py

@@ -11,7 +11,7 @@ class TabelaCSV(Block):
     a partir de um modelo de linha, para arquivos de saída do NEWAVE.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     BEGIN_PATTERN = "-----;------;"
     LINE_MODEL = Line([])

inewave/newave/modelos/blocos/versaomodelo.py

@@ -2,7 +2,7 @@ from cfinterface.components.block import Block
 from cfinterface.components.literalfield import LiteralField
 from cfinterface.components.line import Line
 
-from typing import IO
+from typing import IO, List
 
 
 class VersaoModelo(Block):
@@ -11,7 +11,7 @@ class VersaoModelo(Block):
     título do arquivo.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     BEGIN_PATTERN = r"CEPEL: NEWAVE"
     END_PATTERN = ""
@@ -36,7 +36,7 @@ class VersaoModeloLibs(Block):
     título do arquivo.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     BEGIN_PATTERN = r"NEWAVE -"
     END_PATTERN = ""

inewave/newave/modelos/forwarh.py

@@ -10,7 +10,7 @@ class SecaoDadosForwarh(Section):
     arquivo forwarh.dat
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     ZVAZ = 100
 

inewave/newave/modelos/hidr.py

@@ -12,7 +12,7 @@ class RegistroUHEHidr(Register):
     arquivo HIDR.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     LINE = Line(
         [

inewave/newave/modelos/modif.py

@@ -7,7 +7,7 @@ from cfinterface.components.floatfield import FloatField
 from cfinterface.adapters.components.repository import factory
 from copy import deepcopy
 from datetime import datetime
-from typing import Optional, IO
+from typing import Optional, IO, List
 
 
 class ModifRegister(Register):
@@ -73,7 +73,7 @@ class USINA(Register):
     Registro que contém a usina modificada.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     IDENTIFIER = " USINA"
     IDENTIFIER_DIGITS = 8
@@ -376,7 +376,7 @@ class VMAXT(Register):
     com data.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     IDENTIFIER = " VMAXT"
     IDENTIFIER_DIGITS = 8
@@ -439,7 +439,7 @@ class VMINT(Register):
     com data.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     IDENTIFIER = " VMINT"
     IDENTIFIER_DIGITS = 8
@@ -502,7 +502,7 @@ class VMINP(Register):
     com data para adoção de penalidade.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     IDENTIFIER = " VMINP"
     IDENTIFIER_DIGITS = 8
@@ -565,7 +565,7 @@ class VAZMINT(Register):
     com data.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     IDENTIFIER = " VAZMINT"
     IDENTIFIER_DIGITS = 8
@@ -613,7 +613,7 @@ class VAZMAXT(Register):
     com data.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     IDENTIFIER = " VAZMAXT"
     IDENTIFIER_DIGITS = 8
@@ -661,7 +661,7 @@ class TURBMAXT(Register):
     com data.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     IDENTIFIER = " TURBMAXT"
     IDENTIFIER_DIGITS = 9
@@ -709,7 +709,7 @@ class TURBMINT(Register):
     com data.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     IDENTIFIER = " TURBMINT"
     IDENTIFIER_DIGITS = 9

inewave/newave/modelos/vazoes.py

@@ -9,7 +9,7 @@ class RegistroVazoesPostos(Register):
     Registro com os dados associados às vazões dos postos.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     POSTOS = 320
 

inewave/newave/modif.py

@@ -29,7 +29,7 @@ class Modif(RegisterFile):
     configurações das usinas hidroelétricas.
     """
 
-    __slots__ = []
+    __slots__: List[str] = []
 
     T = TypeVar("T")
 

inewave/nwlistop/modelos/blocos/valoresserie.py

@@ -18,7 +18,7 @@ class ValoresSerie(Block):
     __slots__ = ["__linha", "__linha_ano", "__ano"]
 
     BEGIN_PATTERN = "     ANO: "
-    END_PATTERN = "MEDIA  "
+    END_PATTERN = "MEDIA "
     HEADER_LINE = Line([])
     DATA_LINE = Line([])
 

{inewave-1.8.0.dist-info → inewave-1.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: inewave
-Version: 1.8.0
+Version: 1.8.1
 Summary: Interface para arquivos do NEWAVE
 Home-page: https://github.com/rjmalves/inewave
 Author: Rogerio Alves

{inewave-1.8.0.dist-info → inewave-1.8.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ examples/plot_dger.py,sha256=e8Qi-DEBmxgGBgfJfABqx39rThuRXQlMHTOfobT601U,1563
 examples/plot_modif.py,sha256=hqB3WRRYP4CBEvnnhrBwlbIrFWzkiHqgaXe76b3olzo,2735
 examples/plot_pmo.py,sha256=-NgaJnsr8N6-8DWWfSH8n8G8Ad9E0StFJBt21xwZxME,1473
 examples/plot_sistema.py,sha256=mM287WEkPV_5NCz-nB9kH9So9KOAbjBfBeB0PTVfHCA,2422
-inewave/__init__.py,sha256=U56sv_V04j8nX5teszVmhXBkhoQEDqF2d4n1SVUJ_G0,235
+inewave/__init__.py,sha256=l-P5bymGMXfai8Hinso_F31BQnE2JQ52dj9VxewBsXI,235
 inewave/config.py,sha256=fMgG2sqE_PNz30QCNxkgfPf78SEOAVfV07kGtO1bREE,1106
 inewave/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -64,7 +64,7 @@ inewave/newave/gtminpat.py,sha256=6Xb4j3ltFVc-5DlyPzYHcMt7Tf41jeNB8C58w6pglls,35
 inewave/newave/hidr.py,sha256=mTPxx254XO67j7P7YIImNZIwnM017DWz8HsuRIYONM8,11647
 inewave/newave/itaipu.py,sha256=tlJmIQLaSQpcliL2P5DrU9fXgcL7rNEsy8Z9optnseE,338
 inewave/newave/manutt.py,sha256=NkJ1CRxi0bbKeFEpX09eMQM8kPCGuqBMyAaK278-CEY,1386
-inewave/newave/modif.py,sha256=tEJowJhFaU01RZHrMT7t4LVNRAKzTnyiSPGmsi2YTuc,13967
+inewave/newave/modif.py,sha256=9Y4gI9zPBAcav6fOS_Am65vCScX2hZ9fgi_Wxk_a9UM,13978
 inewave/newave/newavetim.py,sha256=wQSCRSApKW6rwBteoQ4zmPPa8A820SJ2FATIpjiG1uo,838
 inewave/newave/nwv_avl_evap.py,sha256=9N4qE7dz2DyvZ86XI_OUDn96XLfXc9M6JS2qIQG6zLA,1261
 inewave/newave/nwv_cortes_evap.py,sha256=mKNZMTwqlrMuna3Nx1NE0LM-kutbba-pxkv4-rijvfc,1299
@@ -125,14 +125,14 @@ inewave/newave/modelos/ensoaux.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 inewave/newave/modelos/exph.py,sha256=scWdK6iZ-g3YJK-67WWRueng-WQgCoQKHvTFv4WrXLk,5569
 inewave/newave/modelos/expt.py,sha256=TgfHkVhZUbBcvRgctjxHgRHqcm_57BecXY5wKb1ZrXY,3360
 inewave/newave/modelos/forward.py,sha256=f3YDCMcl45DOYVa41XtI3A9Ko9pPmeI-_epu5ov3m4o,88425
-inewave/newave/modelos/forwarh.py,sha256=z4GfzvkSSPRy7NNoMdWhnQj1Ee0rEtrHoVLakRhUJbc,8220
+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/gtminpat.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inewave/newave/modelos/hidr.py,sha256=TyUuxhMTOmUG9uZVoVuGeG6cICMszVwaESzD3c3Zmpc,15762
+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=zv4p2SK-5u8gSoB2YozYBI-o87vFEXaalVcgygL4ucU,17065
+inewave/newave/modelos/modif.py,sha256=uXNRcO03dwqCeoJ1kBSNWAiaYJLLqIDThAeqsym20Uo,17159
 inewave/newave/modelos/newavetim.py,sha256=7mfLuwT8hbr-KJkm_dKKFD4wJuLAVnuO6VJ5SciEA1U,2088
 inewave/newave/modelos/nwv_avl_evap.py,sha256=22oXfDH9R-I1HwAiaQgm7x21zDWGWVySWYsLfdvGlHg,1228
 inewave/newave/modelos/nwv_cortes_evap.py,sha256=nAgdZ-TdWPmokcG1qANgoKtfwyq3waIFclKcY7WyWtQ,1292
@@ -156,14 +156,14 @@ inewave/newave/modelos/vazaob.py,sha256=_G5Kd1PD7C5DU2aV_Xam67GpaqJTEvXCWuhiAO_P
 inewave/newave/modelos/vazaof.py,sha256=PSHPz4HrufV1yTz5JQEKrYZMZh7uGSoP_jaYVRntlsM,2673
 inewave/newave/modelos/vazaos.py,sha256=WlfIHMpByYhSKEk2bgwp2UDK_ZU6wSZ2w1wi6jFMHg8,2633
 inewave/newave/modelos/vazinat.py,sha256=aOM8r_4dmisEYY0od917NEAG3DsIa5HVGlEilzxIDE4,2886
-inewave/newave/modelos/vazoes.py,sha256=60QPlMnN-WJ7GaPmfNUPBq98A9O_sFDLo8bJXcnTndI,900
+inewave/newave/modelos/vazoes.py,sha256=uURQVg8Zz6Xyg9bLsM9ehZJ3B_26NbGig6einYUKtxw,911
 inewave/newave/modelos/vazpast.py,sha256=dsymx68UmKhCkvFfRpGFNYZ0rIMUes0Zeb3cyXiLKP4,3487
 inewave/newave/modelos/volref_saz.py,sha256=QMcf5kQKu1geBzVp4dBVpbGZHK6w6Yk8H_ppAkTE6Ng,3504
 inewave/newave/modelos/arquivoscsv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/arquivoscsv/arquivocsv.py,sha256=97HYqHCPo9T1K35x19ILV6mxwDeXgVdbDNULrZha5VI,1659
 inewave/newave/modelos/blocos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inewave/newave/modelos/blocos/tabelacsv.py,sha256=N3sDO2FBxC5Wbm-Z83WGb8uVsCAFsx-rcJWl2PmUVzQ,2120
-inewave/newave/modelos/blocos/versaomodelo.py,sha256=zgSoIdtgtqkq2AaFQJQZU66l1tmrXypOlF_eBfwcNd4,1549
+inewave/newave/modelos/blocos/tabelacsv.py,sha256=1MHxVBNW_SypjMC8nm24FkFvVGtUgnXguxq8V48zZOI,2131
+inewave/newave/modelos/blocos/versaomodelo.py,sha256=fjmw8Tf8T7sW82kK-1JYL7Hq5Rn2geDV9-DJi_IIeUU,1577
 inewave/nwlistcf/__init__.py,sha256=NVTYQl6Gh_BbtXuoORDoY4XeFYVwoMzZVr3Ddou7ME4,218
 inewave/nwlistcf/arquivos.py,sha256=JaUlJ2Aw6sM2H1BEwSQb5J9ywMfq5r4GZXRJSA1N8s0,6739
 inewave/nwlistcf/caso.py,sha256=cahc8MmggJbHWj3FGXKQwt3IIi0W84S1Ut8O3C-QaGM,970
@@ -532,7 +532,7 @@ inewave/nwlistop/modelos/blocos/restricao.py,sha256=WxS9fnUe9Cr8d1ElGIFlPNgv4amL
 inewave/nwlistop/modelos/blocos/submercado.py,sha256=UNknSElcXsYVW_2KmVVra2XddCgSeK9VRO0jxUWWGqw,1025
 inewave/nwlistop/modelos/blocos/usina.py,sha256=cQvLVtG1NC8y4lP_to6-YjAKQRGRlaxOd77Jrj0JGAQ,1000
 inewave/nwlistop/modelos/blocos/valoresclassetermicaseriepatamar.py,sha256=8a5MbdaQ_hoYA3GcI4xa3b2yVtTDKChnOPqL314ACY0,3302
-inewave/nwlistop/modelos/blocos/valoresserie.py,sha256=LI36H32QrsRNFSHpOKqB9fhtaqu2R_324B_gjuW-2lg,2162
+inewave/nwlistop/modelos/blocos/valoresserie.py,sha256=ZS7fwdeYO4QttpvfVf4Oj4sbI47ed9O2TQC0L4md_e8,2161
 inewave/nwlistop/modelos/blocos/valoresseriepatamar.py,sha256=HTvWWxUEfSwG08uIJwFzVL-DQ6ux4MKUQh_wEYTOQmk,2594
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/_arquivos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -895,8 +895,8 @@ tests/nwlistop/test_nwlistopdat.py,sha256=1RFOziEIrQy1Vy73pAxBRTeCN6dSvcgbx3rAb5
 tests/nwlistop/test_perdf.py,sha256=HTBNLJMnayhdGY7xnpQerEQ3OfH-lbdhrNZxZRjlT3o,1139
 tests/nwlistop/test_perdfm.py,sha256=AIRdaa1F3NDjlung31YH_DjzKQ-yT7TKm2OIgJymOS4,1166
 tests/nwlistop/test_perdfsin.py,sha256=zJ8Ky1lxmMG8tU6fXXfJlmkyO5MnJ3RhF94fmjlfwwk,1115
-tests/nwlistop/test_pivarm.py,sha256=N6l1EhJilcTv2A1pHltZ9G01azX6qALoalQFBBd64oE,1238
-tests/nwlistop/test_pivarmincr.py,sha256=NYRTMhAdPcMfi9qoLPpNiBMsMAcmHhJXWWSYeY2macs,1286
+tests/nwlistop/test_pivarm.py,sha256=0ELsmCa0UDJ3ut0qek3tMLIOvOsOk5C_9RZmQmdKnfg,1775
+tests/nwlistop/test_pivarmincr.py,sha256=O5AAkfIl2uHzq09egkcyhQp3rpvIkKm9jG5rQlUHKiw,1858
 tests/nwlistop/test_qafluh.py,sha256=H0O1e7SqfVlC6gpF2npmNb-gcS7sWI59ew5Px1bxDvY,1190
 tests/nwlistop/test_qbomb.py,sha256=pAvh6MsjS9dkyBHHL_PRnLZ9Vlt-bUDTYSdRw3qmB1o,1186
 tests/nwlistop/test_qdesviouh.py,sha256=X2x9u1FO4nH0pIXWO4LMUfSxESm15yBcoPxCAdXy3JA,1229
@@ -952,8 +952,8 @@ tests/nwlistop/test_vmortm.py,sha256=re8ypER8xgRbgRdgBd1H97G1ebNxtYZn23_nBGyWwhU
 tests/nwlistop/test_vmortsin.py,sha256=LvdpNPPZtnQWIxrLMUx_KIg6k22pOif6SzmRasAjquc,1113
 tests/nwlistop/test_vretiradauh.py,sha256=tF59BcX4SY-Jn1rULJJB8ZbpR8D3SRSBo10CI4w62QE,1236
 tests/nwlistop/test_vturuh.py,sha256=wvQ9zq9nuHdt0CPNt3SkPKMGq5WHQs7nZUnRaY33ONQ,1190
-inewave-1.8.0.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.8.0.dist-info/METADATA,sha256=i7-6QNp523Gfdhp83usULWtAht9zpGxSsESq4TfbQ7o,1958
-inewave-1.8.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-inewave-1.8.0.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
-inewave-1.8.0.dist-info/RECORD,,
+inewave-1.8.1.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.8.1.dist-info/METADATA,sha256=Qdu6eyoA6otwLKooLJifKHQB_7GcngTLOGb0InuHsfA,1958
+inewave-1.8.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+inewave-1.8.1.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
+inewave-1.8.1.dist-info/RECORD,,

tests/nwlistop/test_pivarm.py

@@ -4,12 +4,13 @@ from datetime import datetime
 from tests.mocks.mock_open import mock_open
 from unittest.mock import MagicMock, patch
 
-from tests.mocks.arquivos.pivarm import MockPivarm
+from tests.mocks.arquivos.pivarm import MockPivarm, MockPivarm_v29_2
 
 ARQ_TESTE = "./tests/mocks/arquivos/__init__.py"
 
 
 def test_atributos_encontrados_pivarm():
+    Pivarm.set_version("28.12")
     m: MagicMock = mock_open(read_data="".join(MockPivarm))
     with patch("builtins.open", m):
         n = Pivarm.read(ARQ_TESTE)
@@ -21,6 +22,19 @@ def test_atributos_encontrados_pivarm():
         assert n.valores.iloc[-1, -1] == 11.57
 
 
+def test_atributos_encontrados_pivarm_v29_2():
+    Pivarm.set_version("29.2")
+    m: MagicMock = mock_open(read_data="".join(MockPivarm_v29_2))
+    with patch("builtins.open", m):
+        n = Pivarm.read(ARQ_TESTE)
+        assert n.usina is not None
+        assert n.usina == "CAMARGOS"
+        assert n.valores is not None
+        assert n.valores.iloc[0, 0] == datetime(2021, 1, 1)
+        assert n.valores.iloc[3, -1] == -312253.4
+        assert n.valores.iloc[-1, -1] == -418673.9
+
+
 def test_atributos_nao_encontrados_pivarm():
     m: MagicMock = mock_open(read_data="")
     with patch("builtins.open", m):

tests/nwlistop/test_pivarmincr.py

@@ -4,12 +4,16 @@ from datetime import datetime
 from tests.mocks.mock_open import mock_open
 from unittest.mock import MagicMock, patch
 
-from tests.mocks.arquivos.pivarmincr import MockPivarmincr
+from tests.mocks.arquivos.pivarmincr import (
+    MockPivarmincr,
+    MockPivarmincr_v29_2,
+)
 
 ARQ_TESTE = "./tests/mocks/arquivos/__init__.py"
 
 
 def test_atributos_encontrados_pivarmincr():
+    Pivarmincr.set_version("28.12")
     m: MagicMock = mock_open(read_data="".join(MockPivarmincr))
     with patch("builtins.open", m):
         n = Pivarmincr.read(ARQ_TESTE)
@@ -21,6 +25,19 @@ def test_atributos_encontrados_pivarmincr():
         assert n.valores.iloc[-1, -1] == 0.89
 
 
+def test_atributos_encontrados_pivarmincr_v29_2():
+    Pivarmincr.set_version("29.2")
+    m: MagicMock = mock_open(read_data="".join(MockPivarmincr_v29_2))
+    with patch("builtins.open", m):
+        n = Pivarmincr.read(ARQ_TESTE)
+        assert n.usina is not None
+        assert n.usina == "FURNAS"
+        assert n.valores is not None
+        assert n.valores.iloc[0, 0] == datetime(2021, 1, 1)
+        assert n.valores.iloc[3, -1] == -312253.4
+        assert n.valores.iloc[-1, -1] == -418673.9
+
+
 def test_atributos_nao_encontrados_pivarmincr():
     m: MagicMock = mock_open(read_data="")
     with patch("builtins.open", m):