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

inewave/newave/modelos/re.py

@@ -149,7 +149,7 @@ class BlocoConfiguracaoRestricoesRE(Section):
                 "restricao",
             ]
             df = pd.DataFrame(tabela, columns=cols)
-            df["Motivo"] = motivos
+            df["motivo"] = motivos
             df = df.astype(
                 {
                     "conjunto": "int64",

inewave/newave/modif.py

@@ -412,7 +412,11 @@ class Modif(RegisterFile):
         modificacoes_usina: List[Register] = []
         if len(reg_usina) > 0:
             r = reg_usina[0].next
-            while not (isinstance(r, USINA) or r.is_last):
+            while True:
+                if r is None:
+                    break
+                elif isinstance(r, USINA) or r.is_last:
+                    break
                 modificacoes_usina.append(r)
                 r = r.next
 

inewave/newave/re.py

@@ -56,6 +56,7 @@ class Re(SectionFile):
         - ano_fim (`int`)
         - patamar (`int`)
         - restricao (`float`)
+        - motivo (`str`)
 
         :return: A tabela como um DataFrame.
         :rtype: pd.DataFrame | None

{inewave-1.5.0.dist-info → inewave-1.5.2.dist-info}/METADATA

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

{inewave-1.5.0.dist-info → inewave-1.5.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=NOjImNiVV4VDOkaa6uaDTXTa3SwWxxpzzG-D8AjM1q0,235
+inewave/__init__.py,sha256=hKtDmjHFx1SfLYJF8xwlxQNfB3WgGX8RkNtSoD1PMTg,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
@@ -58,7 +58,7 @@ inewave/newave/gtminpat.py,sha256=6Xb4j3ltFVc-5DlyPzYHcMt7Tf41jeNB8C58w6pglls,35
 inewave/newave/hidr.py,sha256=mTPxx254XO67j7P7YIImNZIwnM017DWz8HsuRIYONM8,11647
 inewave/newave/itaipu.py,sha256=tlJmIQLaSQpcliL2P5DrU9fXgcL7rNEsy8Z9optnseE,338
 inewave/newave/manutt.py,sha256=NkJ1CRxi0bbKeFEpX09eMQM8kPCGuqBMyAaK278-CEY,1386
-inewave/newave/modif.py,sha256=f4wl9iw54hR-dKZzDL4fpkfYUh493QtvUFDVlapMi0s,13844
+inewave/newave/modif.py,sha256=26rCNCHE5-5HPDFkMNkWeQWhUCV6ek9w-fIaDFhnBig,13947
 inewave/newave/newavetim.py,sha256=wQSCRSApKW6rwBteoQ4zmPPa8A820SJ2FATIpjiG1uo,838
 inewave/newave/nwv_avl_evap.py,sha256=ARICggAKNMj7CebXgKYsg77dNZqe9rm7tFFyuRHWqMI,968
 inewave/newave/nwv_cortes_evap.py,sha256=wkxSqEDUcZswMI9LdZXk76Tnw_iUb0gBHc4bAgCSIdA,1007
@@ -70,7 +70,7 @@ inewave/newave/patamar.py,sha256=yvJmHMFuc8eB7w8sdnMyYU8ZUxUjGoPxqb3CjYP_Aj0,437
 inewave/newave/penalid.py,sha256=BzpJADw24jsxV0UtemD8zUZOcduukV02qtVeIJeVmVQ,1234
 inewave/newave/perda.py,sha256=RBfGVQLTr1wJmUdO95md0XYaX_JE7VNmhsndT9ixpb0,364
 inewave/newave/pmo.py,sha256=_UQqs1hchnvNbr4dsj6TqveWuMQZ-IaY51TFO1KKw7Q,11278
-inewave/newave/re.py,sha256=-kVLazSmD8uwAa1CSPF6kcMqbREOSe7p-3oE-Ew3dqo,2013
+inewave/newave/re.py,sha256=zQ1dP1c-QT6clQ_4aEJ6aLLT7GxaButZaTlWk4U5BGk,2038
 inewave/newave/ree.py,sha256=J7Bin2gCmYb9xyZrwLuLsbT4nnoaFRjYs-OTYo_U41g,1926
 inewave/newave/sar.py,sha256=7UE-KwSAh8jGo_pG2OHevCtaj5BCgmBo315k0X4LBg4,350
 inewave/newave/selcor.py,sha256=-YMIjBqx8mQhraggIJWUlrU_j_t3almRuc1SroebqCs,5411
@@ -137,7 +137,7 @@ inewave/newave/modelos/patamar.py,sha256=P9uxFGqrv8uDuJYa5rCNtM9YfM9dc50lFRYAnRs
 inewave/newave/modelos/penalid.py,sha256=R4yUfP9hn9nUGCiQMBTe8ExvpZr080fbzz0gmwDLhZA,5663
 inewave/newave/modelos/perda.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/pmo.py,sha256=DeFGkzyzs8jQLTJ6U9eV1FI0NjzHKV6TCvMFuQI_W8o,29018
-inewave/newave/modelos/re.py,sha256=VtzlRaCmrNWOJ7tQyvXUVxCKDnOy9Dq3DHEMwZO4JRg,6574
+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
 inewave/newave/modelos/selcor.py,sha256=iRl7h0YtvSnkjuauxCr8HFKPWniA0k6fZdxiv_eIGb4,1996
@@ -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.0.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.5.0.dist-info/METADATA,sha256=gJpxftcCgkDVroPd73Z2gL_moA_IvdTZxhm0JW65l_s,1958
-inewave-1.5.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-inewave-1.5.0.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
-inewave-1.5.0.dist-info/RECORD,,
+inewave-1.5.2.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.5.2.dist-info/METADATA,sha256=8WsapdU9vo6Yn5emmE_sJ42x5M2ZggNcpKnAOSs6uak,1958
+inewave-1.5.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+inewave-1.5.2.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
+inewave-1.5.2.dist-info/RECORD,,

{inewave-1.5.0.dist-info → inewave-1.5.2.dist-info}/WHEEL

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