psr-factory 4.1.0b3__py3-none-win_amd64.whl → 4.1.0b5__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 (14) hide show
  1. psr/cloud/cloud.py +63 -25
  2. psr/cloud/version.py +1 -1
  3. psr/factory/__init__.py +1 -1
  4. psr/factory/api.py +86 -21
  5. psr/factory/factory.dll +0 -0
  6. psr/factory/factory.pmd +97 -74
  7. psr/factory/factory.pmk +511 -49
  8. psr/factory/factorylib.py +6 -0
  9. psr/factory/libcurl-x64.dll +0 -0
  10. {psr_factory-4.1.0b3.dist-info → psr_factory-4.1.0b5.dist-info}/METADATA +3 -3
  11. {psr_factory-4.1.0b3.dist-info → psr_factory-4.1.0b5.dist-info}/RECORD +14 -14
  12. {psr_factory-4.1.0b3.dist-info → psr_factory-4.1.0b5.dist-info}/WHEEL +1 -1
  13. {psr_factory-4.1.0b3.dist-info → psr_factory-4.1.0b5.dist-info}/licenses/LICENSE.txt +0 -0
  14. {psr_factory-4.1.0b3.dist-info → psr_factory-4.1.0b5.dist-info}/top_level.txt +0 -0
psr/factory/factory.pmd CHANGED
@@ -2493,6 +2493,8 @@ DEFINE_MODEL MODL:Optgen_RestricaoCapacidade
2493
2493
  PARM INTEGER FlagIncremental
2494
2494
  PARM INTEGER PenaltyFlag
2495
2495
  PARM INTEGER SystemCodePu
2496
+ PARM REFERENCE SystemElement PSRSystem
2497
+ VECTOR REFERENCE AgentElement PSRElement
2496
2498
  END_MODEL
2497
2499
  //--------------------------------------------------------------------------------------------------
2498
2500
  // Modelo para Restricao de Precedencia
@@ -2519,6 +2521,7 @@ DEFINE_MODEL MODL:Optgen_RestricaoGenerica
2519
2521
  PARM INTEGER LimitType
2520
2522
  PARM REAL Penalty
2521
2523
  PARM INTEGER Selected
2524
+ VECTOR REFERENCE AgentElement PSRElement
2522
2525
  END_MODEL
2523
2526
  //--------------------------------------------------------------------------------------------------
2524
2527
  // Modelo para Restricao Generica
@@ -2806,8 +2809,8 @@ END_MODEL
2806
2809
  //--------------------------------------------------------------------------------------------------
2807
2810
  // Modelo para Solicitacao
2808
2811
  //--------------------------------------------------------------------------------------------------
2809
- DEFINE_MODEL MODL:Optmain_Solicitacao
2810
- PARM STRING Name
2812
+ DEFINE_CLASS PSRMaintenanceSolicitation
2813
+ PARM STRING Name @id
2811
2814
  PARM INTEGER UnitCode
2812
2815
  PARM INTEGER MinDateDay
2813
2816
  PARM INTEGER MinDateMonth
@@ -2822,67 +2825,68 @@ DEFINE_MODEL MODL:Optmain_Solicitacao
2822
2825
  PARM REAL Score
2823
2826
  PARM INTEGER Fix
2824
2827
  PARM INTEGER FixOuter
2825
- PARM REFERENCE Plant
2826
- END_MODEL
2828
+ PARM REFERENCE Plant PSRPlant
2829
+ END_CLASS
2827
2830
 
2828
2831
  //--------------------------------------------------------------------------------------------------
2829
2832
  // Modelo para Grupo Exclusivo
2830
2833
  //--------------------------------------------------------------------------------------------------
