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

inewave/newave/modelos/modif.py

@@ -4,7 +4,6 @@ from cfinterface.components.field import Field
 from cfinterface.components.integerfield import IntegerField
 from cfinterface.components.literalfield import LiteralField
 from cfinterface.components.floatfield import FloatField
-from cfinterface.components.datetimefield import DatetimeField
 from cfinterface.adapters.components.repository import factory
 from copy import deepcopy
 from datetime import datetime
@@ -182,7 +181,7 @@ class VOLMAX(ModifRegister):
         self.data[1] = t
 
 
-class NUMCNJ(Register):
+class NUMCNJ(ModifRegister):
     """
     Registro que contém uma modificação de número de conjunto
     de máquinas.
@@ -190,7 +189,7 @@ class NUMCNJ(Register):
 
     IDENTIFIER = " NUMCNJ"
     IDENTIFIER_DIGITS = 8
-    LINE = Line([IntegerField(3, 10)])
+    LINE = Line([IntegerField(2, 11)])
 
     @property
     def numero(self) -> int:
@@ -207,7 +206,7 @@ class NUMCNJ(Register):
         self.data[0] = t
 
 
-class NUMMAQ(Register):
+class NUMMAQ(ModifRegister):
     """
     Registro que contém uma modificação do número de máquinas em um
     conjunto de máquinas.
@@ -215,7 +214,7 @@ class NUMMAQ(Register):
 
     IDENTIFIER = " NUMMAQ"
     IDENTIFIER_DIGITS = 8
-    LINE = Line([IntegerField(3, 10), IntegerField(3, 14)])
+    LINE = Line([IntegerField(3, 11), IntegerField(3, 14)])
 
     @property
     def conjunto(self) -> Optional[int]:
@@ -246,7 +245,7 @@ class NUMMAQ(Register):
         self.data[1] = t
 
 
-class VAZMIN(Register):
+class VAZMIN(ModifRegister):
     """
     Registro que contém uma modificação de vazão mínima (m3/s).
     """
@@ -270,14 +269,16 @@ class VAZMIN(Register):
         self.data[0] = t
 
 
-class CFUGA(Register):
+class CFUGA(ModifRegister):
     """
     Registro que contém uma modificação do nível do canal de fuga.
     """
 
     IDENTIFIER = " CFUGA"
     IDENTIFIER_DIGITS = 8
-    LINE = Line([DatetimeField(7, 10, format="%m %Y"), FloatField(7, 18, 3)])
+    LINE = Line(
+        [IntegerField(2, 10), IntegerField(4, 13), FloatField(7, 18, 3)]
+    )
 
     @property
     def data_inicio(self) -> datetime:
