psr-factory 5.0.0b47__py3-none-win_amd64.whl → 5.0.0b49__py3-none-win_amd64.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of psr-factory might be problematic. Click here for more details.

Files changed (12) hide show
  1. psr/factory/__init__.py +1 -1
  2. psr/factory/factory.dll +0 -0
  3. psr/factory/factory.pmd +16 -2
  4. psr/factory/factory.pmk +16 -16
  5. psr/factory/libcurl-x64.dll +0 -0
  6. psr/factory/samples/sddp_case01.py +2 -2
  7. psr/factory/samples/sddp_case21.py +3 -3
  8. {psr_factory-5.0.0b47.dist-info → psr_factory-5.0.0b49.dist-info}/METADATA +1 -1
  9. {psr_factory-5.0.0b47.dist-info → psr_factory-5.0.0b49.dist-info}/RECORD +12 -12
  10. {psr_factory-5.0.0b47.dist-info → psr_factory-5.0.0b49.dist-info}/WHEEL +0 -0
  11. {psr_factory-5.0.0b47.dist-info → psr_factory-5.0.0b49.dist-info}/licenses/LICENSE.txt +0 -0
  12. {psr_factory-5.0.0b47.dist-info → psr_factory-5.0.0b49.dist-info}/top_level.txt +0 -0
psr/factory/__init__.py CHANGED
@@ -2,6 +2,6 @@
2
2
  # Unauthorized copying of this file, via any medium is strictly prohibited
3
3
  # Proprietary and confidential
4
4
 
5
- __version__ = "5.0.0b47"
5
+ __version__ = "5.0.0b49"
6
6
 
7
7
  from .api import *
psr/factory/factory.dll CHANGED
Binary file
psr/factory/factory.pmd CHANGED
@@ -2784,6 +2784,17 @@ DEFINE_MODEL MODL:Optgen_Bateria
2784
2784
  VECTOR DATE DataPotenciaFirme
2785
2785
  VECTOR REAL PotenciaFirme INDEX DataPotenciaFirme
2786
2786
  END_MODEL
2787
+ //--------------------------------------------------------------------------------------------------
2788
+ // Modelo para Eficiencia Energetica
2789
+ //--------------------------------------------------------------------------------------------------
2790
+ DEFINE_MODEL MODL:Optgen_EE
2791
+ PARM INTEGER EnergiaFirmeUnit
2792
+ VECTOR DATE DataEnergiaFirme
2793
+ VECTOR REAL EnergiaFirme INDEX DataEnergiaFirme
2794
+ PARM INTEGER PotenciaFirmeUnit
2795
+ VECTOR DATE DataPotenciaFirme
2796
+ VECTOR REAL PotenciaFirme INDEX DataPotenciaFirme
2797
+ END_MODEL
2787
2798
 
2788
2799
  //--------------------------------------------------------------------------------------------------
2789
2800
  // Modelo para Projeto de Expansao
@@ -4202,7 +4213,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Demanda
4202
4213
  VETOR REAL CoefVariation DIM(block) INDEX Data
4203
4214
  PARM REAL Duracao DIM(block)
4204
4215
 
4205
- VETOR DATE DataCorrelationInflow
4216
+ VETOR DATE DataCorrelationInflow @addyear_chronological
4206
4217
  VETOR REAL CorrelationInflow DIM(block) INDEX DataCorrelationInflow
4207
4218
 
4208
4219
  PARM REAL MaxShiftUp DEFAULT 0
@@ -4721,7 +4732,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Gnd
4721
4732
  DIMENSION block
4722
4733
  DIMENSION reserve_max
4723
4734
  DIMENSION reserve_price
4724
-
4735
+
4725
4736
  MERGE_MODEL Sddp_Georeference
4726
4737
  VETOR DATE Data @addyear_modification
4727
4738
  VETOR INTEGER Existing INDEX Data DEFAULT 0
@@ -4782,6 +4793,7 @@ DEFINE_MODEL MODL:SDDP_Csp
4782
4793
  DIMENSION reserve_max
4783
4794
  DIMENSION reserve_price
4784
4795
 
4796
+ MERGE_MODEL Sddp_Georeference
4785
4797
  VETOR DATE Data @addyear_modification