2831
- DEFINE_MODEL MODL:Optmain_Excl
2832
- PARM STRING SetName
2833
- VECTOR REFERENCE PlantsThermal
2834
- VECTOR REFERENCE PlantsHydro
2835
- VECTOR REFERENCE PlantsGnd
2836
- END_MODEL
2834
+ DEFINE_CLASS PSRMaintenanceExclusive
2835
+ PARM STRING SetName @id
2836
+ VECTOR REFERENCE PlantsThermal PSRThermalPlant
2837
+ VECTOR REFERENCE PlantsHydro PSRHydroPlant
2838
+ VECTOR REFERENCE PlantsGnd PSRGndPlant
2839
+ END_CLASS
2837
2840
 
2838
2841
  //--------------------------------------------------------------------------------------------------
2839
2842
  // Modelo para Grupo Compartilhado
2840
2843
  //--------------------------------------------------------------------------------------------------
2841
- DEFINE_MODEL MODL:Optmain_Shared
2842
- PARM STRING SetName
2843
- VECTOR REFERENCE PlantsThermal
2844
- VECTOR REFERENCE PlantsHydro
2845
- VECTOR REFERENCE PlantsGnd
2846
- END_MODEL
2844
+ DEFINE_CLASS PSRMaintenanceShared
2845
+ PARM STRING SetName @id
2846
+ VECTOR REFERENCE PlantsThermal PSRThermalPlant
2847
+ VECTOR REFERENCE PlantsHydro PSRHydroPlant
2848
+ VECTOR REFERENCE PlantsGnd PSRGndPlant
2849
+ END_CLASS
2847
2850
 
2848
2851
  //--------------------------------------------------------------------------------------------------
2849
2852
  // Modelo para Grupo Associado
2850
2853
  //--------------------------------------------------------------------------------------------------
2851
- DEFINE_MODEL MODL:Optmain_Ass
2852
- PARM STRING SetName
2854
+ DEFINE_CLASS PSRMaintenanceAssociation
2855
+ PARM STRING SetName @id
2853
2856
  VECTOR REFERENCE Solicitations
2854
- END_MODEL
2857
+ END_CLASS
2855
2858
 
2856
2859
  //--------------------------------------------------------------------------------------------------
2857
2860
  // Modelo para Restricoes de Solicitacoes Exclusivas
2858
2861
  //--------------------------------------------------------------------------------------------------
2859
- DEFINE_MODEL MODL:Optmain_ExclSol
2860
- PARM STRING SetName
2862
+ DEFINE_CLASS PSRMaintenanceExclusiveSol
2863
+ PARM STRING SetName @id
2861
2864
  VECTOR REFERENCE Solicitations
2862
- END_MODEL
2865
+ END_CLASS
2863
2866
 
2864
2867
  //--------------------------------------------------------------------------------------------------
2865
2868
  // Modelo para Periodos Restritos
2866
2869
  //--------------------------------------------------------------------------------------------------
2867
- DEFINE_MODEL MODL:Optmain_StageCstr
2870
+ MERGE_CLASS PSRPlant StageCstr
2868
2871
  VECTOR DATE RestDate
2869
2872
  VECTOR INTEGER RestrictedStages INDEX RestDate
2870
- END_MODEL
2873
+ END_CLASS
2871
2874
 
2872
2875
  //--------------------------------------------------------------------------------------------------
2873
2876
  // Modelo para Reserva Minima
2874
2877
  //--------------------------------------------------------------------------------------------------
2875
- DEFINE_MODEL MODL:Optmain_MinRes
2878
+ MERGE_CLASS PSRSystem MinRes
2876
2879
  VECTOR DATE MinResDate
2877
2880
  VECTOR REAL MinimumReserve INDEX MinResDate
2878
- END_MODEL
2881
+ END_CLASS
2879
2882
 
2880
2883
  //--------------------------------------------------------------------------------------------------
2881
2884
  // Modelo para Demanda Instantanea
2882
2885
  //--------------------------------------------------------------------------------------------------
2883
- DEFINE_MODEL MODL:Optmain_InstDem
2884
- VECTOR REAL InstantDemand
2885
- END_MODEL
2886
+ MERGE_CLASS PSRSystem InstDem
2887
+ VECTOR DATE InstantDemandDate
2888
+ VECTOR REAL InstantDemand INDEX InstantDemandDate
2889
+ END_CLASS
2886
2890
 
