psr-factory 4.1.0b10__py3-none-win_amd64.whl → 4.1.0b12__py3-none-win_amd64.whl

psr/factory/samples/{sddp_1_stage_case01.py → sddp_case01.py}

@@ -9,11 +9,12 @@ 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:
+def create_case01(legacy: bool) -> psr.factory.Study:
     blocks = 1
+    model = "SDDP" if not legacy else "SDDP17"
     # Create a study object and define its basic settings.
     study = psr.factory.create_study({
-        "Models": ["SDDP", ], # Default model: SDDP
+        "Models": [model, ], # Default model: SDDP
         "Blocks": blocks, # Default number of blocks: 1
         "StageType": 2,   # Weekly: 1 (default), Monthly: 2
     })
@@ -103,7 +104,7 @@ def create_sddp_sample_case01() -> psr.factory.Study:
     study.add(fuel2)
 
     # Create all thermal plants.
-    plant1 = psr.factory.create("ThermalPlant", study.context)
+    plant1 = study.create("ThermalPlant")
     plant1.code = 1
     plant1.name = "Thermal 1"
     # Set plant's properties
@@ -124,11 +125,7 @@ def create_sddp_sample_case01() -> psr.factory.Study:
         "RefSystem": system,
     }
     plant1.from_dict(t_params)
-    for i in range(5):
-        pcopy = copy.copy(plant1)
-        pcopy.code = i + 1
-        study.add(pcopy)
-
+    study.add(plant1)
 
     # Use Python copy's module copy function to create
     # a copy of an object.
@@ -158,11 +155,10 @@ def create_sddp_sample_case01() -> psr.factory.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()
+    study = create_case01(False)
     print(" OK.")
     print("Saving example case in \"{}\"... ".format(case_path), end="")
     study.save(case_path)

psr/factory/samples/sddp_case21.py

@@ -0,0 +1,242 @@
+"""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_case21(legacy: bool) -> psr.factory.Study:
+    # Create a study object and define its basic settings.
+    blocks = 1
+    model = "SDDP" if not legacy else "SDDP17"
+    # 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", [model, ])  # 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_case21(False)
+    print(" OK.")
+    print("Saving example case in \"{}\"... ".format(case_path), end="")
+    study.save(case_path)
+    print(" OK.")

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

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

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

@@ -2,24 +2,25 @@ 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=ZP2gRmm2OzreWE6xvp7pDpceYeU_X8-DusH34M6xTx0,43669
-psr/cloud/data.py,sha256=3zWh1qnBNFfI8K3N8jZKqDnzHWMQ5llc_wwGMZ4FtKs,3548
+psr/cloud/cloud.py,sha256=XOtTr6AoxZSNrWXzvM3Ia2BfMjThLn3FVF_7LM4BtME,57585
+psr/cloud/data.py,sha256=nQVpCZhHlHI0HOpqsNhBpotLO37ha5Fl9txWABDnFwQ,4008
 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=RG2RB_TfKD_2sF3BR3PpbFPEmlXkWUJOgqpsnMmcVsc,192
-psr/cloud/xml.py,sha256=dmBh4iRieORCctm1obz1EGA2QN-KkZlH5_dQfBud-AI,1847
-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/cloud/xml.py,sha256=ac2lyflOQm8khPvJn0zmI26I4sfUDY6A_OTsxzbMQEs,1896
+psr/factory/__init__.py,sha256=HNNVl6Rl2MZnfodAZFBM6ZH7qOVD9vrpQNpom_cXALM,219
+psr/factory/api.py,sha256=N5153ZJmZjzLQ0AvRZnSlTu6UmHBQqbYw0UQ69sZHkE,98705
+psr/factory/factory.dll,sha256=Xi0W6KyNvWhLfbaZziLOjnLxG7wgGg7LFZZ0PEcWEUA,12969744
+psr/factory/factory.pmd,sha256=BntBOXSJ1Uf2rZ9HIM-yaHT1F9erAm8zOxHYssUCZCo,242440
+psr/factory/factory.pmk,sha256=3xDhU0fpUz6dSn29E8GkXEmCOSadnq7cJPcNPbEyFfI,579203
 psr/factory/factorylib.py,sha256=xnhCFTo4DpU0e5oHtIWMmc-kk6ThtNAUI3cxpDXrBKE,27497
-psr/factory/libcurl-x64.dll,sha256=6MVf69XKZf-LWdjiCj9rv_bykkU9uSxA4BUC8uRBk1g,5317904
+psr/factory/libcurl-x64.dll,sha256=smw29I-r8m5zrvILQqP_T3HY2m67YBW8k6duQvbV0mA,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_case01.py,sha256=jo71p9NN7dtRqMT76TEbD4S4Lut7p4ejbpu6SoSwg0Y,5034
+psr/factory/samples/sddp_case21.py,sha256=-9Wk2ntjIC1-PrQDXDcnWUjV0OF9Xi_IREFb2pUWSi4,8797
 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
@@ -28,8 +29,8 @@ psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,39
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
 psr/runner/runner.py,sha256=xmo8YtrVvR4wzTHmnEeWxZzBQb9oRgg3bK_sPAGBcko,26599
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-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.0b12.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-4.1.0b12.dist-info/METADATA,sha256=T9n8MRvmsZH5CUY9htEmNEL4iEupy9QoRkuyQmBwS4g,2429
+psr_factory-4.1.0b12.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-4.1.0b12.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-4.1.0b12.dist-info/RECORD,,