enerdata 1.1.2__tar.gz → 1.1.4__tar.gz
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.
- {enerdata-1.1.2/enerdata.egg-info → enerdata-1.1.4}/PKG-INFO +1 -1
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/__init__.py +1 -1
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/contracts/tariff.py +13 -9
- {enerdata-1.1.2 → enerdata-1.1.4/enerdata.egg-info}/PKG-INFO +1 -1
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata.egg-info/SOURCES.txt +0 -1
- enerdata-1.1.4/requirements-dev.txt +4 -0
- enerdata-1.1.2/LICENSE +0 -22
- enerdata-1.1.2/requirements-dev.txt +0 -3
- {enerdata-1.1.2 → enerdata-1.1.4}/MANIFEST.in +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/README.rst +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/calendars/__init__.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/contracts/__init__.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/contracts/contract.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/contracts/electrical_seasons.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/contracts/normalized_power.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/cups/__init__.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/cups/cups.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/datetime/__init__.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/datetime/holidays.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/datetime/solar_hour.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/datetime/station.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/datetime/timezone.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/datetime/work_and_holidays.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/metering/__init__.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/metering/measure.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/metering/meter.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/profiles/__init__.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/profiles/data/coefficients_HIDRO_RE.csv +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/profiles/data/coefficients_RE.xlsx +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata/profiles/profile.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata.egg-info/dependency_links.txt +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata.egg-info/requires.txt +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/enerdata.egg-info/top_level.txt +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/requirements.txt +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/setup.cfg +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/setup.py +0 -0
- {enerdata-1.1.2 → enerdata-1.1.4}/spec/__init__.py +0 -0
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
__author__ = 'ecarreras'
|
|
2
|
-
__version__ = '1.1.
|
|
2
|
+
__version__ = '1.1.4'
|
|
@@ -233,9 +233,11 @@ class Tariff(object):
|
|
|
233
233
|
return True
|
|
234
234
|
|
|
235
235
|
@staticmethod
|
|
236
|
-
def are_powers_normalized(powers):
|
|
236
|
+
def are_powers_normalized(powers, allow_zero_power=False):
|
|
237
237
|
np = NormalizedPower()
|
|
238
238
|
for power in powers:
|
|
239
|
+
if allow_zero_power and power == 0:
|
|
240
|
+
continue
|
|
239
241
|
if not np.is_normalized(int(power * 1000)):
|
|
240
242
|
return False
|
|
241
243
|
|
|
@@ -261,8 +263,10 @@ class Tariff(object):
|
|
|
261
263
|
|
|
262
264
|
return errors
|
|
263
265
|
|
|
264
|
-
def evaluate_powers(self, powers):
|
|
265
|
-
if min(powers) <= 0:
|
|
266
|
+
def evaluate_powers(self, powers, allow_zero_power=False):
|
|
267
|
+
if not allow_zero_power and min(powers) <= 0:
|
|
268
|
+
raise NotPositivePower()
|
|
269
|
+
if allow_zero_power and min(powers) < 0:
|
|
266
270
|
raise NotPositivePower()
|
|
267
271
|
if not len(self.power_periods) == len(powers):
|
|
268
272
|
raise IncorrectPowerNumber(len(powers), len(self.power_periods))
|
|
@@ -270,7 +274,7 @@ class Tariff(object):
|
|
|
270
274
|
raise IncorrectMaxPower(max(powers), self.min_power, self.max_power)
|
|
271
275
|
if not self.is_minimum_powers_correct(min(powers)):
|
|
272
276
|
raise IncorrectMinPower(min(powers), self.min_power, self.max_power)
|
|
273
|
-
if not self.are_powers_normalized(powers):
|
|
277
|
+
if not self.are_powers_normalized(powers, allow_zero_power=allow_zero_power):
|
|
274
278
|
raise NotNormalizedPower()
|
|
275
279
|
|
|
276
280
|
return True
|
|
@@ -410,7 +414,7 @@ class TariffPreTD(Tariff):
|
|
|
410
414
|
|
|
411
415
|
return errors
|
|
412
416
|
|
|
413
|
-
def evaluate_powers(self, powers):
|
|
417
|
+
def evaluate_powers(self, powers, allow_zero_power=False):
|
|
414
418
|
if min(powers) <= 0:
|
|
415
419
|
raise NotPositivePower()
|
|
416
420
|
if not len(self.power_periods) == len(powers):
|
|
@@ -787,8 +791,8 @@ class T31A(T30A):
|
|
|
787
791
|
measures[idx] = measure._replace(**values)
|
|
788
792
|
return measures
|
|
789
793
|
|
|
790
|
-
def evaluate_powers(self, powers):
|
|
791
|
-
super(T31A, self).evaluate_powers(powers)
|
|
794
|
+
def evaluate_powers(self, powers, allow_zero_power=False):
|
|
795
|
+
super(T31A, self).evaluate_powers(powers, allow_zero_power=allow_zero_power)
|
|
792
796
|
|
|
793
797
|
if not are_powers_ascending(powers):
|
|
794
798
|
raise NotAscendingPowers()
|
|
@@ -895,8 +899,8 @@ class T61A(TariffPreTD):
|
|
|
895
899
|
# 6.1A doesn't need to have normalized powers
|
|
896
900
|
return True
|
|
897
901
|
|
|
898
|
-
def evaluate_powers(self, powers):
|
|
899
|
-
super(T61A, self).evaluate_powers(powers)
|
|
902
|
+
def evaluate_powers(self, powers, allow_zero_power=False):
|
|
903
|
+
super(T61A, self).evaluate_powers(powers, allow_zero_power=allow_zero_power)
|
|
900
904
|
|
|
901
905
|
if not are_powers_ascending(powers):
|
|
902
906
|
raise NotAscendingPowers()
|
enerdata-1.1.2/LICENSE
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
The MIT License (MIT)
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2014 Eduard Carreras
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
22
|
-
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|