psr-factory 4.1.0b5__py3-none-win_amd64.whl → 4.1.0b10__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.0b5"
+__version__ = "4.1.0b10"
 
 from .api import *

psr/factory/api.py

@@ -5,6 +5,7 @@
 import locale
 from typing import Dict, List, Optional, Tuple, Union
 from types import ModuleType
+import copy
 import ctypes
 import datetime as dt
 import enum
@@ -945,6 +946,9 @@ class DataObject(_BaseObject):
     def help(self) -> str:
         return help(self.type)
 
+    def clone(self) -> "DataObject":
+        return copy.copy(self)
+
     @property
     def context(self) -> "Context":
         _check_initialized()
@@ -1234,7 +1238,6 @@ class Context(DataObject):
 class Study(_BaseObject):
     def __init__(self):
         super().__init__()
-        self.find_by_name = self.find
 
     def __del__(self):
         if self._hdr is not None:
@@ -1269,10 +1272,18 @@ class Study(_BaseObject):
         dest._hdr = ref
         return dest
 
+    def create(self, object_type: str) -> DataObject:
+        _check_initialized()
+        return create(object_type, self.context)
+
+
     @staticmethod
     def help():
         return help("Study")
 
+    def clone(self) -> "Study":
+        return copy.deepcopy(self)
+
     @staticmethod
     def create_object(profile_or_context: Union[str, Context, dict, None],
                       blocks: Optional[int] = None):
@@ -1431,7 +1442,14 @@ class Study(_BaseObject):
         object_list._hdr = ref
         return object_list.to_list()
 
-    def find_by_name(self, type_name: str, name: str) -> List[DataObject]:
+    def find_by_name(self, type_name: str, name: Optional[str] = None) -> List[DataObject]:
+        if name is None:
+            warnings.warn(DeprecationWarning("Starting from Factory 4.0.28 "
+                                             "the second argument 'name' must be provided.\n"
+                                             "Use find_by_name(type_name, name)"))
+
+        type_name, name_str = type_name.split(".", 1)
+        name = name_str
         object_list = ValueList(False)
         _err = Error()
         if name.strip() == "":
@@ -1765,7 +1783,7 @@ class _DataFrameBuilder:
                 if self._err.code != 0:
                     raise FactoryException(self._err.what)
                 # convert array values to python datetime