2887
2891
  //--------------------------------------------------------------------------------------------------
2888
2892
  // Modelo para Parametros de Opcoes
@@ -2921,26 +2925,26 @@ END_MODEL
2921
2925
  //--------------------------------------------------------------------------------------------------
2922
2926
  // Modelo para Restricoes de Precedencia
2923
2927
  //--------------------------------------------------------------------------------------------------
2924
- DEFINE_MODEL MODL:Optmain_Prec
2925
- PARM STRING PrecName
2928
+ DEFINE_CLASS PSRMaintenancePrecedence
2929
+ PARM STRING PrecName @id
2926
2930
  VECTOR INTEGER DelayMin
2927
2931
  VECTOR INTEGER DelayMax
2928
- VECTOR REFERENCE Solicitations
2929
- END_MODEL
2932
+ VECTOR REFERENCE Solicitations PSRMaintenanceSolicitation
2933
+ END_CLASS
2930
2934
 
2931
2935
  //--------------------------------------------------------------------------------------------------
2932
2936
  // Modelo para Fatores de Unidades
2933
2937
  //--------------------------------------------------------------------------------------------------
2934
- DEFINE_MODEL MODL:Optmain_UnitFactors
2938
+ MERGE_CLASS PSRPlant UnitFactors
2935
2939
  VECTOR REAL UnitFactors
2936
- END_MODEL
2940
+ END_CLASS
2937
2941
 
2938
2942
  //--------------------------------------------------------------------------------------------------
2939
2943
  // Modelo para Mapeamento de Unidades
2940
2944
  //--------------------------------------------------------------------------------------------------
2941
- DEFINE_MODEL MODL:Optmain_UnitCodes
2945
+ MERGE_CLASS PSRPlant UnitCodes
2942
2946
  VECTOR INTEGER UnitCodes
2943
- END_MODEL
2947
+ END_CLASS
2944
2948
  //--------------------------------------
2945
2949
  //--- Modelo de Avaliacao Economica ---
2946
2950
  //--------------------------------------
@@ -3684,6 +3688,9 @@ DEFINE_MODEL MODL:SDDP_V10.2_ConfiguracaoEstudo
3684
3688
  VETOR DATE SubHourlyStage
3685
3689
  VETOR INTEGER SubHourlyScenario INDEX SubHourlyStage
3686
3690
  VETOR INTEGER SubHourlyDays INDEX SubHourlyStage
3691
+ PARM INTEGER DynamicConvergenceNumberSegments
3692
+ VETOR REAL DynamicConvergenceMaxTime
3693
+ VETOR REAL DynamicConvergenceTolerance
3687
3694
 
3688
3695
  //--------------------------------------
3689
3696
  //--- MAXREV ---
@@ -4184,11 +4191,13 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
4184
4191
 
4185
4192
  //--- Net Head x Power ---
4186
4193
  VECTOR DATE HxP_Date
4194
+ VECTOR DATE HxP_EndDate INTERVAL HxP_Date
4187
4195
  VECTOR REAL NetHead DIM(varpoint) INDEX HxP_Date
4188
4196
  VECTOR REAL Power DIM(varpoint) INDEX HxP_Date
4189
4197
 
4190
4198
  //--- Net Head x Production coefficient ---
4191
4199
  VECTOR DATE HxPC_Date
4200
+ VECTOR DATE HxPC_EndDate INTERVAL HxPC_Date
4192
4201
  VECTOR REAL NetH DIM(varpoint) INDEX HxPC_Date
4193
4202
  VECTOR REAL ProdCoef DIM(varpoint) INDEX HxPC_Date
4194
4203
 
@@ -5029,7 +5038,6 @@ END_MODEL
5029
5038
  //--------------------------------------------------------------------------------------------------
5030
5039
  DEFINE_CLASS SingleContingency
