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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. psr/cloud/cloud.py +351 -28
  2. psr/factory/__init__.py +1 -1
  3. psr/factory/api.py +5 -0
  4. psr/factory/factory.dll +0 -0
  5. psr/factory/factory.pmd +322 -37
  6. psr/factory/factory.pmk +378 -52
  7. psr/factory/libcurl-x64.dll +0 -0
  8. psr/factory/samples/{sddp_sample_case01.py → sddp_case01.py} +6 -5
  9. psr/factory/samples/{sddp_sample_case21.py → sddp_case21.py} +4 -3
  10. {psr_factory-4.1.0b10.dist-info → psr_factory-5.0.0b1.dist-info}/METADATA +3 -3
  11. {psr_factory-4.1.0b10.dist-info → psr_factory-5.0.0b1.dist-info}/RECORD +14 -15
  12. psr/factory/samples/sddp_1_stage_case01.py +0 -169
  13. {psr_factory-4.1.0b10.dist-info → psr_factory-5.0.0b1.dist-info}/WHEEL +0 -0
  14. {psr_factory-4.1.0b10.dist-info → psr_factory-5.0.0b1.dist-info}/licenses/LICENSE.txt +0 -0
  15. {psr_factory-4.1.0b10.dist-info → psr_factory-5.0.0b1.dist-info}/top_level.txt +0 -0
psr/factory/factory.pmd CHANGED
@@ -2081,6 +2081,272 @@ DEFINE_MODEL MODL:NETPLAN_V3.0_ConversorDCAC
2081
2081
  VETOR INTEGER Status DIM(block) INDEX DataStatus
2082
2082
  END_MODEL
2083
2083
 
