Skip to content

Commit

Permalink
padroniza nome para estagio
Browse files Browse the repository at this point in the history
  • Loading branch information
marianasnoel committed Feb 23, 2024
1 parent 343b711 commit 968489a
Show file tree
Hide file tree
Showing 43 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions examples/plot_dec_oper_sist.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
# específico do arquivo ou da idecomp.
import plotly.express as px

estagio_mensal = df["periodo"].max()
estagio_mensal = df["estagio"].max()
# sphinx_gallery_thumbnail_number = 1
fig = px.box(
df.loc[df["periodo"] == estagio_mensal],
df.loc[df["estagio"] == estagio_mensal],
x="nome_submercado",
y="geracao_termica_MW",
)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/avl_cortesfpha_dec.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
A tabela de dados que está contida no arquivo.
- codigo_usina (`int`)
- periodo (`int`)
- estagio (`int`)
- nome_usina (`str`)
- segmento_fpha (`int`)
- fator_correcao (`float`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_avl_evap.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- codigo_usina (`int`)
- nome_usina (`str`)
- codigo_submercado (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_cortes_evap.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- codigo_usina (`int`)
- nome_usina (`str`)
- codigo_submercado (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_desvfpha.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
A tabela de dados que está contida no arquivo.
- codigo_usina (`int`)
- periodo (`int`)
- estagio (`int`)
- no (`int`)
- patamar (`int`)
- nome_usina (`str`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_eco_discr.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- patamar (`int`)
- duracao (`float`)
- numero_patamares (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_oper_gnl.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- no (`int`)
- cenario (`int`)
- patamar (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_oper_interc.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- no (`int`)
- cenario (`int`)
- patamar (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_oper_ree.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- no (`int`)
- cenario (`int`)
- codigo_ree (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_oper_sist.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- no (`int`)
- cenario (`int`)
- patamar (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_oper_usie.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- no (`int`)
- cenario (`int`)
- patamar (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_oper_usih.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- no (`int`)
- cenario (`int`)
- patamar (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/dec_oper_usit.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- no (`int`)
- cenario (`int`)
- patamar (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/modelos/avl_cortesfpha_dec.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TabelaCortesFpha(TabelaCSV):
)
COLUMN_NAMES = [
"codigo_usina",
"periodo",
"estagio",
"nome_usina",
"segmento_fpha",
"fator_correcao",
Expand Down
10 changes: 5 additions & 5 deletions idecomp/decomp/modelos/dadger.py
Original file line number Diff line number Diff line change
Expand Up @@ -3141,17 +3141,17 @@ class AR(Register):
)

@property
def periodo(self) -> Optional[int]:
def estagio(self) -> Optional[int]:
"""
O período inicial de aplicação do CVaR.
O estágio inicial de aplicação do CVaR.
:return: O índice do período inicial.
:return: O índice do estágio inicial.
:rtype: int | None
"""
return self.data[0]

@periodo.setter
def periodo(self, p: int):
@estagio.setter
def estagio(self, p: int):
self.data[0] = p

@property
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/modelos/dec_avl_evap.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TabelaAvlEvap(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"codigo_usina",
"nome_usina",
"codigo_submercado",
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/modelos/dec_cortes_evap.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TabelaCortesEvap(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"codigo_usina",
"nome_usina",
"codigo_submercado",
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/modelos/dec_desvfpha.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class TabelaDesvFpha(TabelaCSV):
)
COLUMN_NAMES = [
"codigo_usina",
"periodo",
"estagio",
"no",
"patamar",
"nome_usina",
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/modelos/dec_eco_discr.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class TabelaEcoDiscr(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"patamar",
"duracao",
"numero_patamares",
Expand Down
4 changes: 2 additions & 2 deletions idecomp/decomp/modelos/dec_oper_gnl.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class TabelaOperGnlv31(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"cenario",
"patamar",
"duracao",
Expand Down Expand Up @@ -91,7 +91,7 @@ class TabelaOperGnl(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"no",
"cenario",
"patamar",
Expand Down
4 changes: 2 additions & 2 deletions idecomp/decomp/modelos/dec_oper_interc.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class TabelaOperIntercv31(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"cenario",
"patamar",
"codigo_submercado_de",
Expand Down Expand Up @@ -73,7 +73,7 @@ class TabelaOperInterc(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"no",
"cenario",
"patamar",
Expand Down
4 changes: 2 additions & 2 deletions idecomp/decomp/modelos/dec_oper_ree.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class TabelaOperReev31(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"cenario",
"codigo_ree",
"nome_ree",
Expand Down Expand Up @@ -73,7 +73,7 @@ class TabelaOperRee(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"no",
"cenario",
"codigo_ree",
Expand Down
4 changes: 2 additions & 2 deletions idecomp/decomp/modelos/dec_oper_sist.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TabelaOperSistv31(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"cenario",
"patamar",
"duracao",
Expand Down Expand Up @@ -110,7 +110,7 @@ class TabelaOperSist(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"no",
"cenario",
"patamar",
Expand Down
4 changes: 2 additions & 2 deletions idecomp/decomp/modelos/dec_oper_usie.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class TabelaOperUsiev31(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"cenario",
"patamar",
"duracao",
Expand Down Expand Up @@ -79,7 +79,7 @@ class TabelaOperUsie(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"no",
"cenario",
"patamar",
Expand Down
4 changes: 2 additions & 2 deletions idecomp/decomp/modelos/dec_oper_usih.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class TabelaOperUsihv31(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"cenario",
"patamar",
"duracao",
Expand Down Expand Up @@ -127,7 +127,7 @@ class TabelaOperUsih(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"no",
"cenario",
"patamar",
Expand Down
4 changes: 2 additions & 2 deletions idecomp/decomp/modelos/dec_oper_usit.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class TabelaOperUsitv31(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"cenario",
"patamar",
"duracao",
Expand Down Expand Up @@ -79,7 +79,7 @@ class TabelaOperUsit(TabelaCSV):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"no",
"cenario",
"patamar",
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/modelos/oper_desvio_fpha.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class TabelaOperDesvioFpha(TabelaCSVLibs):
delimiter=";",
)
COLUMN_NAMES = [
"periodo",
"estagio",
"cenario",
"patamar",
"codigo_usina",
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/oper_desvio_fpha.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def tabela(self) -> Optional[pd.DataFrame]:
"""
A tabela de dados que está contida no arquivo.
- periodo (`int`)
- estagio (`int`)
- cenario (`int`)
- patamar (`int`)
- codigo_usina (`int`)
Expand Down
2 changes: 1 addition & 1 deletion idecomp/decomp/relgnl.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def relatorio_operacao_termica(self) -> Optional[pd.DataFrame]:
Tabela com o relatório do despacho sinalizado para as usinas
térmicas GNL.
- periodo (`int`)
- estagio (`int`)
- cenario (`int`)
- probabilidade (`float`)
- nome_submercado (`str`)
Expand Down
2 changes: 1 addition & 1 deletion tests/decomp/test_avl_cortesfpha_dec.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def test_atributos_encontrados_avl_cortesfpha_dec():
assert rel.versao == "31.23"

assert rel.tabela.at[0, "codigo_usina"] == 1
assert rel.tabela.at[0, "periodo"] == 1
assert rel.tabela.at[0, "estagio"] == 1
assert rel.tabela.at[0, "nome_usina"] == "CAMARGOS"
assert rel.tabela.at[0, "segmento_fpha"] == 1
assert rel.tabela.at[0, "fator_correcao"] == 0.991429
Expand Down
6 changes: 3 additions & 3 deletions tests/decomp/test_dadger.py
Original file line number Diff line number Diff line change
Expand Up @@ -1663,9 +1663,9 @@ def test_registro_ar_dadger():
with open("", "") as fp:
r.read(fp)
assert r.data == [1, None, None]
assert r.periodo == 1
r.periodo = 2
assert r.periodo == 2
assert r.estagio == 1
r.estagio = 2
assert r.estagio == 2
assert r.alfa is None
r.alfa = 50
assert r.alfa == 50
Expand Down
2 changes: 1 addition & 1 deletion tests/decomp/test_dec_avl_evap.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def test_atributos_encontrados_dec_avl_evap():
with patch("builtins.open", m):
rel = DecAvlEvap.read("./tests/mocks/arquivos/dec_avl_evap.py")
assert rel.versao == "31.14"
assert rel.tabela.at[0, "periodo"] == 1
assert rel.tabela.at[0, "estagio"] == 1
assert rel.tabela.at[0, "codigo_usina"] == 1
assert rel.tabela.at[0, "nome_usina"] == "CAMARGOS"
assert rel.tabela.at[0, "codigo_submercado"] == 1
Expand Down
2 changes: 1 addition & 1 deletion tests/decomp/test_dec_cortes_evap.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def test_atributos_encontrados_dec_cortes_evap():
with patch("builtins.open", m):
rel = DecCortesEvap.read("./tests/mocks/arquivos/dec_cortes_evap.py")
assert rel.versao == "31.14"
assert rel.tabela.at[0, "periodo"] == 1
assert rel.tabela.at[0, "estagio"] == 1
assert rel.tabela.at[0, "codigo_usina"] == 1
assert rel.tabela.at[0, "nome_usina"] == "CAMARGOS"
assert rel.tabela.at[0, "codigo_submercado"] == 1
Expand Down
2 changes: 1 addition & 1 deletion tests/decomp/test_dec_desvfpha.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_atributos_encontrados_dec_desvfpha():
rel = DecDesvFpha.read("./tests/mocks/arquivos/dec_desvfpha.py")
assert rel.versao == "31.0.2"
assert rel.tabela.at[0, "codigo_usina"] == 1
assert rel.tabela.at[0, "periodo"] == 1
assert rel.tabela.at[0, "estagio"] == 1
assert rel.tabela.at[0, "no"] == 1
assert rel.tabela.at[0, "patamar"] == 1
assert rel.tabela.at[0, "nome_usina"] == "CAMARGOS"
Expand Down
2 changes: 1 addition & 1 deletion tests/decomp/test_dec_eco_discr.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_atributos_encontrados_dec_eco_discr():
with patch("builtins.open", m):
rel = DecEcoDiscr.read("./tests/mocks/arquivos/dec_eco_discr.py")
assert rel.versao == "31.14"
assert rel.tabela.at[0, "periodo"] == 1
assert rel.tabela.at[0, "estagio"] == 1
assert rel.tabela.at[0, "patamar"] == 1
assert rel.tabela.at[0, "duracao"] == 40.0
assert np.isnan(rel.tabela.at[0, "numero_patamares"])
Expand Down
Loading

0 comments on commit 968489a

Please sign in to comment.