5031
5040
  @dictionary singlecontingency, singctg
5032
- PARM STRING name @id
5033
5041
  PARM REFERENCE Serie PSRSerie @id
5034
5042
  PARM REFERENCE MonitoringList MonitoringList
5035
5043
  END_CLASS
@@ -5165,7 +5173,7 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5165
5173
  PARM INTEGER CCTA
5166
5174
  PARM INTEGER CCTL
5167
5175
  PARM INTEGER MAXT
5168
- PARM INTEGER RPK2
5176
+ PARM STRING RPK2
5169
5177
  PARM INTEGER BINF
5170
5178
  PARM INTEGER EXPN
5171
5179
  PARM INTEGER MXAP
@@ -5246,6 +5254,7 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5246
5254
  PARM INTEGER FINJ
5247
5255
  PARM INTEGER ETYP
5248
5256
  PARM INTEGER RFCF
5257
+ PARM INTEGER RFIT
5249
5258
  PARM INTEGER PFCF
5250
5259
  PARM INTEGER PENL
5251
5260
  PARM INTEGER LSFI
@@ -5293,27 +5302,29 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5293
5302
  PARM INTEGER NCPL_TERF
5294
5303
  PARM INTEGER NCPL_DEBG
5295
5304
  PARM INTEGER NCPL_CCOS
5296
- PARM INTEGER NCPL_SCRT
5297
- PARM INTEGER NCPL_RLOS
5298
- PARM INTEGER NCPL_RSBT
5299
- PARM INTEGER NCPL_HUNI
5300
- PARM INTEGER NCPL_RAMP
5301
- PARM INTEGER NCPL_INCO
5302
- PARM INTEGER NCPL_RTRA
5303
- PARM INTEGER NCPL_INWT
5304
- PARM INTEGER NCPL_BINS
5305
- PARM INTEGER NCPL_BETR
5306
- PARM INTEGER NCPL_NDIS
5307
- PARM INTEGER NCPL_KDIS
5308
- PARM INTEGER NCPL_DETM
5309
- PARM INTEGER NCPL_CKMC
5310
- PARM INTEGER NCPL_TMUP
5311
- PARM INTEGER NCPL_GNPR
5312
- PARM INTEGER NCPL_PRES
5313
- PARM INTEGER NCPL_MEMO
5314
- PARM INTEGER NCPL_GMIN
5315
- PARM INTEGER NCPL_HGEN
5316
- PARM INTEGER NCPL_BMIP
5305
+ PARM INTEGER NCPL_SCRT
5306
+ PARM INTEGER NCPL_RLOS
5307
+ PARM INTEGER NCPL_RSBT
5308
+ PARM INTEGER NCPL_HUNI
5309
+ PARM INTEGER NCPL_RAMP
5310
+ PARM INTEGER NCPL_INCO
5311
+ PARM INTEGER NCPL_RTRA
5312
+ PARM INTEGER NCPL_INWT
5313
+ PARM INTEGER NCPL_BINS
5314
+ PARM INTEGER NCPL_BETR
5315
+ PARM INTEGER NCPL_NDIS
5316
+ PARM INTEGER NCPL_KDIS
5317
+ PARM INTEGER NCPL_DETM
5318
+ PARM INTEGER NCPL_CKMC
5319
+ PARM INTEGER NCPL_TMUP
5320
+ PARM INTEGER NCPL_GNPR
5321
+ PARM INTEGER NCPL_PRES
5322
+ PARM INTEGER NCPL_MEMO
5323
+ PARM INTEGER NCPL_GMIN
5324
+ PARM INTEGER NCPL_HGEN
5325
+ PARM INTEGER NCPL_BMIP
5326
+ PARM INTEGER NCPL_UDNC // use ncplite dynamic convergence
5327
+ PARM INTEGER INFM
5317
5328
  END_MODEL
5318
5329
 
5319
5330
  //--------------------------------------------------------------------------------------------------
