inewave 1.8.0__tar.gz → 1.8.1__tar.gz

{inewave-1.8.0/inewave.egg-info → inewave-1.8.1}/PKG-INFO

@@ -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 → inewave-1.8.1}/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-1.8.0 → inewave-1.8.1}/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-1.8.0 → inewave-1.8.1}/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-1.8.0 → inewave-1.8.1}/inewave/newave/modelos/forwarh.py

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

{inewave-1.8.0 → inewave-1.8.1}/inewave/newave/modelos/hidr.py

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

{inewave-1.8.0 → inewave-1.8.1}/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-1.8.0 → inewave-1.8.1}/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-1.8.0 → inewave-1.8.1}/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-1.8.0 → inewave-1.8.1}/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 → inewave-1.8.1/inewave.egg-info}/PKG-INFO

@@ -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 → inewave-1.8.1}/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):

{inewave-1.8.0 → inewave-1.8.1}/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):