psr-factory 4.1.0b11__py3-none-win_amd64.whl → 5.0.0b1__py3-none-win_amd64.whl

psr/factory/samples/{sddp_sample_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,6 +125,7 @@ def create_sddp_sample_case01() -> psr.factory.Study:
         "RefSystem": system,
     }
     plant1.from_dict(t_params)
+    study.add(plant1)
 
     # Use Python copy's module copy function to create
     # a copy of an object.
@@ -153,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_sample_case21.py → sddp_case21.py}

@@ -9,14 +9,15 @@ 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:
+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", ["SDDP", ])  # Default model: Sddp
+    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)
 
@@ -234,7 +235,7 @@ 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()
+    study = create_case21(False)
     print(" OK.")
     print("Saving example case in \"{}\"... ".format(case_path), end="")
     study.save(case_path)

{psr_factory-4.1.0b11.dist-info → psr_factory-5.0.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 4.1.0b11
+Version: 5.0.0b1
 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.0b11)
+PSR Factory (version 5.0.0b1)
 ============================
 
 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.0b11-py3-none-win_amd64.whl
+pip install psr_factory-5.0.0b1-py3-none-win_amd64.whl
 ```
 
 Factory will be available to all Python scripts in your system after importing it:

{psr_factory-4.1.0b11.dist-info → psr_factory-5.0.0b1.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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/cloud.py,sha256=wEi_gUJkdS1s5SozaGVII6zdyYMFLLQkvi1ouCa_Smc,57344
 psr/cloud/data.py,sha256=3zWh1qnBNFfI8K3N8jZKqDnzHWMQ5llc_wwGMZ4FtKs,3548
 psr/cloud/desktop.py,sha256=JFroCMEFV1Nz3has74n7OVrGCg2lS7Ev5bcjdw2hRxY,2980
 psr/cloud/log.py,sha256=Dvhz1enIWlFWeaRK7JAAuZVPfODgoEIRNcHEmbEliyQ,1366
@@ -10,26 +10,25 @@ 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=pQ8r8rtz7eoepWGAoN4mxRBn-FsVNQ6BKEoLEntO3Vs,219
-psr/factory/api.py,sha256=StGPIDNkWcDLIlbwAm9arok3netOqr1fFXZNeX1GNUA,98497
-psr/factory/factory.dll,sha256=XgwRs5_mo7K2fVw4QwYzmUiTMVHHvQgWLpyR716Hy4s,12964120
-psr/factory/factory.pmd,sha256=Fe1cedVdYb6h8hEJTC0u1qz53JmZnTIOK1GmJuUNo2g,230965
-psr/factory/factory.pmk,sha256=zYyK8QEMa-J2r_kvYuRiqVzGLqMAiav_DP6h7-2wtX8,570074
+psr/factory/__init__.py,sha256=nPeJZw4RnzmdBNr2kBhEnDrrbO5pciX55tTbrUATTg4,218
+psr/factory/api.py,sha256=N5153ZJmZjzLQ0AvRZnSlTu6UmHBQqbYw0UQ69sZHkE,98705
+psr/factory/factory.dll,sha256=b708lQU_J2zQ-XQ8LYKLC_W5fVLu2jOemndQ1CrjD5g,13027088
+psr/factory/factory.pmd,sha256=Ma9gT-K4fSyQHN-mlmGyukk24fr0w51T0HVvczfOhgo,238710
+psr/factory/factory.pmk,sha256=Px4YBSwfMbWNkRlEVITYC6Zl2lsrm_NQ4w3eilVZf5Q,579459
 psr/factory/factorylib.py,sha256=xnhCFTo4DpU0e5oHtIWMmc-kk6ThtNAUI3cxpDXrBKE,27497
-psr/factory/libcurl-x64.dll,sha256=6MVf69XKZf-LWdjiCj9rv_bykkU9uSxA4BUC8uRBk1g,5317904
+psr/factory/libcurl-x64.dll,sha256=Lx3vh3ZyXXAfUIMhgVEoyfZNmrQkf7ZUOtcTPt5CCcU,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/factory/samples/sddp_case01.py,sha256=jo71p9NN7dtRqMT76TEbD4S4Lut7p4ejbpu6SoSwg0Y,5034
+psr/factory/samples/sddp_case21.py,sha256=-9Wk2ntjIC1-PrQDXDcnWUjV0OF9Xi_IREFb2pUWSi4,8797
 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=xmo8YtrVvR4wzTHmnEeWxZzBQb9oRgg3bK_sPAGBcko,26599
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-4.1.0b11.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-4.1.0b11.dist-info/METADATA,sha256=1CJafrgXiqe-hvlCSwgf1xnxUHIpDIKRhM1wS4ld3Nc,2429
-psr_factory-4.1.0b11.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-4.1.0b11.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-4.1.0b11.dist-info/RECORD,,
+psr_factory-5.0.0b1.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b1.dist-info/METADATA,sha256=jaAWrN4AZdeOUo9imt2iNpWcZYyrEHpq7EMZDH2OssU,2426
+psr_factory-5.0.0b1.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b1.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b1.dist-info/RECORD,,

psr/factory/samples/sddp_1_stage_case01.py

@@ -1,169 +0,0 @@
-"""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.")