@@ -287,11 +288,12 @@ class CFUGA(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def nivel(self) -> float:
@@ -301,21 +303,23 @@ class CFUGA(Register):
         :return: O novo nível
         :rtype: Optional[int]
         """
-        return self.data[1]
+        return self.data[2]
 
     @nivel.setter
     def nivel(self, t: float):
-        self.data[1] = t
+        self.data[2] = t
 
 
-class CMONT(Register):
+class CMONT(ModifRegister):
     """
     Registro que contém uma modificação do nível do canal de montante.
     """
 
     IDENTIFIER = " CMONT"
     IDENTIFIER_DIGITS = 8
-    LINE = Line([DatetimeField(7, 10, format="%m %Y"), FloatField(7, 18, 3)])
+    LINE = Line(
+        [IntegerField(2, 10), IntegerField(4, 13), FloatField(7, 18, 3)]
+    )
 
     @property
     def data_inicio(self) -> datetime:
@@ -325,11 +329,12 @@ class CMONT(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def nivel(self) -> Optional[float]:
@@ -339,11 +344,11 @@ class CMONT(Register):
         :return: O novo nível
         :rtype: Optional[float]
         """
-        return self.data[1]
+        return self.data[2]
 
     @nivel.setter
     def nivel(self, t: float):
-        self.data[1] = t
+        self.data[2] = t
 
 
 class VMAXT(Register):
@@ -356,7 +361,8 @@ class VMAXT(Register):
     IDENTIFIER_DIGITS = 8
     LINE = Line(
         [
-            DatetimeField(7, 10, format="%m %Y"),
+            IntegerField(2, 10),
+            IntegerField(4, 13),
             FloatField(7, 18, 3),
             LiteralField(3, 26),
         ]
@@ -370,11 +376,12 @@ class VMAXT(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def volume(self) -> Optional[float]:
@@ -384,11 +391,11 @@ class VMAXT(Register):
         :return: O novo volume
         :rtype: Optional[float]
         """
-        return self.data[1]
+        return self.data[2]
 
     @volume.setter
     def volume(self, t: float):
-        self.data[1] = t
+        self.data[2] = t
 
     @property
     def unidade(self) -> Optional[str]:
@@ -398,11 +405,11 @@ class VMAXT(Register):
         :return: A unidade
         :rtype: Optional[str]
         """
-        return self.data[2]
+        return self.data[3]
 
     @unidade.setter
     def unidade(self, t: str):
-        self.data[2] = t
+        self.data[3] = t
 
 
 class VMINT(Register):
@@ -415,7 +422,8 @@ class VMINT(Register):
     IDENTIFIER_DIGITS = 8
     LINE = Line(
         [
-            DatetimeField(7, 10, format="%m %Y"),
+            IntegerField(2, 10),
+            IntegerField(4, 13),
             FloatField(7, 18, 3),
             LiteralField(3, 26),
         ]
@@ -429,11 +437,12 @@ class VMINT(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def volume(self) -> Optional[float]:
@@ -443,11 +452,11 @@ class VMINT(Register):
         :return: O novo volume
         :rtype: Optional[float]
         """
-        return self.data[1]
+        return self.data[2]
 
     @volume.setter
     def volume(self, t: float):
-        self.data[1] = t
+        self.data[2] = t
 
     @property
     def unidade(self) -> Optional[str]:
@@ -457,11 +466,11 @@ class VMINT(Register):
         :return: A unidade
         :rtype: Optional[str]
         """
-        return self.data[2]
+        return self.data[3]
 
     @unidade.setter
     def unidade(self, t: str):
-        self.data[2] = t
+        self.data[3] = t
 
 
 class VMINP(Register):
@@ -474,7 +483,8 @@ class VMINP(Register):
     IDENTIFIER_DIGITS = 8
     LINE = Line(
         [
-            DatetimeField(7, 10, format="%m %Y"),
+            IntegerField(2, 10),
+            IntegerField(4, 13),
             FloatField(7, 18, 3),
             LiteralField(3, 26),
         ]
@@ -488,11 +498,12 @@ class VMINP(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def volume(self) -> Optional[float]:
@@ -502,11 +513,11 @@ class VMINP(Register):
         :return: O novo volume
         :rtype: Optional[float]
         """
-        return self.data[1]
+        return self.data[2]
 
     @volume.setter
     def volume(self, t: float):
-        self.data[1] = t
+        self.data[2] = t
 
     @property
     def unidade(self) -> Optional[str]:
@@ -516,11 +527,11 @@ class VMINP(Register):
         :return: A unidade
         :rtype: Optional[str]
         """
-        return self.data[2]
+        return self.data[3]
 
     @unidade.setter
     def unidade(self, t: str):
-        self.data[2] = t
+        self.data[3] = t
 
 
 class VAZMINT(Register):
@@ -533,7 +544,8 @@ class VAZMINT(Register):
     IDENTIFIER_DIGITS = 8
     LINE = Line(
         [
-            DatetimeField(7, 10, format="%m %Y"),
+            IntegerField(2, 10),
+            IntegerField(4, 13),
             FloatField(7, 18, 2),
         ]
     )
@@ -546,11 +558,12 @@ class VAZMINT(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def vazao(self) -> Optional[float]:
@@ -560,11 +573,11 @@ class VAZMINT(Register):
         :return: A nova vazão
         :rtype: Optional[float]
         """
-        return self.data[1]
+        return self.data[2]
 
     @vazao.setter
     def vazao(self, t: float):
-        self.data[1] = t
+        self.data[2] = t
 
 
 class VAZMAXT(Register):
@@ -577,7 +590,8 @@ class VAZMAXT(Register):
     IDENTIFIER_DIGITS = 8
     LINE = Line(
         [
-            DatetimeField(7, 10, format="%m %Y"),
+            IntegerField(2, 10),
+            IntegerField(4, 13),
             FloatField(7, 18, 2),
         ]
     )
@@ -590,11 +604,12 @@ class VAZMAXT(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def vazao(self) -> Optional[float]:
@@ -604,11 +619,11 @@ class VAZMAXT(Register):
         :return: A nova vazão
         :rtype: Optional[float]
         """
-        return self.data[1]
+        return self.data[2]
 
     @vazao.setter
     def vazao(self, t: float):
-        self.data[1] = t
+        self.data[2] = t
 
 
 class TURBMAXT(Register):
@@ -621,7 +636,8 @@ class TURBMAXT(Register):
     IDENTIFIER_DIGITS = 9
     LINE = Line(
         [
-            DatetimeField(7, 10, format="%m %Y"),
+            IntegerField(2, 10),
+            IntegerField(4, 13),
             FloatField(7, 18, 2),
         ]
     )
@@ -634,11 +650,12 @@ class TURBMAXT(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def turbinamento(self) -> Optional[float]:
@@ -648,11 +665,11 @@ class TURBMAXT(Register):
         :return: O novo turbinamento
         :rtype: Optional[float]
         """
-        return self.data[1]
+        return self.data[2]
 
     @turbinamento.setter
     def turbinamento(self, t: float):
-        self.data[1] = t
+        self.data[2] = t
 
 
 class TURBMINT(Register):
@@ -665,7 +682,8 @@ class TURBMINT(Register):
     IDENTIFIER_DIGITS = 9
     LINE = Line(
         [
-            DatetimeField(7, 10, format="%m %Y"),
+            IntegerField(2, 10),
+            IntegerField(4, 13),
             FloatField(7, 18, 2),
         ]
     )
@@ -678,11 +696,12 @@ class TURBMINT(Register):
         :return: A data de início da modificação
         :rtype: Optional[datetime]
         """
-        return self.data[0]
+        return datetime(self.data[1], self.data[0], 1)
 
     @data_inicio.setter
     def data_inicio(self, t: datetime):
-        self.data[0] = t
+        self.data[0] = t.month
+        self.data[1] = t.year
 
     @property
     def turbinamento(self) -> Optional[float]:
@@ -692,8 +711,8 @@ class TURBMINT(Register):
         :return: O novo turbinamento
         :rtype: Optional[float]
         """
-        return self.data[1]
+        return self.data[2]
 
     @turbinamento.setter
     def turbinamento(self, t: float):
-        self.data[1] = t
+        self.data[2] = t

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

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

{inewave-1.5.3.dist-info → inewave-1.5.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=C8LILlWfxb9Nl1CXKe6HiZpO1aJHPonrpWKy4f04nsQ,235
+inewave/__init__.py,sha256=B54mRO8_-sByHXiUevblw2KgadGzWmVYGsogkcGgZOs,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
@@ -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=l-VgxwfUYFYgzkSykgFKMvwzgxfC_PfzMR7AWJnHr9A,15967
+inewave/newave/modelos/modif.py,sha256=yiM8FgR1V1m5eF-432KOto9kDPVLoyg5HD5SgyarIk4,16644
 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=d8xis0DznszFM10IGBVc_O4Xjx-1tLT1Rt5ug5fLEgM,7014
+tests/newave/test_modif.py,sha256=J67q4p7FqycuB6fFJuS3MKmoKmxcLHqFUmeprYbYw0A,6897
 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.3.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.5.3.dist-info/METADATA,sha256=kfLNHOb62zX5JeiEb2MR55E6sqIR_RgC6KVAA3J9EqU,1958
-inewave-1.5.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-inewave-1.5.3.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
-inewave-1.5.3.dist-info/RECORD,,
+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,,

tests/newave/test_modif.py

@@ -75,7 +75,7 @@ def test_registro_vmaxt_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2021, 12, 1), 61.310, "'%'"]
+    assert r.data == [12, 2021, 61.310, "'%'"]
     assert r.data_inicio == datetime(2021, 12, 1)
     assert r.volume == 61.310
     assert r.unidade == "'%'"
@@ -88,7 +88,7 @@ def test_registro_vazmint_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2021, 10, 1), 10.00]
+    assert r.data == [10, 2021, 10.00]
     assert r.data_inicio == datetime(2021, 10, 1)
     assert r.vazao == 10.00
 
@@ -146,7 +146,7 @@ def test_registro_vmint_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2021, 10, 1), 20.0, "'%'"]
+    assert r.data == [10, 2021, 20.0, "'%'"]
     assert r.data_inicio == datetime(2021, 10, 1)
     assert r.volume == 20.0
     assert r.unidade == "'%'"
@@ -159,7 +159,7 @@ def test_registro_vminp_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2021, 10, 1), 20.0, "'%'"]
+    assert r.data == [10, 2021, 20.0, "'%'"]
     assert r.data_inicio == datetime(2021, 10, 1)
     assert r.volume == 20.0
     assert r.unidade == "'%'"
@@ -172,7 +172,7 @@ def test_registro_cfuga_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2021, 10, 1), 5.60]
+    assert r.data == [10, 2021, 5.60]
     assert r.data_inicio == datetime(2021, 10, 1)
     assert r.nivel == 5.60
 
@@ -184,7 +184,7 @@ def test_registro_cmont_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2021, 10, 1), 71.30]
+    assert r.data == [10, 2021, 71.30]
     assert r.data_inicio == datetime(2021, 10, 1)
     assert r.nivel == 71.30
 
@@ -196,7 +196,7 @@ def test_registro_vazmaxt_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2020, 1, 1), 0.00]
+    assert r.data == [1, 2020, 0.00]
     assert r.data_inicio == datetime(2020, 1, 1)
     assert r.vazao == 0.0
 
@@ -208,7 +208,7 @@ def test_registro_turbmaxt_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2020, 1, 1), 0.00]
+    assert r.data == [1, 2020, 0.00]
     assert r.data_inicio == datetime(2020, 1, 1)
     assert r.turbinamento == 0.0
 
@@ -220,7 +220,7 @@ def test_registro_turbmint_modif():
         with open("", "") as fp:
             r.read(fp)
 
-    assert r.data == [datetime(2020, 1, 1), 0.00]
+    assert r.data == [1, 2020, 0.00]
     assert r.data_inicio == datetime(2020, 1, 1)
     assert r.turbinamento == 0.0