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

inewave/newave/modelos/dsvagua.py

@@ -28,7 +28,7 @@ class BlocoDsvUHE(Section):
         super().__init__(previous, next, data)
         campos_iniciais: List[Field] = [IntegerField(4, 0), IntegerField(3, 6)]
         campos_desvios: List[Field] = [
-            FloatField(6, 10 + 7 * i, 2) for i in range(len(MESES_DF))
+            FloatField(7, 9 + 7 * i, 2) for i in range(len(MESES_DF))
         ]
         campos_finais: List[Field] = [
             IntegerField(4, 94),

inewave/nwlistop/cmarg.py

@@ -1,8 +1,8 @@
-from inewave.nwlistop.modelos.blocos.submercado import Submercado
-from inewave.nwlistop.modelos.cmarg import CmargsAnos
 from inewave.nwlistop.modelos.arquivos.arquivosubmercadopatamar import (
     ArquivoSubmercadoPatamar,
 )
+from inewave.nwlistop.modelos.blocos.submercado import Submercado
+from inewave.nwlistop.modelos.cmarg import CmargsAnos, CmargsAnos27
 
 
 class Cmarg(ArquivoSubmercadoPatamar):
@@ -20,3 +20,11 @@ class Cmarg(ArquivoSubmercadoPatamar):
         Submercado,
         CmargsAnos,
     ]
+
+    VERSIONS = {
+        "27": [
+            Submercado,
+            CmargsAnos27,
+        ],
+        "29.4.1": [Submercado, CmargsAnos],
+    }

inewave/nwlistop/cmargmed.py

@@ -1,8 +1,8 @@
-from inewave.nwlistop.modelos.blocos.submercado import Submercado
 from inewave.nwlistop.modelos.arquivos.arquivosubmercado import (
     ArquivoSubmercado,
 )
-from inewave.nwlistop.modelos.cmargmed import CmargsAnos
+from inewave.nwlistop.modelos.blocos.submercado import Submercado
+from inewave.nwlistop.modelos.cmargmed import CmargsAnos, CmargsAnos28
 
 
 class Cmargmed(ArquivoSubmercado):
@@ -20,3 +20,11 @@ class Cmargmed(ArquivoSubmercado):
         Submercado,
         CmargsAnos,
     ]
+
+    VERSIONS = {
+        "28": [
+            Submercado,
+            CmargsAnos28,
+        ],
+        "29.4.1": [Submercado, CmargsAnos],
+    }

inewave/nwlistop/modelos/cmarg.py

@@ -1,14 +1,14 @@
-from inewave.config import MESES_DF
-
-from cfinterface.components.line import Line
-from cfinterface.components.integerfield import IntegerField
 from cfinterface.components.floatfield import FloatField
+from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.line import Line
+
+from inewave.config import MESES_DF
 from inewave.nwlistop.modelos.blocos.valoresseriepatamar import (
     ValoresSeriePatamar,
 )
 
 
-class CmargsAnos(ValoresSeriePatamar):
+class CmargsAnos27(ValoresSeriePatamar):
     """
     Bloco com a informaçao do submercado associado aos valores de Custo
     Marginal de Operação.
@@ -24,3 +24,21 @@ class CmargsAnos(ValoresSeriePatamar):
         ]
         + [FloatField(8, 15 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
     )
+
+
+class CmargsAnos(ValoresSeriePatamar):
+    """
+    Bloco com a informaçao do submercado associado aos valores de Custo
+    Marginal de Operação.
+    """
+
+    __slots__ = []
+
+    HEADER_LINE = Line([IntegerField(4, 10)])
+    DATA_LINE = Line(
+        [  # type: ignore
+            IntegerField(4, 2),
+            IntegerField(2, 9),
+        ]
+        + [FloatField(11, 14 + 11 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
+    )

inewave/nwlistop/modelos/cmargmed.py

@@ -1,12 +1,12 @@
-from inewave.config import MESES_DF
-
-from cfinterface.components.line import Line
-from cfinterface.components.integerfield import IntegerField
 from cfinterface.components.floatfield import FloatField
+from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.line import Line
+
+from inewave.config import MESES_DF
 from inewave.nwlistop.modelos.blocos.valoresserie import ValoresSerie
 
 
-class CmargsAnos(ValoresSerie):
+class CmargsAnos28(ValoresSerie):
     """
     Bloco com a informaçao do submercado associado aos valores de Custo
     Marginal de Operação.
