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

inewave/newave/modelos/dger.py

@@ -1173,7 +1173,7 @@ class BlocoTipoSimFinal(Section):
             [
                 LiteralField(24, 0),
                 IntegerField(1, 24),
-                IntegerField(4, 26),
+                IntegerField(1, 28),
                 LiteralField(76, 31),
             ]
         )

inewave/newave/modelos/modif.py

@@ -39,6 +39,7 @@ class ModifRegister(Register):
             self.__data = [None] * len(self.__class__.LINE.fields)
         else:
             self.__data = data
+        super().__init__(previous, next, data)
 
     def read(self, file: IO, storage: str = "", *args, **kwargs) -> bool:
         delimited_fields = [deepcopy(f) for f in self.__class__.LINE.fields]

{inewave-1.5.4.dist-info → inewave-1.5.6.dist-info}/METADATA

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

{inewave-1.5.4.dist-info → inewave-1.5.6.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=B54mRO8_-sByHXiUevblw2KgadGzWmVYGsogkcGgZOs,235
+inewave/__init__.py,sha256=fdz2PmfzLBVxFei9Z-PQlZtEU5M1MXjBHPAEEYmddYw,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
@@ -103,7 +103,7 @@ inewave/newave/modelos/cortes.py,sha256=1O7y0WPp8Xy1CL7HH7jnHiQMSeD4SQFPIccie29d
 inewave/newave/modelos/cortesh.py,sha256=HJjJL99ymuoFdA05zp4i7mycCRxsZFoZv24fNk_jP1c,30466
 inewave/newave/modelos/curva.py,sha256=5NKDDbdHBRuRTihl9-uN3pkan7DJurcWFBPSMI3o1dg,13812
 inewave/newave/modelos/cvar.py,sha256=dnZXTTPNKCPJ7R2eMgJOdevO6yDtSg-eY_YgEyepr7c,7547
-inewave/newave/modelos/dger.py,sha256=-uciaY_hPG_zUfy6yeNPP4q5R-jD0whQqKLEjXNCPJY,140730
+inewave/newave/modelos/dger.py,sha256=sonHnQsj211adbmfQBkZwRTY2ZCvpHwXzeokCiaqSh4,140730
 inewave/newave/modelos/dsvagua.py,sha256=t75s_cj3TuK09SZC4i1aLmNIDoMWJ8VXzKfbF3SqTSE,5560
 inewave/newave/modelos/eafpast.py,sha256=hvK1-l77_Ti-pjAa-seFsUK1AjjwXFVEJJ3z1N_qx3g,3323
 inewave/newave/modelos/eco_fpha.py,sha256=q-b-ShvAW-RDpr7xlmhBvM9ixWF9DxqFvhxApA7oGdo,1646
@@ -125,7 +125,7 @@ inewave/newave/modelos/gtminpat.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 inewave/newave/modelos/hidr.py,sha256=-HMrsPjy6XhLQAU3sV8Tj5GrqHzGX0NZZ5Auc-pqUQE,15742
 inewave/newave/modelos/itaipu.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/manutt.py,sha256=kOX1XGcIkOW0WCPg7bq7fSDbAACBZ7h5LbzTydgPdoM,3732
-inewave/newave/modelos/modif.py,sha256=yiM8FgR1V1m5eF-432KOto9kDPVLoyg5HD5SgyarIk4,16644
+inewave/newave/modelos/modif.py,sha256=mF3NT0CJMPhANXb_VvUqKgjdDcMW8Wqa23UD2t9UAbo,16691
 inewave/newave/modelos/newavetim.py,sha256=XxIwI47Tg39geiDworvs1Bqc7x_oUrrbwUEqXu3ShwM,2060
 inewave/newave/modelos/nwv_avl_evap.py,sha256=0hsOjpxND9z2KpvaxZEfGF5AS_IJ3K_ROdwKg18zPgo,1208
 inewave/newave/modelos/nwv_cortes_evap.py,sha256=YaWA3kz309p5JYOmowQzRF2Z8eKY14QvvQQxEaKHcY4,1272
@@ -651,7 +651,7 @@ tests/newave/test_forwarh.py,sha256=Mfb0YR7plQVkYipjYD-Fi2flnOc-d7Q4D7aqXDthvao,
 tests/newave/test_ghmin.py,sha256=hy5muLAbW7SgB3ZV6uj0w4jkzc5FUlYvCX2gPYiQhC8,2360
 tests/newave/test_hidr.py,sha256=P_DdI7B4SrNRDpjnVxugX7ipwV8DYCX7jDgC2waPDLk,1628
 tests/newave/test_manutt.py,sha256=vZ-YKzLatzKSd09HXb6DUPge5pOjZIYssBrwofsDYYA,2249
-tests/newave/test_modif.py,sha256=J67q4p7FqycuB6fFJuS3MKmoKmxcLHqFUmeprYbYw0A,6897
+tests/newave/test_modif.py,sha256=yWpCQAtbIKB-fjUF6BfwzFn7nn5pgLmlxcJq7-spx9w,8825
 tests/newave/test_newavetim.py,sha256=_qZbSRyTKoHYeTp7i3V3kprcjMtc9-yKbBxXHyNMuoc,1731
 tests/newave/test_nwv_avl_evap.py,sha256=MuSXR65rZFSOkuSUF3XrErnDJgUboEjGMXWHPOVKiTk,1532
 tests/newave/test_nwv_cortes_evap.py,sha256=D2hkXzdE__s4zmlN1G6OIWIA-AvRqOwtI4Vp0FKZ2-8,1660
@@ -804,8 +804,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.5.4.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.5.4.dist-info/METADATA,sha256=i8A1Klu4orf2xELIVc9Jx8EgY2AVOMhA3Q4uCzgBzgw,1958
-inewave-1.5.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-inewave-1.5.4.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
-inewave-1.5.4.dist-info/RECORD,,
+inewave-1.5.6.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.5.6.dist-info/METADATA,sha256=cnQGCz7evD6Z3ZuRABgfwUov2YoYe3s-p-xXMrq-smA,1958
+inewave-1.5.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+inewave-1.5.6.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
+inewave-1.5.6.dist-info/RECORD,,

tests/newave/test_modif.py

@@ -54,7 +54,11 @@ def test_registro_usina_modif():
 
     assert r.data == [1, "CAMARGOS"]
     assert r.codigo == 1
+    r.codigo = 2
+    assert r.codigo == 2
     assert r.nome == "CAMARGOS"
+    r.nome = "C1"
+    assert r.nome == "C1"
 
 
 def test_registro_vazmin_modif():
@@ -66,6 +70,8 @@ def test_registro_vazmin_modif():
 
     assert r.data == [34]
     assert r.vazao == 34
+    r.vazao = 50
+    assert r.vazao == 50
 
 
 def test_registro_vmaxt_modif():
@@ -77,8 +83,14 @@ def test_registro_vmaxt_modif():
 
     assert r.data == [12, 2021, 61.310, "'%'"]
     assert r.data_inicio == datetime(2021, 12, 1)
+    r.data_inicio = datetime(2022, 12, 1)
+    assert r.data_inicio == datetime(2022, 12, 1)
     assert r.volume == 61.310
+    r.volume = 50.0
+    assert r.volume == 50.0
     assert r.unidade == "'%'"
+    r.unidade = "'h'"
+    assert r.unidade == "'h'"
 
 
 def test_registro_vazmint_modif():
@@ -90,7 +102,11 @@ def test_registro_vazmint_modif():
 
     assert r.data == [10, 2021, 10.00]
     assert r.data_inicio == datetime(2021, 10, 1)
+    r.data_inicio = datetime(2022, 10, 1)
+    assert r.data_inicio == datetime(2022, 10, 1)
     assert r.vazao == 10.00
+    r.vazao = 5.0
+    assert r.vazao == 5.0
 
 
 def test_registro_volmin_modif():
@@ -102,6 +118,11 @@ def test_registro_volmin_modif():
 
     assert r.data == [15563.63, "'h'"]
     assert r.volume == 15563.63
+    r.volume = 15
+    assert r.volume == 15
+    assert r.unidade == "'h'"
+    r.unidade = "'%'"
+    assert r.unidade == "'%'"
 
 
 def test_registro_volmax_modif():
@@ -113,7 +134,11 @@ def test_registro_volmax_modif():
 
     assert r.data == [55.0, "'%'"]
     assert r.volume == 55.0
+    r.volume = 1000
+    assert r.volume == 1000
     assert r.unidade == "'%'"
+    r.unidade = "'h'"
+    assert r.unidade == "'h'"
 
 
 def test_registro_numcnj_modif():
@@ -125,6 +150,8 @@ def test_registro_numcnj_modif():
 
     assert r.data == [2]
     assert r.numero == 2
+    r.numero = 1
+    assert r.numero == 1
 
 
 def test_registro_nummaq_modif():
@@ -136,7 +163,11 @@ def test_registro_nummaq_modif():
 
     assert r.data == [2, 5]
     assert r.conjunto == 2
+    r.conjunto = 1
+    assert r.conjunto == 1
     assert r.numero_maquinas == 5
+    r.numero_maquinas = 10
+    assert r.numero_maquinas == 10
 
 
 def test_registro_vmint_modif():
@@ -148,8 +179,14 @@ def test_registro_vmint_modif():
 
     assert r.data == [10, 2021, 20.0, "'%'"]
     assert r.data_inicio == datetime(2021, 10, 1)
+    r.data_inicio = datetime(2022, 10, 1)
+    assert r.data_inicio == datetime(2022, 10, 1)
     assert r.volume == 20.0
+    r.volume = 10.0
+    assert r.volume == 10.0
     assert r.unidade == "'%'"
+    r.unidade = "'h'"
+    assert r.unidade == "'h'"
 
 
 def test_registro_vminp_modif():
@@ -161,8 +198,14 @@ def test_registro_vminp_modif():
 
     assert r.data == [10, 2021, 20.0, "'%'"]
     assert r.data_inicio == datetime(2021, 10, 1)
+    r.data_inicio = datetime(2022, 10, 1)
+    assert r.data_inicio == datetime(2022, 10, 1)
     assert r.volume == 20.0
+    r.volume = 10.0
+    assert r.volume == 10.0
     assert r.unidade == "'%'"
+    r.unidade = "'h'"
+    assert r.unidade == "'h'"
 
 
 def test_registro_cfuga_modif():
@@ -174,7 +217,11 @@ def test_registro_cfuga_modif():
 
     assert r.data == [10, 2021, 5.60]
     assert r.data_inicio == datetime(2021, 10, 1)
+    r.data_inicio = datetime(2022, 10, 1)
+    assert r.data_inicio == datetime(2022, 10, 1)
     assert r.nivel == 5.60
+    r.nivel = 10.0
+    assert r.nivel == 10.0
 
 
 def test_registro_cmont_modif():
@@ -186,7 +233,11 @@ def test_registro_cmont_modif():
 
     assert r.data == [10, 2021, 71.30]
     assert r.data_inicio == datetime(2021, 10, 1)
+    r.data_inicio = datetime(2022, 10, 1)
+    assert r.data_inicio == datetime(2022, 10, 1)
     assert r.nivel == 71.30
+    r.nivel = 10.0
+    assert r.nivel == 10.0
 
 
 def test_registro_vazmaxt_modif():
@@ -198,7 +249,11 @@ def test_registro_vazmaxt_modif():
 
     assert r.data == [1, 2020, 0.00]
     assert r.data_inicio == datetime(2020, 1, 1)
+    r.data_inicio = datetime(2022, 10, 1)
+    assert r.data_inicio == datetime(2022, 10, 1)
     assert r.vazao == 0.0
+    r.vazao = 5.0
+    assert r.vazao == 5.0
 
 
 def test_registro_turbmaxt_modif():
@@ -210,7 +265,11 @@ def test_registro_turbmaxt_modif():
 
     assert r.data == [1, 2020, 0.00]
     assert r.data_inicio == datetime(2020, 1, 1)
+    r.data_inicio = datetime(2022, 10, 1)
+    assert r.data_inicio == datetime(2022, 10, 1)
     assert r.turbinamento == 0.0
+    r.turbinamento = 5.0
+    assert r.turbinamento == 5.0
 
 
 def test_registro_turbmint_modif():
@@ -222,7 +281,11 @@ def test_registro_turbmint_modif():
 
     assert r.data == [1, 2020, 0.00]
     assert r.data_inicio == datetime(2020, 1, 1)
+    r.data_inicio = datetime(2022, 10, 1)
+    assert r.data_inicio == datetime(2022, 10, 1)
     assert r.turbinamento == 0.0
+    r.turbinamento = 5.0
+    assert r.turbinamento == 5.0
 
 
 def test_atributos_encontrados_modif():