psr-factory 4.1.0b4__py3-none-win_amd64.whl → 4.1.0b5__py3-none-win_amd64.whl

psr/cloud/cloud.py

@@ -68,12 +68,8 @@ def _check_for_errors(
 
 
 def _hide_password(params: str) -> str:
-    # Define a expressão regular para encontrar o parâmetro senha com atributos adicionais
     pattern = r'(<Parametro nome="senha"[^>]*>)(.*?)(</Parametro>)'
-
-    # Substitui o conteúdo da senha por ********
     result = re.sub(pattern, r"\1********\3", params)
-
     return result
 
 
@@ -882,10 +878,21 @@ class Client:
         portal_ws = zeep.Client(self.cluster["url"] + "?WSDL")
         section = str(id(self))
         password_md5 = _md5sum(self.username + self.__password + section).upper()
+        password_md5 = (
+            password_md5
+            if self.cluster["name"] == "PSR-US"
+            or self.cluster["name"] == "PSR-HOTFIX"
+            or self.cluster["name"] == "PSR-US_OHIO"
+            else self.__password.upper()
+        )
         additional_arguments = kwargs.get("additional_arguments", None)
         parameters = {
             "sessao_id": section,
-            "tipo_autenticacao": "portal",
+            "tipo_autenticacao": "portal"
+            if self.cluster["name"] == "PSR-US"
+            or self.cluster["name"] == "PSR-HOTFIX"
+            or self.cluster["name"] == "PSR-US_OHIO"
+            else "bcrypt",
             "idioma": "3",
         }
         if additional_arguments:

psr/cloud/version.py

@@ -2,4 +2,4 @@
 # Unauthorized copying of this file, via any medium is strictly prohibited
 # Proprietary and confidential
 
-__version__ = "0.3.1"
+__version__ = "0.3.3"

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.0b4"
+__version__ = "4.1.0b5"
 
 from .api import *

psr/factory/api.py

@@ -1288,6 +1288,7 @@ class Study(_BaseObject):
 
     @staticmethod
     def load(study_path: Union[str, pathlib.Path], profile_or_context: Union[str, Context, None],
+             settings_only: bool = False,
              options: Optional[Union[dict, "Value", "DataObject"]] = None):
         if not isinstance(options, (DataObject, type(None))):
             raise TypeError("options must be a DataObject or None.")
@@ -1297,28 +1298,41 @@ class Study(_BaseObject):
         err = Error()
         options_value = _get_arg_object(options)
         study = Study()
-        study._hdr = factorylib.lib.psrd_study_load(_c_str(study_path),
-                                                    _bytes(study_path),
-                                                    options_value.handler(),
-                                                    context.handler(),
-                                                    err.handler())
+        if not settings_only:
+            load_fn = factorylib.lib.psrd_study_load
+        else:
+            load_fn = factorylib.lib.psrd_study_load_settings
+        study._hdr = load_fn(_c_str(study_path), _bytes(study_path),
+                             options_value.handler(), context.handler(),
+                             err.handler())
         if err.code != 0:
             raise FactoryException(err.what)
         return study
 
-    def save(self, output_path: Union[str, pathlib.Path], options: Optional[Union[dict, Value, DataObject]] = None):
-        if not isinstance(options, (DataObject, type(None))):
-            raise TypeError("options must be a DataObject or None.")
+    def save(self, output_path: Union[str, pathlib.Path],
+             options: Optional[Union[dict, Value, DataObject]] = None):
         output_path = str(output_path)
         _err = Error()
         options_value = _get_arg_object(options)
-        factorylib.lib.psrd_study_save(self._hdr, _c_str(output_path),
-                                       _bytes(output_path),
+        factorylib.lib.psrd_study_save(self._hdr,
+                                       _c_str(output_path), _bytes(output_path),
                                        options_value.handler(),
                                        _err.handler())
         if _err.code != 0:
             raise FactoryException(_err.what)
 
+    def save_settings(self, output_path: Union[str, pathlib.Path],
+             options: Optional[Union[dict, Value, DataObject]] = None):
+        output_path = str(output_path)
+        _err = Error()
+        options_value = _get_arg_object(options)
+        factorylib.lib.psrd_study_save_settings(self._hdr, _c_str(output_path),
+                                                _bytes(output_path),
+                                                options_value.handler(),
+                                                _err.handler())
+        if _err.code != 0:
+            raise FactoryException(_err.what)
+
     @property
     def context(self) -> "Context":
         _check_initialized()
@@ -1396,6 +1410,16 @@ class Study(_BaseObject):
         if _err.code != 0:
             raise FactoryException(_err.what)
 
+    def get_all_objects(self) -> List[DataObject]:
+        object_list = ValueList(False)
+        error = Error()
+        ref = factorylib.lib.psrd_study_get_all_objects(self._hdr,
+                                                        error.handler())
+        if error.code != 0 or ref is None:
+            raise FactoryException(error.what)
+        object_list._hdr = ref
+        return object_list.to_list()
+
     def find(self, expression: str) -> List[DataObject]:
         object_list = ValueList(False)
         _err = Error()
@@ -1407,6 +1431,20 @@ class Study(_BaseObject):
         object_list._hdr = ref
         return object_list.to_list()
 
+    def find_by_name(self, type_name: str, name: str) -> List[DataObject]:
+        object_list = ValueList(False)
+        _err = Error()
+        if name.strip() == "":
+            name = "*"
+        expression = f"{type_name}.{name}"
+        ref = factorylib.lib.psrd_study_find(self._hdr,
+                                             _c_str(expression),
+                                             _err.handler())
+        if _err.code != 0 or ref is None:
+            raise FactoryException(_err.what)
+        object_list._hdr = ref
+        return object_list.to_list()
+
     def find_by_code(self, type_name: str, code: Optional[int] = None) -> List[DataObject]:
         if code is None:
             warnings.warn(DeprecationWarning("Starting from Factory 4.0.9 "
@@ -2254,7 +2292,15 @@ def create_study(*args, **kwargs) -> Study:
 def load_study(study_path: Union[str, pathlib.Path],
                profile_or_context: Union[str, Context, None] = None,
                options: Optional[DataObject] = None) -> Study:
-    return Study.load(study_path, profile_or_context, options)
+    settings_only = False
+    return Study.load(study_path, profile_or_context, settings_only, options)
+
+
+def load_study_settings(study_path: Union[str, pathlib.Path],
+               profile_or_context: Union[str, Context, None] = None,
+               options: Optional[DataObject] = None) -> Study:
+    settings_only = True
+    return Study.load(study_path, profile_or_context, settings_only, options)
 
 
 def create(class_name: str,

psr/factory/factory.pmd

@@ -2494,6 +2494,7 @@ DEFINE_MODEL MODL:Optgen_RestricaoCapacidade
 	PARM INTEGER	PenaltyFlag
 	PARM INTEGER	SystemCodePu
 	PARM REFERENCE  SystemElement PSRSystem
+	VECTOR REFERENCE AgentElement PSRElement
 END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Modelo para Restricao de Precedencia
@@ -2520,6 +2521,7 @@ DEFINE_MODEL MODL:Optgen_RestricaoGenerica
 	PARM INTEGER	LimitType
 	PARM REAL		Penalty
 	PARM INTEGER    Selected
+	VECTOR REFERENCE AgentElement PSRElement
 END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Modelo para Restricao Generica
@@ -2823,7 +2825,7 @@ DEFINE_CLASS PSRMaintenanceSolicitation
 	PARM REAL			Score
 	PARM INTEGER		Fix
 	PARM INTEGER		FixOuter
-	PARM REFERENCE		Plant
+	PARM REFERENCE		Plant PSRPlant
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -2831,9 +2833,9 @@ END_CLASS
 //--------------------------------------------------------------------------------------------------
 DEFINE_CLASS PSRMaintenanceExclusive
 	PARM STRING  		SetName @id
-	VECTOR REFERENCE	PlantsThermal
-	VECTOR REFERENCE	PlantsHydro
-	VECTOR REFERENCE	PlantsGnd
+	VECTOR REFERENCE	PlantsThermal PSRThermalPlant
+	VECTOR REFERENCE	PlantsHydro PSRHydroPlant
+	VECTOR REFERENCE	PlantsGnd PSRGndPlant
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -2841,9 +2843,9 @@ END_CLASS
 //--------------------------------------------------------------------------------------------------
 DEFINE_CLASS PSRMaintenanceShared
 	PARM STRING  		SetName @id
-	VECTOR REFERENCE	PlantsThermal
-	VECTOR REFERENCE	PlantsHydro
-	VECTOR REFERENCE	PlantsGnd
+	VECTOR REFERENCE	PlantsThermal PSRThermalPlant
+	VECTOR REFERENCE	PlantsHydro	PSRHydroPlant
+	VECTOR REFERENCE	PlantsGnd PSRGndPlant
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -2882,7 +2884,8 @@ END_CLASS
 // Modelo para Demanda Instantanea
 //--------------------------------------------------------------------------------------------------
 MERGE_CLASS PSRSystem InstDem
-	VECTOR REAL  	    InstantDemand
+	VECTOR DATE			InstantDemandDate
+	VECTOR REAL  	    InstantDemand INDEX InstantDemandDate
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -2926,7 +2929,7 @@ DEFINE_CLASS PSRMaintenancePrecedence
 	PARM STRING  		PrecName @id
 	VECTOR INTEGER  	DelayMin
 	VECTOR INTEGER  	DelayMax
-	VECTOR REFERENCE	Solicitations
+	VECTOR REFERENCE	Solicitations	PSRMaintenanceSolicitation
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -3685,6 +3688,9 @@ DEFINE_MODEL MODL:SDDP_V10.2_ConfiguracaoEstudo
 	VETOR DATE SubHourlyStage
 	VETOR INTEGER SubHourlyScenario INDEX SubHourlyStage
 	VETOR INTEGER SubHourlyDays INDEX SubHourlyStage
+	PARM INTEGER DynamicConvergenceNumberSegments
+  VETOR REAL   DynamicConvergenceMaxTime
+  VETOR REAL   DynamicConvergenceTolerance
 
 	//--------------------------------------
 	//--- MAXREV                         ---
@@ -4185,11 +4191,13 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
 
 	//--- Net Head x Power ---
 	VECTOR DATE     HxP_Date
+	VECTOR DATE     HxP_EndDate INTERVAL HxP_Date
 	VECTOR REAL     NetHead  DIM(varpoint) INDEX HxP_Date
 	VECTOR REAL     Power    DIM(varpoint) INDEX HxP_Date
 
 	//--- Net Head x Production coefficient ---
 	VECTOR DATE     HxPC_Date
+	VECTOR DATE     HxPC_EndDate INTERVAL HxPC_Date
 	VECTOR REAL     NetH     DIM(varpoint) INDEX HxPC_Date
 	VECTOR REAL     ProdCoef DIM(varpoint) INDEX HxPC_Date
 
@@ -5030,7 +5038,6 @@ END_MODEL
 //--------------------------------------------------------------------------------------------------
 DEFINE_CLASS SingleContingency
 	@dictionary singlecontingency, singctg
-	PARM	STRING	name @id
 	PARM	REFERENCE	Serie PSRSerie @id
 	PARM	REFERENCE	MonitoringList MonitoringList
 END_CLASS
@@ -5166,7 +5173,7 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
     PARM INTEGER CCTA
     PARM INTEGER CCTL
     PARM INTEGER MAXT
-    PARM INTEGER RPK2
+    PARM STRING RPK2
     PARM INTEGER BINF
     PARM INTEGER EXPN
     PARM INTEGER MXAP
@@ -5295,27 +5302,29 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
     PARM INTEGER NCPL_TERF
     PARM INTEGER NCPL_DEBG
     PARM INTEGER NCPL_CCOS
-	PARM INTEGER NCPL_SCRT
-	PARM INTEGER NCPL_RLOS
-	PARM INTEGER NCPL_RSBT
-	PARM INTEGER NCPL_HUNI
-	PARM INTEGER NCPL_RAMP
-	PARM INTEGER NCPL_INCO
-	PARM INTEGER NCPL_RTRA
-	PARM INTEGER NCPL_INWT
-	PARM INTEGER NCPL_BINS
-	PARM INTEGER NCPL_BETR
-	PARM INTEGER NCPL_NDIS
-	PARM INTEGER NCPL_KDIS
-	PARM INTEGER NCPL_DETM
-	PARM INTEGER NCPL_CKMC
-	PARM INTEGER NCPL_TMUP
-	PARM INTEGER NCPL_GNPR
-	PARM INTEGER NCPL_PRES
-	PARM INTEGER NCPL_MEMO
-	PARM INTEGER NCPL_GMIN
-	PARM INTEGER NCPL_HGEN
-	PARM INTEGER NCPL_BMIP
+    PARM INTEGER NCPL_SCRT
+    PARM INTEGER NCPL_RLOS
+    PARM INTEGER NCPL_RSBT
+    PARM INTEGER NCPL_HUNI
+    PARM INTEGER NCPL_RAMP
+    PARM INTEGER NCPL_INCO
+    PARM INTEGER NCPL_RTRA
+    PARM INTEGER NCPL_INWT
+    PARM INTEGER NCPL_BINS
+    PARM INTEGER NCPL_BETR
+    PARM INTEGER NCPL_NDIS
+    PARM INTEGER NCPL_KDIS
+    PARM INTEGER NCPL_DETM
+    PARM INTEGER NCPL_CKMC
+    PARM INTEGER NCPL_TMUP
+    PARM INTEGER NCPL_GNPR
+    PARM INTEGER NCPL_PRES
+    PARM INTEGER NCPL_MEMO
+    PARM INTEGER NCPL_GMIN
+    PARM INTEGER NCPL_HGEN
+    PARM INTEGER NCPL_BMIP
+    PARM INTEGER NCPL_UDNC // use ncplite dynamic convergence
+	PARM INTEGER INFM
 END_MODEL
 
 //--------------------------------------------------------------------------------------------------
@@ -5363,11 +5372,21 @@ END_MODEL
 DEFINE_MODEL MODL:SDDP_Asset
 	DIMENSION owner
 
-    //--- Proprietários e participações ---
+	//--- Proprietários e participações ---
 	PARM REFERENCE Owner      DIM(owner) PSROwner
 	PARM REAL      OwnerShare DIM(owner)
 END_MODEL
 
+//----------------------------------------------------------------------
+// Propriedade/Ativo/Asset
+//----------------------------------------------------------------------
+DEFINE_MODEL MODL:SDDP_Ownership
+	//--- Relacionamento PSROwner x PSRElement ---
+	PARM	REFERENCE Owner      PSROwner
+	PARM	REFERENCE Element    PSRElement
+	PARM	REAL      Share
+END_MODEL
+
 //----------------------------------------------------------------------
 // Area
 //----------------------------------------------------------------------
@@ -5456,7 +5475,7 @@ DEFINE_MODEL MODL:SDDP_Line
 	VECTOR	REAL	Re INDEX Data
 	VECTOR	REAL	Prob INDEX Data
 
-	VECTOR	DATE	DateStatus
+	VECTOR	DATE	DateStatus @addyear_fullmodification
 	VECTOR	INTEGER	Status DIM(block) INDEX DateStatus
 
 	MERGE_MODEL MODL:SDDP_Asset
@@ -5500,7 +5519,7 @@ DEFINE_MODEL MODL:SDDP_Transformer
 	VECTOR	REAL	MinPhaseAngle INDEX Data
 	VECTOR	REAL	MaxPhaseAngle INDEX Data
 
-	VECTOR	DATE	DateStatus
+	VECTOR	DATE	DateStatus @addyear_fullmodification
 	VECTOR	INTEGER	Status DIM(block) INDEX DateStatus
 
 	VETOR	DATE	DateTap
@@ -5579,7 +5598,7 @@ DEFINE_MODEL MODL:SDDP_Transformer3Winding
 	VETOR	REAL	MinPhaseAngle3 INDEX Data
 	VETOR	REAL	MaxPhaseAngle3 INDEX Data
 
-	VECTOR	DATE	DateStatus
+	VECTOR	DATE	DateStatus @addyear_fullmodification
 	VECTOR	INTEGER	Status DIM(block) INDEX DateStatus
 
 	VETOR	DATE	DateTap
@@ -5708,14 +5727,14 @@ DEFINE_MODEL MODL:SDDP_TCSC
 	VETOR	REAL	Prob INDEX Data
 
 	//--- Status do circuito para cada patamar ---
-	VETOR	DATE	DateStatus
+	VETOR	DATE	DateStatus @addyear_fullmodification
 	VETOR	INTEGER	Status DIM(block) INDEX DateStatus
 
 	VETOR	DATE	DateBypass
 	VETOR	INTEGER	Bypass DIM(block) INDEX DateBypass
 
 	VETOR	DATE	DateSetpoint
-	VETOR	INTEGER	Setpoint DIM(block) INDEX DateSetpoint
+	VETOR	REAL	Setpoint DIM(block) INDEX DateSetpoint
 
 	VETOR	DATE	DateFlow
 	VETOR	REAL	MaxFlow DIM(block) INDEX DateFlow
@@ -5778,7 +5797,9 @@ DEFINE_MODEL MODL:SDDP_SimpleTwoTerminal_DCLink
 	VETOR	REAL	CapacityEmergencyFromTo INDEX Data
 	VETOR	REAL	CapacityEmergencyToFrom INDEX Data
 	VETOR	REAL	R INDEX Data
-	VETOR	INTEGER	Status INDEX Data
+
+	VETOR	DATE	DateStatus @addyear_fullmodification
+	VETOR	INTEGER	Status INDEX DateStatus
 
 	// Reactive power model
 	VETOR	REAL	ReactivePowerFactorFrom INDEX Data
@@ -5828,7 +5849,7 @@ DEFINE_MODEL MODL:SDDP_DCLine
 	VETOR	REAL	Re INDEX Data
 	VETOR	REAL	Prob INDEX Data
 
-	VETOR	DATE	DateStatus
+	VETOR	DATE	DateStatus @addyear_fullmodification
 	VETOR	INTEGER	Status DIM(block) INDEX DateStatus
 END_MODEL
 //----------------------------------------------------------------------
@@ -5866,7 +5887,7 @@ DEFINE_MODEL MODL:SDDP_LCC_Converter
 	VETOR	DATE	DateTap
 	VETOR	REAL	Tap DIM(block) INDEX DateTap
 
-	VETOR	DATE	DateStatus
+	VETOR	DATE	DateStatus @addyear_fullmodification
 	VETOR	INTEGER	Status DIM(block) INDEX DateStatus
 END_MODEL
 //----------------------------------------------------------------------
@@ -5887,7 +5908,7 @@ DEFINE_MODEL MODL:SDDP_VSC_Converter
 
     MERGE_MODEL MODL:SDDP_GeneratorVoltageRegulator
 
-	VETOR	DATE	DateStatus
+	VETOR	DATE	DateStatus @addyear_fullmodification
 	VETOR	INTEGER	Status DIM(block) INDEX DateStatus
 END_MODEL
 
@@ -5903,7 +5924,7 @@ DEFINE_MODEL MODL:SDDP_BusShunt
 	VECTOR	REAL	B INDEX Data
 	VECTOR	INTEGER	NumberOfUnits INDEX Data
 	VECTOR	DATE	DateUnitsInService
-	VECTOR	REAL	UnitsInService DIM(block) INDEX DateUnitsInService
+	VECTOR	INTEGER	UnitsInService DIM(block) INDEX DateUnitsInService
 END_MODEL
 //----------------------------------------------------------------------
 // Non-linear Reactive Power Models - Line Shunt
@@ -5916,7 +5937,7 @@ DEFINE_MODEL MODL:SDDP_LineShunt
 	VECTOR	REAL	Bfrom	INDEX Data
 	VECTOR	REAL	Gto	INDEX Data
 	VECTOR	REAL	Bto	INDEX Data
-	VECTOR	DATE	DateStatus
+	VECTOR	DATE	DateStatus @addyear_fullmodification
 	VECTOR	INTEGER	Status DIM(block) INDEX DateStatus
 END_MODEL
 //----------------------------------------------------------------------

psr/factory/factory.pmk

@@ -6659,12 +6659,11 @@ 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"))
-FixOuter			INTEGER,15	AUTOSET(model.parm("FixOuter"))
-Plant			REFERENCE,16	AUTOSET(model.parm("Plant"))
+Plant			REFERENCE,15	AUTOSET(model.parm("Plant"))
 END_DATA
 DEFINE_HEADER
 $version=3
-!Name,UnitCode,MinDateDay,MinDateMonth,MinDateYear,MaxDateDay,MaxDateMonth,MaxDateYear,Duration,PrefDateDay,PrefDateMonth,PrefDateYear,Score,Fix,FixOuter,Plant
+!Name,UnitCode,MinDateDay,MinDateMonth,MinDateYear,MaxDateDay,MaxDateMonth,MaxDateYear,Duration,PrefDateDay,PrefDateMonth,PrefDateYear,Score,Fix,Plant
 END_HEADER
 END_MASK
 //--------------------------------------------------------------------------------------------------
@@ -6916,12 +6915,13 @@ MODEL InstDem
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
-PSRSystem		REFERENCE,1
-InstantDemand		REAL,2
+PSRSystem		    REFERENCE,1
+InstantDemandDate	DATE,2	YYYY/MM/DD	AUTOSET
+InstantDemand		REAL,3  AUTOSET
 END_DATA
 DEFINE_HEADER
 $version=2
-!PSRSystem,InstantDemand
+!PSRSystem,InstantDemandDate,InstantDemand
 END_HEADER
 END_MASK
 //--------------------------------------------------------------------------------------------------
@@ -8558,6 +8558,22 @@ Kv		REAL		22,27	AUTOSET(model.parm("Kv"))
 END_DATA
 END_MASK
 
+//---------------------------------------------------------------------
+// AREA V17
+//---------------------------------------------------------------------
+DEFINE_MASK ROWDATA SDDP_V17_area
+
+DEFINE_HEADER
+$version=1
+! Num ....Nome.)
+END_HEADER
+DEFINE_DATA
+Num		INTEGER		1,5
+Nome		STRING		7,18
+END_DATA
+
+END_MASK
+
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA SDDP_v10.2_Dcirc
@@ -14700,9 +14716,8 @@ CREATE_OBJECTS TRUE
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
-name			          REFERENCE,1	AUTOSET(model.parm("name"))
-Serie			          REFERENCE,2	AUTOSET(model.parm("Serie"))
-MonitoringList			REFERENCE,3	AUTOSET(model.parm("MonitoringList"))
+Serie			          REFERENCE,1	AUTOSET(model.parm("Serie"))
+MonitoringList			REFERENCE,2	AUTOSET(model.parm("MonitoringList"))
 END_DATA
 DEFINE_HEADER
 $version=1
@@ -14978,9 +14993,9 @@ DEFINE_HEADER
 END_HEADER
 
 DEFINE_DATA
-Code			INTEGER,1
-Name			STRING,2
-UseUserScenarios INTEGER,3
+Code				INTEGER,1
+Name				STRING,2
+UseUserScenarios	INTEGER,3 AUTOSET(model.parm("UseUserScenarios"))
 END_DATA
 
 END_MASK
@@ -14994,7 +15009,7 @@ DEFINE_HEADER
 END_HEADER
 
 DEFINE_DATA
-Circuit			INTEGER,1
+Circuit		INTEGER,1
 DLR			INTEGER,2
 END_DATA
 
@@ -15049,13 +15064,12 @@ DEFINE_MASK CSVDATA SDDP_dzone
 
 DEFINE_HEADER
 $version=1
-!Code,Name,SystemCode
+!Code,Name
 END_HEADER
 
 DEFINE_DATA
 Code       INTEGER 1
 Name       STRING  2
-SystemCode INTEGER 3
 END_DATA
 
 END_MASK
@@ -15614,7 +15628,7 @@ DEFINE_MASK CSVDATA SDDP_ddclink
 
 DEFINE_HEADER
 $version=1
-!Code,Name,BusFrom,BusTo,Existing,Status,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,FlagQuadraticLoss,R,MeteringEnd,ReactivePowerFactorFrom,ReactivePowerFactorTo,WheelingCostFromTo,WheelingCostToFrom,Currency,ReserveMargin
+!Code,Name,BusFrom,BusTo,Existing,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,FlagQuadraticLoss,R,MeteringEnd,ReactivePowerFactorFrom,ReactivePowerFactorTo,WheelingCostFromTo,WheelingCostToFrom,Currency,ReserveMargin
 END_HEADER
 
 DEFINE_DATA
@@ -15623,23 +15637,22 @@ Name                    STRING   2
 BusFromCode             INTEGER  3
 BusToCode               INTEGER  4
 Existing                INTEGER  5 AUTOSET
-Status                  INTEGER  6 AUTOSET
-Decommissioned          INTEGER  7 AUTOSET
-CapacityFromTo          REAL     8 AUTOSET
-CapacityToFrom          REAL     9 AUTOSET
-LossFactorFromTo        REAL    10 AUTOSET
-LossFactorToFrom        REAL    11 AUTOSET
-CapacityEmergencyFromTo REAL    12 AUTOSET
-CapacityEmergencyToFrom REAL    13 AUTOSET
-FlagQuadraticLoss       INTEGER 14 AUTOSET(model.parm("FlagQuadraticLoss"))
-R                       REAL    15 AUTOSET
-MeteringEnd             INTEGER 16 AUTOSET(model.parm("MeteringEnd"))
-ReactivePowerFactorFrom REAL    17 AUTOSET
-ReactivePowerFactorTo   REAL    18 AUTOSET
-WheelingCostFromTo      REAL    19	AUTOSET(model.parm("WheelingCostFromTo"))
-WheelingCostToFrom      REAL    20	AUTOSET(model.parm("WheelingCostToFrom"))
-Currency                STRING  21	AUTOSET(model.parm("Currency"))
-ReserveMargin           REAL    22	AUTOSET(model.parm("ReserveMargin"))
+Decommissioned          INTEGER  6 AUTOSET
+CapacityFromTo          REAL     7 AUTOSET
+CapacityToFrom          REAL     8 AUTOSET
+LossFactorFromTo        REAL     9 AUTOSET
+LossFactorToFrom        REAL    10 AUTOSET
+CapacityEmergencyFromTo REAL    11 AUTOSET
+CapacityEmergencyToFrom REAL    12 AUTOSET
+FlagQuadraticLoss       INTEGER 13 AUTOSET(model.parm("FlagQuadraticLoss"))
+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"))
 
 END_DATA
 
@@ -15649,7 +15662,7 @@ DEFINE_MASK CSVDATA SDDP_mdclink
 
 DEFINE_HEADER
 $version=1
-!Day,Month,Year,Code,Name,BusFrom,BusTo,Existing,Status,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
 END_HEADER
 
 DEFINE_DATA
@@ -15661,20 +15674,40 @@ Name                    STRING   5
 BusFromCode             INTEGER  6
 BusToCode               INTEGER  7
 Existing                INTEGER  8 AUTOSET
-Status                  INTEGER  9 AUTOSET
-Decommissioned          INTEGER 10 AUTOSET
-CapacityFromTo          REAL    11 AUTOSET
-CapacityToFrom          REAL    12 AUTOSET
-LossFactorFromTo        REAL    13 AUTOSET
-LossFactorToFrom        REAL    14 AUTOSET
-CapacityEmergencyFromTo REAL    15 AUTOSET
-CapacityEmergencyToFrom REAL    16 AUTOSET
-R                       REAL    17 AUTOSET
-ReactivePowerFactorFrom REAL    18 AUTOSET
-ReactivePowerFactorTo   REAL    19 AUTOSET
+Decommissioned          INTEGER  9 AUTOSET
+CapacityFromTo          REAL    10 AUTOSET
+CapacityToFrom          REAL    11 AUTOSET
+LossFactorFromTo        REAL    12 AUTOSET
+LossFactorToFrom        REAL    13 AUTOSET
+CapacityEmergencyFromTo REAL    14 AUTOSET
+CapacityEmergencyToFrom REAL    15 AUTOSET
+R                       REAL    16 AUTOSET
+ReactivePowerFactorFrom REAL    17 AUTOSET
+ReactivePowerFactorTo   REAL    18 AUTOSET
 
 END_DATA
+END_MASK
+//---------------------------------------------------------------------
+DEFINE_MASK CSVDATA SDDP_dclinkstatus
+DEFINE_AUTOMATIC_INFO
+FILENAME dclinkstatus.dat
+VERSION 1
+CONTEXT_READ sddpac
+CONTEXT_WRITE sddpac
+CLASSNAME PSRLinkDC
+MODEL MODL:SDDP_SimpleTwoTerminal_DCLink
+ATTRIBUTE_ID code
+END_AUTOMATIC_INFO
 
+DEFINE_DATA
+code        REFERENCE   1
+DateStatus  DATE        2 YYYY/MM/DD AUTOSET
+Status      INTEGER     3 AUTOSET
+END_DATA
+DEFINE_HEADER
+$version=1
+!code,Date,Status
+END_HEADER
 END_MASK
 //---------------------------------------------------------------------
 DEFINE_MASK CSVDATA SDDP_dmtdclink
@@ -15772,7 +15805,7 @@ DEFINE_MASK CSVDATA SDDP_dcnvlcc
 
 DEFINE_HEADER
 $version=1
-!Code,Name,ACBusCode,DCBusCode,GroundBusCode,ConverterType,Bridges,SecondaryVoltage,Existing,Decommissioned,NominalCurrent,Xc,MinTap,MaxTap,TapSteps,MaxDcAcCapacity,MaxAcDcCapacity,MinIgnitionAngle,MaxIgnitionAngle,DesiredIgnitionAngle,MinExtinctionAngle,MaxExtinctionAngle,DesiredExtinctionAngle,Capacitance,Frequency
+!Code,Name,ACBusCode,DCBusCode,GroundBusCode,ConverterType,Bridges,SecondaryVoltage,Existing,Decommissioned,NominalCurrent,Xc,MinTap,MaxTap,TapSteps,MaxDcAcCapacity,MaxAcDcCapacity,MinIgnitionAngle,MaxIgnitionAngle,DesiredIgnitionAngle,MinExtinctionAngle,MaxExtinctionAngle,DesiredExtinctionAngle,NominalPower,Capacitance,Frequency
 END_HEADER
 
 DEFINE_DATA
@@ -15799,8 +15832,9 @@ DesiredIgnitionAngle   REAL    20 AUTOSET
 MinExtinctionAngle     REAL    21 AUTOSET
 MaxExtinctionAngle     REAL    22 AUTOSET
 DesiredExtinctionAngle REAL    23 AUTOSET
-Capacitance            REAL    24 AUTOSET
-Frequency              REAL    25 AUTOSET(model.parm("Frequency"))
+NominalPower           REAL    24 AUTOSET
+Capacitance            REAL    25 AUTOSET
+Frequency              REAL    26 AUTOSET(model.parm("Frequency"))
 END_DATA
 
 END_MASK
@@ -15809,7 +15843,7 @@ DEFINE_MASK CSVDATA SDDP_mcnvlcc
 
 DEFINE_HEADER
 $version=1
-!Day,Month,Year,Code,Name,ACBusCode,DCBusCode,GroundBusCode,Existing,Decommissioned,NominalCurrent,Xc,MinTap,MaxTap,TapSteps,MaxDcAcCapacity,MaxAcDcCapacity,MinIgnitionAngle,MaxIgnitionAngle,DesiredIgnitionAngle,MinExtinctionAngle,MaxExtinctionAngle,DesiredExtinctionAngle,Capacitance
+!Day,Month,Year,Code,Name,ACBusCode,DCBusCode,GroundBusCode,Existing,Decommissioned,NominalCurrent,Xc,MinTap,MaxTap,TapSteps,MaxDcAcCapacity,MaxAcDcCapacity,MinIgnitionAngle,MaxIgnitionAngle,DesiredIgnitionAngle,MinExtinctionAngle,MaxExtinctionAngle,DesiredExtinctionAngle,NominalPower,Capacitance
 END_HEADER
 
 DEFINE_DATA
@@ -15836,7 +15870,8 @@ DesiredIgnitionAngle   REAL    20 AUTOSET
 MinExtinctionAngle     REAL    21 AUTOSET
 MaxExtinctionAngle     REAL    22 AUTOSET
 DesiredExtinctionAngle REAL    23 AUTOSET
-Capacitance            REAL    24 AUTOSET
+NominalPower           REAL    24 AUTOSET
+Capacitance            REAL    25 AUTOSET
 END_DATA
 
 END_MASK
@@ -16898,7 +16933,7 @@ DEFINE_DATA
 code        REFERENCE   1
 DateTap     DATE        2 YYYY/MM/DD AUTOSET
 block       INTEGER     3
-Tap         INTEGER     4
+Tap         REAL        4
 END_DATA
 DEFINE_HEADER
 $version=1
@@ -16946,7 +16981,7 @@ DEFINE_DATA
 code                 REFERENCE   1
 DateUnitsInService   DATE        2 YYYY/MM/DD AUTOSET
 block                INTEGER     3
-UnitsInService       REAL        4
+UnitsInService       INTEGER     4
 END_DATA
 DEFINE_HEADER
 $version=1
@@ -17049,7 +17084,6 @@ $version=1
 !code,Date,block,Setpoint
 END_HEADER
 END_MASK
-
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK CSVDATA SDDP_hlgc
@@ -17648,6 +17682,19 @@ ElementType            INTEGER  3
 Coefficient            REAL     4
 END_DATA
 END_MASK
+
+DEFINE_MASK CSVDATA SDDP_mip_dyn_conv
+
+DEFINE_DATA
+Step                INTEGER,1
+MaxTime  	          REAL,2
+Tolerance			      REAL,3
+END_DATA
+DEFINE_HEADER
+!Step,MaxTime,Tolerance
+END_HEADER
+END_MASK
+
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA SDDP_v10.3_cloads

psr/factory/factorylib.py

@@ -65,6 +65,10 @@ def initialize():
     lib.psrd_study_load.argtypes = [ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]
     lib.psrd_study_save.restype = ctypes.c_int
     lib.psrd_study_save.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p, ctypes.c_void_p]
+    lib.psrd_study_load_settings.restype = ctypes.c_void_p
+    lib.psrd_study_load_settings.argtypes = [ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]
+    lib.psrd_study_save_settings.restype = ctypes.c_int
+    lib.psrd_study_save_settings.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p, ctypes.c_void_p]
     lib.psrd_study_create.restype = ctypes.c_void_p
     lib.psrd_study_create.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
     lib.psrd_study_is_equals_to.restype = ctypes.c_int
@@ -111,6 +115,8 @@ def initialize():
     lib.psrd_study_add.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]
     lib.psrd_study_remove.restype = ctypes.c_int
     lib.psrd_study_remove.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]
