Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 14:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loops: accommodate invalid calendars with no working times in sequence utility

Browse Source
This commit is contained in:
Dion Moult
2022-02-23 13:04:29 +11:00
parent 348373d47e
commit deb0597000
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/util/sequence.py
+4 -4
View File
@@ -38,7 +38,7 @@ def count_working_days(start, finish, calendar):
current_date = datetime.date(start.year, start.month, start.day) current_date = datetime.date(start.year, start.month, start.day)
finish_date = datetime.date(finish.year, finish.month, finish.day) finish_date = datetime.date(finish.year, finish.month, finish.day)
while current_date < finish_date: while current_date < finish_date:
if is_working_day(current_date, calendar): if calendar and calendar.WorkingTimes and is_working_day(current_date, calendar):
result += 1 result += 1
current_date += datetime.timedelta(days=1) current_date += datetime.timedelta(days=1)
return result return result
@@ -49,7 +49,7 @@ def get_finish_date(start, duration, duration_type, calendar):
abs_duration = abs(duration.days) abs_duration = abs(duration.days)
date_offset = datetime.timedelta(days=1 if duration.days > 0 else -1) date_offset = datetime.timedelta(days=1 if duration.days > 0 else -1)
while abs_duration > 0: while abs_duration > 0:
if duration_type == "ELAPSEDTIME" or not calendar: if duration_type == "ELAPSEDTIME" or not calendar or not calendar.WorkingTimes:
abs_duration -= 1 abs_duration -= 1
elif ifcopenshell.util.sequence.is_working_day(current_date, calendar): elif ifcopenshell.util.sequence.is_working_day(current_date, calendar):
abs_duration -= 1 abs_duration -= 1
@@ -63,7 +63,7 @@ def get_finish_date(start, duration, duration_type, calendar):
def get_soonest_working_day(start, duration_type, calendar): def get_soonest_working_day(start, duration_type, calendar):
if duration_type == "ELAPSEDTIME" or not calendar: if duration_type == "ELAPSEDTIME" or not calendar or not calendar.WorkingTimes:
return start return start
while not is_working_day(start, calendar): while not is_working_day(start, calendar):
start += datetime.timedelta(days=1) start += datetime.timedelta(days=1)
@@ -71,7 +71,7 @@ def get_soonest_working_day(start, duration_type, calendar):
def get_recent_working_day(start, duration_type, calendar): def get_recent_working_day(start, duration_type, calendar):
if duration_type == "ELAPSEDTIME" or not calendar: if duration_type == "ELAPSEDTIME" or not calendar or not calendar.WorkingTimes:
return start return start
while not is_working_day(start, calendar): while not is_working_day(start, calendar):
start -= datetime.timedelta(days=1) start -= datetime.timedelta(days=1)