-                self.indices[index].values = [dt.datetime.utcfromtimestamp(value - _date_transform) for value in array_values]
+                self.indices[index].values = [dt.datetime.fromtimestamp(value - _date_transform, dt.UTC) for value in array_values]
             else:
                 array_values = (ctypes.c_int * rows_count)()
                 factorylib.lib.psrd_table_index_get_int32_values(df.handler(),

psr/factory/factory.pmd

@@ -2516,11 +2516,11 @@ DEFINE_MODEL MODL:Optgen_RestricaoGenerica
 	PARM DATE		DataMin
 	PARM DATE		DataMax
 	PARM REAL		RHS
-	PARM STRING		Type
 	VECTOR REAL		Coefficients
 	PARM INTEGER	LimitType
 	PARM REAL		Penalty
 	PARM INTEGER    Selected
+	PARM INTEGER	FlagIncremental
 	VECTOR REFERENCE AgentElement PSRElement
 END_MODEL
 //--------------------------------------------------------------------------------------------------
@@ -2739,6 +2739,7 @@ DEFINE_MODEL MODL:Optgen_Configuration_Keywords
     PARM INTEGER RXGM
     PARM INTEGER FSCN
     PARM INTEGER RMET
+    PARM REAL MXPF
 END_MODEL
 
 
@@ -4450,8 +4451,8 @@ END_MODEL
 //--------------------------------------------------------------------------------------------------
 DEFINE_MODEL MODL:SDDP_V10.2_Combustivel
 	VETOR DATE		Data @addyear_chronological
-	PARM  STRING		UComb
-	PARM  STRING		UE
+	PARM  STRING	UComb
+	PARM  STRING	UE
 	PARM  REAL		EmiCO2
 	VETOR REAL		Custo INDEX Data
 
@@ -4460,7 +4461,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Combustivel
 	VETOR DATE		DataAvailability @addyear_chronological
 	VETOR REAL		Availability INDEX DataAvailability
 
-	PARM INTEGER		FlagScenario
+	PARM INTEGER	FlagScenario
 	VETOR REAL		ScenarioCost
 END_MODEL
 
@@ -4864,7 +4865,7 @@ END_MODEL
 // Supply chain Node
 //--------------------------------------------------------------------------------------------------
 DEFINE_MODEL MODL:SDDP_ElectrificationNode
-	// nada aqui
+	MERGE_MODEL Sddp_Georeference
 END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Supply chain Transport

psr/factory/factory.pmk

@@ -6865,6 +6865,7 @@ CONTEXT_READ optmain
 CONTEXT_WRITE optmain
 CLASSNAME PSRPlant
 MODEL StageCstr
+MERGE_OBJECTS TRUE
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
@@ -6888,6 +6889,7 @@ CONTEXT_READ optmain
 CONTEXT_WRITE optmain
 CLASSNAME PSRSystem
 MODEL MinRes
+MERGE_OBJECTS TRUE
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
@@ -6912,6 +6914,7 @@ CONTEXT_READ optmain
 CONTEXT_WRITE optmain
 CLASSNAME PSRSystem
 MODEL InstDem
+MERGE_OBJECTS TRUE
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
@@ -6984,6 +6987,7 @@ CONTEXT_READ optmain
 CONTEXT_WRITE optmain
 CLASSNAME PSRPlant
 MODEL UnitFactors
+MERGE_OBJECTS TRUE
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
@@ -7007,6 +7011,7 @@ CONTEXT_READ optmain
 CONTEXT_WRITE optmain
 CLASSNAME PSRPlant
 MODEL UnitCodes
+MERGE_OBJECTS TRUE
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
@@ -14721,7 +14726,7 @@ MonitoringList			REFERENCE,2	AUTOSET(model.parm("MonitoringList"))
 END_DATA
 DEFINE_HEADER
 $version=1
-!name,Serie,MonitoringList
+!Serie,MonitoringList
 END_HEADER
 END_MASK
 //--------------------------------------------------------------------------------------------------
@@ -16806,7 +16811,7 @@ END_AUTOMATIC_INFO
 
 DEFINE_DATA
 code        REFERENCE   1
-DateStatus  DATE        2 YYYY/MM/DD AUTOSET
+DateBypass  DATE        2 YYYY/MM/DD AUTOSET
 block       INTEGER     3
 Bypass      INTEGER     4
 END_DATA
@@ -17390,8 +17395,8 @@ DEFINE_MASK CSVDATA SDDP_genesysweights
 DEFINE_AUTOMATIC_INFO
 FILENAME genesys_weights.dat
 VERSION 1
-CONTEXT_READ sddp
-CONTEXT_WRITE sddp
+CONTEXT_READ genesys
+CONTEXT_WRITE genesys
 CLASSNAME PSRStudy
 MODEL GenesysWeights
 CREATE_OBJECTS TRUE
@@ -17682,7 +17687,8 @@ ElementType            INTEGER  3
 Coefficient            REAL     4
 END_DATA
 END_MASK
-
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
 DEFINE_MASK CSVDATA SDDP_mip_dyn_conv
 
 DEFINE_DATA
@@ -17694,7 +17700,24 @@ DEFINE_HEADER
 !Step,MaxTime,Tolerance
 END_HEADER
 END_MASK
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK CSVDATA SDDP_ccombu
+DEFINE_HEADER
+$version=2
+!Code,Name,FuelUnit,Cost,EmissionFactor,CostType
+END_HEADER
 
+DEFINE_DATA
+Code                   INTEGER  1
+Name                   STRING   2
+UComb                  STRING   3 AUTOSET(model.parm("UComb"))
+Custo                  REAL     4 AUTOSET
+EmiCO2                 REAL     5 AUTOSET(model.parm("EmiCO2"))
+FlagScenario           INTEGER  6 AUTOSET(model.parm("FlagScenario"))
+END_DATA
+
+END_MASK
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA SDDP_v10.3_cloads

psr/factory/samples/sddp_1_stage_case01.py

@@ -0,0 +1,169 @@
+"""Creates SDDP 1 stage Case01 example."""
+import copy
+import os
+
+import psr.factory
+
+
+def get_case_path() -> str:
+    return os.path.join(os.path.splitext(os.path.basename(__file__))[0], "")
+
+
+def create_sddp_sample_case01() -> psr.factory.Study:
+    blocks = 1
+    # Create a study object and define its basic settings.
+    study = psr.factory.create_study({
+        "Models": ["SDDP", ], # Default model: SDDP
+        "Blocks": blocks, # Default number of blocks: 1
+        "StageType": 2,   # Weekly: 1 (default), Monthly: 2
+    })
+    study.from_dict({
+        "Description": "Caso ejemplo - DT - 1 etapa - 1 bloque",
+        "InitialYear": 2013,
+        "InitialStage": 1,
+        "NumberOfStages": 1,
+        "NumberOfSeries": 1,
+    })
+
+    # Study options
+    study.from_dict({
+        "Type": 2,
+        "InitialYearOfHydrology": 1996,
+        "NumberOfSystems": 1,
+        "AggregateInTheOperationPolicy": 0,
+        "UMON": "$",
+        "LoadSheddingInBuses": 0,
+        "MonitoringOfCircuitLimits": 0,
+        "HourlyRepresentation": 0,
+        "MaximumNumberOfIterations": 10,
+        "MinimumOutflowPenaltyHm3": 5000.0,
+        "DeficitSegment": [100.0, 0.0, 0.0, 0.0],
+        "DeficitCost": [500.0, 0.0, 0.0, 0.0],
+        "FutureCostStage": 4,
+        "FutureCostYear": 1998,
+    })
+
+    # Study duration
+    study.set("FixedDurationOfBlocks(1)", 100.0)
+
+    # By default, a study comes with one system.
+    system = study.get("System")[0]
+    system.code = 1
+    system.id = "s1"
+    system.name = "System 1"
+    # System's currency
+    system.set("SystemCurrency", "$")
+    # It's not required to add an existing object to the study.
+
+    # Set study to run with this unique system
+    study.set("CodesOfPowerSystems", [1, ])
+
+    # Create a demand segment - it's required to add at least
+    # an inelastic segment to a demand object.
+    segment = psr.factory.create("DemandSegment", study.context)
+    # Set demand and cost data.
+    segment.set_at("EnergyPerBlock(:)", "01/2013", 8.928)
+    # Add segment to the study.
+    study.add(segment)
+
+    # Create a system demand.
+    demand = psr.factory.create("Demand", study.context)
+    demand.code = 1
+    demand.name = "System 1"
+    # Associate it with the only system in the case.
+    demand.set("RefSystem", system)
+    # Associate the demand with its segments.
+    demand.set("RefSegments", [segment, ])
+    # Add demand to the study.
+    study.add(demand)
+
+    # Create all fuels - Thermal plants requires then.
+    fuel1 = psr.factory.create("Fuel", study.context)
+    fuel1.code = 1
+    fuel1.name = "Fuel 1"
+    fuel1.from_dict({
+        "Unit": "UC",
+        "UE": "MWh",
+        "Price": 0.8,
+        "EmissionFactor": 0.0,
+        "RefSystem": system,
+    })
+    study.add(fuel1)
+
+    fuel2 = psr.factory.create("Fuel", study.context)
+    fuel2.code = 2
+    fuel2.name = "Fuel 2"
+    fuel2.from_dict({
+        "Unit": "UC",
+        "UE": "MWh",
+        "Price": 1.2,
+        "EmissionFactor": 0.0,
+        "RefSystem": system,
+    })
+    study.add(fuel2)
+
+    # Create all thermal plants.
+    plant1 = psr.factory.create("ThermalPlant", study.context)
+    plant1.code = 1
+    plant1.name = "Thermal 1"
+    # Set plant's properties
+    t_params = {
+        "MaximumGenerationCapacity": 10.0,
+        "InstalledCapacity": 10.0,
+        "ThermalType": 0,
+        "Type": 0,
+        "NumberOfGeneratingUnits": 1,
+        "NumberOfAlternativeFuels": 0,
+        "CodeOfAlternativeFuels(:)": 0,
+        "O&MCost": 0.0,
+        "FuelTransportationCost": 0.0,
+        "SpecificConsumptionSegment(1)": 100.0,
+        "SpecificConsumptionSegment(2:3)": 0.0,
+        "SpecificConsumption(1:3,1)": 10.0,
+        "RefFuels": [fuel1, ],
+        "RefSystem": system,
+    }
+    plant1.from_dict(t_params)
+    for i in range(5):
+        pcopy = copy.copy(plant1)
+        pcopy.code = i + 1
+        study.add(pcopy)
+
+
+    # Use Python copy's module copy function to create
+    # a copy of an object.
+    plant2 = copy.copy(plant1)
+    plant2.code = 2
+    plant2.name = "Thermal 2"
+    plant2.set("MaximumGenerationCapacity", 5.0)
+    plant2.set("InstalledCapacity", 5.0)
+    plant2.set("SpecificConsumption(1:3,1)", 15.0)
+    plant2.set("RefFuels", [fuel1, ])
+    plant2.set("RefSystem", system)
+    study.add(plant2)
+
+    plant3 = plant2.clone()
+    plant3.code = 3
+    plant3.name = "Thermal 3"
+    plant3.from_dict({
+        "MaximumGenerationCapacity": 20.0,
+        "InstalledCapacity": 20.0,
+        "SpecificConsumption(1:3,1)": 12.5,
+        "RefFuels": [fuel2, ],
+        "RefSystem": system,
+    })
+    study.add(plant3)
+
+    return study
+
+
+if __name__ == "__main__":
+
+    case_path = get_case_path()
+    os.makedirs(case_path, exist_ok=True)
+    print("Creating example case... ", end="")
+    study = create_sddp_sample_case01()
+    print(" OK.")
+    print("Saving example case in \"{}\"... ".format(case_path), end="")
+    study.save(case_path)
+    print(" OK.")

psr/factory/samples/sddp_sample_case01.py

@@ -0,0 +1,164 @@
+"""Creates SDDP 1 stage Case01 example."""
+import copy
+import os
+
+import psr.factory
+
+
+def get_case_path() -> str:
+    return os.path.join(os.path.splitext(os.path.basename(__file__))[0], "")
+
+
+def create_sddp_sample_case01() -> psr.factory.Study:
+    blocks = 1
+    # Create a study object and define its basic settings.
+    study = psr.factory.create_study({
+        "Models": ["SDDP", ], # Default model: SDDP
+        "Blocks": blocks, # Default number of blocks: 1
+        "StageType": 2,   # Weekly: 1 (default), Monthly: 2
+    })
+    study.from_dict({
+        "Description": "Caso ejemplo - DT - 1 etapa - 1 bloque",
+        "InitialYear": 2013,
+        "InitialStage": 1,
+        "NumberOfStages": 1,
+        "NumberOfSeries": 1,
+    })
+
+    # Study options
+    study.from_dict({
+        "Type": 2,
+        "InitialYearOfHydrology": 1996,
+        "NumberOfSystems": 1,
+        "AggregateInTheOperationPolicy": 0,
+        "UMON": "$",
+        "LoadSheddingInBuses": 0,
+        "MonitoringOfCircuitLimits": 0,
+        "HourlyRepresentation": 0,
+        "MaximumNumberOfIterations": 10,
+        "MinimumOutflowPenaltyHm3": 5000.0,
+        "DeficitSegment": [100.0, 0.0, 0.0, 0.0],
+        "DeficitCost": [500.0, 0.0, 0.0, 0.0],
+        "FutureCostStage": 4,
+        "FutureCostYear": 1998,
+    })
+
+    # Study duration
+    study.set("FixedDurationOfBlocks(1)", 100.0)
+
+    # By default, a study comes with one system.
+    system = study.get("System")[0]
+    system.code = 1
+    system.id = "s1"
+    system.name = "System 1"
+    # System's currency
+    system.set("SystemCurrency", "$")
+    # It's not required to add an existing object to the study.
+
+    # Set study to run with this unique system
+    study.set("CodesOfPowerSystems", [1, ])
+
+    # Create a demand segment - it's required to add at least
+    # an inelastic segment to a demand object.
+    segment = psr.factory.create("DemandSegment", study.context)
+    # Set demand and cost data.
+    segment.set_at("EnergyPerBlock(:)", "01/2013", 8.928)
+    # Add segment to the study.
+    study.add(segment)
+
+    # Create a system demand.
+    demand = psr.factory.create("Demand", study.context)
+    demand.code = 1
+    demand.name = "System 1"
+    # Associate it with the only system in the case.
+    demand.set("RefSystem", system)
+    # Associate the demand with its segments.
+    demand.set("RefSegments", [segment, ])
+    # Add demand to the study.
+    study.add(demand)
+
+    # Create all fuels - Thermal plants requires then.
+    fuel1 = psr.factory.create("Fuel", study.context)
+    fuel1.code = 1
+    fuel1.name = "Fuel 1"
+    fuel1.from_dict({
+        "Unit": "UC",
+        "UE": "MWh",
+        "Price": 0.8,
+        "EmissionFactor": 0.0,
+        "RefSystem": system,
+    })
+    study.add(fuel1)
+
+    fuel2 = psr.factory.create("Fuel", study.context)
+    fuel2.code = 2
+    fuel2.name = "Fuel 2"
+    fuel2.from_dict({
+        "Unit": "UC",
+        "UE": "MWh",
+        "Price": 1.2,
+        "EmissionFactor": 0.0,
+        "RefSystem": system,
+    })
+    study.add(fuel2)
+
+    # Create all thermal plants.
+    plant1 = psr.factory.create("ThermalPlant", study.context)
+    plant1.code = 1
+    plant1.name = "Thermal 1"
+    # Set plant's properties
+    t_params = {
+        "MaximumGenerationCapacity": 10.0,
+        "InstalledCapacity": 10.0,
+        "ThermalType": 0,
+        "Type": 0,
+        "NumberOfGeneratingUnits": 1,
+        "NumberOfAlternativeFuels": 0,
+        "CodeOfAlternativeFuels(:)": 0,
+        "O&MCost": 0.0,
+        "FuelTransportationCost": 0.0,
+        "SpecificConsumptionSegment(1)": 100.0,
+        "SpecificConsumptionSegment(2:3)": 0.0,
+        "SpecificConsumption(1:3,1)": 10.0,
+        "RefFuels": [fuel1, ],
+        "RefSystem": system,
+    }
+    plant1.from_dict(t_params)
+
+    # Use Python copy's module copy function to create
+    # a copy of an object.
+    plant2 = copy.copy(plant1)
+    plant2.code = 2
+    plant2.name = "Thermal 2"
+    plant2.set("MaximumGenerationCapacity", 5.0)
+    plant2.set("InstalledCapacity", 5.0)
+    plant2.set("SpecificConsumption(1:3,1)", 15.0)
+    plant2.set("RefFuels", [fuel1, ])
+    plant2.set("RefSystem", system)
+    study.add(plant2)
+
+    plant3 = plant2.clone()
+    plant3.code = 3
+    plant3.name = "Thermal 3"
+    plant3.from_dict({
+        "MaximumGenerationCapacity": 20.0,
+        "InstalledCapacity": 20.0,
+        "SpecificConsumption(1:3,1)": 12.5,
+        "RefFuels": [fuel2, ],
+        "RefSystem": system,
+    })
+    study.add(plant3)
+
+    return study
+
+
+if __name__ == "__main__":
+
+    case_path = get_case_path()
+    os.makedirs(case_path, exist_ok=True)
+    print("Creating example case... ", end="")
+    study = create_sddp_sample_case01()
+    print(" OK.")
+    print("Saving example case in \"{}\"... ".format(case_path), end="")
+    study.save(case_path)
+    print(" OK.")

psr/factory/samples/sddp_sample_case21.py

@@ -0,0 +1,241 @@
+"""Creates SDDP 12 stages Case21 example."""
+import copy
+import os
+
+import psr.factory
+
+
+def get_case_path() -> str:
+    return os.path.join(os.path.splitext(os.path.basename(__file__))[0], "")
+
+
+def create_sddp_sample_case21() -> psr.factory.Study:
+    # Create a study object and define its basic settings.
+    blocks = 1
+    # A context defines the dimensions of the study and the meaning of
+    # its stages. You can only share or copy data from one study to another
+    # if they share the same context.
+    context = psr.factory.get_new_context()
+    context.set("Models", ["SDDP", ])  # Default model: Sddp
+    context.set("Blocks", blocks)   # Default number of blocks: 3
+    context.set("StageType", 2)     # Weekly: 1, Monthly: 2 (default)
+
+    study = psr.factory.create_study(context)
+    study.set("Description", "SDDP")
+    study.set("InitialYear", 2016)
+    study.set("InitialStage", 1)
+    study.set("NumberOfStages", 12)
+    study.set("NumberOfSeries", 1)
+
+    # Study options
+    study.set("Type", 2)
+    study.set("InitialYearOfHydrology", 2016)
+    study.set("NumberOfSystems", 1)
+    study.set("AggregateInTheOperationPolicy", 1)
+    study.set("DeficitSegment", [100.0, 0.0, 0.0, 0.0])
+    study.set("DeficitCost", [1000.0, 0.0, 0.0, 0.0])
+    study.set("UMON", "$")
+
+    # Study duration
+    study.set("FixedDurationOfBlocks(1)", 100.0)
+
+    # By default, a study comes with one system.
+    system = study.get("System")[0]
+    system.code = 1
+    system.id = "s1"
+    system.name = "S1"
+    # System's currency
+    system.set("SystemCurrency", "$")
+    # It's not required to add an existing object to the study.
+
+    # Set study to run with this unique system
+    study.set("CodesOfPowerSystems", [1, ])
+
+    # Create a demand segment - it's required to add at least
+    # inelastic segment to a demand object.
+    segment = psr.factory.create("DemandSegment", context)
+    # Set demand and cost data.
+    segment.set_at("EnergyPerBlock(:)", "01/2016", 11.7)
+    segment.set_at("EnergyPerBlock(:)", "02/2016", 10.8)
+    segment.set_at("EnergyPerBlock(:)", "03/2016", 12.5)
+    segment.set_at("EnergyPerBlock(:)", "04/2016", 13.7)
+    segment.set_at("EnergyPerBlock(:)", "05/2016", 14.6)
+    segment.set_at("EnergyPerBlock(:)", "06/2016", 14.8)
+    segment.set_at("EnergyPerBlock(:)", "07/2016", 15.8)
+    segment.set_at("EnergyPerBlock(:)", "08/2016", 16.2)
+    segment.set_at("EnergyPerBlock(:)", "09/2016", 15.3)
+    segment.set_at("EnergyPerBlock(:)", "10/2016", 14.5)
+    segment.set_at("EnergyPerBlock(:)", "11/2016", 12.9)
+    segment.set_at("EnergyPerBlock(:)", "12/2016", 12.5)
+
+    segment.set_at("PricePerBlock(:)", "01/2016", 0.0)
+    # Add segment to the study.
+    study.add(segment)
+
+    # Create a system demand.
+    demand = psr.factory.create("Demand", context)
+    demand.code = 1
+    demand.name = "S1"
+    # Associate it with the only system in the case.
+    demand.set("RefSystem", system)
+    # Add segment to the demand.
+    demand.set("RefSegments", [segment, ])
+    # Add demand to the study.
+    study.add(demand)
+
+    # Create all fuels - Thermal plants requires them.
+    fuel1 = psr.factory.create("Fuel", context)
+    fuel1.code = 1
+    fuel1.name = "C1"
+    fuel1.set("Unit", "MWh")
+    fuel1.set("Price", 8.0)
+    fuel1.set("RefSystem", system)
+    study.add(fuel1)
+
+    fuel2 = psr.factory.create("Fuel", context)
+    fuel2.code = 2
+    fuel2.name = "C2"
+    fuel2.set("Unit", "MWh")
+    fuel2.set("Price", 12.0)
+    fuel2.set("RefSystem", system)
+    study.add(fuel2)
+
+    fuel3 = psr.factory.create("Fuel", context)
+    fuel3.code = 3
+    fuel3.name = "C3"
+    fuel3.set("Unit", "MWh")
+    fuel3.set("Price", 14.4)
+    fuel3.set("RefSystem", system)
+    study.add(fuel3)
+
+    # Create all thermal plants.
+    plant1 = psr.factory.create("ThermalPlant", context)
+    plant1.code = 1
+    plant1.name = "T1"
+    # Set plant's properties
+    plant1.set("MaximumGenerationCapacity", 12.0)
+    plant1.set("InstalledCapacity", 12.0)
+    plant1.set("ThermalType", 0)  # Standard operation mode.
+    plant1.set("Type", 0)         # It's an existing plant.
+    plant1.set("NumberOfGeneratingUnits", 1)
+    plant1.set("NumberOfAlternativeFuels", 0)  # No alternative fuels
+    plant1.set("CodeOfAlternativeFuels(:)", 0)
+    plant1.set("O&MCost", 0.0)
+    plant1.set("FuelTransportationCost", 0.0)
+    plant1.set("SpecificConsumptionSegment(1)", 100.0)
+    plant1.set("SpecificConsumptionSegment(2:3)", 0.0)
+    plant1.set("SpecificConsumption(1:3,1)", 1.0)
+    plant1.set("Co2EmissionCoefficient", 1.0)
+    # It's required to associate a thermal plant to a fuel.
+    plant1.set("RefFuels", [fuel1, ])
+    plant1.set("RefSystem", system)
+    # These references are optional and can be set as None.
+    plant1.set("RefGasNode", None)
+    study.add(plant1)
+
+    plant2 = psr.factory.create("ThermalPlant", context)
+    plant2.code = 2
+    plant2.name = "T2"
+    plant2.set("MaximumGenerationCapacity", 8.0)
+    plant2.set("InstalledCapacity", 8.0)
+    plant2.set("ThermalType", 0)
+    plant2.set("Type", 0)
+    plant2.set("NumberOfGeneratingUnits", 1)
+    plant2.set("NumberOfAlternativeFuels", 0)
+    plant2.set("CodeOfAlternativeFuels(:)", 0)
+    plant2.set("O&MCost", 0.0)
+    plant2.set("FuelTransportationCost", 0.0)
+    plant2.set("SpecificConsumptionSegment(1)", 100.0)
+    plant2.set("SpecificConsumptionSegment(2:3)", 0.0)
+    plant2.set("SpecificConsumption(1:3,1)", 1.0)
+    plant2.set("Co2EmissionCoefficient", 1.0)
+    plant2.set("RefFuels", [fuel2, ])
+    plant2.set("RefSystem", system)
+    study.add(plant2)
+
+    plant3 = plant2.clone()
+    plant3.code = 3
+    plant3.name = "T3"
+    plant3.set("MaximumGenerationCapacity", 4.0)
+    plant3.set("InstalledCapacity", 4.0)
+    plant3.set("RefFuels", [fuel3, ])
+    plant3.set("RefSystem", system)
+    study.add(plant3)
+
+    # Define gauging station for hydro plants inflows
+    station1 = psr.factory.create("HydroStation", context)
+    station1.code = 1
+    station1.name = "Estacion 1"
+
+    station2 = psr.factory.create("HydroStation", context)
+    station2.code = 2
+    station2.name = "Estacion 2"
+
+    for year in (2014, 2015, 2016):
+        station1.set_at("Inflow", f"01/{year}", 13.5)
+        station1.set_at("Inflow", f"02/{year}", 40.7)
+        station1.set_at("Inflow", f"03/{year}", 28.8)
+        station1.set_at("Inflow", f"04/{year}", 25.6)
+        station1.set_at("Inflow", f"05/{year}", 23.8)
+        station1.set_at("Inflow", f"06/{year}", 27.8)
+        station1.set_at("Inflow", f"07/{year}", 28.8)
+        station1.set_at("Inflow", f"08/{year}", 18.8)
+        station1.set_at("Inflow", f"09/{year}", 18.2)
+        station1.set_at("Inflow", f"10/{year}", 29.6)
+        station1.set_at("Inflow", f"11/{year}", 17.7)
+        station1.set_at("Inflow", f"12/{year}", 26.3)
+
+        for month in range(1, 12 + 1):
+            station2.set_at("Vazao", f"{month:02d}/{year}", 0.0)
+
+    study.add(station1)
+    study.add(station2)
+
+    # Define hydroplants
+    hydro1 = psr.factory.create("HydroPlant", context)
+    hydro1.code = 1
+    hydro1.name = "H1"
+    hydro1.set("Type", 0)
+    hydro1.set("NumberOfUnits", 1)
+    hydro1.set("InstalledCapacity", 5.5)
+    hydro1.set("MaximumTurbinedOutflow", 55.0)
+    hydro1.set("MeanProductionCoefficient", 0.1)
+    hydro1.set("MinimumStorage", 0.0)
+    hydro1.set("MaximumStorage", 50.0)
+    hydro1.set("InitialCondition", 0.2)
+    hydro1.set("RefSystem", system)
+    hydro1.set("RefStation", station1)
+    study.add(hydro1)
+
+    hydro2 = hydro1.clone()
+    hydro2.code = 2
+    hydro2.name = "H2"
+    hydro2.set("MaximumStorage", 0.0)
+    hydro2.set("InitialCondition", 1.0)
+    hydro2.set("RefSystem", system)
+    hydro2.set("RefStation", station2)
+    study.add(hydro2)
+
+    # Connect hydro plants
+    connection_spill = psr.factory.create("HydroPlantConnection", context)
+    connection_spill.set("IsVertimento", 1)
+    connection_spill.set("RefPlants", [hydro1, hydro2])
+    study.add(connection_spill)
+
+    connection_turb = psr.factory.create("HydroPlantConnection", context)
+    connection_turb.set("IsTurbinamento", 1)
+    connection_turb.set("RefPlants", [hydro1, hydro2])
+    study.add(connection_turb)
+
+    return study
+
+
+if __name__ == "__main__":
+    case_path = get_case_path()
+    os.makedirs(case_path, exist_ok=True)
+    print("Creating example case... ", end="")
+    study = create_sddp_sample_case21()
+    print(" OK.")
+    print("Saving example case in \"{}\"... ".format(case_path), end="")
+    study.save(case_path)
+    print(" OK.")

psr/runner/runner.py

@@ -48,6 +48,7 @@ else:
 def _get_semver_version(version: str) -> Tuple[int, int, Union[int, str], Optional[str]]:
     def get_tag_from_part(part: str) -> Tuple[int, Optional[str]]:
         to_try = ("beta", "rc")
+        part = part.lower()
         for tag_name in to_try:
             if tag_name in part:
                 tag_pos = part.lower().index(tag_name)
@@ -124,6 +125,7 @@ def _write_mpi_settings(mpi_file_path: Union[str, pathlib.Path], cluster_setting
 
 def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.Path], **kwargs):
     case_path = os.path.abspath(str(case_path))
