cloudpss 4.5.9__py3-none-any.whl → 4.5.11__py3-none-any.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.
Files changed (6) hide show
  1. cloudpss/ieslab/DataManageModel.py +12 -3
  2. cloudpss/version.py +1 -1
  3. {cloudpss-4.5.9.dist-info → cloudpss-4.5.11.dist-info}/METADATA +1 -1
  4. {cloudpss-4.5.9.dist-info → cloudpss-4.5.11.dist-info}/RECORD +6 -6
  5. {cloudpss-4.5.9.dist-info → cloudpss-4.5.11.dist-info}/WHEEL +0 -0
  6. {cloudpss-4.5.9.dist-info → cloudpss-4.5.11.dist-info}/top_level.txt +0 -0
cloudpss/ieslab/DataManageModel.py CHANGED
@@ -83,7 +83,7 @@ class DataManageModel(object):
83
83
 
84
84
  :return: 无
85
85
  '''
86
- list = ['thermalLoads', 'heatingLoad', 'coolingLoad', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold', 'HydrogenLoad']
86
+ list = ['thermalLoads', 'heatingLoad', 'coolingLoad', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold', 'HydrogenLoad', 'ammoniaLoad']
87
87
  for kind,value in self._kindUrlMap.items():
88
88
  try:
89
89
  if kind in list:
@@ -125,6 +125,7 @@ class DataManageModel(object):
125
125
  assert (dataType in self._kindNameMap
126
126
  or dataType in self._kindUrlMap), "数据类型不存在"
127
127
  kind = self._kindNameMap.get(dataType, dataType)
128
+ print(kind)
128
129
  return copy.deepcopy(self._kindItemDataMap[kind])
129
130
 
130
131
  def AddDataItem(self, dataType, data):
@@ -151,7 +152,7 @@ class DataManageModel(object):
151
152
  self._kindIdMap[str(data['id'])]=kind
152
153
  self._itemDataMap[str(data['timeid'])]=data
153
154
  self._itemDataMap[str(data['id'])]=data
154
- if kind in ['thermalLoads', 'heatingLoad','coolingLoad', 'electricLoads', 'fuels']:
155
+ if kind in ['thermalLoads', 'heatingLoad','coolingLoad', 'electricLoads', 'fuels', 'ammoniaLoad']:
155
156
  dataList = self._fetchItemData(self._kindUrlMap[kind], None)
156
157
  self._kindItemDataMap[kind] = dataList
157
158
  return dataList[-1]['id']
@@ -490,7 +491,11 @@ class IESOptDataManageModel(DataManageModel):
490
491
  "氢气压缩设备": "HydrogenCompression",
491
492
  "氢负荷": "HydrogenLoad",
492
493
  "氢": "HydrogenProductionFuels",
493
- "运氢槽车": "HydrogenTanker"
494
+ "运氢槽车": "HydrogenTanker",
495
+ "制氨设备": "AmmoniaProduction",
496
+ "储氨罐": "AmmoniaStoTank",
497
+ "制氮设备": "NitrogenProduction",
498
+ "氨负荷": "ammoniaLoad",
494
499
  }
495
500
  _kindUrlMap = {
496
501
  "PhotovoltaicSys": "api/ieslab-opt/rest/dpcs/",
@@ -537,5 +542,9 @@ class IESOptDataManageModel(DataManageModel):
537
542
  "ALK": "api/ieslab-opt/rest/hpc/",
538
543
  "PEME": "api/ieslab-opt/rest/hpc/",
539
544
  "SOEC": "api/ieslab-opt/rest/hpc/",
545
+ "AmmoniaProduction": "api/ieslab-opt/rest/apc/",
546
+ "AmmoniaStoTank": "api/ieslab-opt/rest/esc/",
547
+ "NitrogenProduction": "api/ieslab-opt/rest/asec/",
548
+ "ammoniaLoad": "api/ieslab-opt/rest/ammoniaLoad/",
540
549
  }
541
550
  pass
cloudpss/version.py CHANGED
@@ -1 +1 @@
1
- __version__ = '4.5.9'
1
+ __version__ = '4.5.11'
{cloudpss-4.5.9.dist-info → cloudpss-4.5.11.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cloudpss
3
- Version: 4.5.9
3
+ Version: 4.5.11
4
4
  Summary: cloudpss sdk
5
5
  Home-page: https://www.cloudpss.net
6
6
  Author: cloudpss
{cloudpss-4.5.9.dist-info → cloudpss-4.5.11.dist-info}/RECORD RENAMED
@@ -1,6 +1,6 @@
1
1
  cloudpss/__init__.py,sha256=1RNmUBhoxYUutZiTS-XJ9yBoNGGh8Mpt1uY6ETlSBDc,825
2
2
  cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
3
- cloudpss/version.py,sha256=xGdaPJqc07-IU62quHl65eRw-4ZSqCOIvpSy2ca3mQ0,22
3
+ cloudpss/version.py,sha256=_IT83jacQ37kz3mRzZ1NSiIrzcbJvBVztIDQY-Auz6c,23
4
4
  cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
5
5
  cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
6
6
  cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -24,7 +24,7 @@ cloudpss/function/__init__.py,sha256=TNzChB-gQF6oB62F423evpUlgcp6s03D4pKKs89Lz4Q
24
24
  cloudpss/function/function.py,sha256=llomkfnTmKMiFJYJ2mKnmAEoIjTNVCnjCUUyiJMOV1s,29
25
25
  cloudpss/function/functionExecution.py,sha256=YM2hS0Ao3jhMJodqFfxk0JAK7ZR00MPh-U2foBWshT0,16897
26
26
  cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
27
- cloudpss/ieslab/DataManageModel.py,sha256=5YqS_-xaLT8yTqEyjm3_mgO8mi8JESvibrUleFfYlsA,25520
27
+ cloudpss/ieslab/DataManageModel.py,sha256=UVH1EIsl8_yTD6hsPW0RBVZwXekNngCBfz4yB1UAa-E,25966
28
28
  cloudpss/ieslab/EvaluationModel.py,sha256=hGZmuaB8lL9LVti_TCG-qCfK_bA-HJgdxYt7oMmVrXY,9399
29
29
  cloudpss/ieslab/IESLabOpt.py,sha256=KMswh-q_RpM_HU8HtKLj05p-AKBwnNrc37zy7pq6cf8,9063
30
30
  cloudpss/ieslab/IESLabPlan.py,sha256=rEf1W2pT_J3C8-TFFHVm8Llli9ySSXbBeRpd6Yz9Glk,8345
@@ -74,7 +74,7 @@ cloudpss/utils/graphqlUtil.py,sha256=zGEhRZvy5JMipFKFxjDmbc-HQP3aPZ5noDwi-RTXWSk
74
74
  cloudpss/utils/httprequests.py,sha256=1AzngOGVRRSUuI3duE75w1dRlQ7AvexnJL4aXxpDOhk,1857
75
75
  cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
76
76
  cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
77
- cloudpss-4.5.9.dist-info/METADATA,sha256=pXYw_t8cxFUdKKa-tbqAyvWaNxBYtdD-RPP1PLU0dLY,2401
78
- cloudpss-4.5.9.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
79
- cloudpss-4.5.9.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
80
- cloudpss-4.5.9.dist-info/RECORD,,
77
+ cloudpss-4.5.11.dist-info/METADATA,sha256=shJT0xBxbu6_7EJ_BEAkUZewUr3jO3LAWeMajC_gHK4,2402
78
+ cloudpss-4.5.11.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
79
+ cloudpss-4.5.11.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
80
+ cloudpss-4.5.11.dist-info/RECORD,,