+    lib.psrd_study_get_all_objects.restype = ctypes.c_void_p
+    lib.psrd_study_get_all_objects.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
     lib.psrd_study_find.restype = ctypes.c_void_p
     lib.psrd_study_find.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_void_p]
     lib.psrd_study_find_by_id.restype = ctypes.c_void_p

{psr_factory-4.1.0b4.dist-info → psr_factory-4.1.0b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 4.1.0b4
+Version: 4.1.0b5
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License: MIT License
@@ -46,7 +46,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Dynamic: license-file
 
-PSR Factory (version 4.1.0b4)
+PSR Factory (version 4.1.0b5)
 ============================
 
 Factory is a library that helps to manage SDDP cases. 
@@ -67,7 +67,7 @@ pip install psr-factory
 Or, if the package directly from the wheel (whl) file:
 
 ```bash
-pip install psr_factory-4.1.0b4-py3-none-win_amd64.whl
+pip install psr_factory-4.1.0b5-py3-none-win_amd64.whl
 ```
 
 Factory will be available to all Python scripts in your system after importing it:

{psr_factory-4.1.0b4.dist-info → psr_factory-4.1.0b5.dist-info}/RECORD

@@ -2,21 +2,21 @@ psr/apps/__init__.py,sha256=frSq1WIy5vIdU21xJIGX7U3XoAZRj0pcQmFb-R00b7I,228
 psr/apps/apps.py,sha256=8jVxTFZ73KFk_PbY-8rZDD8HBONdCjt-jzsDJyu2P50,6921
 psr/apps/version.py,sha256=vs459L6JsatAkUxna7BNG-vMCaXpO1Ye8c1bmkEx4U4,194
 psr/cloud/__init__.py,sha256=inZMwG7O9Fca9hg1BhqYObOYtTTJOkpuTIuXnkHJZkI,246
-psr/cloud/cloud.py,sha256=5Id6YAVqUjcakttj9DqiCmgviYWK5IBccOHkb5d4ltA,43374
+psr/cloud/cloud.py,sha256=ZP2gRmm2OzreWE6xvp7pDpceYeU_X8-DusH34M6xTx0,43669
 psr/cloud/data.py,sha256=3zWh1qnBNFfI8K3N8jZKqDnzHWMQ5llc_wwGMZ4FtKs,3548
 psr/cloud/desktop.py,sha256=JFroCMEFV1Nz3has74n7OVrGCg2lS7Ev5bcjdw2hRxY,2980
 psr/cloud/log.py,sha256=Dvhz1enIWlFWeaRK7JAAuZVPfODgoEIRNcHEmbEliyQ,1366
 psr/cloud/status.py,sha256=vcI4B9S6wCt9maT5NNrVwYaEgGIvy6kkC1UVpJjYbtw,3607
 psr/cloud/tempfile.py,sha256=1IOeye0eKWnmBynK5K5FMWiTaEVhn4GbQ8_y0THEva0,3893
-psr/cloud/version.py,sha256=BpUfaGYiH-pI7AmsrOg4kw1AMIrzxQnhaYJhik3dXPA,192
+psr/cloud/version.py,sha256=RG2RB_TfKD_2sF3BR3PpbFPEmlXkWUJOgqpsnMmcVsc,192
 psr/cloud/xml.py,sha256=dmBh4iRieORCctm1obz1EGA2QN-KkZlH5_dQfBud-AI,1847
-psr/factory/__init__.py,sha256=lgKVj-eqOOmnk_p7wb2ScOICXmUf_P_eILgZE2sJuI0,218
-psr/factory/api.py,sha256=A7MQ5uhCWHuy4dDwOf9i2zDZ7Jm-9lSYtkDgMFlw3n8,95962
-psr/factory/factory.dll,sha256=-D_fB_YeX-0qYDWdrqm5poGsbbCHx3946rcSGgGBazI,17805344
-psr/factory/factory.pmd,sha256=8AKUfKW1fQHT76oCzaCWLTpd0jwPTg2MV83C-KN4zA8,229668
-psr/factory/factory.pmk,sha256=cOMeJvl_magd8mfOwdt-IJ77nQx2CCutPzC_AYPurCo,568182
-psr/factory/factorylib.py,sha256=Orcg4X47J3J1CNr0WEERucqsTJLqt0TV9VFFZXLv6WE,26978
-psr/factory/libcurl-x64.dll,sha256=i1buVpg57cf1FMEI_ddD0ocD3fk74vqeosyBA7IJ5QQ,5319200
+psr/factory/__init__.py,sha256=Nl98tVqyFGyljAkoVgYtYUwVArZB-Obb7_rO3Wd9BV4,218
+psr/factory/api.py,sha256=-OV9OhO5KrULPiaeKXGOkBp6stYFc5_tmY94dAV0dUY,97854
+psr/factory/factory.dll,sha256=GgrAE4-pGqeoZhMmpy-Wtu566H_j7WfmnlRfWLwZZK8,12822568
+psr/factory/factory.pmd,sha256=sJytMHoS-EfdIc5mMugV0XevFAakdaHQc0_3jznfmFk,230920
+psr/factory/factory.pmk,sha256=YTuSJNfwgn8BE8-LT3eIYSdjXgkGwNM_oiR_PWtW060,569213
+psr/factory/factorylib.py,sha256=xnhCFTo4DpU0e5oHtIWMmc-kk6ThtNAUI3cxpDXrBKE,27497
+psr/factory/libcurl-x64.dll,sha256=UqPBLcXSpPLHkQ56dyxohB2wzH_37Lrwj3Kwl-QJtPE,5319208
 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,8 +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.0b4.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-4.1.0b4.dist-info/METADATA,sha256=2OmQazPLiYvF_1958lyh2C6GtOBf24nuWTjD7lpNBKU,3721
-psr_factory-4.1.0b4.dist-info/WHEEL,sha256=jcBIzWeetTfKWoqh1t37_3WRou9luDyd3A1574l0jA4,97
-psr_factory-4.1.0b4.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-4.1.0b4.dist-info/RECORD,,
+psr_factory-4.1.0b5.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-4.1.0b5.dist-info/METADATA,sha256=E1t4BjFK8F8Lw8f6ZqqOvMdbHTiU8Z4CYDULRfpy1-c,3721
+psr_factory-4.1.0b5.dist-info/WHEEL,sha256=4cvAR2LpmdqpvXM0-t_4duJjmI_AlyeOb6Zx6aFyoSA,97
+psr_factory-4.1.0b5.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-4.1.0b5.dist-info/RECORD,,

{psr_factory-4.1.0b4.dist-info → psr_factory-4.1.0b5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-win_amd64