inewave 1.7.3__py3-none-any.whl → 1.7.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.7.3"
+__version__ = "1.7.4"
 
 from . import newave  # noqa
 from . import nwlistcf  # noqa

inewave/newave/modelos/energias.py

@@ -12,6 +12,8 @@ class SecaoDadosEnergias(Section):
     no arquivo energias.dat.
     """
 
+    TAMANHO_REGISTRO = 4000
+
     def __init__(self, previous=None, next=None, data=None) -> None:
         super().__init__(previous, next, data)
 
@@ -39,19 +41,28 @@ class SecaoDadosEnergias(Section):
         *args,
         **kwargs,
     ):
-        numero_registros = (
-            (numero_estagios + numero_estagios_th)
-            * numero_rees
-            * numero_series
-        )
+        self.numero_series = numero_series
+        self.numero_rees = numero_rees
+        self.numero_estagios = numero_estagios
+        self.numero_estagios_th = numero_estagios_th
+
+        numero_entradas_estagio = numero_series * numero_rees
+        saldo_final_registro = (
+            self.TAMANHO_REGISTRO - numero_entradas_estagio
+        ) % self.TAMANHO_REGISTRO
         self.__linha = Line(
             [
                 FloatField(size=8, starting_position=8 * i)
-                for i in range(numero_registros)
+                for i in range(numero_entradas_estagio)
             ],
             storage="BINARY",
         )
-        dados = self.__linha.read(file.read(self.__linha.size))
+        dados = []
+        for i in range(numero_estagios + numero_estagios_th):
+            dados_estagio = self.__linha.read(file.read(self.__linha.size))
+            dados += dados_estagio
+            if saldo_final_registro > 0:
+                file.read(saldo_final_registro * 8)
         indices_estagios = np.arange(
             1 - numero_estagios_th, numero_estagios + 1
         )
@@ -76,11 +87,29 @@ class SecaoDadosEnergias(Section):
 
     def write(self, file: IO, *args, **kwargs):
         dados = self.data["valor"].to_numpy()
-        linha = Line(
+        numero_entradas_estagio = self.numero_series * self.numero_rees
+        saldo_final_registro = (
+            self.TAMANHO_REGISTRO - numero_entradas_estagio
+        ) % self.TAMANHO_REGISTRO
+        self.__linha = Line(
+            [
+                FloatField(size=8, starting_position=8 * i)
+                for i in range(numero_entradas_estagio)
+            ],
+            storage="BINARY",
+        )
+        self.__linha_saldo = Line(
             [
                 FloatField(size=8, starting_position=8 * i)
-                for i in range(len(dados))
+                for i in range(saldo_final_registro)
             ],
             storage="BINARY",
         )
-        file.write(linha.write(dados))
+        for i in range(self.numero_estagios + self.numero_estagios_th):
+            idx_i = i * numero_entradas_estagio
+            idx_f = idx_i + numero_entradas_estagio
+            file.write(self.__linha.write(dados[idx_i:idx_f]))
+            if saldo_final_registro > 0:
+                file.write(
+                    self.__linha_saldo.write([0.0] * saldo_final_registro)
+                )

inewave/newave/modelos/pmo.py

@@ -416,7 +416,9 @@ class BlocoGeracaoMinimaUsinasTermicasPMO(Block):
             # Confere se acabou
             if len(linha) < 3 or "X--------------------" in linha:
                 tabela = tabela[:i, :]
-                self.data = converte_tabela_em_df()
+                self.data = (
+                    converte_tabela_em_df() if i > 0 else pd.DataFrame()
+                )
                 break
             # Lê mais uma linha
             dados = self.__line.read(linha)
@@ -500,7 +502,9 @@ class BlocoGeracaoMaximaUsinasTermicasPMO(Block):
             # Confere se acabou
             if len(linha) < 3 or "X--------------------" in linha:
                 tabela = tabela[:i, :]
-                self.data = converte_tabela_em_df()
+                self.data = (
+                    converte_tabela_em_df() if i > 0 else pd.DataFrame()
+                )
                 break
             # Lê mais uma linha
             dados = self.__line.read(linha)

{inewave-1.7.3.dist-info → inewave-1.7.4.dist-info}/METADATA

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

{inewave-1.7.3.dist-info → inewave-1.7.4.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=yhruXlT9N-YihZsQtcl4jIk779t58h0ajbrjqBzjoNY,235
+inewave/__init__.py,sha256=FVhIKwB-9f8cEuK9xbkOp6vCNj4FvgF5F9sKWonaN2Q,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
@@ -112,7 +112,7 @@ inewave/newave/modelos/enavazb.py,sha256=mo2nCrsyZSCTBK1UiqJ51SsG0WYU9AHjkuI_RO7
 inewave/newave/modelos/enavazf.py,sha256=DYIOFG24J-sQQ6sx-s7KfWtABRUqMf7oYUHOoBfx8Gw,2709
 inewave/newave/modelos/energiab.py,sha256=Hy8VPg9K-idZKBdn7AuwILFqgItEBlMFUH_T9lnGtR4,2880
 inewave/newave/modelos/energiaf.py,sha256=761lZhVwiDU6Za3tOZLRFfLY0l0AmkophWfpLoyLWfo,2652
-inewave/newave/modelos/energias.py,sha256=JI8d7Zadz1pYgdwBFBcqwTOOWaJ71mh-GYFLoGEuyN4,2612
+inewave/newave/modelos/energias.py,sha256=Se0ByXQ59VVTSrzmw20gmA_SUbxlJaFa1Z8xVzfBw10,3891
 inewave/newave/modelos/engnat.py,sha256=vvZDX10qtzv1IvES4r_hXA_dCwNkQCJxrpaJguKBkEY,2832
 inewave/newave/modelos/ensoaux.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/exph.py,sha256=52JxLuZJY2BeuJguDThWwxYf9-0kJfC_FF2xLec1FIY,5520
@@ -136,7 +136,7 @@ inewave/newave/modelos/parpvaz.py,sha256=npnubBGthrac8uJ2tkkZruvhpuaI6zsLsymoGKY
 inewave/newave/modelos/patamar.py,sha256=P9uxFGqrv8uDuJYa5rCNtM9YfM9dc50lFRYAnRsIf94,21478
 inewave/newave/modelos/penalid.py,sha256=R4yUfP9hn9nUGCiQMBTe8ExvpZr080fbzz0gmwDLhZA,5663
 inewave/newave/modelos/perda.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inewave/newave/modelos/pmo.py,sha256=GCADoT0XJlATPXNO8D7XEBqN8gBlHk_igoLZay7CO1A,55106
+inewave/newave/modelos/pmo.py,sha256=Mz3i5kVhj09qU6w0gSxyB0VPLqQV94EjxseMH2y-N7w,55244
 inewave/newave/modelos/re.py,sha256=ZevREGtx584M0yPH3PC4_DqeH3PQsKM_VQCxbwTJlj0,6574
 inewave/newave/modelos/ree.py,sha256=IqNVcDpl5AomPhWV1306hq26xkR7sL5nSG8Y7EKXmJs,4406
 inewave/newave/modelos/sar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -606,7 +606,7 @@ tests/mocks/arquivos/perdfm.py,sha256=FzaJlwSXyAa6gyRzEVOg3b4h-fltHDmqCyxkdAzmIg
 tests/mocks/arquivos/perdfsin.py,sha256=jMhP-qdW9E0t4N6VOJnpE6KL6HlQN_Dra_meCi68FkE,267139
 tests/mocks/arquivos/pivarm.py,sha256=PGkPHgmJXErjDku5CO_MFCXMPgb-CjqGVDSmeZ-bOzI,425677
 tests/mocks/arquivos/pivarmincr.py,sha256=jdHu1xfI8xU2Eu5WRYaRK_OmNO2AVYQC-2FnZZu1A5M,14847
-tests/mocks/arquivos/pmo.py,sha256=N-Moz6l6-5TgtYucXPEGTXiAH79Qd0Euu5uHA4xOIx0,655644
+tests/mocks/arquivos/pmo.py,sha256=Tq2n1INLsLjYxS8cfOKnGo8LzfG_cMC6_1ZXwYwDfo8,657056
 tests/mocks/arquivos/qafluh.py,sha256=ado-zuW71uEHNLQrPIBu2ssLZ5ZhG9QQMQdyYSkRne8,283145
 tests/mocks/arquivos/qincruh.py,sha256=jRvjlyaGefwZKSA36QxdLUeeHP3Z0kC5omZ1mLk2Dns,283145
 tests/mocks/arquivos/re.py,sha256=AyVV_dNpv-finVzNyB3jk2sH0T23nND0EZWa_ug0o6o,1843
@@ -669,7 +669,7 @@ tests/newave/test_enavazb.py,sha256=Uw0rF4_A3WOLH5sOjX2BatEW84x8FHsF-3zRJ5dvu_0,
 tests/newave/test_enavazf.py,sha256=SEzLVVTL-r43SKNj7tNz7q58DoiZ8BUUB4LWE0X8juE,1895
 tests/newave/test_energiab.py,sha256=-ZYCBpp6dBqb_zR9SWWH79brgDGbR-XgbJCe6bkRsxA,1883
 tests/newave/test_energiaf.py,sha256=TQlvhVdYCxlQvGfNFHZZETNoud5z5fyR2kVoGDaTgWQ,1909
-tests/newave/test_energias.py,sha256=96d6hnohlnMx3rJNgzLsRMqa_DxB6wQ2DliEGQ_rBkk,1885
+tests/newave/test_energias.py,sha256=9tVOeV1R2i3Bh-Ox1x0dvKbxZ-RixQnA13urG4Otg1I,1883
 tests/newave/test_engnat.py,sha256=gZ4BVSI2r3B5lIkOHG1iUzYJ0Afcjsh8gciTjfFkShI,1808
 tests/newave/test_exph.py,sha256=KBXCUaLE9w52x6B9dJbCK5QdKM0TD-Z3o21S9P2Ayts,2500
 tests/newave/test_expt.py,sha256=UEK-qeK1zCXYRudKghdQIy51hgs9rZSrn27r79Xl_F0,2422
@@ -843,8 +843,8 @@ tests/nwlistop/test_vmort.py,sha256=KUqgO1HznEzu7TX5xu8wLhSl_sKSJteNfMd9zVcruls,
 tests/nwlistop/test_vmortm.py,sha256=re8ypER8xgRbgRdgBd1H97G1ebNxtYZn23_nBGyWwhU,1204
 tests/nwlistop/test_vmortsin.py,sha256=LvdpNPPZtnQWIxrLMUx_KIg6k22pOif6SzmRasAjquc,1113
 tests/nwlistop/test_vturuh.py,sha256=wvQ9zq9nuHdt0CPNt3SkPKMGq5WHQs7nZUnRaY33ONQ,1190
-inewave-1.7.3.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.7.3.dist-info/METADATA,sha256=yPawla4WFTbJuBxqC0oPcY_54VjFdwZPNBME37_QFn0,1958
-inewave-1.7.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-inewave-1.7.3.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
-inewave-1.7.3.dist-info/RECORD,,
+inewave-1.7.4.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.7.4.dist-info/METADATA,sha256=IwiwmuiLYZICY0F1h_F7g-73ztv51Lm9h3TyfrLnyZQ,1958
+inewave-1.7.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+inewave-1.7.4.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
+inewave-1.7.4.dist-info/RECORD,,

{inewave-1.7.3.dist-info → inewave-1.7.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/mocks/arquivos/pmo.py

@@ -1067,6 +1067,14 @@ MockBlocoGeracaoMaximaUsinasTermicasPMO = [
     "                        2027     0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00\n",
     " X---------------------------------------------------------------------------------------------------------------------------X\n",
     "\n",
+    "\n",
+    "   GERACAO TERMICA MAXIMA POR USINA (MWmed)\n",
+    " X---------------------------------------------------------------------------------------------------------------------------X\n",
+    "\n",
+    "  NUMERO     NOME       ANO                                               ESTAGIOS\n",
+    "                                  1       2       3       4       5       6       7       8       9      10      11      12\n",
+    " X------X------------X-------X-------X-------X-------X-------X-------X-------X-------X-------X-------X-------X-------X-------X\n",
+    " X---------------------------------------------------------------------------------------------------------------------------X\n",
 ]
 
 MockBlocoGeracaoMinimaUsinasTermicasPMO = [
@@ -1830,6 +1838,14 @@ MockBlocoGeracaoMinimaUsinasTermicasPMO = [
     "                        2027     0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00    0.00\n",
     " X---------------------------------------------------------------------------------------------------------------------------X\n",
     "\n",
+    "   GERACAO TERMICA MINIMA POR USINA (MWmed)\n",
+    " X---------------------------------------------------------------------------------------------------------------------------X\n",
+    "\n",
+    "  NUMERO     NOME       ANO                                               ESTAGIOS\n",
+    "                                  1       2       3       4       5       6       7       8       9      10      11      12\n",
+    " X------X------------X-------X-------X-------X-------X-------X-------X-------X-------X-------X-------X-------X-------X-------X\n",
+    " X---------------------------------------------------------------------------------------------------------------------------X\n",
+    "\n",
 ]
 
 

tests/newave/test_energias.py

@@ -8,10 +8,10 @@ from unittest.mock import MagicMock, patch
 
 ARQ_TESTE = "./tests/mocks/arquivos/energias.dat"
 
-NUM_SERIES = 2
-NUM_REES = 1
-NUM_ESTAGIOS = 16
-NUM_ESTAGIOS_TH = 12
+NUM_SERIES = 3
+NUM_REES = 2
+NUM_ESTAGIOS = 3
+NUM_ESTAGIOS_TH = 3
 NUM_ENTRADAS = NUM_SERIES * NUM_REES * (NUM_ESTAGIOS_TH + NUM_ESTAGIOS)