psr-factory 4.1.0b2__py3-none-win_amd64.whl → 4.1.0b3__py3-none-win_amd64.whl

psr/factory/__init__.py

@@ -2,6 +2,6 @@
 # Unauthorized copying of this file, via any medium is strictly prohibited
 # Proprietary and confidential
 
-__version__ = "4.1.0b2"
+__version__ = "4.1.0b3"
 
 from .api import *

psr/factory/api.py

@@ -2174,6 +2174,10 @@ def _initialize():
             "INDEX_STARTS_AT_ZERO": True,
             "NAME": "Python",
             "VERSION": f"{sys.version}",
+            "EXE": f"{sys.executable}",
+            "LIB": f"{factorylib.get_lib_path()}",
+            "BASE_PREFIX": f"{sys.base_prefix}",
+            "REAL_PREFIX": f"{sys.prefix}",
         }
         for prop, value in map_prop_values.items():
             _value = Value()

psr/factory/factory.pmd

@@ -2914,6 +2914,8 @@ DEFINE_MODEL MODL:Optmain_Options
 	PARM INTEGER		RFBF
 	PARM INTEGER		ASNM
 	PARM INTEGER		ASDT
+	PARM INTEGER		TUNE
+	PARM INTEGER		NCVR
 END_MODEL
 
 //--------------------------------------------------------------------------------------------------
@@ -4103,6 +4105,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
 	VETOR DATE      Data @addyear_modification
 	VETOR INTEGER   Existing       INDEX Data
 	VETOR INTEGER   Unidades       INDEX Data
+	VETOR REAL      MinGen         INDEX Data
 	VETOR REAL      PotInst        INDEX Data
 	VETOR REAL      FPMed          INDEX Data
 	VETOR REAL      Qmin           INDEX Data
@@ -4245,6 +4248,10 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
 	PARM INTEGER 	SingleReserveInfo
 	PARM INTEGER 	SingleReserveUnit
 
+	PARM  REAL      MinTurbiningPenalty
+	VETOR DATE      DataMinTurbining @chronological @addyear_chronological
+	VETOR REAL      MinTurbining INDEX  DataMinTurbining
+
 	PARM  REAL      MaxTurbiningPenalty
 	VETOR DATE      DataMaxTurbining @chronological @addyear_chronological
 	VETOR REAL      MaxTurbining INDEX  DataMaxTurbining
@@ -4998,7 +5005,7 @@ DEFINE_MODEL MODL:SDDP_WaterWay
 	PARM  REAL      FlowMax
 	VETOR DATE      DataFlowMaximum
 	VETOR REAL      FlowMaximum INDEX DataFlowMaximum
-	PARM  INTEGER   TravelTime
+	PARM  REAL      TravelTime
 	PARM  INTEGER   Disabled
 END_MODEL
 
@@ -5238,6 +5245,38 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
     PARM INTEGER HIRS
     PARM INTEGER FINJ
     PARM INTEGER ETYP
+    PARM INTEGER RFCF
+    PARM INTEGER PFCF
+    PARM INTEGER PENL
+    PARM INTEGER LSFI
+    PARM INTEGER FIXL
+    PARM INTEGER HCMT
+    PARM REAL MXFT
+    PARM INTEGER HLFR
+    PARM INTEGER LSUP
+    PARM INTEGER PVNC
+    PARM INTEGER HMEM
+    PARM INTEGER HTPP
+    PARM INTEGER FSCN
+    PARM INTEGER SKPS
+    PARM REAL MMPP
+    PARM INTEGER FMIP
+    PARM INTEGER MUPR
+    PARM INTEGER MXBD
+    PARM REAL TOLR
+    PARM INTEGER IGMR
+    PARM REAL GCTE
+    PARM INTEGER LCIR
+    PARM INTEGER VSEC
+    PARM INTEGER SRPD
+    PARM INTEGER LSST
+    PARM REAL LLSF
+    PARM INTEGER GLLS
+    PARM INTEGER LSAL
+    PARM INTEGER PTOU
+    PARM INTEGER SHOT
+    PARM INTEGER FCFO
+    PARM INTEGER HYRM
 
     PARM REAL NCPL_MIPR
     PARM REAL NCPL_LTOL
@@ -5281,10 +5320,13 @@ END_MODEL
 // Generic variable
 //--------------------------------------------------------------------------------------------------
 DEFINE_MODEL PSRGenericVariable
-    PARM    STRING     unit
-	PARM	INTEGER	   resol
+	PARM    STRING     unit
+	PARM    INTEGER	   resol
 	PARM    INTEGER    type // 0 continuous, 1 binary