4786
4798
  VETOR INTEGER Existing INDEX Data DEFAULT 0
4787
4799
  VETOR INTEGER Unidades INDEX Data DEFAULT 1
@@ -4916,6 +4928,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_PostoHidrologico
4916
4928
  VETOR DATE Data @chronological
4917
4929
  VETOR REAL Vazao INDEX Data
4918
4930
 
4931
+ PARM REFERENCE DownstreamStation PSRGaugingStation
4919
4932
  PARM INTEGER InflowResol DEFAULT 9
4920
4933
 
4921
4934
  //--- Parametros associados a representacao por autoregressao ---
@@ -5663,6 +5676,7 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5663
5676
  PARM INTEGER BLVP DEFAULT 0
5664
5677
  PARM INTEGER GAME
5665
5678
  PARM INTEGER TRUP
5679
+ PARM INTEGER HINS
5666
5680
 
5667
5681
  PARM REAL NCPL_MIPR DEFAULT 0.005
5668
5682
  PARM REAL NCPL_LTOL
psr/factory/factory.pmk CHANGED
@@ -12180,21 +12180,6 @@ END_DATA
12180
12180
 
12181
12181
  END_MASK
12182
12182
 
12183
- DEFINE_MASK CSVDATA SDDP_GEOREFERENCE_v1
12184
-
12185
- DEFINE_HEADER
12186
- $version=1
12187
- !NUM,Latitude,Longitude
12188
- END_HEADER
12189
-
12190
- DEFINE_DATA
12191
- Num INTEGER 1
12192
- Latitude REAL 2 AUTOSET
12193
- Longitude REAL 3 AUTOSET
12194
- END_DATA
12195
-
12196
- END_MASK
12197
-
12198
12183
 
12199
12184
  DEFINE_MASK ROWDATA GEOREFERENCE:Circuit
12200
12185
 
@@ -13051,7 +13036,7 @@ DEFINE_MASK CSVDATA SDDP_v14.0_opechd
13051
13036
 
13052
13037
  DEFINE_HEADER
13053
13038
  $version=1
13054
- !Code,Name,TurbiningTravelTime,SpillingTravelTime,DischargeRampUp,DischargeRampDown,RampUp,RampDown,Commitment,StartupCost,MaxStartup,TurbRampUp,TurbRampDown,SpilRampUp,SpilRampDown,ForebayRampUp,ForebayRampDown,ForebayRampUpDay,ForebayRampDownDay
13039
+ !Code,Name........,TurbiningTravelTime,SpillingTravelTime,DischargeRampUp,DischargeRampDown,RampUp,RampDown,Commitment,StartupCost,MaxStartup,TurbRampUp,TurbRampDown,SpilRampUp,SpilRampDown,ForebayRampUp,ForebayRampDown,ForebayRampUpDay,ForebayRampDownDay
13055
13040
  END_HEADER
13056
13041
 
13057
13042
  DEFINE_DATA
@@ -16669,6 +16654,21 @@ Latitude REAL 2 AUTOSET(model.vector("Latitude")[*])
16669
16654
  Longitude REAL 3 AUTOSET(model.vector("Longitude")[*])
16670
16655
  END_DATA
16671
16656
 
16657
+ END_MASK
16658
+ //---------------------------------------------------------------------
16659
+ DEFINE_MASK CSVDATA SDDP_georeference_v1
16660
+
16661
+ DEFINE_HEADER
16662
+ $version=1
16663
+ !Code,Latitude,Longitude
16664
+ END_HEADER
16665
+
16666
+ DEFINE_DATA
16667
+ Code INTEGER 1
16668
+ Latitude REAL 2 AUTOSET(model.vector("Latitude")[*])
16669
+ Longitude REAL 3 AUTOSET(model.vector("Longitude")[*])
16670
+ END_DATA
16671
+
16672
16672
  END_MASK
16673
16673
  //---------------------------------------------------------------------
16674
16674
  DEFINE_MASK CSVDATA SDDP_dbus
psr/factory/libcurl-x64.dll CHANGED
Binary file
psr/factory/samples/sddp_case01.py CHANGED
@@ -28,7 +28,7 @@ def create_case01(legacy: bool = False) -> psr.factory.Study:
28
28
 