@@ -21,3 +21,20 @@ class CmargsAnos(ValoresSerie):
         ]
         + [FloatField(8, 9 + 10 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
     )
+
+
+class CmargsAnos(ValoresSerie):
+    """
+    Bloco com a informaçao do submercado associado aos valores de Custo
+    Marginal de Operação.
+    """
+
+    __slots__ = []
+
+    HEADER_LINE = Line([IntegerField(4, 10)])
+    DATA_LINE = Line(
+        [  # type: ignore
+            IntegerField(4, 2),
+        ]
+        + [FloatField(11, 9 + 11 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
+    )

{inewave-1.9.0.dist-info → inewave-1.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: inewave
-Version: 1.9.0
+Version: 1.9.2
 Summary: Interface para arquivos do NEWAVE
 Home-page: https://github.com/rjmalves/inewave
 Author: Rogerio Alves
@@ -12,9 +12,9 @@ Classifier: Development Status :: 3 - Alpha
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Requires-Dist: cfinterface>=1.7.0
 Requires-Dist: numpy
 Requires-Dist: pandas
-Requires-Dist: cfinterface >=1.6.0
 
 # inewave
 

{inewave-1.9.0.dist-info → inewave-1.9.2.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=ZTZmGVgzja9HLLu_bFTGLJ1k8PYyDxPdIG-XLILzlqU,235
+inewave/__init__.py,sha256=PmNnq_QDq5F_juDDg66gUfP3Nz1_8cHr-xCpA6QCbLI,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
@@ -111,7 +111,7 @@ inewave/newave/modelos/cortesh.py,sha256=ayA-zWiBQ3o77J_wqehgODhl9wjeold84bYsKmK
 inewave/newave/modelos/curva.py,sha256=m_f4LWgMjw9F5259-FhtphTb8-2toOQ7ouuqqasMDr4,13857
 inewave/newave/modelos/cvar.py,sha256=5otv4CiOcVXb1rxpzBKD5MIP5RJMlZWtky8_xxrYTmY,7592
 inewave/newave/modelos/dger.py,sha256=5ClnO3yF4DjQxsQgtWdUwD45-DtGecfFV_UN9dK73qM,143761
-inewave/newave/modelos/dsvagua.py,sha256=C2C_rIbBrCg_rxvv2SpZIdilRmuaWeQQHJUoYsUY9TE,5609
+inewave/newave/modelos/dsvagua.py,sha256=YOTaDq-0kvHlAQgXiCti41TdV0AXtZetD5PeRiraVhs,5608
 inewave/newave/modelos/eafpast.py,sha256=0P0UMPrVp4Xky6U8x4p9DN7X2umCucNfHl3VOC0aW_Q,3368
 inewave/newave/modelos/eco_fpha.py,sha256=q-b-ShvAW-RDpr7xlmhBvM9ixWF9DxqFvhxApA7oGdo,1646
 inewave/newave/modelos/elnino.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -186,8 +186,8 @@ inewave/nwlistop/cbombsin.py,sha256=oqyWFkLKD4bnbqOoEpscU2IKZ1HsNbxvQmb0lBbmwek,
 inewave/nwlistop/cdef.py,sha256=2yrH-VxU4qj-xLhCZcxSB0eijH-wIsD4HewSDWjfrEE,464
 inewave/nwlistop/cdefsin.py,sha256=1NHcK1mcdtMKzw5hzcRfOOrgzL9EFlggZ0nB0EJlRwE,436
 inewave/nwlistop/celetricas.py,sha256=C-a7ROKnnpPD8XxAyEjUsrFbWySxvt4kAdLillQGg9w,792
-inewave/nwlistop/cmarg.py,sha256=dQIlEpy-kRiWFZbZjF9aCJRHZ2iy0k4aIUkg98K33IQ,627
-inewave/nwlistop/cmargmed.py,sha256=wO7wtwbph8wIQknjME7-ZNkWXO5f9nZZXIMf_uB9Dn8,603
+inewave/nwlistop/cmarg.py,sha256=uC-4_F3C7Ky5-7J5Uy7_dWJtvzH0m9kUaTTc5luxJ-Y,786
+inewave/nwlistop/cmargmed.py,sha256=-sy4-BCtnteS8gg33pYPzmtihCepBZ02fVkhxRLc3s4,762
 inewave/nwlistop/coper.py,sha256=g6O8Axyj-Vv75oOfsQ8Qcmj4B6alqs1kBFRbkln8XgU,440
 inewave/nwlistop/corteolm.py,sha256=EK0_5cUBhMJdAwTDmjzMSrl4_Cn-0MuvX1ps9IGoP_w,598
 inewave/nwlistop/cterm.py,sha256=qcF7_olSJVlvPr7hws6g0AsrCYFuxt9UlLz2YwfvJms,604
@@ -358,8 +358,8 @@ inewave/nwlistop/modelos/cbombsin.py,sha256=SdYDSQMRbgrRec79OPOxOB8gEDVVrKnxZw9B
 inewave/nwlistop/modelos/cdef.py,sha256=YsLhq4GY-Y2JAHk45yZ57FxrasM8iN1bpGNI22WnMo8,635
 inewave/nwlistop/modelos/cdefsin.py,sha256=YsLhq4GY-Y2JAHk45yZ57FxrasM8iN1bpGNI22WnMo8,635
 inewave/nwlistop/modelos/celetricas.py,sha256=0f9pYAaE96ceedKNT0-IcPKaMUsyoJyUpgnba5oxzCc,831
-inewave/nwlistop/modelos/cmarg.py,sha256=Q7rpL1ejlekRPG_mE7m0WqpsxBIuTCzR7c6T-mPEOuI,733
-inewave/nwlistop/modelos/cmargmed.py,sha256=gGLyLwg5RZCV3ddXprA3yxtY4n2L8nxPxAz2XcazHkQ,671
+inewave/nwlistop/modelos/cmarg.py,sha256=Z6YJIp2PgG-iInFaSFvCTTwpmbj95xLuE-8RB7YHv_o,1177
+inewave/nwlistop/modelos/cmargmed.py,sha256=UvUktfI4h49VReHnfZJliQFQ8WXA74woL_4eaN96T5w,1075
 inewave/nwlistop/modelos/coper.py,sha256=XCi45_Yh9baxfDi93hZBEIzLRDmfEL3M6GoNQ77W-Kc,638
 inewave/nwlistop/modelos/corteolm.py,sha256=nXbkfgIyQc8pWndzkBV8LaJpLjyp_O6Ck5OrdDdyvx8,806
 inewave/nwlistop/modelos/cterm.py,sha256=e0fHuWCJEBUFlZcOw9kcUT92DSjsZLxUsF_TgGBIXe8,679
@@ -573,8 +573,8 @@ tests/mocks/arquivos/cdef.py,sha256=DJ9AsF5Idb7esf2ZRA4DBqu4OFp8uJAL531nkBJTqsA,
 tests/mocks/arquivos/cdefsin.py,sha256=ZhQ06zGjp2amWus4Z1-9baIxJUO2Z0uzR77olVOocfg,1392
 tests/mocks/arquivos/celetricas.py,sha256=_2o9G2LHwGBONUhu3Y6q0Bg2y2m90pIRmElnD5UHnjI,24312
 tests/mocks/arquivos/clast.py,sha256=jqnWTiVquakLhE83FW5Xyu7Mseyjb-cc1BVHKjYcq1E,30063
-tests/mocks/arquivos/cmarg.py,sha256=K5-Vj2fWeL5GZjJjEY1HijvBM_2VFoXqzYzs-XWd1t0,847210
-tests/mocks/arquivos/cmargmed.py,sha256=tpKa5ViZU5UNUZyS27P5dhyvE4k-L7j_nhD7N2sI9y4,295249
+tests/mocks/arquivos/cmarg.py,sha256=fs7BYgk3BYiBBXflXm-643U7m14l2sxNnxh3AUmpdGE,1850522
+tests/mocks/arquivos/cmargmed.py,sha256=zgouSh5Qw264Fzq-oTNlna0GJtDvpg1oYP82o3QoYck,620538
 tests/mocks/arquivos/confhd.py,sha256=E3RcqlxYcrdLR8RnWtYUzh3cM4r-xeZFOQodccRyTkQ,13487
 tests/mocks/arquivos/conft.py,sha256=yXylpE_T2-xRt9J-QDt1R8DLZxF7ivqJk6JyN_2QLn0,6262
 tests/mocks/arquivos/coper.py,sha256=_sJe31KZQdsZXfKzVw-Ki66011a_O6D_p2QsQ8lV8AI,295245
@@ -812,8 +812,8 @@ tests/nwlistop/test_cbombsin.py,sha256=klsY2dnFUFOkW36pYOsbkJk2eFYiInIja0_uXdsSc
 tests/nwlistop/test_cdef.py,sha256=HEXPCHoadNTwtBzBabvHSmf2B-FkTjcIX1HwZxXcRG8,1178
 tests/nwlistop/test_cdefsin.py,sha256=d2chPzKxRzaopuahaoOMoBMflUCYbnroiJDstGypgZQ,1100
 tests/nwlistop/test_celetricas.py,sha256=1JHaNnzguRufUWsRTz5qLMqmFlQ0FIPKDPIlMx2FNiA,1139
-tests/nwlistop/test_cmarg.py,sha256=cjWg88Z3S1NODYzp4__OHn8N7U8I78p0-eJ-gzqKNN8,1193
-tests/nwlistop/test_cmargmed.py,sha256=xNIaI9NhfaU5aFm1Si08Y0WEm-ITfim8pN9A5VlLsKI,1231
+tests/nwlistop/test_cmarg.py,sha256=Y_wezn5-VWHCSJxTw5z2KsdjzfvQR-dW3G-jP7o707s,1673
+tests/nwlistop/test_cmargmed.py,sha256=ZCmdib0TWnfJFQwZg5IrtrqGnKzcOLHPQN8VJr7d1b4,1729
 tests/nwlistop/test_coper.py,sha256=z2EehjXp0T-_tq2bHOpSHggo7oPWDms6aG1CuXP46CE,1077
 tests/nwlistop/test_corteolm.py,sha256=TZ7tkZah1pejZBkgRNk9td30AHZNaK3iyXzSmMTPzXo,1230
 tests/nwlistop/test_cterm.py,sha256=8TTmmctXt0L0RjbHVjmGzcGIdNgGjbsBNxcFBotdseg,1194
@@ -972,8 +972,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.9.0.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.9.0.dist-info/METADATA,sha256=BEJeHX0UUCBDbzZk3u1uVomNh7lMIxnfJoUNuA6QuDs,1958
-inewave-1.9.0.dist-info/WHEEL,sha256=pd56usn78UTvq1xeX_ZwFhoK6jE5u5wzu4TTBIG5cQ0,91
-inewave-1.9.0.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
-inewave-1.9.0.dist-info/RECORD,,
+inewave-1.9.2.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.9.2.dist-info/METADATA,sha256=yZxilDi2mZWCBEFFeaPTWE8rS9HHvAK0r3zGf3uChYg,1957
+inewave-1.9.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+inewave-1.9.2.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
+inewave-1.9.2.dist-info/RECORD,,

{inewave-1.9.0.dist-info → inewave-1.9.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any