Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Corrección reparto periodos por horas en estimación y ajuste de curvas #149

Merged
merged 3 commits into from
Jul 30, 2021
Merged

Corrección reparto periodos por horas en estimación y ajuste de curvas #149

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e945148
fix get_period_by_date on measure.date
francescpuig7 Jul 21, 2021
0a30f3d
Fix tests function calls
davidmunoznovoa Jul 21, 2021
529ba25
Fix suspicious test
davidmunoznovoa Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 15 additions & 8 deletions enerdata/profiles/profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,13 +479,15 @@ def get_hours_per_period(self, tariff, only_valid=False):
if only_valid:
for m in self.measures:
if m.valid:
period = tariff.get_period_by_date(m.date)
dt = m.date - timedelta(minutes=1)
period = tariff.get_period_by_date(dt)
hours_per_period[period.code] += 1
else:
start_idx = self.start_date
end = self.end_date
while start_idx <= end:
period = tariff.get_period_by_date(start_idx)
dt = start_idx - timedelta(minutes=1)
period = tariff.get_period_by_date(dt)
hours_per_period[period.code] += 1
start_idx += timedelta(hours=1)
return hours_per_period
Expand All @@ -497,7 +499,8 @@ def get_consumption_per_period(self, tariff):
consumption_per_period[period] = 0
for m in self.measures:
if m.valid:
period = tariff.get_period_by_date(m.date)
dt = m.date - timedelta(minutes=1)
period = tariff.get_period_by_date(dt)
consumption_per_period[period.code] += m.measure
return consumption_per_period

Expand Down Expand Up @@ -550,8 +553,9 @@ def estimate(self, tariff, balance):
cofs_per_period = Counter()

for gap in self.gaps:
period = tariff.get_period_by_date(gap)
gap_cof = cofs.get(gap)
dt = gap - timedelta(minutes=1)
period = tariff.get_period_by_date(dt)
gap_cof = cofs.get(dt)
cofs_per_period[period.code] += gap_cof.cof[tariff.cof]

logger.debug('Coefficients per period calculated: {0}'.format(
Expand All @@ -569,15 +573,17 @@ def estimate(self, tariff, balance):
if not self.drag_by_periods:
init_drag_key = "default"
else:
init_drag_key = tariff.get_period_by_date(self.gaps[0]).code
dt = self.gaps[0] - timedelta(minutes=1)
init_drag_key = tariff.get_period_by_date(dt).code

dragger.drag(self.accumulated, key=init_drag_key)

for idx, gap in enumerate(self.gaps):
logger.debug('Gap {0}/{1}'.format(
idx + 1, len(self.gaps)
))
period = tariff.get_period_by_date(gap)
dt = gap - timedelta(minutes=1)
period = tariff.get_period_by_date(dt)

drag_key = period.code if not self.drag_by_periods else "default"

Expand Down Expand Up @@ -623,7 +629,8 @@ def adjust(self, tariff, balance, diff=0):
if not margin_bottom <= period_profile <= margin_top:
profile.adjusted_periods.append(period_name)
for idx, measure in enumerate(profile.measures):
period = tariff.get_period_by_date(measure.date).code
dt = measure.date - timedelta(minutes=1)
period = tariff.get_period_by_date(dt).code
if period != period_name:
continue
values = measure._asdict()
Expand Down