29
29
  # Study options
30
30
  study.from_dict({
31
- "Type": 2,
31
+ "PARModel": 2,
32
32
  "InitialYearOfHydrology": 1996,
33
33
  "NumberOfSystems": 1,
34
34
  "AggregateInTheOperationPolicy": 0,
@@ -113,7 +113,7 @@ def create_case01(legacy: bool = False) -> psr.factory.Study:
113
113
  "InstalledCapacity": 10.0,
114
114
  "ThermalType": 0,
115
115
  "Type": 0,
116
- "NumberOfGeneratingUnits": 1,
116
+ "NumberOfUnits": 1,
117
117
  "NumberOfAlternativeFuels": 0,
118
118
  "CodeOfAlternativeFuels(:)": 0,
119
119
  "O&MCost": 0.0,
psr/factory/samples/sddp_case21.py CHANGED
@@ -29,7 +29,7 @@ def create_case21(legacy: bool = False) -> psr.factory.Study:
29
29
  study.set("NumberOfSeries", 1)
30
30
 
31
31
  # Study options
32
- study.set("Type", 2)
32
+ study.set("PARModel", 2)
33
33
  study.set("InitialYearOfHydrology", 2016)
34
34
  study.set("NumberOfSystems", 1)
35
35
  study.set("AggregateInTheOperationPolicy", 1)
@@ -118,7 +118,7 @@ def create_case21(legacy: bool = False) -> psr.factory.Study:
118
118
  plant1.set("InstalledCapacity", 12.0)
119
119
  plant1.set("ThermalType", 0) # Standard operation mode.
120
120
  plant1.set("Type", 0) # It's an existing plant.
121
- plant1.set("NumberOfGeneratingUnits", 1)
121
+ plant1.set("NumberOfUnits", 1)
122
122
  plant1.set("NumberOfAlternativeFuels", 0) # No alternative fuels
123
123
  plant1.set("CodeOfAlternativeFuels(:)", 0)
124
124
  plant1.set("O&MCost", 0.0)
@@ -141,7 +141,7 @@ def create_case21(legacy: bool = False) -> psr.factory.Study:
141
141
  plant2.set("InstalledCapacity", 8.0)
142
142
  plant2.set("ThermalType", 0)
143
143
  plant2.set("Type", 0)
144
- plant2.set("NumberOfGeneratingUnits", 1)
144
+ plant2.set("NumberOfUnits", 1)
145
145
  plant2.set("NumberOfAlternativeFuels", 0)
146
146
  plant2.set("CodeOfAlternativeFuels(:)", 0)
147
147
  plant2.set("O&MCost", 0.0)
{psr_factory-5.0.0b47.dist-info → psr_factory-5.0.0b49.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: psr-factory
3
- Version: 5.0.0b47
3
+ Version: 5.0.0b49
4
4
  Summary: PSR database management module.
5
5
  Author-email: "PSR Inc." <psrfactory@psr-inc.com>
6
6
  License-Expression: MIT
{psr_factory-5.0.0b47.dist-info → psr_factory-5.0.0b49.dist-info}/RECORD RENAMED
@@ -16,17 +16,17 @@ psr/execqueue/config.py,sha256=rUOzO5dtTkwWoZlZfk06K9RE94xCx53T1bJ1h5JaDUo,1446
16
16
  psr/execqueue/db.py,sha256=sNr_StNEgZZQCKcyCWiB1WrQJIhE9UvLUxPA2tWiXGs,8498
17
17
  psr/execqueue/server.py,sha256=LolYERWRt96P_ip4yKU7DsN7M_n9d_pbflbT0ckUV0E,15782
18
18
  psr/execqueue/watcher.py,sha256=R1dyXJ-OYn_QjqdItBwbLJZQ2LcbtdHqnRaYkyphi4w,5637
19
- psr/factory/__init__.py,sha256=v79dUKI3wH0ErW3nDBPZo5wAysJ0k5yAyaaaI5odVp0,219
19
+ psr/factory/__init__.py,sha256=ihQGJERDdCfxWpr6AEPCspxsq6K0Byk_4Xlv0Bt_jFQ,219
20
20
  psr/factory/api.py,sha256=ttRLilLZqkYUglLLoE0rXDfbENZ-PMSpvfkZU6fjn5k,105058
21
- psr/factory/factory.dll,sha256=TKfDSRQJ8tWX0W5GnoccvLkMp0M_6fcTBuOzpLcbdCU,18740048
22
- psr/factory/factory.pmd,sha256=XCa78VZaYplQTjx3H3lkIqUh-iIwIa1FO8ElU0DiGtY,251366
23
- psr/factory/factory.pmk,sha256=xUmWIJKh_I3Ng9BVhaxB3I9xNXR3e--QnWlSgaN2m5A,600775
21
+ psr/factory/factory.dll,sha256=sARB60q7r2gnkThVNOf3MxgABSp52Abu7Mt6dHafreg,18766160
22
+ psr/factory/factory.pmd,sha256=bEfHWAurubmKA352GrOSGnUY4uViOXUa0j6l8Pfd_CM,252010
23
+ psr/factory/factory.pmk,sha256=tnWrmVleg6xAZGfwekVzWQd7ME1KFb8kgkUkoIn3gM0,600955
24
24
  psr/factory/factorylib.py,sha256=wrgb1oaY9SkehzDXCn4RdTb26YFaem-ZwXOBPfhwOf0,28481
25
- psr/factory/libcurl-x64.dll,sha256=I6-VFSZyO5C-hV4pGmFHRblnSO6E3wBWze_0LVnKboA,5317968
25
+ psr/factory/libcurl-x64.dll,sha256=f58DAr2e0rUwFW4MopBZ8ZhwtjUirAnpL7ytXte-kNU,5317968
26
26
  psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
27
27
  psr/factory/samples/__init__.py,sha256=xxOch5Fokzjy571a6OHD87FWM17qKgvfcbr8xn-n36I,80
28
- psr/factory/samples/sddp_case01.py,sha256=eLhtOAS2STl9-H7Nr5VUG4ATO0bVcn-CJtCn3Rf-vpI,5044
29
- psr/factory/samples/sddp_case21.py,sha256=Eymn3q0uyaGSmZaTr0Yk2q9yf1-enqdoUFXPwuQ1YOk,8807
28
+ psr/factory/samples/sddp_case01.py,sha256=h8MDJ6ajXMH_ngiUFSCVFG3XCKDRys6y78vFYyfCMmE,5038
29
+ psr/factory/samples/sddp_case21.py,sha256=5DNIEu5aMhf8QOOJT-erdBmtozZukJA3k45C0nbfxYo,8791
30
30
  psr/outputs/__init__.py,sha256=Rs2MCBm2fUjwm9CAjZU-2Ll7KUsVEbW16mNY1Xnx-pI,193
31
31
  psr/outputs/outputs.py,sha256=gzmKl9Ma6K9gjpTTBc45p-IT7DgEX-PzRqtsQSWfja0,6727
32
32
  psr/outputs/resample.py,sha256=6fVBWOzxu3utkavGS5EIUd0QpSZm6kc-J1Qv8Bk0X6o,14276
@@ -36,8 +36,8 @@ psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,39
36
36
  psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
37
37
  psr/runner/runner.py,sha256=hCVH62HAZK_M9YUiHQgqCkMevN17utegjfRIw49MdvM,27542
38
38
  psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
39
- psr_factory-5.0.0b47.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
40
- psr_factory-5.0.0b47.dist-info/METADATA,sha256=Wdaoza3IsL3po-7UBjcHKBWKZn55TrOecBdkUZkJTEk,3486
41
- psr_factory-5.0.0b47.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
42
- psr_factory-5.0.0b47.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
43
- psr_factory-5.0.0b47.dist-info/RECORD,,
39
+ psr_factory-5.0.0b49.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
40
+ psr_factory-5.0.0b49.dist-info/METADATA,sha256=kIgMdtEL3qbNMS2LTT5k4JYVZTUxUByLKM69RcVsjbg,3486
41
+ psr_factory-5.0.0b49.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
42
+ psr_factory-5.0.0b49.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
43
+ psr_factory-5.0.0b49.dist-info/RECORD,,