mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-10 01:41:57 +00:00
Scheduling calculations no longer calculate from midnight and now handle a single 9-5 day as a duration of 1 day, as per industry standard practice.
This commit is contained in:
Dion Moult
@@ -47,15 +47,32 @@ class Usecase:
|
||||
|
||||
for rel in task.IsSuccessorFrom:
|
||||
predecessor = rel.RelatingProcess
|
||||
predecessor_duration = (
|
||||
ifcopenshell.util.date.ifc2datetime(predecessor.TaskTime.ScheduleDuration)
|
||||
if predecessor.TaskTime.ScheduleDuration
|
||||
else datetime.timedelta()
|
||||
)
|
||||
if rel.SequenceType == "FINISH_START":
|
||||
finish = self.get_task_time_attribute(predecessor, "ScheduleFinish")
|
||||
if not finish:
|
||||
continue
|
||||
days = 0 if predecessor_duration.days == 0 else 1
|
||||
duration_type = "WORKTIME"
|
||||
if rel.TimeLag:
|
||||
days = self.get_lag_time_days(rel.TimeLag)
|
||||
days += self.get_lag_time_days(rel.TimeLag)
|
||||
duration_type = rel.TimeLag.DurationType
|
||||
starts.append(self.offset_date(finish, days, duration_type, self.get_calendar(task)))
|
||||
starts.append(self.offset_date(finish, days, duration_type, self.get_calendar(predecessor)))
|
||||
if days:
|
||||
starts.append(
|
||||
datetime.datetime.combine(
|
||||
self.offset_date(finish, days, duration_type, self.get_calendar(task)), datetime.time(9)
|
||||
)
|
||||
)
|
||||
starts.append(
|
||||
datetime.datetime.combine(
|
||||
self.offset_date(finish, days, duration_type, self.get_calendar(predecessor)),
|
||||
datetime.time(9),
|
||||
)
|
||||
)
|
||||
else:
|
||||
starts.append(finish)
|
||||
elif rel.SequenceType == "START_START":
|
||||
@@ -84,25 +101,31 @@ class Usecase:
|
||||
start = self.get_task_time_attribute(predecessor, "ScheduleStart")
|
||||
if not start:
|
||||
continue
|
||||
days = -1
|
||||
duration_type = "WORKTIME"
|
||||
if rel.TimeLag:
|
||||
days = self.get_lag_time_days(rel.TimeLag)
|
||||
days += self.get_lag_time_days(rel.TimeLag)
|
||||
duration_type = rel.TimeLag.DurationType
|
||||
finishes.append(self.offset_date(start, days, duration_type, self.get_calendar(task)))
|
||||
finishes.append(self.offset_date(start, days, duration_type, self.get_calendar(predecessor)))
|
||||
if days or rel.TimeLag:
|
||||
finishes.append(
|
||||
datetime.datetime.combine(
|
||||
self.offset_date(start, days, duration_type, self.get_calendar(task)), datetime.time(17)
|
||||
)
|
||||
)
|
||||
finishes.append(
|
||||
datetime.datetime.combine(
|
||||
self.offset_date(start, days, duration_type, self.get_calendar(predecessor)),
|
||||
datetime.time(17),
|
||||
)
|
||||
)
|
||||
else:
|
||||
finishes.append(start)
|
||||
|
||||
if starts and finishes:
|
||||
start = max(starts)
|
||||
finish = max(finishes)
|
||||
potential_finish = datetime.datetime.combine(
|
||||
ifcopenshell.util.sequence.get_finish_date(
|
||||
start,
|
||||
duration,
|
||||
task.TaskTime.DurationType,
|
||||
self.get_calendar(task),
|
||||
),
|
||||
datetime.datetime.min.time(),
|
||||
potential_finish = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
start, duration, task.TaskTime.DurationType, self.get_calendar(task), date_type="FINISH"
|
||||
)
|
||||
if potential_finish > finish:
|
||||
start_ifc = ifcopenshell.util.date.datetime2ifc(start, "IfcDateTime")
|
||||
@@ -116,11 +139,8 @@ class Usecase:
|
||||
return
|
||||
task.TaskTime.ScheduleFinish = finish_ifc
|
||||
task.TaskTime.ScheduleStart = ifcopenshell.util.date.datetime2ifc(
|
||||
ifcopenshell.util.sequence.get_finish_date(
|
||||
finish,
|
||||
-duration,
|
||||
task.TaskTime.DurationType,
|
||||
self.get_calendar(task),
|
||||
ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
finish, duration, task.TaskTime.DurationType, self.get_calendar(task), date_type="START"
|
||||
),
|
||||
"IfcDateTime",
|
||||
)
|
||||
@@ -131,11 +151,8 @@ class Usecase:
|
||||
return
|
||||
task.TaskTime.ScheduleFinish = finish_ifc
|
||||
task.TaskTime.ScheduleStart = ifcopenshell.util.date.datetime2ifc(
|
||||
ifcopenshell.util.sequence.get_finish_date(
|
||||
finish,
|
||||
-duration,
|
||||
task.TaskTime.DurationType,
|
||||
self.get_calendar(task),
|
||||
ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
finish, duration, task.TaskTime.DurationType, self.get_calendar(task), date_type="START"
|
||||
),
|
||||
"IfcDateTime",
|
||||
)
|
||||
@@ -146,11 +163,8 @@ class Usecase:
|
||||
return
|
||||
task.TaskTime.ScheduleStart = start_ifc
|
||||
task.TaskTime.ScheduleFinish = ifcopenshell.util.date.datetime2ifc(
|
||||
ifcopenshell.util.sequence.get_finish_date(
|
||||
start,
|
||||
duration,
|
||||
task.TaskTime.DurationType,
|
||||
self.get_calendar(task),
|
||||
ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
start, duration, task.TaskTime.DurationType, self.get_calendar(task), date_type="FINISH"
|
||||
),
|
||||
"IfcDateTime",
|
||||
)
|
||||
@@ -167,10 +181,7 @@ class Usecase:
|
||||
return self.calendar_cache[task.id()]
|
||||
|
||||
def offset_date(self, date, days, duration_type, calendar):
|
||||
return datetime.datetime.combine(
|
||||
ifcopenshell.util.sequence.get_finish_date(date, datetime.timedelta(days=days), duration_type, calendar),
|
||||
datetime.datetime.min.time(),
|
||||
)
|
||||
return ifcopenshell.util.sequence.offset_date(date, datetime.timedelta(days=days), duration_type, calendar)
|
||||
|
||||
def get_task_time_attribute(self, task, attribute):
|
||||
if task.TaskTime:
|
||||
|
||||
@@ -40,13 +40,21 @@ class Usecase:
|
||||
del self.settings["attributes"]["ScheduleFinish"]
|
||||
|
||||
duration_type = self.settings["attributes"].get("DurationType", self.settings["task_time"].DurationType)
|
||||
if self.settings["attributes"].get("ScheduleFinish", None):
|
||||
self.settings["attributes"]["ScheduleFinish"] = ifcopenshell.util.sequence.get_soonest_working_day(
|
||||
self.settings["attributes"]["ScheduleFinish"], duration_type, self.calendar
|
||||
finish = self.settings["attributes"].get("ScheduleFinish", None)
|
||||
if finish:
|
||||
if isinstance(finish, str):
|
||||
finish = datetime.datetime.fromisoformat(finish)
|
||||
self.settings["attributes"]["ScheduleFinish"] = datetime.datetime.combine(
|
||||
ifcopenshell.util.sequence.get_soonest_working_day(finish, duration_type, self.calendar),
|
||||
datetime.time(17),
|
||||
)
|
||||
if self.settings["attributes"].get("ScheduleStart", None):
|
||||
self.settings["attributes"]["ScheduleStart"] = ifcopenshell.util.sequence.get_soonest_working_day(
|
||||
self.settings["attributes"]["ScheduleStart"], duration_type, self.calendar
|
||||
start = self.settings["attributes"].get("ScheduleStart", None)
|
||||
if start:
|
||||
if isinstance(start, str):
|
||||
start = datetime.datetime.fromisoformat(start)
|
||||
self.settings["attributes"]["ScheduleStart"] = datetime.datetime.combine(
|
||||
ifcopenshell.util.sequence.get_soonest_working_day(start, duration_type, self.calendar),
|
||||
datetime.time(9),
|
||||
)
|
||||
|
||||
for name, value in self.settings["attributes"].items():
|
||||
@@ -76,20 +84,21 @@ class Usecase:
|
||||
ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=self.task)
|
||||
|
||||
def calculate_finish(self):
|
||||
finish_date = ifcopenshell.util.sequence.get_finish_date(
|
||||
finish = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
ifcopenshell.util.date.ifc2datetime(self.settings["task_time"].ScheduleStart),
|
||||
ifcopenshell.util.date.ifc2datetime(self.settings["task_time"].ScheduleDuration),
|
||||
self.settings["task_time"].DurationType,
|
||||
self.calendar,
|
||||
date_type="FINISH",
|
||||
)
|
||||
self.settings["task_time"].ScheduleFinish = ifcopenshell.util.date.datetime2ifc(finish_date, "IfcDateTime")
|
||||
self.settings["task_time"].ScheduleFinish = ifcopenshell.util.date.datetime2ifc(finish, "IfcDateTime")
|
||||
|
||||
def calculate_duration(self):
|
||||
start = ifcopenshell.util.date.ifc2datetime(self.settings["task_time"].ScheduleStart)
|
||||
finish = ifcopenshell.util.date.ifc2datetime(self.settings["task_time"].ScheduleFinish)
|
||||
current_date = datetime.date(start.year, start.month, start.day)
|
||||
finish_date = datetime.date(finish.year, finish.month, finish.day)
|
||||
duration = datetime.timedelta()
|
||||
duration = datetime.timedelta(days=1)
|
||||
while current_date < finish_date:
|
||||
if self.settings["task_time"].DurationType == "ELAPSEDTIME" or not self.calendar:
|
||||
duration += datetime.timedelta(days=1)
|
||||
|
||||
@@ -116,14 +116,12 @@ class Usecase:
|
||||
predecessor_types = [rel.SequenceType for rel in task.IsSuccessorFrom]
|
||||
successor_types = [rel.SequenceType for rel in task.IsPredecessorTo]
|
||||
|
||||
if not predecessor_types or (
|
||||
"FINISH_START" not in predecessor_types and "START_START" not in predecessor_types
|
||||
):
|
||||
if not predecessor_types:
|
||||
self.edges.append(("start", task.id(), {"lag_time": 0, "type": "FS"}))
|
||||
if task.TaskTime and task.TaskTime.ScheduleStart:
|
||||
self.start_dates.append(ifcopenshell.util.date.ifc2datetime(task.TaskTime.ScheduleStart))
|
||||
if not successor_types or ("FINISH_START" not in successor_types and "FINISH_FINISH" not in successor_types):
|
||||
self.edges.append((task.id(), "finish", {"lag_time": 0, "type": "FS"}))
|
||||
if not successor_types:
|
||||
self.edges.append((task.id(), "finish", {"lag_time": 0, "type": "FF"}))
|
||||
|
||||
def update_task_times(self):
|
||||
for ifc_definition_id in self.g.nodes:
|
||||
@@ -149,7 +147,7 @@ class Usecase:
|
||||
)
|
||||
|
||||
def offset_date(self, date, days, node):
|
||||
return ifcopenshell.util.sequence.get_finish_date(
|
||||
return ifcopenshell.util.sequence.offset_date(
|
||||
date, datetime.timedelta(days=days), node["duration_type"], node["calendar"]
|
||||
)
|
||||
|
||||
@@ -170,45 +168,74 @@ class Usecase:
|
||||
finish = predecessor_data.get("early_finish")
|
||||
if finish is None:
|
||||
return
|
||||
if not edge["lag_time"]:
|
||||
starts.append(finish)
|
||||
days = 0 if predecessor_data["duration"] == 0 else 1
|
||||
if edge["lag_time"]:
|
||||
days += edge["lag_time"]
|
||||
if days:
|
||||
starts.append(datetime.datetime.combine(self.offset_date(finish, days, data), datetime.time(9)))
|
||||
starts.append(
|
||||
datetime.datetime.combine(
|
||||
self.offset_date(finish, days, predecessor_data), datetime.time(9)
|
||||
)
|
||||
)
|
||||
else:
|
||||
starts.append(self.offset_date(finish, edge["lag_time"], data))
|
||||
starts.append(self.offset_date(finish, edge["lag_time"], predecessor_data))
|
||||
starts.append(finish)
|
||||
elif edge["type"] == "SS":
|
||||
start = predecessor_data.get("early_start")
|
||||
if start is None:
|
||||
return
|
||||
if not edge["lag_time"]:
|
||||
starts.append(start)
|
||||
else:
|
||||
if edge["lag_time"]:
|
||||
starts.append(self.offset_date(start, edge["lag_time"], data))
|
||||
starts.append(self.offset_date(start, edge["lag_time"], predecessor_data))
|
||||
else:
|
||||
starts.append(start)
|
||||
elif edge["type"] == "FF":
|
||||
finish = predecessor_data.get("early_finish")
|
||||
if finish is None:
|
||||
return
|
||||
if not edge["lag_time"]:
|
||||
finishes.append(finish)
|
||||
else:
|
||||
if edge["lag_time"]:
|
||||
finishes.append(self.offset_date(finish, edge["lag_time"], data))
|
||||
finishes.append(self.offset_date(finish, edge["lag_time"], predecessor_data))
|
||||
else:
|
||||
finishes.append(finish)
|
||||
elif edge["type"] == "SF":
|
||||
start = predecessor_data.get("early_start")
|
||||
if start is None:
|
||||
return
|
||||
if not edge["lag_time"]:
|
||||
finishes.append(start)
|
||||
days = -1
|
||||
if edge["lag_time"]:
|
||||
days += edge["lag_time"]
|
||||
if days or edge["lag_time"]:
|
||||
finishes.append(
|
||||
datetime.datetime.combine(self.offset_date(start, days, data), datetime.time(17))
|
||||
)
|
||||
finishes.append(
|
||||
datetime.datetime.combine(
|
||||
self.offset_date(start, days, predecessor_data), datetime.time(17)
|
||||
)
|
||||
)
|
||||
else:
|
||||
finishes.append(self.offset_date(start, edge["lag_time"], data))
|
||||
finishes.append(self.offset_date(start, edge["lag_time"], predecessor_data))
|
||||
finishes.append(start)
|
||||
if starts and finishes:
|
||||
data["early_start"] = max(starts)
|
||||
data["early_finish"] = max(finishes)
|
||||
if self.offset_date(data["early_start"], data["duration"], data) > data["early_finish"]:
|
||||
data["early_finish"] = self.offset_date(data["early_start"], data["duration"], data)
|
||||
potential_finish = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
data["early_start"],
|
||||
datetime.timedelta(days=data["duration"]),
|
||||
data["duration_type"],
|
||||
data["calendar"],
|
||||
date_type="FINISH",
|
||||
)
|
||||
if potential_finish > data["early_finish"]:
|
||||
data["early_finish"] = potential_finish
|
||||
else:
|
||||
data["early_start"] = self.offset_date(data["early_finish"], -data["duration"], data)
|
||||
data["early_start"] = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
data["early_finish"],
|
||||
datetime.timedelta(days=data["duration"]),
|
||||
data["duration_type"],
|
||||
data["calendar"],
|
||||
date_type="START",
|
||||
)
|
||||
elif finishes:
|
||||
data["early_finish"] = max(finishes)
|
||||
elif starts:
|
||||
@@ -217,9 +244,21 @@ class Usecase:
|
||||
print("How did this happen?")
|
||||
|
||||
if data.get("early_finish") is None:
|
||||
data["early_finish"] = self.offset_date(data["early_start"], data["duration"], data)
|
||||
data["early_finish"] = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
data["early_start"],
|
||||
datetime.timedelta(days=data["duration"]),
|
||||
data["duration_type"],
|
||||
data["calendar"],
|
||||
date_type="FINISH",
|
||||
)
|
||||
elif data.get("early_start") is None:
|
||||
data["early_start"] = self.offset_date(data["early_finish"], -data["duration"], data)
|
||||
data["early_start"] = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
data["early_finish"],
|
||||
datetime.timedelta(days=data["duration"]),
|
||||
data["duration_type"],
|
||||
data["calendar"],
|
||||
date_type="START",
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
@@ -241,25 +280,36 @@ class Usecase:
|
||||
start = successor_data.get("late_start")
|
||||
if start is None:
|
||||
return
|
||||
if not edge["lag_time"]:
|
||||
finishes.append(start)
|
||||
days = 1
|
||||
if edge["lag_time"]:
|
||||
days += edge["lag_time"]
|
||||
if days or edge["lag_time"]:
|
||||
finishes.append(
|
||||
datetime.datetime.combine(self.offset_date(start, -days, data), datetime.time(17))
|
||||
)
|
||||
finishes.append(
|
||||
datetime.datetime.combine(self.offset_date(start, -days, successor_data), datetime.time(17))
|
||||
)
|
||||
else:
|
||||
finishes.append(self.offset_date(start, -edge["lag_time"], data))
|
||||
finishes.append(self.offset_date(start, -edge["lag_time"], successor_data))
|
||||
finishes.append(start)
|
||||
free_floats.append(
|
||||
self.calculate_free_float(
|
||||
data["early_finish"], successor_data["early_start"], edge["lag_time"], data, successor_data
|
||||
data["early_finish"].date() + datetime.timedelta(days=1),
|
||||
successor_data["early_start"].date(),
|
||||
edge["lag_time"],
|
||||
data,
|
||||
successor_data,
|
||||
)
|
||||
)
|
||||
elif edge["type"] == "SS":
|
||||
start = successor_data.get("late_start")
|
||||
if start is None:
|
||||
return
|
||||
if not edge["lag_time"]:
|
||||
starts.append(start)
|
||||
else:
|
||||
if edge["lag_time"]:
|
||||
starts.append(self.offset_date(start, -edge["lag_time"], data))
|
||||
starts.append(self.offset_date(start, -edge["lag_time"], successor_data))
|
||||
else:
|
||||
starts.append(start)
|
||||
free_floats.append(
|
||||
self.calculate_free_float(
|
||||
data["early_start"], successor_data["early_start"], edge["lag_time"], data, successor_data
|
||||
@@ -269,11 +319,11 @@ class Usecase:
|
||||
finish = successor_data.get("late_finish")
|
||||
if finish is None:
|
||||
return
|
||||
if not edge["lag_time"]:
|
||||
finishes.append(finish)
|
||||
else:
|
||||
if edge["lag_time"]:
|
||||
finishes.append(self.offset_date(finish, -edge["lag_time"], data))
|
||||
finishes.append(self.offset_date(finish, -edge["lag_time"], successor_data))
|
||||
else:
|
||||
finishes.append(finish)
|
||||
free_floats.append(
|
||||
self.calculate_free_float(
|
||||
data["early_finish"], successor_data["early_finish"], edge["lag_time"], data, successor_data
|
||||
@@ -283,11 +333,18 @@ class Usecase:
|
||||
finish = successor_data.get("late_finish")
|
||||
if finish is None:
|
||||
return
|
||||
if not edge["lag_time"]:
|
||||
starts.append(finish)
|
||||
days = 0 if successor_data["duration"] == 0 else -1
|
||||
if edge["lag_time"]:
|
||||
days += edge["lag_time"]
|
||||
if days:
|
||||
starts.append(
|
||||
datetime.datetime.combine(self.offset_date(finish, -days, data), datetime.time(9))
|
||||
)
|
||||
starts.append(
|
||||
datetime.datetime.combine(self.offset_date(finish, -days, successor_data), datetime.time(9))
|
||||
)
|
||||
else:
|
||||
starts.append(self.offset_date(finish, -edge["lag_time"], data))
|
||||
starts.append(self.offset_date(finish, -edge["lag_time"], successor_data))
|
||||
starts.append(finish)
|
||||
free_floats.append(
|
||||
self.calculate_free_float(
|
||||
data["early_start"], successor_data["early_finish"], edge["lag_time"], data, successor_data
|
||||
@@ -297,9 +354,21 @@ class Usecase:
|
||||
data["late_start"] = min(starts)
|
||||
data["late_finish"] = min(finishes)
|
||||
if self.offset_date(data["late_start"], data["duration"], data) < data["late_finish"]:
|
||||
data["late_finish"] = self.offset_date(data["late_start"], data["duration"], data)
|
||||
data["late_finish"] = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
data["late_start"],
|
||||
datetime.timedelta(days=data["duration"]),
|
||||
data["duration_type"],
|
||||
data["calendar"],
|
||||
date_type="FINISH",
|
||||
)
|
||||
else:
|
||||
data["late_start"] = self.offset_date(data["late_finish"], -data["duration"], data)
|
||||
data["late_start"] = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
data["late_finish"],
|
||||
datetime.timedelta(days=data["duration"]),
|
||||
data["duration_type"],
|
||||
data["calendar"],
|
||||
date_type="START",
|
||||
)
|
||||
elif finishes:
|
||||
data["late_finish"] = min(finishes)
|
||||
elif starts:
|
||||
@@ -308,9 +377,21 @@ class Usecase:
|
||||
print("How did this happen?")
|
||||
|
||||
if data.get("late_finish") is None:
|
||||
data["late_finish"] = self.offset_date(data["late_start"], data["duration"], data)
|
||||
data["late_finish"] = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
data["late_start"],
|
||||
datetime.timedelta(days=data["duration"]),
|
||||
data["duration_type"],
|
||||
data["calendar"],
|
||||
date_type="FINISH",
|
||||
)
|
||||
elif data.get("late_start") is None:
|
||||
data["late_start"] = self.offset_date(data["late_finish"], -data["duration"], data)
|
||||
data["late_start"] = ifcopenshell.util.sequence.get_start_or_finish_date(
|
||||
data["late_finish"],
|
||||
datetime.timedelta(days=data["duration"]),
|
||||
data["duration_type"],
|
||||
data["calendar"],
|
||||
date_type="START",
|
||||
)
|
||||
|
||||
if data["duration_type"] == "WORKTIME":
|
||||
data["total_float"] = datetime.timedelta(
|
||||
@@ -320,8 +401,14 @@ class Usecase:
|
||||
)
|
||||
else:
|
||||
data["total_float"] = data["late_finish"] - data["early_finish"]
|
||||
# If the float is within the span of a single day, it may show as a 8 hours
|
||||
if data["total_float"].seconds == 60 * 60 * 8:
|
||||
data["total_float"] = datetime.timedelta(days=data["total_float"].days + 1)
|
||||
|
||||
data["free_float"] = min(free_floats) if free_floats else None
|
||||
# If the float is within the span of a single day, it may show as a 8 hours
|
||||
if data["free_float"] and data["free_float"].seconds == 60 * 60 * 8:
|
||||
data["free_float"] = datetime.timedelta(days=data["free_float"].days + 1)
|
||||
|
||||
return True
|
||||
|
||||
|
||||
Reference in New Issue
Block a user