2084
+ //-----------------------------------------
2085
+ //--- Modelo de Configuracao do NETPLAN ---
2086
+ //-----------------------------------------
2087
+ DEFINE_MODEL MODL:OPTNET_Options
2088
+
2089
+ //--------------------------------------
2090
+ //--- Execution options ---
2091
+ //--------------------------------------
2092
+ // DEXE_SSIS = []
2093
+ // PARM INTEGER DEXE_SIMS
2094
+ PARM REAL DEXE_CRLT
2095
+ PARM REAL DEXE_TOLF
2096
+ PARM REAL DEXE_CIRL
2097
+ PARM REAL DEXE_DEVF
2098
+ PARM REAL DEXE_DEVX
2099
+ PARM REAL DEXE_TLOS
2100
+ PARM REAL DEXE_LSHC
2101
+ PARM INTEGER DEXE_ANLS
2102
+ PARM INTEGER DEXE_APRJ
2103
+ PARM INTEGER DEXE_BCUT
2104
+ PARM INTEGER DEXE_CHKR
2105
+ PARM INTEGER DEXE_CMON
2106
+ PARM INTEGER DEXE_CSCN
2107
+ PARM INTEGER DEXE_CSVR
2108
+ PARM INTEGER DEXE_CTGA
2109
+ PARM INTEGER DEXE_EMCB
2110
+ PARM INTEGER DEXE_EMRG
2111
+ PARM INTEGER DEXE_EXOP
2112
+ PARM INTEGER DEXE_FINV
2113
+ PARM INTEGER DEXE_KIRC
2114
+ PARM INTEGER DEXE_LOSS
2115
+ PARM INTEGER DEXE_LSEG
2116
+ PARM INTEGER DEXE_MDEV
2117
+ PARM INTEGER DEXE_MRED
2118
+ PARM INTEGER DEXE_MSCN
2119
+ PARM INTEGER DEXE_MXBC
2120
+ PARM INTEGER DEXE_MXIT
2121
+ PARM INTEGER DEXE_NFIX
2122
+ PARM INTEGER DEXE_OPDF
2123
+ PARM INTEGER DEXE_PLAN
2124
+ PARM INTEGER DEXE_RBCT
2125
+ PARM INTEGER DEXE_SCTG
2126
+ PARM INTEGER DEXE_SUMC
2127
+ PARM INTEGER DEXE_TCPU
2128
+ PARM INTEGER DEXE_TDCM
2129
+ PARM INTEGER DEXE_THRX
2130
+ PARM INTEGER DEXE_TLIM
2131
+ PARM INTEGER DEXE_TMIP
2132
+ PARM INTEGER DEXE_WBCT
2133
+ PARM INTEGER DGRF_BINI
2134
+
2135
+ //--------------------------------------
2136
+ //--- Additional execution options ---
2137
+ //--------------------------------------
2138
+ PARM INTEGER DEXE_INJS
2139
+ PARM INTEGER DEXE_HSDM
2140
+ PARM INTEGER DEXE_BCTH
2141
+ PARM INTEGER DEXE_CAND
2142
+ PARM INTEGER DEXE_RDCS
2143
+ PARM INTEGER DEXE_FENC
2144
+ PARM INTEGER DEXE_UPDP
2145
+ PARM INTEGER DEXE_CFLW
2146
+ PARM INTEGER DEXE_DISB
2147
+ PARM INTEGER DEXE_RLEV
2148
+ PARM INTEGER DEXE_SVLP
2149
+ PARM INTEGER DEXE_SSVF
2150
+ PARM INTEGER DEXE_INTP
2151
+ PARM INTEGER DEXE_UPSC
2152
+ PARM INTEGER DEXE_AOPE
2153
+ PARM INTEGER DEXE_BPGR
2154
+ PARM INTEGER DEXE_FLDC
2155
+ PARM INTEGER DEXE_RYEA
2156
+ PARM INTEGER DEXE_CTGI
2157
+
2158
+ END_MODEL
2159
+
2160
+ DEFINE_MODEL MODL:OPTFLOW_Options
2161
+
2162
+ //--------------------------------------
2163
+ //--- Execution options ---
2164
+ //--------------------------------------
2165
+ // DCNV_SSIS = []
2166
+ // DCNV_SREG = []
2167
+ // DCNV_SARE = []
2168
+ // PARM REAL DCNV_SIMS
2169
+ PARM REAL DCNV_FEAS
2170
+ PARM REAL DCNV_DGMW
2171
+ PARM REAL DCNV_DEVF
2172
+ PARM REAL DCNV_DEVX
2173
+ PARM REAL DCNV_TRVN
2174
+ PARM REAL DCNV_TRVX
2175
+ PARM REAL DTOL_CDEF
2176
+ PARM INTEGER DCNV_MXIT
2177
+ PARM INTEGER DCNV_EMCB
2178
+ PARM INTEGER DCNV_EMRG
2179
+ PARM INTEGER DCNV_MXRS
2180
+ PARM INTEGER DCNV_AVAR
2181
+ PARM INTEGER DCNV_SCTG
2182
+ PARM INTEGER DCNV_QINJ
2183
+ PARM INTEGER DCNV_BMON
2184
+ PARM INTEGER DCNV_CMON
2185
+ PARM INTEGER DCNV_PLAN
2186
+ PARM INTEGER DCNV_OPDF
2187
+ PARM INTEGER DOBJ_AVAR
2188
+ PARM INTEGER DOBJ_LOSS
2189
+ PARM INTEGER DOBJ_DGMW
2190
+ PARM INTEGER DCON_QGEN
2191
+ PARM INTEGER DCON_SHNT
2192
+ PARM INTEGER DCON_TAPC
2193
+ PARM INTEGER DCON_PHSS
2194
+ PARM INTEGER DCON_CAPS
2195
+ PARM INTEGER DCON_ADSP
2196
+ PARM INTEGER DCON_CTAP
2197
+ PARM INTEGER DCON_QSIN
2198
+ PARM INTEGER DCON_QCER
2199
+ PARM INTEGER DCCT_QGEN
2200
+ PARM INTEGER DCCT_SHNT
2201
+ PARM INTEGER DCCT_TAPC
2202
+ PARM INTEGER DCCT_PHSS
2203
+ PARM INTEGER DCCT_CAPS
2204
+ PARM INTEGER DCCT_ADSP
2205
+ PARM INTEGER DCCT_CTAP
2206
+ PARM INTEGER DCCT_QSIN
2207
+ PARM INTEGER DCCT_QCER
2208
+ PARM INTEGER DCNS_FLMW
2209
+ PARM INTEGER DCNS_FMVA
2210
+ PARM INTEGER DCNS_SUMC
2211
+ PARM INTEGER DREP_RBAR
2212
+ PARM INTEGER DREP_RLIN
2213
+ PARM INTEGER DREP_RGER
2214
+ PARM INTEGER DREP_RVAR
2215
+ PARM INTEGER DREP_RSHC
2216
+ PARM INTEGER DREP_CONV
2217
+ PARM INTEGER DREP_LINK
2218
+ PARM INTEGER DGRF_BINI
2219
+
2220
+ //--------------------------------------
2221
+ //--- Additional execution options ---
2222
+ //--------------------------------------
2223
+ PARM REAL DCNV_DTEN
2224
+ PARM REAL DCNV_FOFC
2225
+ PARM REAL DCNV_SHMX
2226
+ PARM REAL DCNV_SHCS
2227
+ PARM REAL DCNV_PCNV
2228
+ PARM REAL DCNV_EPSI
2229
+ PARM REAL DCNV_WPGN
2230
+ PARM REAL DCNV_WPGI
2231
+ PARM REAL DCNV_TRAD
2232
+ PARM REAL DCNV_VTOL
2233
+ PARM REAL DCNV_VRTP
2234
+ PARM REAL DCNV_PESH
2235
+ PARM REAL DCNV_PESI
2236
+ PARM REAL DCNV_PECE
2237
+ PARM REAL DCNV_LVSC
2238
+ PARM REAL DTOL_CLSH
2239
+ PARM REAL DTOL_TDIS
2240
+ PARM REAL DTOL_PRTQ
2241
+ PARM INTEGER DCNV_DGSH
2242
+ PARM INTEGER DCNV_SLCK
2243
+ PARM INTEGER DOBJ_ASHN
2244
+ PARM INTEGER DOBJ_LSHD
2245
+ PARM INTEGER DCON_PGEN
2246
+ PARM INTEGER DCNS_ANGD
2247
+ PARM INTEGER DGRF_TYPE
2248
+ PARM INTEGER DCNV_FORS
2249
+ PARM INTEGER DCNV_INVC
2250
+ PARM INTEGER DCNV_RXPG
2251
+ PARM INTEGER DCNV_RILH
2252
+ PARM INTEGER DCNV_XRAD
2253
+ PARM INTEGER DCNV_SLCK
2254
+ PARM INTEGER DCNV_ANGI
2255
+ PARM INTEGER DCNV_VOL1
2256
+ PARM INTEGER DCNV_TAP1
2257
+ PARM INTEGER DCNV_REXV
2258
+ PARM INTEGER DCNV_VLIM
2259
+ PARM INTEGER DCNV_VITE
2260
+ PARM INTEGER DCNV_IRLX
2261
+ PARM INTEGER DCNV_RVLR
2262
+ PARM INTEGER DCNV_INJS
2263
+ PARM INTEGER DCNV_OPCE
2264
+ PARM INTEGER DCNV_QFPP
2265
+ PARM INTEGER DCNV_OPSH
2266
+ PARM INTEGER DCNV_OPSI
2267
+ PARM INTEGER DCNV_LIBC
2268
+ PARM INTEGER DCNV_LCIT
2269
+ PARM INTEGER DCNV_LCLM
2270
+ PARM INTEGER DCNV_FICG
2271
+ PARM INTEGER DCNV_FICI
2272
+ PARM INTEGER DCNV_DISB
2273
+ PARM INTEGER DCNV_IQ3R
2274
+ PARM INTEGER DCNV_FCTG
2275
+ PARM INTEGER DCNV_UPGL
2276
+ PARM INTEGER DCNV_FLAT
2277
+ PARM INTEGER DCNV_FLTN
2278
+ PARM INTEGER DCNV_IQIN
2279
+ PARM INTEGER DCNV_VGND
2280
+ PARM INTEGER DCNV_HSTS
2281
+ PARM INTEGER DCNV_FHST
2282
+ PARM INTEGER DCNV_BHST
2283
+ PARM INTEGER DOBJ_CGMW
2284
+ PARM INTEGER DOBJ_DSHN
2285
+ PARM INTEGER DOBJ_CQGP
2286
+ PARM INTEGER DOBJ_AGMW
2287
+ PARM INTEGER DOBJ_INJP
2288
+ PARM INTEGER DCON_LINK
2289
+ PARM INTEGER DCON_LNKQ
2290
+ PARM INTEGER DCON_PCNV
2291
+ PARM INTEGER DCON_LNKT
2292
+ PARM INTEGER DREP_RTRF
2293
+ PARM INTEGER DREP_RSCR
2294
+ PARM INTEGER DREP_RCSV
2295
+ PARM INTEGER DREP_SINJ
2296
+ PARM INTEGER DREP_SSHT
2297
+ PARM INTEGER DREP_SETP
2298
+ PARM INTEGER DREP_BALC
2299
+ PARM INTEGER DGRF_SEQM
2300
+ PARM INTEGER DOPT_MXSI
2301
+ PARM INTEGER DOPT_MXSS
2302
+ PARM INTEGER DOPT_MXSV
2303
+ PARM INTEGER DOPT_MOUT
2304
+ PARM INTEGER DOPT_MXSG
2305
+ PARM INTEGER DOPT_MXLS
2306
+ PARM INTEGER DOPT_MXDL
2307
+
2308
+ END_MODEL
2309
+
2310
+ DEFINE_MODEL MODL:NETPLAN_V5.0_TransmissionConstants
2311
+
2312
+ //--------------------------------------
2313
+ //--- Transmission constants ---
2314
+ //--------------------------------------
2315
+
2316
+ // --- Global ---
2317
+ PARM REAL ZMIN
2318
+ PARM REAL FTOL
2319
+ PARM REAL CTOL
2320
+ PARM REAL CRPF
2321
+
2322
+ // --- AC network ---
2323
+ PARM REAL ACNT_GBNT
2324
+ PARM REAL ACNT_GBMT
2325
+ PARM REAL ACNT_GCNT
2326
+ PARM REAL ACNT_GCMT
2327
+ PARM REAL ACNT_SBNT
2328
+ PARM REAL ACNT_SBMT
2329
+ PARM REAL ACNT_SCNT
2330
+ PARM REAL ACNT_SCMT
2331
+ PARM REAL ACNT_CBNT
2332
+ PARM REAL ACNT_CBMT
2333
+ PARM REAL ACNT_CCNT
2334
+ PARM REAL ACNT_CCMT
2335
+ PARM REAL ACNT_HBMT
2336
+ PARM REAL ACNT_HCMT
2337
+ PARM REAL ACNT_HBNT
2338
+ PARM REAL ACNT_HCNT
2339
+ PARM REAL ACNT_VBNT
2340
+ PARM REAL ACNT_VBMT
2341
+ PARM REAL ACNT_VCNT
2342
+ PARM REAL ACNT_VCMT
2343
+ PARM REAL ACNT_TBNT
2344
+ PARM REAL ACNT_TBMT
2345
+ PARM REAL ACNT_TCNT
2346
+ PARM REAL ACNT_TCMT
2347
+
2348
+ END_MODEL
2349
+
2084
2350
 
