psr-factory 5.0.0b48__py3-none-win_amd64.whl → 5.0.0b50__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__ = "5.0.0b48"
+__version__ = "5.0.0b50"
 
 from .api import *

psr/factory/api.py

@@ -1236,6 +1236,34 @@ class DataObject(_BaseObject):
     def type(self):
         raise AttributeError("do not delete type")
 
+    @property
+    def key(self) -> str:
+        err = Error()
+        size = factorylib.lib.psrd_object_get_key(self._hdr, None,
+                                                  0, err.handler())
+        if err.code != 0:
+            raise FactoryException(err.what)
+        buffer = ctypes.create_string_buffer(size)
+        factorylib.lib.psrd_object_get_key(self._hdr, buffer,
+                                           size, err.handler())
+        if err.code == 0:
+            return _from_c_str(buffer.value)
+        raise FactoryException(err.what)
+
+    @key.setter
+    def key(self, value: str):
+        err = Error()
+        factorylib.lib.psrd_object_set_key(self._hdr,
+                                           _c_str(value),
+                                           _bytes(value),
+                                           err.handler())
+        if err.code != 0:
+            raise FactoryException(err.what)
+
+    @key.deleter
+    def key(self):
+        raise AttributeError("do not delete key")
+
     @property
     def name(self) -> str:
         err = Error()

psr/factory/factory.pmd

@@ -5103,6 +5103,7 @@ DEFINE_MODEL MODL:SDDP_ContratoCombustivel
         PARM  REAL	MinOfftakeRatePen DEFAULT 0
         PARM  REAL	MinOfftakeRateDay DEFAULT -1
         PARM  REAL	MaxOfftakeRateDay DEFAULT -1
+		PARM  REAL	MinOfftakeRatePerStage DEFAULT -1
 
 		VETOR DATE DataCost @chronological @addyear_chronological
 		VETOR REAL Cost  INDEX DataCost
@@ -5111,10 +5112,13 @@ DEFINE_MODEL MODL:SDDP_ContratoCombustivel
 	VETOR REAL MaxOfftake  DIM(block) INDEX DataMaxOfftake
 
 	VETOR DATE      DateMinOfftakeRateDayChro @chronological @addyear_chronological
-	VETOR REAL      MinOfftakeRateDayChro INDEX  DateMinOfftakeRateDayChro
+	VETOR REAL      MinOfftakeRateDayChro INDEX DateMinOfftakeRateDayChro
 
 	VETOR DATE      DateMaxOfftakeRateDayChro @chronological @addyear_chronological
-	VETOR REAL      MaxOfftakeRateDayChro INDEX  DateMaxOfftakeRateDayChro
+	VETOR REAL      MaxOfftakeRateDayChro INDEX DateMaxOfftakeRateDayChro
+
+	VETOR DATE		DateMinOfftakeRatePerStageChro @chronological @addyear_chronological
+	VETOR REAL		MinOfftakeRatePerStageChro INDEX DateMinOfftakeRatePerStageChro
 
 	VETOR DATE		DataAvailability @chronological @addyear_chronological
 	VETOR REAL		Availability INDEX DataAvailability DEFAULT -1

psr/factory/factory.pmk

@@ -12468,7 +12468,7 @@ END_MASK
 DEFINE_MASK ROWDATA SDDP_fuecnt_v2
 DEFINE_HEADER
 $version=2
-!Num Nome........ Comb Custo... Tipo d1/m1/yy01 d2/m2/yy02 nrep cnt.min. cnt.max. cnt.ini. disp.max traf.max CustoToP Availab. Tcin SpillPen MinOfft. MinOfPen MinOfftD MaxOfftD
+!Num Nome........ Comb Custo... Tipo d1/m1/yy01 d2/m2/yy02 nrep cnt.min. cnt.max. cnt.ini. disp.max traf.max CustoToP Availab. Tcin SpillPen MinOfft. MinOfPen MinOfftD MaxOfftD MinOfftS
 END_HEADER
 DEFINE_DATA
 Num			INTEGER	1,4
@@ -12490,8 +12490,9 @@ UnitConsumedAmount	INTEGER  128,131 AUTOSET(model.parm("UnitConsumedAmount"))
 SpillagePen	REAL  133,140 AUTOSET(model.parm("SpillagePen"))
 MinOfftakeRate	REAL  142,149 AUTOSET(model.parm("MinOfftakeRate"))
 MinOfftakeRatePen	REAL  151,158 AUTOSET(model.parm("MinOfftakeRatePen"))
-MinOfftakeRateDay	REAL  160,167
-MaxOfftakeRateDay	REAL  169,176
+MinOfftakeRateDay	REAL  160,167 AUTOSET(model.parm("MinOfftakeRateDay"))
+MaxOfftakeRateDay	REAL  169,176 AUTOSET(model.parm("MaxOfftakeRateDay"))
+MinOfftakeRatePerStage	REAL  178,185 AUTOSET(model.parm("MinOfftakeRatePerStage"))
 END_DATA
 
 END_MASK