+	PARM    INTEGER    UseCostAndBounds //determines if following values are used
 	PARM    REAL       cost
+	PARM    REAL       UpperBound
+	PARM    REAL       LowerBound
 END_MODEL
 
 //--------------------------------------------------------------------------------------------------
@@ -5295,6 +5337,7 @@ DEFINE_MODEL PSRHydroUnit
 	VETOR	INTEGER		Nunits INDEX Data
 	VETOR	REAL		MinTurb INDEX Data
 	VETOR	REAL		MaxTurb INDEX Data
+	VETOR	REAL		MinGen INDEX Data
 	VETOR	REAL		MaxGen INDEX Data
 	VETOR	INTEGER		Existing INDEX Data
 END_MODEL
@@ -5329,10 +5372,10 @@ END_MODEL
 DEFINE_MODEL MODL:SDDP_Area
 	DIMENSION block
 
-	//--- Importação da Area do  ---
-	VETOR	DATE	DateTransfer @addyear_modification
-	VETOR	REAL	MaxImport DIM(block) INDEX DateTransfer
-	VETOR	REAL	MaxExport DIM(block) INDEX DateTransfer
+	VETOR	DATE	DateMinTransfer @addyear_modification
+	VETOR	DATE	DateMaxTransfer @addyear_modification
+	VETOR	REAL	MinTransfer DIM(block) INDEX DateMinTransfer
+	VETOR	REAL	MaxTransfer DIM(block) INDEX DateMaxTransfer
 END_MODEL
 
 //----------------------------------------------------------------------
@@ -5694,6 +5737,7 @@ DEFINE_MODEL MODL:SDDP_FlowController
 	VETOR	REAL	Xmax INDEX Data
 	VETOR	REAL	Rn INDEX Data
 	VETOR	REAL	Re INDEX Data
+	VETOR	REAL	MaxPower INDEX Data
 
 	PARM	INTEGER	Location
 	PARM	INTEGER	FlowControlType
@@ -5949,6 +5993,7 @@ DEFINE_CLASS PSRGenerationOfferHydroPlant
 	VECTOR	DATE 		Date @addyear_modification
 	VECTOR	REAL		Price INDEX Date
 	VECTOR	REAL		Quantity INDEX Date
+	PARM	REFERENCE	Plant PSRHydroPlant
 END_CLASS
 
 DEFINE_CLASS PSRGenerationOfferThermalPlant
@@ -5958,6 +6003,7 @@ DEFINE_CLASS PSRGenerationOfferThermalPlant
 	VECTOR	DATE 		Date @addyear_modification
 	VECTOR	REAL		Price INDEX Date
 	VECTOR	REAL		Quantity INDEX Date
+	PARM	REFERENCE	Plant PSRThermalPlant
 END_CLASS
 
 DEFINE_CLASS PSRGenerationOfferRenewablePlant
@@ -5967,6 +6013,7 @@ DEFINE_CLASS PSRGenerationOfferRenewablePlant
 	VECTOR	DATE 		Date @addyear_modification
 	VECTOR	REAL		Price INDEX Date
 	VECTOR	REAL		Quantity INDEX Date
+	PARM	REFERENCE	Plant PSRGndPlant
 END_CLASS
 
 //----------------------------------------------------------------------

psr/factory/factory.pmk

@@ -6442,6 +6442,9 @@ RelCrit		REAL,2
 END_DATA
 END_MASK
 
+//---------------------------------------------------------------------
+// Horizonte Rolante
+//---------------------------------------------------------------------
 DEFINE_MASK CSVDATA OPTGEN_dathzn
 
 DEFINE_HEADER
@@ -6472,7 +6475,22 @@ SensitivityGroup	STRING,3
 Active				INTEGER,4
 Serie				INTEGER,5
 END_DATA
+END_MASK
+
+//---------------------------------------------------------------------
+// Chronological GAP
+//---------------------------------------------------------------------
+DEFINE_MASK CSVDATA OPTGEN_dattgyear
+
+DEFINE_HEADER
+!year,GAP(%),TimeLimit(s)
+END_HEADER
 
+DEFINE_DATA
+InitialYear			INTEGER,1
+GAP					REAL,2
+TimeLimit			INTEGER,3
+END_DATA
 END_MASK
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
@@ -7643,7 +7661,7 @@ END_MASK
 DEFINE_MASK ROWDATA SDDP_v10.2_chidro
 
 DEFINE_HEADER