2085
2351
  //--------------------------------------
2086
2352
  //--- Modelo de Barra ---
@@ -2813,16 +3079,10 @@ END_MODEL
2813
3079
  DEFINE_CLASS PSRMaintenanceSolicitation
2814
3080
  PARM STRING Name @id
2815
3081
  PARM INTEGER UnitCode
2816
- PARM INTEGER MinDateDay
2817
- PARM INTEGER MinDateMonth
2818
- PARM INTEGER MinDateYear
2819
- PARM INTEGER MaxDateDay
2820
- PARM INTEGER MaxDateMonth
2821
- PARM INTEGER MaxDateYear
3082
+ PARM DATE MinDate
3083
+ PARM DATE MaxDate
2822
3084
  PARM INTEGER Duration
2823
- PARM INTEGER PrefDateDay
2824
- PARM INTEGER PrefDateMonth
2825
- PARM INTEGER PrefDateYear
3085
+ PARM DATE PrefDate
2826
3086
  PARM REAL Score
2827
3087
  PARM INTEGER Fix
2828
3088
  PARM INTEGER FixOuter
@@ -2921,6 +3181,7 @@ DEFINE_MODEL MODL:Optmain_Options
2921
3181
  PARM INTEGER ASDT
2922
3182
  PARM INTEGER TUNE