+
     sddp_path = str(sddp_path)
     parallel_run = kwargs.get("parallel_run", True)
     cluster_settings: Optional[Union[int, bool, Dict[str, int]]] = kwargs.get("cluster_settings", False)
@@ -133,10 +135,6 @@ def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.
     exec_mode = kwargs.get("_mode", None)
     mpi_path = kwargs.get("mpi_path", __default_mpi_path)
 
-    if os.name == 'nt':
-        sddp_path_full = os.path.join(sddp_path, "Oper")
-    else:
-        sddp_path_full = sddp_path
     # Append last / if missing.
     case_path = os.path.join(os.path.abspath(case_path), "")
 
@@ -146,6 +144,14 @@ def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.
 
     major, minor, patch, tag = _get_semver_version(get_sddp_version(sddp_path))
 
+    if os.name == 'nt':
+        if major >= 18:
+            sddp_path_full = os.path.join(sddp_path, r"sddp\Oper")
+        else:
+            sddp_path_full = os.path.join(sddp_path, "Oper")
+
+    else:
+        sddp_path_full = sddp_path
     with change_cwd(sddp_path_full):
         # Write MPI settings if required
         if parallel_run and cluster_settings is not None:
@@ -190,7 +196,10 @@ def run_sddp_convert_fcf(case_path: Union[str, pathlib.Path], sddp_path: Union[s
 
 def get_sddp_version(sddp_path: Union[str, pathlib.Path]) -> str:
     sddp_path = str(sddp_path)
-    if os.name == 'nt':
+
+    if os.name == 'nt' and "18" in sddp_path:
+        sddp_path_full = os.path.join(sddp_path, "sddp/Oper")
+    elif os.name == 'nt':
         sddp_path_full = os.path.join(sddp_path, "Oper")
     else:
         sddp_path_full = sddp_path

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

@@ -1,30 +1,9 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 4.1.0b5
+Version: 4.1.0b10
 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.
-        
+License-Expression: MIT
 Project-URL: documentation, https://docs.psr-inc.com/factory/
 Keywords: psr,factory,sddp
 Classifier: Development Status :: 4 - Beta
@@ -40,13 +19,12 @@ 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.0b5)
+PSR Factory (version 4.1.0b10)
 ============================
 
 Factory is a library that helps to manage SDDP cases. 
@@ -67,7 +45,7 @@ pip install psr-factory
 Or, if the package directly from the wheel (whl) file:
 
 ```bash
-pip install psr_factory-4.1.0b5-py3-none-win_amd64.whl
+pip install psr_factory-4.1.0b10-py3-none-win_amd64.whl
 ```
 
 Factory will be available to all Python scripts in your system after importing it:

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

@@ -10,22 +10,26 @@ psr/cloud/status.py,sha256=vcI4B9S6wCt9maT5NNrVwYaEgGIvy6kkC1UVpJjYbtw,3607
 psr/cloud/tempfile.py,sha256=1IOeye0eKWnmBynK5K5FMWiTaEVhn4GbQ8_y0THEva0,3893
 psr/cloud/version.py,sha256=RG2RB_TfKD_2sF3BR3PpbFPEmlXkWUJOgqpsnMmcVsc,192
 psr/cloud/xml.py,sha256=dmBh4iRieORCctm1obz1EGA2QN-KkZlH5_dQfBud-AI,1847
-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/__init__.py,sha256=3IuHvbSNQtfVOkCgi4Dh3YrbBpgn5OH8-mrH4JU5l0s,219
+psr/factory/api.py,sha256=StGPIDNkWcDLIlbwAm9arok3netOqr1fFXZNeX1GNUA,98497
+psr/factory/factory.dll,sha256=qiwYjYrm1_klZ7N3XTDeW-FBQWh5bXsKxt9mVR0aw-o,12964120
+psr/factory/factory.pmd,sha256=Fe1cedVdYb6h8hEJTC0u1qz53JmZnTIOK1GmJuUNo2g,230965
+psr/factory/factory.pmk,sha256=zYyK8QEMa-J2r_kvYuRiqVzGLqMAiav_DP6h7-2wtX8,570074
 psr/factory/factorylib.py,sha256=xnhCFTo4DpU0e5oHtIWMmc-kk6ThtNAUI3cxpDXrBKE,27497
-psr/factory/libcurl-x64.dll,sha256=UqPBLcXSpPLHkQ56dyxohB2wzH_37Lrwj3Kwl-QJtPE,5319208
+psr/factory/libcurl-x64.dll,sha256=6MVf69XKZf-LWdjiCj9rv_bykkU9uSxA4BUC8uRBk1g,5317904
 psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+psr/factory/samples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+psr/factory/samples/sddp_1_stage_case01.py,sha256=7-HsTZLISQXWyez-MAi6U6cw-83-fj223C-ci54jfi0,5109
+psr/factory/samples/sddp_sample_case01.py,sha256=49C7w86EQT5IuguaNvt7mz7OqbVRhov5c3zb7_l12FE,4994
+psr/factory/samples/sddp_sample_case21.py,sha256=La9I6PcyEUCXDJMB0Mtn98Pl2V0RGPMEHAhGpboPvU8,8757
 psr/psrfcommon/__init__.py,sha256=WXR560XQllIjtFpWd0jiJEbUAQIyh5-6lwj-42_J95c,200
 psr/psrfcommon/psrfcommon.py,sha256=NABM5ahvyfSizDC9c0Vu9dVK1pD_vOzIGFHL1oz2E1o,1464
 psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,3939
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
-psr/runner/runner.py,sha256=fiuwKDRnqOLfV5UKJamLMZqm7PneeVjgEEmhpZbMm98,26340
+psr/runner/runner.py,sha256=xmo8YtrVvR4wzTHmnEeWxZzBQb9oRgg3bK_sPAGBcko,26599
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-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.0b10.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-4.1.0b10.dist-info/METADATA,sha256=J6xav8iS4WuFmukp5fvEaxPoUYWZshxodXwpR8THzM4,2429
+psr_factory-4.1.0b10.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-4.1.0b10.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-4.1.0b10.dist-info/RECORD,,

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

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