@@ -5361,11 +5372,21 @@ END_MODEL
5361
5372
  DEFINE_MODEL MODL:SDDP_Asset
5362
5373
  DIMENSION owner
5363
5374
 
5364
- //--- Proprietários e participações ---
5375
+ //--- Proprietários e participações ---
5365
5376
  PARM REFERENCE Owner DIM(owner) PSROwner
5366
5377
  PARM REAL OwnerShare DIM(owner)
5367
5378
  END_MODEL
5368
5379
 
5380
+ //----------------------------------------------------------------------
5381
+ // Propriedade/Ativo/Asset
5382
+ //----------------------------------------------------------------------
5383
+ DEFINE_MODEL MODL:SDDP_Ownership
5384
+ //--- Relacionamento PSROwner x PSRElement ---
5385
+ PARM REFERENCE Owner PSROwner
5386
+ PARM REFERENCE Element PSRElement
5387
+ PARM REAL Share
5388
+ END_MODEL
5389
+
5369
5390
  //----------------------------------------------------------------------
5370
5391
  // Area
5371
5392
  //----------------------------------------------------------------------
@@ -5454,7 +5475,7 @@ DEFINE_MODEL MODL:SDDP_Line
5454
5475
  VECTOR REAL Re INDEX Data
5455
5476
  VECTOR REAL Prob INDEX Data
5456
5477
 
5457
- VECTOR DATE DateStatus
5478
+ VECTOR DATE DateStatus @addyear_fullmodification
5458
5479
  VECTOR INTEGER Status DIM(block) INDEX DateStatus
5459
5480
 
5460
5481
  MERGE_MODEL MODL:SDDP_Asset
@@ -5498,7 +5519,7 @@ DEFINE_MODEL MODL:SDDP_Transformer
5498
5519
  VECTOR REAL MinPhaseAngle INDEX Data
5499
5520
  VECTOR REAL MaxPhaseAngle INDEX Data
5500
5521
 
5501
- VECTOR DATE DateStatus
5522
+ VECTOR DATE DateStatus @addyear_fullmodification
5502
5523
  VECTOR INTEGER Status DIM(block) INDEX DateStatus
5503
5524
 
5504
5525
  VETOR DATE DateTap
@@ -5577,7 +5598,7 @@ DEFINE_MODEL MODL:SDDP_Transformer3Winding
5577
5598
  VETOR REAL MinPhaseAngle3 INDEX Data
5578
5599
  VETOR REAL MaxPhaseAngle3 INDEX Data
5579
5600
 
5580
- VECTOR DATE DateStatus
5601
+ VECTOR DATE DateStatus @addyear_fullmodification
5581
5602
  VECTOR INTEGER Status DIM(block) INDEX DateStatus
5582
5603
 
5583
5604
  VETOR DATE DateTap
@@ -5706,14 +5727,14 @@ DEFINE_MODEL MODL:SDDP_TCSC
5706
5727
  VETOR REAL Prob INDEX Data
5707
5728
 
5708
5729
  //--- Status do circuito para cada patamar ---
5709
- VETOR DATE DateStatus
5730
+ VETOR DATE DateStatus @addyear_fullmodification
5710
5731
  VETOR INTEGER Status DIM(block) INDEX DateStatus
5711
5732
 
5712
5733
  VETOR DATE DateBypass
5713
5734
  VETOR INTEGER Bypass DIM(block) INDEX DateBypass
5714
5735
 
5715
5736
  VETOR DATE DateSetpoint
5716
- VETOR INTEGER Setpoint DIM(block) INDEX DateSetpoint
5737
+ VETOR REAL Setpoint DIM(block) INDEX DateSetpoint
5717
5738
 
5718
5739
  VETOR DATE DateFlow
5719
5740
  VETOR REAL MaxFlow DIM(block) INDEX DateFlow
@@ -5776,7 +5797,9 @@ DEFINE_MODEL MODL:SDDP_SimpleTwoTerminal_DCLink
5776
5797
  VETOR REAL CapacityEmergencyFromTo INDEX Data