2923
3183
  PARM INTEGER NCVR
3184
+ PARM INTEGER WSVF
2924
3185
  END_MODEL
2925
3186
 
2926
3187
  //--------------------------------------------------------------------------------------------------
@@ -2946,6 +3207,14 @@ END_CLASS
2946
3207
  MERGE_CLASS PSRPlant UnitCodes
2947
3208
  VECTOR INTEGER UnitCodes
2948
3209
  END_CLASS
3210
+
3211
+ //--------------------------------------------------------------------------------------------------
3212
+ // Modelo para Reserva Minima por Area
3213
+ //--------------------------------------------------------------------------------------------------
3214
+ MERGE_CLASS PSRArea MinResArea
3215
+ VECTOR DATE MinResDate
3216
+ VECTOR REAL MinimumReserve INDEX MinResDate
3217
+ END_CLASS
2949
3218
  //--------------------------------------
2950
3219
  //--- Modelo de Avaliacao Economica ---
2951
3220
  //--------------------------------------
@@ -3733,6 +4002,7 @@ END_MODEL
3733
4002
  // Sistema
3734
4003
  //--------------------------------------------------------------------------------------------------
3735
4004
  DEFINE_MODEL MODL:SDDP_V10.2_Sistema
4005
+ DIMENSION block
3736
4006
  PARM INTEGER TipoInfoManutencaoHidro
