idecomp 1.7.2__tar.gz → 1.8.0__tar.gz

{idecomp-1.7.2 → idecomp-1.8.0}/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.8.0
+
+- Atualiza processamento do `postos.dat` para suporte a python `>=3.13` e pandas `>=3.0.0`
+
+# v1.7.3
+
+- Atualiza registro AC COTARE do `dadger.rvX` com maior precisão de dígitos significativos
+
 # v1.7.2
 
 - Atualiza registro AC COTARE do `dadger.rvX` para utilizar notação científica com formatador 'D'

{idecomp-1.7.2 → idecomp-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: idecomp
-Version: 1.7.2
+Version: 1.8.0
 Summary: idecomp
 Project-URL: Documentation, https://rjmalves.github.io/idecomp/
 Project-URL: Repository, https://github.com/rjmalves/idecomp/

{idecomp-1.7.2 → idecomp-1.8.0}/docs/source/conf.py

@@ -115,7 +115,7 @@ intersphinx_mapping = {
     ),
     "pandas": ("http://pandas.pydata.org/pandas-docs/stable/", None),
     "numpy": ("https://numpy.org/doc/stable/", None),
-    "cfinterface": ("https://rjmalves.github.io/cfi/", None),
+    "cfinterface": ("https://rjmalves.github.io/cfinterface/", None),
 }
 
 # https://github.com/sphinx-gallery/sphinx-gallery

{idecomp-1.7.2 → idecomp-1.8.0}/docs/source/referencia/decomp/arquivos/dadgnl.rst

@@ -9,7 +9,7 @@ Dados de Térmicas GNL (dadgnl.rvX)
 As informações de entrada das térmicas de despacho antecipado (GNL) do DECOMP, localizadas no arquivo geralmente denominado
 dadgnl.rvX, onde X varia de 0 a 4, são armazenadas na classe:
 
-.. autoclass:: DadGNL
+.. autoclass:: Dadgnl
    :members:
 
 

{idecomp-1.7.2 → idecomp-1.8.0}/docs/source/referencia/decomp/arquivos/decomptim.rst

@@ -9,5 +9,5 @@ Tempos de Execução (decomp.tim)
 As informações de saída do DECOMP, localizadas no arquivo geralmente denominado
 decomp.tim, são armazenadas na classe:
 
-.. autoclass:: DecompTim
+.. autoclass:: Decomptim
    :members:

{idecomp-1.7.2 → idecomp-1.8.0}/docs/source/referencia/decomp/arquivos/oper_disp_usih_subm.rst

@@ -1,4 +1,4 @@
-.. _oper_disp_usih_subm
+.. _oper_disp_usih_subm:
 
 ====================================================================
 Disponibilidade hidráulica por submercado (oper_disp_usih_subm.csv)

{idecomp-1.7.2 → idecomp-1.8.0}/docs/source/referencia/decomp/arquivos/relgnl.rst

@@ -9,5 +9,5 @@ Relatório de Térmicas GNL (relgnl.rvX)
 As informações de saída das térmicas de despacho antecipado (GNL) do DECOMP, localizadas no arquivo geralmente denominado
 relgnl.rvX, onde X varia de 0 a 4, são armazenadas na classe:
 
-.. autoclass:: RelGNL
+.. autoclass:: Relgnl
    :members:

{idecomp-1.7.2 → idecomp-1.8.0}/docs/source/referencia/libs/arquivos/restricoes.rst

@@ -18,38 +18,38 @@ para cada um.
 
 
 
-.. autoclass:: RegistroREHorizPer
+.. autoclass:: RegistroReHorizPer
    :members:
 
-.. autoclass:: RegistroREHorizData
+.. autoclass:: RegistroReHorizData
    :members:
 
-.. autoclass:: RegistroRE
+.. autoclass:: RegistroRe
    :members:
 
-.. autoclass:: RegistroREPerPat
+.. autoclass:: RegistroRePerPat
    :members:
 
-.. autoclass:: RegistroREDataPat
+.. autoclass:: RegistroReDataPat
    :members:
 
-.. autoclass:: RegistroRELimFormPerPat
+.. autoclass:: RegistroReLimFormPerPat
    :members:
 
-.. autoclass:: RegistroRELimFormDataPat
+.. autoclass:: RegistroReLimFormDataPat
    :members:
 
 
-.. autoclass:: RegistroRERegraAtiva
+.. autoclass:: RegistroReRegraAtiva
    :members:
 
-.. autoclass:: RegistroREHabilita
+.. autoclass:: RegistroReHabilita
    :members:
 
-.. autoclass:: RegistroRETratViol
+.. autoclass:: RegistroReTratViol
    :members:
 
-.. autoclass:: RegistroRETratViolPer
+.. autoclass:: RegistroReTratViolPer
    :members:
 
 .. autoclass:: RegistroAliasElet

{idecomp-1.7.2 → idecomp-1.8.0}/idecomp/__init__.py

