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

inewave/newave/modelos/penalid.py

@@ -126,12 +126,12 @@ class BlocoPenalidades(Section):
             .iterrows()
         ):
             df_penalid = df.loc[df["variavel"] == linha_penalidade["variavel"]]
-            if linha_penalidade["codigo_ree_submercado"] is not None:
+            if pd.notna(linha_penalidade["codigo_ree_submercado"]):
                 df_penalid = df_penalid.loc[
                     df_penalid["codigo_ree_submercado"]
                     == linha_penalidade["codigo_ree_submercado"]
                 ]
-            if linha_penalidade["patamar_carga"] is not None:
+            if pd.notna(linha_penalidade["patamar_carga"]):
                 df_penalid = df_penalid.loc[
                     df_penalid["patamar_carga"]
                     == linha_penalidade["patamar_carga"]

inewave/newave/parp.py

@@ -214,12 +214,14 @@ class Parp(BlockFile):
         ano0 = df["ano"].unique().tolist()[0]
         filtro = (df["ano"] == ano0) & (df["ree"] == ree0)
         n_series = df.loc[filtro].shape[0]
+        novo_vetor_anos: List[int] = []
         for i, ree in enumerate(rees):
             i_i = i * int(linhas_por_ree)
             i_f = i_i + int(linhas_por_ree) - 1
-            df.loc[i_i:i_f, "ano"] = converte_vetor_anos(
+            novo_vetor_anos += converte_vetor_anos(
                 df.loc[i_i:i_f, "ano"].tolist(), n_series
             )
+        df["ano"] = novo_vetor_anos
         return df[["ree"] + cols]
 
     def __converte_ano_mes_data(

inewave/newave/parpeol.py

@@ -197,12 +197,14 @@ class Parpeol(BlockFile):
         ano0 = df["ano"].unique().tolist()[0]
         filtro = (df["ano"] == ano0) & (df["uee"] == uee0)
         n_series = df.loc[filtro].shape[0]
+        novo_vetor_anos: List[int] = []
         for i, uee in enumerate(uees):
             i_i = i * int(linhas_por_uee)
             i_f = i_i + int(linhas_por_uee) - 1
-            df.loc[i_i:i_f, "ano"] = converte_vetor_anos(
+            novo_vetor_anos += converte_vetor_anos(
                 df.loc[i_i:i_f, "ano"].tolist(), n_series
             )
+        df["ano"] = novo_vetor_anos  
         return df[["uee"] + cols]
 
     def __converte_ano_mes_data(

inewave/newave/parpvaz.py

@@ -210,12 +210,14 @@ class Parpvaz(BlockFile):
         ano0 = df["ano"].unique().tolist()[0]
         filtro = (df["ano"] == ano0) & (df["uhe"] == uhe0)
         n_series = df.loc[filtro].shape[0]
+        novo_vetor_anos: List[int] = []
         for i, uhe in enumerate(uhes):
             i_i = i * int(linhas_por_uhe)
             i_f = i_i + int(linhas_por_uhe) - 1
-            df.loc[i_i:i_f, "ano"] = converte_vetor_anos(
+            novo_vetor_anos += converte_vetor_anos(
                 df.loc[i_i:i_f, "ano"].tolist(), n_series
             )
+        df["ano"] = novo_vetor_anos
         return df[["uhe"] + cols]
 
     def __converte_ano_mes_data(

{inewave-1.11.2.dist-info → inewave-1.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inewave
-Version: 1.11.2
+Version: 1.12.0
 Summary: inewave
 Project-URL: Documentation, https://rjmalves.github.io/inewave/
 Project-URL: Repository, https://github.com/rjmalves/inewave/

{inewave-1.11.2.dist-info → inewave-1.12.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-inewave/__init__.py,sha256=ttJGCPEjOBm5z2vtZspXq2TiramCBpddWtr1Ffaijks,236
+inewave/__init__.py,sha256=Yf-HfaGKOfBaSkv6oMJsgzHs85ebfL3bdW-UVkP8heA,236
 inewave/config.py,sha256=fMgG2sqE_PNz30QCNxkgfPf78SEOAVfV07kGtO1bREE,1106
 inewave/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -65,9 +65,9 @@ inewave/newave/newavetim.py,sha256=_YCHr3e3xIBjRpR0ZYWVb0htnf5d52ZMmfZNJb-WJp4,1
 inewave/newave/nwv_avl_evap.py,sha256=9N4qE7dz2DyvZ86XI_OUDn96XLfXc9M6JS2qIQG6zLA,1261
 inewave/newave/nwv_cortes_evap.py,sha256=mKNZMTwqlrMuna3Nx1NE0LM-kutbba-pxkv4-rijvfc,1299
 inewave/newave/nwv_eco_evap.py,sha256=S-sek-rysBTH1v1o7X75-w-Y2h99kw3HX5YDjQpMRgY,1299
-inewave/newave/parp.py,sha256=L3a04zMhtGpyBV8myuEuzPolexKPQy-cmryuMd8vE7Y,18425
-inewave/newave/parpeol.py,sha256=ffJBcq2MPSXDHuX6G29MmssuaGhKIaHmb2Ar8e2kOqk,12841
-inewave/newave/parpvaz.py,sha256=uV-3GlUxLc50nJH8X1WjvUhzcCCTWmzYwcOYCzopceY,15859
+inewave/newave/parp.py,sha256=Iaf4WEQKrBrTdD3-NsX90t3U-MbgI0cJvQs3KqD1vjw,18495
+inewave/newave/parpeol.py,sha256=hrr2OmLtSHNLkVJuz6Yk4Cv98J7ED72eu7CH_9SH2Ig,12913
+inewave/newave/parpvaz.py,sha256=vhEXtUSPf52fZfOoW6YQe1WGoYX4NWq_XLjlgunsXxc,15929
 inewave/newave/patamar.py,sha256=yvJmHMFuc8eB7w8sdnMyYU8ZUxUjGoPxqb3CjYP_Aj0,4371
 inewave/newave/penalid.py,sha256=BzpJADw24jsxV0UtemD8zUZOcduukV02qtVeIJeVmVQ,1234
 inewave/newave/perda.py,sha256=RBfGVQLTr1wJmUdO95md0XYaX_JE7VNmhsndT9ixpb0,364
@@ -138,7 +138,7 @@ inewave/newave/modelos/parp.py,sha256=3vtDfa9rJRo382U_L_UezMa8hk_QF-LftJm-OM-bbI
 inewave/newave/modelos/parpeol.py,sha256=Ym8_2gIdfvtXXMUS3oqtfWqcoQ6n9EUlCYwKS7atbqk,17501
 inewave/newave/modelos/parpvaz.py,sha256=SBB31Loq7ln_S5_iAls_ptGyPp6yWvG4kROEw7My9xY,24621
 inewave/newave/modelos/patamar.py,sha256=aHypOLc_rMEzSdPvlbm8HpthQS1-yq3VXmPg-0X5_nE,21311
-inewave/newave/modelos/penalid.py,sha256=h8SOCDZhFZGMxROWct3mWRAi2J10z6gcAlSVwSWPywc,5656
+inewave/newave/modelos/penalid.py,sha256=rr07vSrePIGoKKXn_rbywKTkXrtDPnF7U1-lAfFKz8k,5652
 inewave/newave/modelos/perda.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/pmo.py,sha256=AN7sl0LcOHL0gutscC3Vgt418GTi_oUeLy9e0gAP_Zs,56493
 inewave/newave/modelos/re.py,sha256=NaEKlkNN1U-UphehyJcHsAsMnJXn1kQ_eMUHCvtFGdY,6438
@@ -541,7 +541,7 @@ inewave/nwlistop/modelos/blocos/usina.py,sha256=cQvLVtG1NC8y4lP_to6-YjAKQRGRlaxO
 inewave/nwlistop/modelos/blocos/valoresclassetermicaseriepatamar.py,sha256=0LV0JMFoiuNEQ3n-XVfG2T0sIq_33bnCt6gmwPOTql8,3283
 inewave/nwlistop/modelos/blocos/valoresserie.py,sha256=Q88QBoI3zyU7y0AvHBeSqDBEVAkb3rAa3XpxA51NbF8,2143
 inewave/nwlistop/modelos/blocos/valoresseriepatamar.py,sha256=xnRdor-_2VyR5EbWNSzU_hbABJFtfgKGlznbcRaslGg,2589
-inewave-1.11.2.dist-info/METADATA,sha256=bLXBwrG9rUZoptFlcsCRNq7BIrku2q2S9tDoA0Dja2s,3743
-inewave-1.11.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-inewave-1.11.2.dist-info/licenses/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.11.2.dist-info/RECORD,,
+inewave-1.12.0.dist-info/METADATA,sha256=LNQKrDlKz03vE1GU2zZZj4F7xzLZocfpUtxJJ2eIFqA,3743
+inewave-1.12.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+inewave-1.12.0.dist-info/licenses/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.12.0.dist-info/RECORD,,