psr-factory 4.1.0b11__py3-none-win_amd64.whl → 5.0.0b1__py3-none-win_amd64.whl

psr/factory/factory.pmk

@@ -4026,7 +4026,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dsis
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (S (........Name......) S
 END_HEADER
 
@@ -4042,7 +4042,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcfg
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (..Date..) (..Cfg_Id..)
 END_HEADER
 
@@ -4057,7 +4057,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dpat
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (..Dem_Id..)
 END_HEADER
 
@@ -4085,7 +4085,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Ddur
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (..Date..) (..Cfg_Id..) (..Dem_Id..) (Dura)
 END_HEADER
 
@@ -4102,7 +4102,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcte
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (ID) (.Value)
 END_HEADER
 
@@ -4117,7 +4117,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dare
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (Ar) (......Name.......) (IPrg) (IMin) (IMax)
 END_HEADER
 
@@ -4153,7 +4153,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dreg
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (R (.......Rnam.......)
 END_HEADER
 
@@ -4168,7 +4168,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dbar
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (Bus) (...Name...) O (.kV.) (Ar) Rg Si (..Date..) C (.Cost.)
 END_HEADER
 
@@ -4210,7 +4210,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dger
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (Ng) (...GNam...) O (Bus) (...Name...) T Nu (Pmin) (Pmax) (Qmin) (Qmax) (PrbF) (..Date..) C (Ktr) (.Ktr Name.)
 END_HEADER
 
@@ -4265,7 +4265,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dlin
 
 DEFINE_HEADER
-$NETPLAN: 02.07.60
+$NETPLAN: 03.04.00
 (Bfr) (Bto) Nc O W (.R%.) (.X%.) (MVAr) (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) TC (Name......) (EF (..Km..)
 END_HEADER
 
@@ -4296,7 +4296,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Mlin
 
 DEFINE_HEADER
-$NETPLAN: 02.07.60
+$NETPLAN: 03.04.00
 (Bfr) (Bto) Nc O W (.R%.) (.X%.) (MVAr) (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) TC (Name......) (EF (..Km..)
 END_HEADER
 
@@ -4323,7 +4323,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dlad
 
 DEFINE_HEADER
-$NETPLAN: 02.07.60
+$NETPLAN: 03.04.00
 (Bfr) (Bto) Nc O W (.R%.) (.X%.) (MVAr) (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) TC (Name......) (EF (..Km..) I
 END_HEADER
 
@@ -4356,7 +4356,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dtrf
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (Bfr) (Bto) Nc O W (.R%.) (.X%.) (Tmn) (Tmx) (PMn) (PMx) TC (BCn) Nt (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) (Name......)
 END_HEADER
 
@@ -4390,7 +4390,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dtad
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (Bfr) (Bto) Nc O W (.R%.) (.X%.) (Tmn) (Tmx) (PMn) (PMx) TC (BCn) Nt (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) (Name......) I
 END_HEADER
 
@@ -4424,7 +4424,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dshl
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (Ns) (...SNam...) O (Bfr) (BTo) Nc (MVAr) B (K$/Uni) (..Date..) C
 END_HEADER
 
@@ -4447,7 +4447,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcsc
 
 DEFINE_HEADER
-$NETPLAN: 02.07.60
+$NETPLAN: 03.04.00
 (Bfr) (Bto) Nc O W (XMn%) (XDe%) (XMx%) (VEsp) (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) TC (Name......) (EF (..Km..) B T
 END_HEADER
 
@@ -4482,7 +4482,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dctg
 
 DEFINE_HEADER
-$NETPLAN: 02.06.00
+$NETPLAN: 03.04.00
 (Bfr) (Bto) Nc (KeyC) (.Bnam Fr..) (.Bnam To..)
 END_HEADER
 
@@ -4500,7 +4500,7 @@ END_MASK
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcba
 DEFINE_HEADER
-$NETPLAN: 02.06.02
+$NETPLAN: 03.04.00
 (BDC) (..BDCnam..) O T P (Volt) (.kV.) (.Rs) (Ar) Rg Si (DC) (..Date..) C (.Cost.)
 END_HEADER
 
@@ -4528,7 +4528,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcli
 
 DEFINE_HEADER
-$NETPLAN: 02.06.02
+$NETPLAN: 03.04.00
 (Bfr) (Bto) Nc O W (..R.) (..L.) (.Cn.) (.Cost.) (..Date..) C (KeyC) (Name......)
 END_HEADER
 
@@ -4552,7 +4552,7 @@ END_MASK
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcnv
 DEFINE_HEADER
-$NETPLAN: 02.06.02
+$NETPLAN: 03.04.00
 (No.) O W (CA.) (CC.) (EL.) T p (Ino.) (.Xc.) (Vfs.) (Snt.) (Rra.) (Lra.) F C (Vmn.) (Vmx.) (Dsp.) (Dtn.) (Dtm.) (Tmn.) (Tmx.) (S (.Cost.) (..Date..) C (...Name...)
 END_HEADER
 DEFINE_DATA
@@ -4621,7 +4621,7 @@ END_MASK
 DEFINE_MASK ROWDATA NETPLAN_v3.0_dbar
 
 DEFINE_HEADER
-$NETPLAN: 03.00.83
+$NETPLAN: 03.04.00
 (Bus) (...Name...) O (.kV.) (Ar) Rg Si (..Date..) C (.Cost.) Ty CC
 END_HEADER
 
@@ -4753,7 +4753,7 @@ END_MASK
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA NETPLAN_v03.02.30_Dcba
 DEFINE_HEADER
-$NETPLAN: 03.02.30
+$NETPLAN: 03.04.00
 (Bus) (...Name...) O T P (.kV.) (.Rs) (Ar) Rg Si (Elo (..Date..) C
 END_HEADER
 
@@ -6645,25 +6645,19 @@ CREATE_OBJECTS TRUE
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
-Name			STRING,1	AUTOSET(model.parm("Name"))
-UnitCode			INTEGER,2	AUTOSET(model.parm("UnitCode"))
-MinDateDay			INTEGER,3	AUTOSET(model.parm("MinDateDay"))
-MinDateMonth			INTEGER,4	AUTOSET(model.parm("MinDateMonth"))
-MinDateYear			INTEGER,5	AUTOSET(model.parm("MinDateYear"))
-MaxDateDay			INTEGER,6	AUTOSET(model.parm("MaxDateDay"))
-MaxDateMonth			INTEGER,7	AUTOSET(model.parm("MaxDateMonth"))
-MaxDateYear			INTEGER,8	AUTOSET(model.parm("MaxDateYear"))
-Duration			INTEGER,9	AUTOSET(model.parm("Duration"))
-PrefDateDay			INTEGER,10	AUTOSET(model.parm("PrefDateDay"))
-PrefDateMonth			INTEGER,11	AUTOSET(model.parm("PrefDateMonth"))
-PrefDateYear			INTEGER,12	AUTOSET(model.parm("PrefDateYear"))
-Score			REAL,13	AUTOSET(model.parm("Score"))
-Fix			INTEGER,14	AUTOSET(model.parm("Fix"))
-Plant			REFERENCE,15	AUTOSET(model.parm("Plant"))
+Name				STRING,1			AUTOSET(model.parm("Name"))
+UnitCode			INTEGER,2			AUTOSET(model.parm("UnitCode"))
+MinDate				DATE,3	DD/MM/YYYY	AUTOSET(model.parm("MinDate"))
+MaxDate				DATE,4	DD/MM/YYYY	AUTOSET(model.parm("MaxDate"))
+Duration			INTEGER,5			AUTOSET(model.parm("Duration"))
+PrefDate			DATE,6	DD/MM/YYYY	AUTOSET(model.parm("PrefDate"))
+Score				REAL,7				AUTOSET(model.parm("Score"))
+Fix					INTEGER,8			AUTOSET(model.parm("Fix"))
+Plant				REFERENCE,9			AUTOSET(model.parm("Plant"))
 END_DATA
 DEFINE_HEADER
 $version=3
-!Name,UnitCode,MinDateDay,MinDateMonth,MinDateYear,MaxDateDay,MaxDateMonth,MaxDateYear,Duration,PrefDateDay,PrefDateMonth,PrefDateYear,Score,Fix,Plant
+!Name,UnitCode,MinDate,MaxDate,Duration,PrefDate,Score,Fix,Plant
 END_HEADER
 END_MASK
 //--------------------------------------------------------------------------------------------------
@@ -7024,6 +7018,31 @@ $version=2
 END_HEADER
 END_MASK
 
+//--------------------------------------------------------------------------------------------------
+// OptMain - PSRArea Vectors indexed by MinResDate
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmresmina
+DEFINE_AUTOMATIC_INFO
+FILENAME optmresmina.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRArea
+MODEL MinResArea
+MERGE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRArea 			REFERENCE,1
+MinResDate			DATE,2	YYYY/MM/DD	AUTOSET
+MinimumReserve		REAL,3	AUTOSET
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRArea,MinResDate,MinimumReserve
+END_HEADER
+END_MASK
+
 DEFINE_MASK CSVDATA Reliability_Generation
 DEFINE_HEADER
 Barra, Sis, Tp, Cod,      Nome, Uni, Pmn, Pmx, Qmn, Qmx,          tx.Falha,     tx.Retor
@@ -7468,7 +7487,7 @@ END_HEADER
 
 DEFINE_DATA
 Num		INTEGER		1,4
-Nome		STRING		6,25
+Nome		STRING		6,17
 ID		STRING		27,28
 UnM		STRING		30,32 AUTOSET(model.parm("UnM"))
 END_DATA
@@ -7482,7 +7501,7 @@ END_HEADER
 
 DEFINE_DATA
 Num		INTEGER		1,4
-Nome		STRING		6,25
+Nome		STRING		6,17
 ID		STRING		27,28
 UnM		STRING		30,32 AUTOSET(model.parm("UnM"))
 TimeZoneOffset	INTEGER		34,36 AUTOSET(model.parm("TimeZoneOffset"))
@@ -9674,7 +9693,7 @@ DEFINE_DATA
 Info 	STRING		1,4
 Num		INTEGER		5,8
 Nome		STRING		15,26
-DefaultPenalty	INTEGER         28,28	AUTOSET(model.parm("DefaultPenalty"))
+RHSType	INTEGER         28,28	AUTOSET(model.parm("RHSType"))
 Penalty		REAL            39,50	AUTOSET(model.parm("Penalty"))
 ReserveAreaCode INTEGER 56,59
 END_DATA
@@ -9878,7 +9897,6 @@ IdentBloco			STRING		1,12	****_Res_ger
 Num					INTEGER		13,17
 Nome				STRING		19,30
 JointReserveUnit	INTEGER		52,53
-JointReserveInfo	INTEGER		55,56
 END_DATA
 
 END_BLOCK
@@ -9938,7 +9956,6 @@ IdentBloco			STRING		1,12	****_Res_ger
 Num					INTEGER		13,17
 Nome				STRING		19,30
 JointReserveUnit	INTEGER		52,53
-JointReserveInfo	INTEGER		55,56
 END_DATA
 
 END_BLOCK
@@ -10899,7 +10916,6 @@ Num					INTEGER		14,17
 Nome				STRING		19,30
 TipoUsina			STRING		38,38
 SingleReserveUnit	INTEGER		52,53
-SingleReserveInfo	INTEGER		55,56
 END_DATA
 END_BLOCK
 //-------------------------------------------------------------
@@ -10958,7 +10974,6 @@ Num					INTEGER		14,17
 Nome				STRING		19,30
 TipoUsina			STRING		38,38
 SingleReserveUnit	INTEGER		52,53
-SingleReserveInfo	INTEGER		55,56
 END_DATA
 END_BLOCK
 //-------------------------------------------------------------
@@ -12939,7 +12954,7 @@ DEFINE_MASK CSVDATA SDDP_v14.0_opechd
 
 DEFINE_HEADER
 $version=1
-!Code,Name........,TrubineTravelTime,SpillingTravelTime,DischargeRampUp,DischargeRampDown,RampUp,RampDown,Commitment,StartupCost,MaxStartup
+!Code,Name........,TurbiningTravelTime,SpillingTravelTime,DischargeRampUp,DischargeRampDown,RampUp,RampDown,Commitment,StartupCost,MaxStartup,TurbRampUp,TurbRampDown,SpilRampUp,SpilRampDown
 END_HEADER
 
 DEFINE_DATA
@@ -12954,6 +12969,10 @@ RampDown			REAL,8 AUTOSET(model.parm("RampDown"))
 Commitment			INTEGER,9 AUTOSET(model.parm("Commitment"))
 StartupCost			REAL,10 AUTOSET(model.parm("StartupCost"))
 MaxStartup			INTEGER,11 AUTOSET(model.parm("MaxStartup"))
+TurbRampUp			REAL,12 AUTOSET(model.parm("TurbRampUp"))
+TurbRampDown		REAL,13 AUTOSET(model.parm("TurbRampDown"))
+SpilRampUp			REAL,14 AUTOSET(model.parm("SpilRampUp"))
+SpilRampDown		REAL,15 AUTOSET(model.parm("SpilRampDown"))
 END_DATA
 
 END_MASK
@@ -13593,6 +13612,130 @@ END_DATA
 END_BLOCK
 
 END_MASK
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK MIXROWDATA SDDP_ccirme_V2
+
+TOTAL_BLOCK	3
+
+//-------------------------------------------------------------
+//-- PRIMEIRO BLOCO -> Identificacao da versao ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	$version=2
+BLOCK_LENGTH 1
+NEXT_BLOCK 2
+
+DEFINE_DATA
+IdentBloco	STRING		1,10	$version=2
+END_DATA
+
+END_BLOCK
+
+//-------------------------------------------------------------
+//-- SEGUNDO BLOCO -> Identificacao do Circuito             ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	****
+BLOCK_LENGTH 1
+NEXT_BLOCK 3
+
+DEFINE_DATA
+IdentBloco	STRING		1,12	****_Planta:
+Num			INTEGER		14,22
+Name		STRING		24,44
+CostType	STRING	    46,48
+Currency	STRING		50,52	AUTOSET(model.parm("Currency"))
+END_DATA
+
+END_BLOCK
+
+//-------------------------------------------------------------
+//-- TERCEIRO BLOCO -> Dados de custo                       ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	Year
+
+DEFINE_HEADER
+Year Blk ......1 ......2 ......3 ......4 ......5 ......6 ......7 ......8 ......9 .....10 .....11 .....12
+END_HEADER
+
+DEFINE_MACRO
+VAR	N	1,12
+END_MACRO
+
+DEFINE_DATA
+Ano		INTEGER		1,4
+Bloco		INTEGER		6,8
+Dado$(N)	REAL		9+8*($(N)-1),16+8*($(N)-1)
+END_DATA
+
+END_BLOCK
+
+END_MASK
+
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK MIXROWDATA SDDP_ctrfme_V2
+
+TOTAL_BLOCK	3
+
+//-------------------------------------------------------------
+//-- PRIMEIRO BLOCO -> Identificacao da versao ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	$version=2
+BLOCK_LENGTH 1
+NEXT_BLOCK 2
+
+DEFINE_DATA
+IdentBloco	STRING		1,10	$version=2
+END_DATA
+
+END_BLOCK
+
+//-------------------------------------------------------------
+//-- SEGUNDO BLOCO -> Identificacao do Circuito             ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	****
+BLOCK_LENGTH 1
+NEXT_BLOCK 3
+
+DEFINE_DATA
+IdentBloco	STRING		1,12	****_Planta:
+Num			INTEGER		14,22
+Name		STRING		24,44
+CostType	STRING	    46,48
+Currency	STRING		50,52	AUTOSET(model.parm("Currency"))
+END_DATA
+
+END_BLOCK
+
+//-------------------------------------------------------------
+//-- TERCEIRO BLOCO -> Dados de custo                       ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	Year
+
+DEFINE_HEADER
+Year Blk ......1 ......2 ......3 ......4 ......5 ......6 ......7 ......8 ......9 .....10 .....11 .....12
+END_HEADER
+
+DEFINE_MACRO
+VAR	N	1,12
+END_MACRO
+
+DEFINE_DATA
+Ano		INTEGER		1,4
+Bloco		INTEGER		6,8
+Dado$(N)	REAL		9+8*($(N)-1),16+8*($(N)-1)
+END_DATA
+
+END_BLOCK
+
+END_MASK
+
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK MIXROWDATA SDDP_ccirse
@@ -13638,6 +13781,125 @@ END_DATA
 
 END_BLOCK
 
+END_MASK
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK MIXROWDATA SDDP_ccirse_V2
+
+TOTAL_BLOCK	3
+
+//-------------------------------------------------------------
+//-- PRIMEIRO BLOCO -> Identificacao da versao ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	$version=2
+BLOCK_LENGTH 1
+NEXT_BLOCK 2
+
+DEFINE_DATA
+IdentBloco	STRING		1,10	$version=2
+END_DATA
+
+END_BLOCK
+//-------------------------------------------------------------
+//-- SEGUNDO BLOCO -> Identificacao do Circuito             ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	****
+BLOCK_LENGTH 1
+NEXT_BLOCK 3
+
+DEFINE_DATA
+IdentBloco	STRING		1,12	****_Planta:
+Num			INTEGER		14,22
+Name		STRING		24,44
+CostType	STRING	    46,48
+Currency	STRING		50,52	AUTOSET(model.parm("Currency"))
+END_DATA
+
+END_BLOCK
+//-------------------------------------------------------------
+//-- TERCEIRO BLOCO -> Dados de Custo                       ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	YEAR
+
+DEFINE_HEADER
+YEAR BLK     1     2     3     4     5     6     7     8     9    10    11    12    13    14    15    16    17    18    19    20    21    22    23    24    25    26    27    28    29    30    31    32    33    34    35    36    37    38    39    40    41    42    43    44    45    46    47    48    49    50    51    52
+END_HEADER
+
+DEFINE_MACRO
+VAR	N	1,52
+END_MACRO
+
+DEFINE_DATA
+Ano		INTEGER		1,4
+Bloco		INTEGER		6,8
+Dado$(N)	REAL		9+8*($(N)-1),16+8*($(N)-1)
+END_DATA
+
+END_BLOCK
+
+END_MASK
+
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK MIXROWDATA SDDP_ctrfse_V2
+
+TOTAL_BLOCK	3
+
+//-------------------------------------------------------------
+//-- PRIMEIRO BLOCO -> Identificacao da versao ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	$version=2
+BLOCK_LENGTH 1
+NEXT_BLOCK 2
+
+DEFINE_DATA
+IdentBloco	STRING		1,10	$version=2
+END_DATA
+
+END_BLOCK
+//-------------------------------------------------------------
+//-- SEGUNDO BLOCO -> Identificacao do Circuito             ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	****
+BLOCK_LENGTH 1
+NEXT_BLOCK 3
+
+DEFINE_DATA
+IdentBloco	STRING		1,12	****_Planta:
+Num			INTEGER		14,22
+Name		STRING		24,44
+CostType	STRING	    46,48
+Currency	STRING		50,52	AUTOSET(model.parm("Currency"))
+END_DATA
+
+END_BLOCK
+//-------------------------------------------------------------
+//-- TERCEIRO BLOCO -> Dados de Custo                       ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	YEAR
+
+DEFINE_HEADER
+YEAR BLK     1     2     3     4     5     6     7     8     9    10    11    12    13    14    15    16    17    18    19    20    21    22    23    24    25    26    27    28    29    30    31    32    33    34    35    36    37    38    39    40    41    42    43    44    45    46    47    48    49    50    51    52
+END_HEADER
+
+DEFINE_MACRO
+VAR	N	1,52
+END_MACRO
+
+DEFINE_DATA
+Ano		INTEGER		1,4
+Bloco		INTEGER		6,8
+Dado$(N)	REAL		9+8*($(N)-1),16+8*($(N)-1)
+END_DATA
+
+END_BLOCK
+
 END_MASK
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
@@ -14438,7 +14700,7 @@ HydroFrom   STRING,   3
 HydroTo     STRING,   4
 FlowMin     REAL,     5 AUTOSET(model.parm("FlowMin"))
 FlowMax     REAL,     6 AUTOSET(model.parm("FlowMax"))
-TravelTime  REAL,     7 AUTOSET(model.parm("TravelTime"))
+TravelTime  INTEGER,  7 AUTOSET(model.parm("TravelTime"))
 Currency    STRING,   8 AUTOSET(model.parm("Currency"))
 Disabled    INTEGER,  9 AUTOSET(model.parm("Disabled"))
 END_DATA
@@ -15654,10 +15916,10 @@ R                       REAL    14 AUTOSET
 MeteringEnd             INTEGER 15 AUTOSET(model.parm("MeteringEnd"))
 ReactivePowerFactorFrom REAL    16 AUTOSET
 ReactivePowerFactorTo   REAL    17 AUTOSET
-WheelingCostFromTo      REAL    18	AUTOSET(model.parm("WheelingCostFromTo"))
-WheelingCostToFrom      REAL    19	AUTOSET(model.parm("WheelingCostToFrom"))
-Currency                STRING  20	AUTOSET(model.parm("Currency"))
-ReserveMargin           REAL    21	AUTOSET(model.parm("ReserveMargin"))
+WheelingCostFromTo      REAL    18 AUTOSET
+WheelingCostToFrom      REAL    19 AUTOSET
+Currency                STRING  20 AUTOSET(model.parm("Currency"))
+ReserveMargin           REAL    21 AUTOSET(model.parm("ReserveMargin"))
 
 END_DATA
 
@@ -15667,7 +15929,7 @@ DEFINE_MASK CSVDATA SDDP_mdclink
 
 DEFINE_HEADER
 $version=1
-!Day,Month,Year,Code,Name,BusFrom,BusTo,Existing,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,R,ReactivePowerFactorFrom,ReactivePowerFactorTo
+!Day,Month,Year,Code,Name,BusFrom,BusTo,Existing,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,R,ReactivePowerFactorFrom,ReactivePowerFactorTo,WheelingCostFromTo,WheelingCostToFrom
 END_HEADER
 
 DEFINE_DATA
@@ -15689,6 +15951,8 @@ CapacityEmergencyToFrom REAL    15 AUTOSET
 R                       REAL    16 AUTOSET
 ReactivePowerFactorFrom REAL    17 AUTOSET
 ReactivePowerFactorTo   REAL    18 AUTOSET
+WheelingCostFromTo      REAL    19 AUTOSET
+WheelingCostToFrom      REAL    20 AUTOSET
 
 END_DATA
 END_MASK
@@ -17718,6 +17982,68 @@ FlagScenario           INTEGER  6 AUTOSET(model.parm("FlagScenario"))
 END_DATA
 
 END_MASK
+
+//--------------------------------------------------------------------------------------------------
+// PSRStudy Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA network-report
+
+DEFINE_AUTOMATIC_INFO
+FILENAME psrnetwork-report.dat
+VERSION 1
+CONTEXT_READ network-report
+CONTEXT_WRITE network-report
+CLASSNAME PSRStudy
+MODEL NetworkReportConfiguration
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+circuits			INTEGER,1	AUTOSET(model.parm("circuits"))
+contingencies			INTEGER,2	AUTOSET(model.parm("contingencies"))
+bridges			INTEGER,3	AUTOSET(model.parm("bridges"))
+binary			INTEGER,4	AUTOSET(model.parm("binary"))
+threshold			REAL,5	AUTOSET(model.parm("threshold"))
+fix_first_block			INTEGER,6	AUTOSET(model.parm("fix_first_block"))
+export_beta_matrix			INTEGER,7	AUTOSET(model.parm("export_beta_matrix"))
+export_b_matrix			INTEGER,8	AUTOSET(model.parm("export_b_matrix"))
+matrix_export_first_stage			INTEGER,9	AUTOSET(model.parm("matrix_export_first_stage"))
+matrix_export_first_year			INTEGER,10	AUTOSET(model.parm("matrix_export_first_year"))
+matrix_export_last_stage			INTEGER,11	AUTOSET(model.parm("matrix_export_last_stage"))
+matrix_export_last_year			INTEGER,12	AUTOSET(model.parm("matrix_export_last_year"))
+cirflw_check			INTEGER,13	AUTOSET(model.parm("cirflw_check"))
+print_elements			INTEGER,14	AUTOSET(model.parm("print_elements"))
+END_DATA
+DEFINE_HEADER
+$version=1
+!circuits,contingencies,bridges,binary,threshold,fix_first_block,export_beta_matrix,export_b_matrix,matrix_export_first_stage,matrix_export_first_year,matrix_export_last_stage,matrix_export_last_year,cirflw_check,print_elements
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// PSRStudy Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA network-reportlist
+
+DEFINE_AUTOMATIC_INFO
+FILENAME psrnetwork-reportlist.dat
+VERSION 1
+CONTEXT_READ network-report
+CONTEXT_WRITE network-report
+CLASSNAME PSRStudy
+MODEL NetworkReportConfiguration
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRStudy		REFERENCE,1
+blocks		INTEGER,2
+series		INTEGER,3
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRStudy,blocks,series
+END_HEADER
+END_MASK
+
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA SDDP_v10.3_cloads