-!NUM ...Nombre... .PV. .VAA .TAA #Uni Tipo ....Pot .FPMed. .QMin.. .QMax.. .VMin.. .VMax.. .VInic. Min.V+T ..VNC.. ..ICP.. ...IH.. ..FP1.. ..Vol1. ..FP2.. ..Vol2. ..FP3.. ..Vol3. ..FP4.. ..Vol4. ..FP5.. ..Vol5. .Area1. ..Vol1. .Area2. ..Vol2. .Area3. ..Vol3. .Area4. ..Vol4. .Area5. ..Vol5. .Filt1. ..Vol1. .Filt2. ..Vol2. .Filt3. ..Vol3. .Filt4. ..Vol4. .Filt5. ..Vol5. .Cota1. .Vol1.. .Cota2. .Vol2.. .Cota3. .Vol3.. .Cota4. .Vol4.. .Cota5. .Vol5.. .Ev1 .Ev2 .Ev3 .Ev4 .Ev5 .Ev6 .Ev7 .Ev8 .Ev9 Ev10 Ev11 Ev12 tini tfil .faa tare .varea. tfil .vfiltr F.Reg.. pVar .ICV C.Vert. sfal Cos.O&M Irxh RendT&G .EA. Niv.Jus I JuAr I .TurIn1 .TotIn1 .TurIn2 .TotIn2 .TurIn3 .TotIn3 .TurIn4 .TotIn4 .TurIn5 .TotIn5 H V .CFuga1 ..Def1. .CFuga2 ..Def2. .CFuga3 ..Def3. .CFuga4 ..Def4. .CFuga5 ..Def5. E PHidTur PHidVer sv st OpMd IrrR IfTp ForFill ForDraw ForPenT ForPen.
+!NUM ...Nombre... .PV. .VAA .TAA #Uni Tipo ....Pot .FPMed. .QMin.. .QMax.. .VMin.. .VMax.. .VInic. Min.V+T ..VNC.. ..ICP.. ...IH.. ..FP1.. ..Vol1. ..FP2.. ..Vol2. ..FP3.. ..Vol3. ..FP4.. ..Vol4. ..FP5.. ..Vol5. .Area1. ..Vol1. .Area2. ..Vol2. .Area3. ..Vol3. .Area4. ..Vol4. .Area5. ..Vol5. .Filt1. ..Vol1. .Filt2. ..Vol2. .Filt3. ..Vol3. .Filt4. ..Vol4. .Filt5. ..Vol5. .Cota1. .Vol1.. .Cota2. .Vol2.. .Cota3. .Vol3.. .Cota4. .Vol4.. .Cota5. .Vol5.. .Ev1 .Ev2 .Ev3 .Ev4 .Ev5 .Ev6 .Ev7 .Ev8 .Ev9 Ev10 Ev11 Ev12 tini tfil .faa tare .varea. tfil .vfiltr F.Reg.. pVar .ICV C.Vert. sfal Cos.O&M Irxh RendT&G .EA. Niv.Jus I JuAr I .TurIn1 .TotIn1 .TurIn2 .TotIn2 .TurIn3 .TotIn3 .TurIn4 .TotIn4 .TurIn5 .TotIn5 H V .CFuga1 ..Def1. .CFuga2 ..Def2. .CFuga3 ..Def3. .CFuga4 ..Def4. .CFuga5 ..Def5. E PHidTur PHidVer sv st OpMd IrrR IfTp ForFill ForDraw ForPenT ForPen. .MinGen
 END_HEADER
 
 DEFINE_MACRO