3737
4007
  PARM INTEGER TipoUnidadeManutencaoHidro
3738
4008
  PARM INTEGER TipoInfoManutencaoTermica
@@ -3756,6 +4026,9 @@ DEFINE_MODEL MODL:SDDP_V10.2_Sistema
3756
4026
  VETOR DATE DataRiskAversionCurve @addyear_chronological
3757
4027
  VETOR REAL RiskAversionCurve INDEX DataRiskAversionCurve
3758
4028
 
4029
+ VECTOR DATE DateCoefVariation @addyear_chronological
4030
+ VECTOR REAL CoefVariation DIM(block) INDEX DateCoefVariation
4031
+
3759
4032
  MERGE_MODEL Sddp_Georeference
3760
4033
 
3761
4034
  PARM REFERENCE SystemDistributedGeneration PSRTimeSeries
@@ -4063,7 +4336,6 @@ DEFINE_MODEL MODL:SDDP_V10.2_Termica
4063
4336
  //--- Single reserve
4064
4337
  VETOR DATE DataSpinningReserve @chronological @addyear_chronological
4065
4338
  VETOR REAL SpinningReserve DIM(block) INDEX DataSpinningReserve
4066
- PARM INTEGER SingleReserveInfo
4067
4339
  PARM INTEGER SingleReserveUnit
4068
4340
 
4069
4341
  PARM INTEGER MaxSecondaryReserveUnit
@@ -4255,7 +4527,6 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
4255
4527
  //--- Single reserve
4256
4528
  VETOR DATE DataSpinningReserve @chronological @addyear_chronological
4257
4529
  VETOR REAL SpinningReserve DIM(block) INDEX DataSpinningReserve
4258
- PARM INTEGER SingleReserveInfo
4259
4530
  PARM INTEGER SingleReserveUnit
4260
4531
 
4261
4532
  PARM REAL MinTurbiningPenalty
@@ -4306,6 +4577,10 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
4306
4577
 
4307
4578
  PARM REAL DischargeRampUp // Discharge Ramp Up
4308
4579
  PARM REAL DischargeRampDown // Discharge Ramp Down
4580
+ PARM REAL TurbRampUp // Turbining Ramp Up
4581
+ PARM REAL TurbRampDown // Turbining Ramp Down
4582
+ PARM REAL SpilRampUp // Spilling Ramp Up
4583
+ PARM REAL SpilRampDown // Spilling Ramp Down
4309
4584
  PARM INTEGER TravelTimeTurb // Water Travel Time Turbining
4310
4585
  PARM INTEGER TravelTimeSpil // Water Travel Time Spilling
4311
4586
  PARM REAL RampUp
@@ -4391,8 +4666,8 @@ DEFINE_MODEL MODL:SDDP_V10.2_Gnd
4391
4666
  PARM REFERENCE ReserveOfPriceSecondaryPerReserve DIM(reserve_price)
4392
4667
  END_MODEL