@@ -6,6 +6,6 @@ idecomp é um módulo em Python para manipulação dos arquivos de entrada
 e saída do DECOMP.
 """
 
-__version__ = "1.7.2"
+__version__ = "1.8.0"
 
 from . import decomp  # noqa

{idecomp-1.7.2 → idecomp-1.8.0}/idecomp/decomp/modelos/dadger.py

@@ -4797,7 +4797,7 @@ class ACCOTARE(Register):
         [
             IntegerField(3, 4),
             IntegerField(5, 19),
-            FloatField(15, 24, 3, 'D'),
+            FloatField(15, 24, 8, 'D'),
             LiteralField(3, 69),
             IntegerField(2, 73),
             IntegerField(4, 76),

{idecomp-1.7.2 → idecomp-1.8.0}/idecomp/decomp/postos.py

@@ -35,7 +35,7 @@ class Postos(RegisterFile):
             return None
         df = pd.DataFrame(
             data={
-                "nome": [r.data[0] for r in registros],
+                "nome": [r.data[0] if r.data[0] is not None else "" for r in registros],
                 "ano_inicio_historico": [r.data[1] for r in registros],
                 "ano_fim_historico": [r.data[2] for r in registros],
             }

{idecomp-1.7.2 → idecomp-1.8.0}/tests/decomp/test_dadger.py

@@ -38,6 +38,7 @@ from idecomp.decomp.modelos.dadger import (
     CS,
     ACJUSMED,
     ACCOTVOL,
+    ACCOTARE,
     ACNUMJUS,
     ACVOLMIN,
     ACCOFEVA,
@@ -121,6 +122,7 @@ from tests.mocks.arquivos.dadger import (
     MockCS,
     MockACJUSMED,
     MockACCOTVOL,
+    MockACCOTARE,
     MockACNUMJUS,
     MockACVOLMIN,
     MockACCOFEVA,
@@ -950,6 +952,40 @@ def test_registro_accotvol_dadger():
     r.ano = 2022
     assert r.ano == 2022
 
+def test_registro_accotare_dadger():
+    m: MagicMock = mock_open(read_data="".join(MockACCOTARE))
+    r = ACCOTARE()
+    with patch("builtins.open", m):
+        with open("", "") as fp:
+            r.read(fp)
+
+    assert r.data == [
+        285,
+        1,
+        3211416.0,
+        "JAN",
+        1,
+        2020,
+    ]
+    assert r.codigo_usina == 285
+    r.codigo_usina = 10
+    assert r.codigo_usina == 10
+    assert r.ordem == 1
+    r.ordem = 2
+    assert r.ordem == 2
+    assert r.coeficiente == 3211416.0
+    r.coeficiente = 3.14
+    assert r.coeficiente == 3.14
+    assert r.mes == "JAN"
+    r.mes = "DEZ"
+    assert r.mes == "DEZ"
+    assert r.semana == 1
+    r.semana = 5
+    assert r.semana == 5
+    assert r.ano == 2020
+    r.ano = 2022
+    assert r.ano == 2022
+
 
 def test_registro_acvolmin_dadger():
     m: MagicMock = mock_open(read_data="".join(MockACVOLMIN))

{idecomp-1.7.2 → idecomp-1.8.0}/tests/decomp/test_dec_estatfpha.py

@@ -51,7 +51,7 @@ def test_neq_blocodesvios():
     with patch("builtins.open", m):
         with open("", "") as fp:
             b2.read(fp)
-    b1.data.iloc[0, 0] = -1
+    b1.data.iloc[0, 0] = "teste"
     assert b1 != b2
 
 

{idecomp-1.7.2 → idecomp-1.8.0}/tests/decomp/test_postos.py

@@ -2,6 +2,7 @@ from idecomp.decomp.modelos.postos import RegistroPostos
 from idecomp.decomp.postos import Postos
 
 from os.path import join
+import pandas as pd  # type: ignore
 from tests.mocks.mock_open import mock_open
 from unittest.mock import MagicMock, patch
 
@@ -61,7 +62,7 @@ def test_leitura_escrita_postos():
     m_releitura: MagicMock = mock_open(read_data=b"".join(linhas_escritas))
     with patch("builtins.open", m_releitura):
         h2 = Postos.read(ARQ_TEST)
-        assert h1 == h2
+        assert h1.postos.equals(h2.postos)
 
 
 def test_leitura_escrita_editando_postos():

{idecomp-1.7.2 → idecomp-1.8.0}/tests/decomp/test_sumario.py

@@ -39,5 +39,5 @@ def test_neq_sumario():
     with patch("builtins.open", m):
         rel1 = Relato.read("./tests/mocks/arquivos/sumario.py")
         rel2 = Relato.read("./tests/mocks/arquivos/sumario.py")
-        rel1.cmo_medio_submercado.iloc[0, 0] = 0
+        rel1.cmo_medio_submercado.iloc[0, 0] = "teste"
         assert rel1 != rel2

{idecomp-1.7.2 → idecomp-1.8.0}/tests/mocks/arquivos/dadger.py

@@ -72,6 +72,8 @@ MockACJUSMED = "AC  285  JUSMED         73.47
 
 MockACCOTVOL = "AC  285  COTVOL        1         90.000                              JAN  1 2020"
 
+MockACCOTARE = "AC  285  COTARE        1   3.211416D+06                              JAN  1 2020"
+
 MockACVOLMIN = "AC   34  VOLMIN         15563       "
 
 MockACCOFEVA = "AC   95  COFEVA       10    0   "
@@ -3391,6 +3393,8 @@ MockDadger = [
     "AC  288  NUMPOS      300                              \n",
     "&Desvio de Belo Monte Complementar para Belo Monte Principal\n",
     "AC  314  DESVIO      288  9999999.                    \n",
+    "AC  001  COTARE        1   0.000000D+00\n"
+    # "AC  001  COTARE        1   3.211416D+06\n"
     "&\n",
     "&------------------------------------------------------------------------------\n",
     "& Adequacao para usinas em que o vertimento possui influencia no canal de fuga\n",