@@ -7717,8 +7735,9 @@ IrrigationDchr        INTEGER       820            823            AUTOSET(model.
 InfiltType            INTEGER       825            828            AUTOSET(model.parm("InfiltType"))
 ForebayFillUp         REAL          830            836            AUTOSET(model.parm("ForebayFillUp"))
 ForebayDrawDown       REAL          838            844            AUTOSET(model.parm("ForebayDrawDown"))
-ForebayPenType        INTEGER       846            849            AUTOSET(model.parm("ForebayPenType"))
-ForebayPen            REAL          851            857            AUTOSET(model.parm("ForebayPen"))
+ForebayPenType        INTEGER       846            852            AUTOSET(model.parm("ForebayPenType"))
+ForebayPen            REAL          854            860            AUTOSET(model.parm("ForebayPen"))
+MinGen                REAL          862            868            AUTOSET
 
 END_DATA
 
@@ -9829,7 +9848,7 @@ DEFINE_BLOCK
 BLOCK_IDENT	 Num
 
 DEFINE_HEADER
-!NUM ...Nombre... .PV. .VAA .TAA #Uni Tipo ....Pot .FPMed. .QMin.. .QMax.. .VMin.. .VMax.. .VInic. Min.V+T ..VNC.. ..ICP.. ...IH.. ..FP1.. ..Vol1. ..FP2.. ..Vol2. ..FP3.. ..Vol3. ..FP4.. ..Vol4. ..FP5.. ..Vol5. .Area1. ..Vol1. .Area2. ..Vol2. .Area3. ..Vol3. .Area4. ..Vol4. .Area5. ..Vol5. .Filt1. ..Vol1. .Filt2. ..Vol2. .Filt3. ..Vol3. .Filt4. ..Vol4. .Filt5. ..Vol5. .Cota1. .Vol1.. .Cota2. .Vol2.. .Cota3. .Vol3.. .Cota4. .Vol4.. .Cota5. .Vol5.. .Ev1 .Ev2 .Ev3 .Ev4 .Ev5 .Ev6 .Ev7 .Ev8 .Ev9 Ev10 Ev11 Ev12 tini tfil .faa tare .varea. tfil .vfiltr F.Reg.. pVar .ICV C.Vert. sfal Cos.O&M Irxh RendT&G .EA. Niv.Jus I JuAr I .TurIn1 .TotIn1 .TurIn2 .TotIn2 .TurIn3 .TotIn3 .TurIn4 .TotIn4 .TurIn5 .TotIn5 H V .CFuga1 ..Def1. .CFuga2 ..Def2. .CFuga3 ..Def3. .CFuga4 ..Def4. .CFuga5 ..Def5. E
+!NUM ...Nombre... .PV. .VAA .TAA #Uni Tipo ....Pot .FPMed. .QMin.. .QMax.. .VMin.. .VMax.. .VInic. Min.V+T ..VNC.. ..ICP.. ...IH.. ..FP1.. ..Vol1. ..FP2.. ..Vol2. ..FP3.. ..Vol3. ..FP4.. ..Vol4. ..FP5.. ..Vol5. .Area1. ..Vol1. .Area2. ..Vol2. .Area3. ..Vol3. .Area4. ..Vol4. .Area5. ..Vol5. .Filt1. ..Vol1. .Filt2. ..Vol2. .Filt3. ..Vol3. .Filt4. ..Vol4. .Filt5. ..Vol5. .Cota1. .Vol1.. .Cota2. .Vol2.. .Cota3. .Vol3.. .Cota4. .Vol4.. .Cota5. .Vol5.. .Ev1 .Ev2 .Ev3 .Ev4 .Ev5 .Ev6 .Ev7 .Ev8 .Ev9 Ev10 Ev11 Ev12 tini tfil .faa tare .varea. tfil .vfiltr F.Reg.. pVar .ICV C.Vert. sfal Cos.O&M Irxh RendT&G .EA. Niv.Jus I JuAr I .TurIn1 .TotIn1 .TurIn2 .TotIn2 .TurIn3 .TotIn3 .TurIn4 .TotIn4 .TurIn5 .TotIn5 H V .CFuga1 ..Def1. .CFuga2 ..Def2. .CFuga3 ..Def3. .CFuga4 ..Def4. .CFuga5 ..Def5. E .MinGen
 END_HEADER
 
 DEFINE_MACRO
@@ -9858,6 +9877,7 @@ TotIn($(P))	REAL	619+(16*$(P)),626+(16*$(P))	AUTOSET
 OxT_Tail($(P))        REAL          695+(16*$(P))  701+(16*$(P))  AUTOSET
 OxT_Outflow($(P))     REAL          703+(16*$(P))  709+(16*$(P))  AUTOSET
 Eaflu		INTEGER	791	791	AUTOSET
+MinGen		REAL	793	799	AUTOSET
 END_DATA
 
 END_BLOCK
@@ -11122,6 +11142,98 @@ END_BLOCK
 
 END_MASK
 
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK MIXROWDATA SDDP_v10.2_mntbme
+
+TOTAL_BLOCK	2
+
+//-------------------------------------------------------------
+//-- PRIMEIRO BLOCO -> Identificacao da Usina               ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	****
+BLOCK_LENGTH 1
+NEXT_BLOCK 2
+
+DEFINE_DATA
+IdentBloco				STRING		1,12	****_Planta:
+Num						INTEGER		14,17
+Nome					STRING		19,30
+IdentPenal				STRING		32,37	Penal:
+MinTurbiningPenalty		REAL		42,50	AUTOSET(model.parm("MinTurbiningPenalty"))
+END_DATA
+
+END_BLOCK
+//-------------------------------------------------------------
+//-- SEGUNDO BLOCO -> Dados                                 ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	Year
+
+DEFINE_HEADER
+A~no ......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
+Dado$(N)	REAL		5+8*($(N)-1),12+8*($(N)-1)
+END_DATA
+
+END_BLOCK
+
+END_MASK
+
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK MIXROWDATA SDDP_v10.2_mntbse
+
+TOTAL_BLOCK	2
+
+//-------------------------------------------------------------
+//-- PRIMEIRO BLOCO -> Identificacao da Usina               ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	****
+BLOCK_LENGTH 1
+NEXT_BLOCK 2
+
+DEFINE_DATA
+IdentBloco				STRING		1,12	****_Planta:
+Num						INTEGER		14,17
+Nome					STRING		19,30
+IdentPenal				STRING		32,37	Penal:
+MinTurbiningPenalty		REAL		42,50	AUTOSET(model.parm("MinTurbiningPenalty"))
+END_DATA
+
+END_BLOCK
+//-------------------------------------------------------------
+//-- SEGUNDO BLOCO -> Dados                                 ---
+//-------------------------------------------------------------
+DEFINE_BLOCK
+BLOCK_IDENT	Year
+
+DEFINE_HEADER
+A~no ......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
+Dado$(N)	REAL		5+8*($(N)-1),12+8*($(N)-1)
+END_DATA
+
+END_BLOCK
+
+END_MASK
+
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK MIXROWDATA SDDP_v10.2_mxtbme
@@ -11669,7 +11781,7 @@ MaxReactivePower         REAL,21 AUTOSET
 ReactivePowerFactor      REAL,22 AUTOSET
 GenDev                   REAL,23 AUTOSET
 MaxDev                   REAL,24 AUTOSET
-DevOpt                   REAL,25 AUTOSET(model.parm("DevOpt"))
+DevOpt                   INTEGER,25 AUTOSET(model.parm("DevOpt"))
 
 END_DATA
 
@@ -13839,7 +13951,7 @@ MaxReactivePower         REAL,15 AUTOSET
 ReactivePowerFactor      REAL,16 AUTOSET
 GenDev                   REAL,17 AUTOSET
 MaxDev                   REAL,18 AUTOSET
-DevOpt                   INTEGER,19 AUTOSET
+DevOpt                   INTEGER,19 AUTOSET(model.parm("DevOpt"))
 END_DATA
 END_MASK
 //---------------------------------------------------------------------
@@ -13855,7 +13967,7 @@ Code                     INTEGER,2
 Name                     STRING,3
 Bus                      INTEGER,4
 Existing                 INTEGER,5 AUTOSET
-NumberOfUnits            INTEGER,6 AUTOSET
+Unidades            	 INTEGER,6 AUTOSET
 PotInst                  REAL,7 AUTOSET
 SM                       REAL,8 AUTOSET
 Efficiency               REAL,9 AUTOSET
@@ -13869,7 +13981,6 @@ MaxDev                   REAL,16 AUTOSET
 END_DATA
 END_MASK
 
-
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK CSVDATA SDDP_polca
@@ -13888,7 +13999,6 @@ A4          REAL,     7
 END_DATA
 END_MASK
 
-
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK CSVDATA SDDP_hidtrb
@@ -13915,7 +14025,7 @@ HydroFrom   STRING,   3
 HydroTo     STRING,   4
 FlowMin     REAL,     5 AUTOSET(model.parm("FlowMin"))
 FlowMax     REAL,     6 AUTOSET(model.parm("FlowMax"))
-TravelTime  INTEGER,  7 AUTOSET(model.parm("TravelTime"))
+TravelTime  REAL,     7 AUTOSET(model.parm("TravelTime"))
 Currency    STRING,   8 AUTOSET(model.parm("Currency"))
 Disabled    INTEGER,  9 AUTOSET(model.parm("Disabled"))
 END_DATA
@@ -14368,11 +14478,14 @@ name			STRING,2
 unit			STRING,3	AUTOSET(model.parm("unit"))
 resol			INTEGER,4	AUTOSET(model.parm("resol"))
 type            INTEGER,5   AUTOSET(model.parm("type"))
-cost            REAL,6      AUTOSET(model.parm("cost"))
+type            INTEGER,6   AUTOSET(model.parm("UseCostAndBounds"))
+cost            REAL,7      AUTOSET(model.parm("cost"))
+cost            REAL,8      AUTOSET(model.parm("UpperBound"))
+cost            REAL,9      AUTOSET(model.parm("LowerBound"))
 END_DATA
 DEFINE_HEADER
 $version=1
-!code,name,unit,resol,type,cost
+!code,name,unit,resol,type,UseCostAndBounds,cost,UpperBound,LowerBound
 END_HEADER
 END_MASK
 //---------------------------------------------------------------------
@@ -15058,7 +15171,7 @@ DEFINE_MASK CSVDATA SDDP_dflowcontroller
 
 DEFINE_HEADER
 $version=1
-!Code,Name,CircuitCode,ControlType,DeviceType,Location,Existing,Decommissioned,Xmin,Xmax,Rating,EmergencyRating,OutageProbability
+!Code,Name,CircuitCode,ControlType,DeviceType,Location,Existing,Decommissioned,Xmin,Xmax,Rating,EmergencyRating,MaxPower,OutageProbability
 END_HEADER
 
 DEFINE_DATA
@@ -15074,7 +15187,8 @@ Xmin            REAL     9 AUTOSET
 Xmax            REAL    10 AUTOSET
 Rn              REAL    11 AUTOSET
 Re              REAL    12 AUTOSET
-Prob            REAL    13 AUTOSET
+MaxPower        REAL    13 AUTOSET
+Prob            REAL    14 AUTOSET
 END_DATA
 
 END_MASK
@@ -15083,7 +15197,7 @@ DEFINE_MASK CSVDATA SDDP_mflowcontroller
 
 DEFINE_HEADER
 $version=1
-!Day,Month,Year,Code,Name,CircuitCode,Existing,Decommissioned,Xmin,Xmax,Rating,EmergencyRating,OutageProbability
+!Day,Month,Year,Code,Name,CircuitCode,Existing,Decommissioned,Xmin,Xmax,Rating,EmergencyRating,MaxPower,OutageProbability
 END_HEADER
 
 DEFINE_DATA
@@ -15099,7 +15213,8 @@ Xmin           REAL     9 AUTOSET
 Xmax           REAL    10 AUTOSET
 Rn             REAL    11 AUTOSET
 Re             REAL    12 AUTOSET
-Prob           REAL    13 AUTOSET
+MaxPower       REAL    13 AUTOSET
+Prob           REAL    14 AUTOSET
 END_DATA
 
 END_MASK
@@ -15752,9 +15867,9 @@ END_DATA
 END_MASK
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
-DEFINE_MASK CSVDATA SDDP_areatransf
+DEFINE_MASK CSVDATA SDDP_areamintransf
 DEFINE_AUTOMATIC_INFO
-FILENAME areatransf.dat
+FILENAME areamintransf.dat
 VERSION 1
 CONTEXT_READ sddpac
 CONTEXT_WRITE sddpac
@@ -15764,15 +15879,38 @@ ATTRIBUTE_ID code
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
-code         REFERENCE   1
-DateTransfer DATE        2 YYYY/MM/DD AUTOSET
-block        INTEGER     3
-MaxImport    REAL        4
-MaxExport    REAL        5
+code            REFERENCE   1
+DateMinTransfer DATE        2 YYYY/MM/DD AUTOSET
+block           INTEGER     3
+MinTransfer     REAL        4
+END_DATA
+DEFINE_HEADER
+$version=1
+!code,Date,block,MinTransfer
+END_HEADER
+END_MASK
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK CSVDATA SDDP_areamaxtransf
+DEFINE_AUTOMATIC_INFO
+FILENAME areamaxtransf.dat
+VERSION 1
+CONTEXT_READ sddpac
+CONTEXT_WRITE sddpac
+CLASSNAME PSRArea
+MODEL  MODL:SDDP_Area
+ATTRIBUTE_ID code
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+code            REFERENCE   1
+DateMaxTransfer DATE        2 YYYY/MM/DD AUTOSET
+block           INTEGER     3
+MaxTransfer     REAL        4
 END_DATA
 DEFINE_HEADER
 $version=1
-!code,Date,block,MinImport,MaxExport
+!code,Date,block,MaxTransfer
 END_HEADER
 END_MASK
 //---------------------------------------------------------------------

psr/factory/factorylib.py

@@ -12,10 +12,13 @@ import psr.psrfcommon
 lib = None
 
 if sys.platform == "win32":
+    def get_lib_path() -> str:
+        return os.path.join(os.path.dirname(__file__), "factory.dll")
     def load_lib():
-        lib_path = os.path.join(os.path.dirname(__file__), "factory.dll")
-        return ctypes.cdll.LoadLibrary(lib_path)
+        return ctypes.cdll.LoadLibrary(get_lib_path())
 else:
+    def get_lib_path() -> str:
+        return os.path.join(os.path.dirname(__file__), "libfactory.so")
     def load_lib():
         with psr.psrfcommon.change_cwd(os.path.dirname(__file__)):
             lib_path = "./libfactory.so"

psr_factory-4.1.0b3.dist-info/METADATA

@@ -0,0 +1,108 @@
+Metadata-Version: 2.4
+Name: psr-factory
+Version: 4.1.0b3
+Summary: PSR database management module.
+Author-email: "PSR Inc." <psrfactory@psr-inc.com>
+License: MIT License
+        
+        Copyright (c) 2025 PSR Factory
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+Project-URL: documentation, https://docs.psr-inc.com/factory/
+Keywords: psr,factory,sddp
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: C
+Classifier: Programming Language :: C++
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Software Development
+Classifier: Topic :: Scientific/Engineering
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
+Classifier: License :: OSI Approved :: MIT License
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Dynamic: license-file
+
+PSR Factory (version 4.1.0b3)
+============================
+
+Factory is a library that helps to manage SDDP cases. 
+It contains functions that create, load, and save studies, and also functions that create,
+access, and modify objects in a study.
+
+
+Installation
+------------
+
+### System-wide installation
+
+Open the command prompt and run the following command:
+```bash
+pip install psr-factory
+```
+
+Or, if the package directly from the wheel (whl) file:
+
+```bash
+pip install psr_factory-4.1.0b3-py3-none-win_amd64.whl
+```
+
+Factory will be available to all Python scripts in your system after importing it:
+
+```python
+import psr.factory
+```
+
+
+Usage sample
+------------
+
+```python
+import psr.factory
+
+study = psr.factory.load_study(r"C:\temp\my\study")
+system_1 = study.find("System.*")[0]
+
+battery = psr.factory.create("Battery")
+battery.code = 1
+battery.name = "Battery 1"
+battery.set("InstalledCapacity", 10.0)
+battery.set("RefSystem", system_1)
+study.add(battery)
+
+study.save(r"C:\temp\my\updated_study")
+```
+
+
+Full documentation
+------------------
+
+The full documentation and reference is available at [https://docs.psr-inc.com/factory/](https://docs.psr-inc.com/factory/).
+
+Releases
+--------
+
+New releases can be found in the release notes at [https://psrenergy-docs.github.io/factory/releases.html](https://psrenergy-docs.github.io/factory/releases.html).

{psr_factory-4.1.0b2.dist-info → psr_factory-4.1.0b3.dist-info}/RECORD

@@ -10,13 +10,13 @@ psr/cloud/status.py,sha256=vcI4B9S6wCt9maT5NNrVwYaEgGIvy6kkC1UVpJjYbtw,3607
 psr/cloud/tempfile.py,sha256=1IOeye0eKWnmBynK5K5FMWiTaEVhn4GbQ8_y0THEva0,3893
 psr/cloud/version.py,sha256=FMkUnJ7LLpNt9YmROO5l8D4w-g7A6-Fo0eI9JbYZh0o,192
 psr/cloud/xml.py,sha256=dmBh4iRieORCctm1obz1EGA2QN-KkZlH5_dQfBud-AI,1847
-psr/factory/__init__.py,sha256=yW9nyLv3uwvnNV1-1OPmfg43kB7Ioeulb-jPNU1Lw3s,218
-psr/factory/api.py,sha256=a2iH0am4O9SStICiy0iID_s3OHX__fC2w0q9UczQUFk,95251
-psr/factory/factory.dll,sha256=o-FjmD45wpt_f89h8s6dbCh2NH6LT5NGLMh47iMe6_c,17730096
-psr/factory/factory.pmd,sha256=3fGQyBFd16Msfn4ZJe8TDFc759XylW5HqQhdwsSReMM,228259
-psr/factory/factory.pmk,sha256=1AQ9L3PAPmCvFZaecjGH7psIa-SURZ7WNnZp1rCnL98,551552
-psr/factory/factorylib.py,sha256=7WK-g9K8juNoEwndCeTGYLMOV421QjO8Q0NlTqgvZzs,26839
-psr/factory/libcurl-x64.dll,sha256=upYQ3cF76RcWm5DWoTNkYvYNkh9CngyYmL7e1qBeqAs,5328944
+psr/factory/__init__.py,sha256=IVy9wUtd7XwVWcncZkrnNFvxa6H-DdlVgggY6VReIPk,218
+psr/factory/api.py,sha256=Ruz9klp70FJnsarb-Se5b5G5FAyqa11mBsP7CqBAzuo,95439
+psr/factory/factory.dll,sha256=C4cVo0_k0GHWTkktG6_Eu_gg6rgsR7_RTgLJxd8PPPk,17828912
+psr/factory/factory.pmd,sha256=r-2idBk98sKzDC-h0-nn6CF8Pr-mxz1RtnpEpvIEaU0,229581
+psr/factory/factory.pmk,sha256=NzPpz4_bR3hvBAff9BWqf-6IWcHNwDd31PHUizo4YYs,555896
+psr/factory/factorylib.py,sha256=Orcg4X47J3J1CNr0WEERucqsTJLqt0TV9VFFZXLv6WE,26978
+psr/factory/libcurl-x64.dll,sha256=d8hRt8TBfeZxKiqQj1ZLxOjdgtZTawVMimzV3KGykRw,5328944
 psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 psr/psrfcommon/__init__.py,sha256=WXR560XQllIjtFpWd0jiJEbUAQIyh5-6lwj-42_J95c,200
 psr/psrfcommon/psrfcommon.py,sha256=NABM5ahvyfSizDC9c0Vu9dVK1pD_vOzIGFHL1oz2E1o,1464
@@ -24,7 +24,8 @@ psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,39
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
 psr/runner/runner.py,sha256=fiuwKDRnqOLfV5UKJamLMZqm7PneeVjgEEmhpZbMm98,26340
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-4.1.0b2.dist-info/METADATA,sha256=Slc6h7a1sMccXnw0G9rYjBTY2NKS4Te73pSoZ3C9sqM,1757
-psr_factory-4.1.0b2.dist-info/WHEEL,sha256=GRAwO4abswPoD8u6X5Ix8yKoy-wTIXRf_V-PAIDNIsM,97
-psr_factory-4.1.0b2.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-4.1.0b2.dist-info/RECORD,,
+psr_factory-4.1.0b3.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-4.1.0b3.dist-info/METADATA,sha256=e3ajWcmlXdJYZfnNBcpHI6cjg8lMBx6Ay1pm1XDdwuE,3721
+psr_factory-4.1.0b3.dist-info/WHEEL,sha256=GRAwO4abswPoD8u6X5Ix8yKoy-wTIXRf_V-PAIDNIsM,97
+psr_factory-4.1.0b3.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-4.1.0b3.dist-info/RECORD,,

psr_factory-4.1.0b3.dist-info/licenses/LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 PSR Factory
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

psr_factory-4.1.0b2.dist-info/METADATA

@@ -1,70 +0,0 @@
-Metadata-Version: 2.4
-Name: psr-factory
-Version: 4.1.0b2
-Summary: PSR database management module.
-Author-email: "PSR Inc." <psrfactory@psr-inc.com>
-Project-URL: documentation, https://docs.psr-inc.com/factory/
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-
-PSR Factory (version 4.1.0b2)
-============================
-
-Factory is a library that helps to manage SDDP cases. 
-It contains functions that create, load, and save studies, and also functions that create,
-access, and modify objects in a study.
-
-
-Installation
-------------
-
-### System-wide installation
-
-Open the command prompt and run the following command:
-```bash
-pip install psr-factory
-```
-
-Or, if the package directly from the wheel (whl) file:
-
-```bash
-pip install psr_factory-4.1.0b2-py3-none-win_amd64.whl
-```
-
-Factory will be available to all Python scripts in your system after importing it:
-
-```python
-import psr.factory
-```
-
-
-Usage sample
-------------
-
-```python
-import psr.factory
-
-study = psr.factory.load_study(r"C:\temp\my\study")
-system_1 = study.find("System.*")[0]
-
-battery = psr.factory.create("Battery")
-battery.code = 1
-battery.name = "Battery 1"
-battery.set("InstalledCapacity", 10.0)
-battery.set("RefSystem", system_1)
-study.add(battery)
-
-study.save(r"C:\temp\my\updated_study")
-```
-
-
-Full documentation
-------------------
-
-The full documentation and reference is available at [https://docs.psr-inc.com/factory/](https://docs.psr-inc.com/manual/factory/).
-
-Releases
---------
-
-New releases can be found in the release notes at [https://psrenergy-docs.github.io/factory/releases.html](https://psrenergy-docs.github.io/factory/releases.html).