psr/factory/factorylib.py

@@ -143,6 +143,10 @@ def initialize():
     lib.psrd_object_get_parent.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
     lib.psrd_object_get_type.restype = ctypes.c_int
     lib.psrd_object_get_type.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p]
+    lib.psrd_object_get_key.restype = ctypes.c_int
+    lib.psrd_object_get_key.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p]
+    lib.psrd_object_set_key.restype = ctypes.c_int
+    lib.psrd_object_set_key.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p]
     lib.psrd_object_get_code.restype = ctypes.c_int
     lib.psrd_object_get_code.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_int), ctypes.c_void_p]
     lib.psrd_object_set_code.restype = ctypes.c_int

{psr_factory-5.0.0b48.dist-info → psr_factory-5.0.0b50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b48
+Version: 5.0.0b50
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT

{psr_factory-5.0.0b48.dist-info → psr_factory-5.0.0b50.dist-info}/RECORD

@@ -16,13 +16,13 @@ psr/execqueue/config.py,sha256=rUOzO5dtTkwWoZlZfk06K9RE94xCx53T1bJ1h5JaDUo,1446
 psr/execqueue/db.py,sha256=sNr_StNEgZZQCKcyCWiB1WrQJIhE9UvLUxPA2tWiXGs,8498
 psr/execqueue/server.py,sha256=LolYERWRt96P_ip4yKU7DsN7M_n9d_pbflbT0ckUV0E,15782
 psr/execqueue/watcher.py,sha256=R1dyXJ-OYn_QjqdItBwbLJZQ2LcbtdHqnRaYkyphi4w,5637
-psr/factory/__init__.py,sha256=DP_HqBOVuzaR2xb50Ys2ghB1JbFVoKvAFVQCnkutwZ4,219
-psr/factory/api.py,sha256=ttRLilLZqkYUglLLoE0rXDfbENZ-PMSpvfkZU6fjn5k,105058
-psr/factory/factory.dll,sha256=P_7DkzKkhD2yteXxoTlr3O3WcqB4OQSjRuiOl1-ad6Y,18755072
-psr/factory/factory.pmd,sha256=bEfHWAurubmKA352GrOSGnUY4uViOXUa0j6l8Pfd_CM,252010
-psr/factory/factory.pmk,sha256=tnWrmVleg6xAZGfwekVzWQd7ME1KFb8kgkUkoIn3gM0,600955
-psr/factory/factorylib.py,sha256=wrgb1oaY9SkehzDXCn4RdTb26YFaem-ZwXOBPfhwOf0,28481
-psr/factory/libcurl-x64.dll,sha256=6WGBmqX4q_eD8Vc0E2VpCvVrFV3W7TQoaKqSdbhXBu0,5313096
+psr/factory/__init__.py,sha256=-L7Nsdfu8QUH_LuI-u2r0qi7QF9BmNSVxKAL8XN5zNo,219
+psr/factory/api.py,sha256=tezioW1Dqv6m7Ozvc0AOTpZcb1q7rLsICqB58twEG5c,106100
+psr/factory/factory.dll,sha256=skIvvA5KlKhUOZp1GA8CwStyGyHsBFJ7kCdhzNpbXsM,18727248
+psr/factory/factory.pmd,sha256=b9yPyDmkfwMC1BVnLwcM8UqV3jJTuMkfhWdMFwbFlEc,252219
+psr/factory/factory.pmk,sha256=gM05-6muZmJJhrceHhlDIIaMMM6FJe6y1ERaHaWJQJc,601130
+psr/factory/factorylib.py,sha256=HCjHezBrzf2hTrHpszhXOREsQ022I0CZvPjigYFxWeE,28799
+psr/factory/libcurl-x64.dll,sha256=bWNvOzKyZjLmn6tMZ_Om6NCwYLKkj0WB__-cNHQmW6Q,5317968
 psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 psr/factory/samples/__init__.py,sha256=xxOch5Fokzjy571a6OHD87FWM17qKgvfcbr8xn-n36I,80
 psr/factory/samples/sddp_case01.py,sha256=h8MDJ6ajXMH_ngiUFSCVFG3XCKDRys6y78vFYyfCMmE,5038
@@ -36,8 +36,8 @@ psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,39
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
 psr/runner/runner.py,sha256=hCVH62HAZK_M9YUiHQgqCkMevN17utegjfRIw49MdvM,27542
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-5.0.0b48.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b48.dist-info/METADATA,sha256=XaOamc4Tm2lE0BqpUEsbbhC7eUrzMmQgxSenbXylvuU,3486
-psr_factory-5.0.0b48.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b48.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b48.dist-info/RECORD,,
+psr_factory-5.0.0b50.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b50.dist-info/METADATA,sha256=KBExsLitxgZIySxowtsO3jvGcKf417CsSja0rTd94-M,3486
+psr_factory-5.0.0b50.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b50.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b50.dist-info/RECORD,,