4393
4668
  DEFINE_MODEL MODL:SDDP_PostoMedicaoGnd
4394
- PARM INTEGER TechType
4395
- PARM INTEGER SourceType
4669
+ PARM INTEGER TechType DEFAULT 0
4670
+ PARM INTEGER SourceType DEFAULT 0
4396
4671
 
4397
4672
  DIMENSION block
4398
4673
  //--- Cenarios de geracao por bloco ---
@@ -4505,17 +4780,16 @@ END_MODEL
4505
4780
  DEFINE_MODEL MODL:SDDP_V10.2_ReservaGeracao
4506
4781
  MERGE_MODEL MODL:SDDP_V10.2_Restricao
4507
4782
 
4508
- PARM INTEGER RHSType
4509
- PARM INTEGER ReserveType
4510
- PARM INTEGER DefaultPenalty
4511
- PARM REAL Penalty
4512
- PARM INTEGER Exclusive
4513
- PARM INTEGER LimitType
4783
+ PARM INTEGER RHSType DEFAULT 1
4784
+ PARM INTEGER ReserveType DEFAULT 1
4785
+ PARM REAL Penalty DEFAULT -1
4786
+ PARM INTEGER Exclusive DEFAULT 0
4787
+ PARM INTEGER LimitType DEFAULT 0
4514
4788
  PARM INTEGER Type
4515
4789
  PARM INTEGER CompensateNoSel
4516
4790
  PARM INTEGER CompensateSel
4517
- PARM INTEGER DCLinkFlowLimit
4518
- PARM INTEGER Unit
4791
+ PARM INTEGER DCLinkFlowLimit DEFAULT 1
4792
+ PARM INTEGER Unit DEFAULT 0
4519
4793
  VETOR REAL HourReserve
4520
4794
  VETOR REAL HourReserveRPD
4521
4795
  PARM REAL CoefA
@@ -4523,8 +4797,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_ReservaGeracao
4523
4797
  PARM REAL Alpha
4524
4798
  PARM REAL Lambda
4525
4799
  VETOR REAL CoefBacked
4526
- PARM INTEGER JointReserveInfo
4527
- PARM INTEGER JointReserveUnit
4800
+ PARM INTEGER JointReserveUnit DEFAULT 3
4528
4801
  END_MODEL
4529
4802
  //--------------------------------------------------------------------------------------------------
4530
4803
  // Modelo de Conexao Hidreletrica entre usinas
@@ -4651,7 +4924,6 @@ DEFINE_MODEL MODL:SDDP_V10.2_Bateria
4651
4924
  //--- Single reserve
4652
4925
  VETOR DATE DataSpinningReserve @chronological @addyear_chronological
4653
4926
  VETOR REAL SpinningReserve DIM(block) INDEX DataSpinningReserve
4654
- PARM INTEGER SingleReserveInfo
4655
4927
  PARM INTEGER SingleReserveUnit
4656
4928
 
4657
4929
  //--- Secondary reserve offer ---
@@ -5015,7 +5287,7 @@ DEFINE_MODEL MODL:SDDP_WaterWay
5015
5287
  PARM REAL FlowMax
5016
5288
  VETOR DATE DataFlowMaximum
5017
5289
  VETOR REAL FlowMaximum INDEX DataFlowMaximum
5018
- PARM REAL TravelTime
5290
+ PARM INTEGER TravelTime
5019
5291
  PARM INTEGER Disabled
5020
5292
  END_MODEL
5021
5293
 
@@ -5236,7 +5508,7 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5236
5508
  PARM INTEGER NCOO
5237
5509
  PARM INTEGER SCOM
5238
5510
  PARM INTEGER RFOR
5239
- PARM INTEGER HSEL
5511
+ PARM REAL HSEL
5240
5512
  PARM INTEGER MXLP
5241
5513
  PARM INTEGER NCRM
5242
5514
  PARM REAL NCRT
@@ -5287,6 +5559,7 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5287
5559
  PARM INTEGER SHOT
5288
5560
  PARM INTEGER FCFO
5289
5561
  PARM INTEGER HYRM
5562
+ PARM INTEGER BLVP
5290
5563
 
5291
5564
  PARM REAL NCPL_MIPR
5292
5565
  PARM REAL NCPL_LTOL