5777
5798
  VETOR REAL CapacityEmergencyToFrom INDEX Data
5778
5799
  VETOR REAL R INDEX Data
5779
- VETOR INTEGER Status INDEX Data
5800
+
5801
+ VETOR DATE DateStatus @addyear_fullmodification
5802
+ VETOR INTEGER Status INDEX DateStatus
5780
5803
 
5781
5804
  // Reactive power model
5782
5805
  VETOR REAL ReactivePowerFactorFrom INDEX Data
@@ -5803,8 +5826,8 @@ DEFINE_MODEL MODL:SDDP_DCBus
5803
5826
  PARM REAL BaseVoltage
5804
5827
  PARM REAL GroundResistance
5805
5828
 
5806
- VETOR DATE DataVoltage
5807
- VETOR REAL Voltage DIM(block) INDEX DataVoltage
5829
+ VETOR DATE DateVolt
5830
+ VETOR REAL Volt DIM(block) INDEX DateVolt
5808
5831
 
5809
5832
  MERGE_MODEL Sddp_Georeference
5810
5833
  END_MODEL
@@ -5826,7 +5849,7 @@ DEFINE_MODEL MODL:SDDP_DCLine
5826
5849
  VETOR REAL Re INDEX Data
5827
5850
  VETOR REAL Prob INDEX Data
5828
5851
 
5829
- VETOR DATE DateStatus
5852
+ VETOR DATE DateStatus @addyear_fullmodification
5830
5853
  VETOR INTEGER Status DIM(block) INDEX DateStatus
5831
5854
  END_MODEL
5832
5855
  //----------------------------------------------------------------------
@@ -5864,7 +5887,7 @@ DEFINE_MODEL MODL:SDDP_LCC_Converter
5864
5887
  VETOR DATE DateTap
5865
5888
  VETOR REAL Tap DIM(block) INDEX DateTap
5866
5889
 
5867
- VETOR DATE DateStatus
5890
+ VETOR DATE DateStatus @addyear_fullmodification
5868
5891
  VETOR INTEGER Status DIM(block) INDEX DateStatus
5869
5892
  END_MODEL
5870
5893
  //----------------------------------------------------------------------
@@ -5885,7 +5908,7 @@ DEFINE_MODEL MODL:SDDP_VSC_Converter
5885
5908
 
5886
5909
  MERGE_MODEL MODL:SDDP_GeneratorVoltageRegulator
5887
5910
 
5888
- VETOR DATE DateStatus
5911
+ VETOR DATE DateStatus @addyear_fullmodification
5889
5912
  VETOR INTEGER Status DIM(block) INDEX DateStatus
5890
5913
  END_MODEL
5891
5914
 
@@ -5901,7 +5924,7 @@ DEFINE_MODEL MODL:SDDP_BusShunt
5901
5924
  VECTOR REAL B INDEX Data
5902
5925
  VECTOR INTEGER NumberOfUnits INDEX Data
5903
5926
  VECTOR DATE DateUnitsInService
5904
- VECTOR REAL UnitsInService DIM(block) INDEX DateUnitsInService
5927
+ VECTOR INTEGER UnitsInService DIM(block) INDEX DateUnitsInService
5905
5928
  END_MODEL
5906
5929
  //----------------------------------------------------------------------
5907
5930
  // Non-linear Reactive Power Models - Line Shunt
@@ -5914,7 +5937,7 @@ DEFINE_MODEL MODL:SDDP_LineShunt
5914
5937
  VECTOR REAL Bfrom INDEX Data
5915
5938
  VECTOR REAL Gto INDEX Data
5916
5939
  VECTOR REAL Bto INDEX Data
5917
- VECTOR DATE DateStatus
5940
+ VECTOR DATE DateStatus @addyear_fullmodification
5918
5941
  VECTOR INTEGER Status DIM(block) INDEX DateStatus
5919
5942
  END_MODEL
5920
5943
  //----------------------------------------------------------------------