Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 23:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Uncached schedule recalculation is now twice as fast

Browse Source
This commit is contained in:
Dion Moult
2021-06-17 11:05:43 +10:00
parent 2a7fbea9c3
commit 97d0286b57
2 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/sequence/operator.py
+1 -9
View File
@@ -1484,9 +1484,7 @@ class VisualiseWorkScheduleDateRange(bpy.types.Operator):
obj.keyframe_insert(data_path="color", frame=product_frame["COMPLETED"]) obj.keyframe_insert(data_path="color", frame=product_frame["COMPLETED"])
def animate_destruction(self, obj, product_frame): def animate_destruction(self, obj, product_frame):
obj.hide_viewport = False
obj.color = (1.0, 1.0, 1.0, 1) obj.color = (1.0, 1.0, 1.0, 1)
obj.keyframe_insert(data_path="hide_viewport", frame=self.start_frame)
obj.keyframe_insert(data_path="color", frame=self.start_frame) obj.keyframe_insert(data_path="color", frame=self.start_frame)
obj.keyframe_insert(data_path="color", frame=product_frame["STARTED"] - 1) obj.keyframe_insert(data_path="color", frame=product_frame["STARTED"] - 1)
obj.color = (1.0, 0.0, 0.0, 1) obj.color = (1.0, 0.0, 0.0, 1)
@@ -1516,9 +1514,7 @@ class VisualiseWorkScheduleDateRange(bpy.types.Operator):
obj.keyframe_insert(data_path="color", frame=product_frame["COMPLETED"]) obj.keyframe_insert(data_path="color", frame=product_frame["COMPLETED"])
def animate_movement_from(self, obj, product_frame): def animate_movement_from(self, obj, product_frame):
obj.hide_viewport = False
obj.color = (1.0, 1.0, 1.0, 1) obj.color = (1.0, 1.0, 1.0, 1)
obj.keyframe_insert(data_path="hide_viewport", frame=self.start_frame)
obj.keyframe_insert(data_path="color", frame=self.start_frame) obj.keyframe_insert(data_path="color", frame=self.start_frame)
obj.keyframe_insert(data_path="color", frame=product_frame["STARTED"] - 1) obj.keyframe_insert(data_path="color", frame=product_frame["STARTED"] - 1)
obj.color = (1.0, 0.5, 0.0, 1) obj.color = (1.0, 0.5, 0.0, 1)
@@ -1529,9 +1525,7 @@ class VisualiseWorkScheduleDateRange(bpy.types.Operator):
obj.keyframe_insert(data_path="hide_viewport", frame=product_frame["COMPLETED"]) obj.keyframe_insert(data_path="hide_viewport", frame=product_frame["COMPLETED"])
def animate_consumption(self, obj, product_frame): def animate_consumption(self, obj, product_frame):
obj.hide_viewport = False
obj.color = (1.0, 1.0, 1.0, 1) obj.color = (1.0, 1.0, 1.0, 1)
obj.keyframe_insert(data_path="hide_viewport", frame=self.start_frame)
obj.keyframe_insert(data_path="color", frame=self.start_frame) obj.keyframe_insert(data_path="color", frame=self.start_frame)
obj.keyframe_insert(data_path="color", frame=product_frame["STARTED"] - 1) obj.keyframe_insert(data_path="color", frame=product_frame["STARTED"] - 1)
obj.color = (0.0, 1.0, 1.0, 1) obj.color = (0.0, 1.0, 1.0, 1)
@@ -1605,9 +1599,7 @@ class VisualiseWorkScheduleDateRange(bpy.types.Operator):
"type": task.PredefinedType, "type": task.PredefinedType,
"relationship": relationship, "relationship": relationship,
"STARTED": round(self.start_frame + (((start - self.start) / self.duration) * self.total_frames)), "STARTED": round(self.start_frame + (((start - self.start) / self.duration) * self.total_frames)),
"COMPLETED": round( "COMPLETED": round(self.start_frame + (((finish - self.start) / self.duration) * self.total_frames)),
self.start_frame + (((finish - self.start) / self.duration) * self.total_frames)
),
} }
) )
src/ifcopenshell-python/ifcopenshell/api/sequence/recalculate_schedule.py
+48 -21
View File
@@ -146,26 +146,38 @@ class Usecase:
finish = predecessor_data.get("early_finish") finish = predecessor_data.get("early_finish")
if finish is None: if finish is None:
return return
starts.append(self.offset_date(finish, edge["lag_time"], data)) if not edge["lag_time"]:
starts.append(self.offset_date(finish, edge["lag_time"], predecessor_data)) starts.append(finish)
else:
starts.append(self.offset_date(finish, edge["lag_time"], data))
starts.append(self.offset_date(finish, edge["lag_time"], predecessor_data))
elif edge["type"] == "SS": elif edge["type"] == "SS":
start = predecessor_data.get("early_start") start = predecessor_data.get("early_start")
if start is None: if start is None:
return return
starts.append(self.offset_date(start, edge["lag_time"], data)) if not edge["lag_time"]:
starts.append(self.offset_date(start, edge["lag_time"], predecessor_data)) starts.append(start)
else:
starts.append(self.offset_date(start, edge["lag_time"], data))
starts.append(self.offset_date(start, edge["lag_time"], predecessor_data))
elif edge["type"] == "FF": elif edge["type"] == "FF":
finish = predecessor_data.get("early_finish") finish = predecessor_data.get("early_finish")
if finish is None: if finish is None:
return return
finishes.append(self.offset_date(finish, edge["lag_time"], data)) if not edge["lag_time"]:
finishes.append(self.offset_date(finish, edge["lag_time"], predecessor_data)) finishes.append(finish)
else:
finishes.append(self.offset_date(finish, edge["lag_time"], data))
finishes.append(self.offset_date(finish, edge["lag_time"], predecessor_data))
elif edge["type"] == "SF": elif edge["type"] == "SF":
start = predecessor_data.get("early_start") start = predecessor_data.get("early_start")
if start is None: if start is None:
return return
finishes.append(self.offset_date(start, edge["lag_time"], data)) if not edge["lag_time"]:
finishes.append(self.offset_date(start, edge["lag_time"], predecessor_data)) finishes.append(start)
else:
finishes.append(self.offset_date(start, edge["lag_time"], data))
finishes.append(self.offset_date(start, edge["lag_time"], predecessor_data))
if starts and finishes: if starts and finishes:
data["early_start"] = max(starts) data["early_start"] = max(starts)
data["early_finish"] = max(finishes) data["early_finish"] = max(finishes)
@@ -205,8 +217,11 @@ class Usecase:
start = successor_data.get("late_start") start = successor_data.get("late_start")
if start is None: if start is None:
return return
finishes.append(self.offset_date(start, -edge["lag_time"], data)) if not edge["lag_time"]:
finishes.append(self.offset_date(start, -edge["lag_time"], successor_data)) finishes.append(start)
else:
finishes.append(self.offset_date(start, -edge["lag_time"], data))
finishes.append(self.offset_date(start, -edge["lag_time"], successor_data))
free_floats.append( free_floats.append(
self.calculate_free_float( self.calculate_free_float(
data["early_finish"], successor_data["early_start"], edge["lag_time"], data, successor_data data["early_finish"], successor_data["early_start"], edge["lag_time"], data, successor_data
@@ -216,8 +231,11 @@ class Usecase:
start = successor_data.get("late_start") start = successor_data.get("late_start")
if start is None: if start is None:
return return
starts.append(self.offset_date(start, -edge["lag_time"], data)) if not edge["lag_time"]:
starts.append(self.offset_date(start, -edge["lag_time"], successor_data)) starts.append(start)
else:
starts.append(self.offset_date(start, -edge["lag_time"], data))
starts.append(self.offset_date(start, -edge["lag_time"], successor_data))
free_floats.append( free_floats.append(
self.calculate_free_float( self.calculate_free_float(
data["early_start"], successor_data["early_start"], edge["lag_time"], data, successor_data data["early_start"], successor_data["early_start"], edge["lag_time"], data, successor_data
@@ -227,8 +245,11 @@ class Usecase:
finish = successor_data.get("late_finish") finish = successor_data.get("late_finish")
if finish is None: if finish is None:
return return
finishes.append(self.offset_date(finish, -edge["lag_time"], data)) if not edge["lag_time"]:
finishes.append(self.offset_date(finish, -edge["lag_time"], successor_data)) finishes.append(finish)
else:
finishes.append(self.offset_date(finish, -edge["lag_time"], data))
finishes.append(self.offset_date(finish, -edge["lag_time"], successor_data))
free_floats.append( free_floats.append(
self.calculate_free_float( self.calculate_free_float(
data["early_finish"], successor_data["early_finish"], edge["lag_time"], data, successor_data data["early_finish"], successor_data["early_finish"], edge["lag_time"], data, successor_data
@@ -238,8 +259,11 @@ class Usecase:
finish = successor_data.get("late_finish") finish = successor_data.get("late_finish")
if finish is None: if finish is None:
return return
starts.append(self.offset_date(finish, -edge["lag_time"], data)) if not edge["lag_time"]:
starts.append(self.offset_date(finish, -edge["lag_time"], successor_data)) starts.append(finish)
else:
starts.append(self.offset_date(finish, -edge["lag_time"], data))
starts.append(self.offset_date(finish, -edge["lag_time"], successor_data))
free_floats.append( free_floats.append(
self.calculate_free_float( self.calculate_free_float(
data["early_start"], successor_data["early_finish"], edge["lag_time"], data, successor_data data["early_start"], successor_data["early_finish"], edge["lag_time"], data, successor_data
@@ -278,12 +302,15 @@ class Usecase:
return True return True
def calculate_free_float(self, predecessor_date, successor_date, lag_time, predecessor_data, successor_data): def calculate_free_float(self, predecessor_date, successor_date, lag_time, predecessor_data, successor_data):
min_successor_date = min( if not lag_time:
( min_successor_date = successor_date
self.offset_date(successor_date, -lag_time, predecessor_data), else:
self.offset_date(successor_date, -lag_time, successor_data), min_successor_date = min(
(
self.offset_date(successor_date, -lag_time, predecessor_data),
self.offset_date(successor_date, -lag_time, successor_data),
)
) )
)
if predecessor_data["duration_type"] == "WORKTIME": if predecessor_data["duration_type"] == "WORKTIME":
return datetime.timedelta( return datetime.timedelta(
days=ifcopenshell.util.sequence.count_working_days( days=ifcopenshell.util.sequence.count_working_days(