@@ -5479,6 +5752,12 @@ DEFINE_MODEL MODL:SDDP_Line
5479
5752
  VECTOR DATE DateStatus @addyear_fullmodification
5480
5753
  VECTOR INTEGER Status DIM(block) INDEX DateStatus
5481
5754
 
5755
+ PARM STRING Currency
5756
+ VECTOR DATE DateCostFromTo @addyear_chronological
5757
+ VECTOR REAL CostFromTo DIM(block) INDEX DateCostFromTo
5758
+ VECTOR DATE DateCostToFrom @addyear_chronological
5759
+ VECTOR REAL CostToFrom DIM(block) INDEX DateCostToFrom
5760
+
5482
5761
  MERGE_MODEL MODL:SDDP_Asset
5483
5762
  END_MODEL
5484
5763
  //----------------------------------------------------------------------
@@ -5523,16 +5802,22 @@ DEFINE_MODEL MODL:SDDP_Transformer
5523
5802
  VECTOR DATE DateStatus @addyear_fullmodification
5524
5803
  VECTOR INTEGER Status DIM(block) INDEX DateStatus
5525
5804
 
5526
- VETOR DATE DateTap
5527
- VETOR REAL Tap DIM(block) INDEX DateTap
5528
- VETOR DATE DatePhase
5529
- VETOR REAL Phase DIM(block) INDEX DatePhase
5805
+ VECTOR DATE DateTap
5806
+ VECTOR REAL Tap DIM(block) INDEX DateTap
5807
+ VECTOR DATE DatePhase
5808
+ VECTOR REAL Phase DIM(block) INDEX DatePhase
5530
5809
 
5531
- VETOR DATE DateFlow
5532
- VETOR REAL MaxFlow DIM(block) INDEX DateFlow
5533
- VETOR REAL MinFlow DIM(block) INDEX DateFlow
5534
- VETOR REAL MaxFlowEmergency DIM(block) INDEX DateFlow
5535
- VETOR REAL MinFlowEmergency DIM(block) INDEX DateFlow
5810
+ VECTOR DATE DateFlow
5811
+ VECTOR REAL MaxFlow DIM(block) INDEX DateFlow
5812
+ VECTOR REAL MinFlow DIM(block) INDEX DateFlow
5813
+ VECTOR REAL MaxFlowEmergency DIM(block) INDEX DateFlow
5814
+ VECTOR REAL MinFlowEmergency DIM(block) INDEX DateFlow
5815
+
5816
+ PARM STRING Currency
5817
+ VECTOR DATE DateCostFromTo @addyear_chronological
5818
+ VECTOR REAL CostFromTo DIM(block) INDEX DateCostFromTo
5819
+ VECTOR DATE DateCostToFrom @addyear_chronological
5820
+ VECTOR REAL CostToFrom DIM(block) INDEX DateCostToFrom
5536
5821
 
5537
5822
  MERGE_MODEL MODL:SDDP_Asset
5538
5823
  END_MODEL
@@ -5785,8 +6070,6 @@ DEFINE_MODEL MODL:SDDP_SimpleTwoTerminal_DCLink
5785
6070
  PARM INTEGER FlagQuadraticLoss
5786
6071
  PARM STRING Currency
5787
6072
  PARM INTEGER MeteringEnd
5788
- PARM REAL WheelingCostFromTo
5789
- PARM REAL WheelingCostToFrom
5790
6073
  PARM REAL ReserveMargin
5791
6074
  VETOR DATE Data @addyear_modification
5792
6075
  VETOR INTEGER Existing INDEX Data
@@ -5798,6 +6081,8 @@ DEFINE_MODEL MODL:SDDP_SimpleTwoTerminal_DCLink
5798
6081
  VETOR REAL CapacityEmergencyFromTo INDEX Data
5799
6082
  VETOR REAL CapacityEmergencyToFrom INDEX Data
5800
6083
  VETOR REAL R INDEX Data
6084
+ VETOR REAL WheelingCostFromTo INDEX Data
6085
+ VETOR REAL WheelingCostToFrom INDEX Data
5801
6086
 
5802
6087
  VETOR DATE DateStatus @addyear_fullmodification
5803
6088
  VETOR INTEGER Status INDEX DateStatus