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

Fix bug where nested task resource-based durations failed to calculate

Browse Source
This commit is contained in:
Dion Moult
2021-09-20 11:52:31 +10:00
parent 20e731235c
commit 5efa65195f
2 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/api/sequence/calculate_task_duration.py
+3 -3
View File
@@ -47,11 +47,11 @@ class Usecase:
work_day_duration = ifcopenshell.util.date.ifc2datetime(psets["Pset_WorkControlCommon"]["WorkDayDuration"]) work_day_duration = ifcopenshell.util.date.ifc2datetime(psets["Pset_WorkControlCommon"]["WorkDayDuration"])
return work_day_duration.seconds return work_day_duration.seconds
def get_work_schedule(self): def get_work_schedule(self, task):
for rel in self.settings["task"].HasAssignments or []: for rel in task.HasAssignments or []:
if rel.is_a("IfcRelAssignsToControl") and rel.RelatingControl.is_a("IfcWorkSchedule"): if rel.is_a("IfcRelAssignsToControl") and rel.RelatingControl.is_a("IfcWorkSchedule"):
return rel.RelatingControl return rel.RelatingControl
for rel in self.settings["task"].Nests or []: for rel in task.Nests or []:
return self.get_work_schedule(rel.RelatingObject) return self.get_work_schedule(rel.RelatingObject)
def calculate_duration_in_days(self, resource): def calculate_duration_in_days(self, resource):
src/ifcopenshell-python/test/api/sequence/test_calculate_task_duration.py
+44
View File
@@ -24,3 +24,47 @@ class TestCalculateTaskDuration(test.bootstrap.IFC4):
ifcopenshell.api.run("sequence.assign_process", self.file, relating_process=task, related_object=resource) ifcopenshell.api.run("sequence.assign_process", self.file, relating_process=task, related_object=resource)
ifcopenshell.api.run("sequence.calculate_task_duration", self.file, task=task) ifcopenshell.api.run("sequence.calculate_task_duration", self.file, task=task)
assert task.TaskTime.ScheduleDuration == "P4D" assert task.TaskTime.ScheduleDuration == "P4D"
def test_calculating_a_task_duration_without_a_work_schedule_defining_workday_duration(self):
ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcProject")
task = ifcopenshell.api.run("sequence.add_task", self.file)
resource = ifcopenshell.api.run("resource.add_resource", self.file, ifc_class="IfcLaborResource")
resource_time = ifcopenshell.api.run("resource.add_resource_time", self.file, resource=resource)
resource_time.ScheduleWork = "P2D"
ifcopenshell.api.run("sequence.assign_process", self.file, relating_process=task, related_object=resource)
ifcopenshell.api.run("sequence.calculate_task_duration", self.file, task=task)
assert task.TaskTime.ScheduleDuration == "P2D"
def test_calculating_a_task_duration_with_a_custom_workday_duration(self):
ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcProject")
schedule = ifcopenshell.api.run("sequence.add_work_schedule", self.file)
pset = ifcopenshell.api.run("pset.add_pset", self.file, product=schedule, name="Pset_WorkControlCommon")
ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset, properties={"WorkDayDuration": "PT2H"})
task = ifcopenshell.api.run("sequence.add_task", self.file, work_schedule=schedule)
resource = ifcopenshell.api.run("resource.add_resource", self.file, ifc_class="IfcLaborResource")
resource_time = ifcopenshell.api.run("resource.add_resource_time", self.file, resource=resource)
resource_time.ScheduleWork = "PT48H"
ifcopenshell.api.run("sequence.assign_process", self.file, relating_process=task, related_object=resource)
ifcopenshell.api.run("sequence.calculate_task_duration", self.file, task=task)
assert task.TaskTime.ScheduleDuration == "P24D"
def test_failing_to_calculate_if_no_schedule_work_usage(self):
ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcProject")
schedule = ifcopenshell.api.run("sequence.add_work_schedule", self.file)
task = ifcopenshell.api.run("sequence.add_task", self.file, work_schedule=schedule)
resource = ifcopenshell.api.run("resource.add_resource", self.file, ifc_class="IfcLaborResource")
ifcopenshell.api.run("sequence.assign_process", self.file, relating_process=task, related_object=resource)
ifcopenshell.api.run("sequence.calculate_task_duration", self.file, task=task)
assert task.TaskTime is None
def test_calculating_a_nested_task_duration_based_on_a_labour_resource_with_work_hours(self):
ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcProject")
schedule = ifcopenshell.api.run("sequence.add_work_schedule", self.file)
task = ifcopenshell.api.run("sequence.add_task", self.file, work_schedule=schedule)
subtask = ifcopenshell.api.run("sequence.add_task", self.file, parent_task=task)
resource = ifcopenshell.api.run("resource.add_resource", self.file, ifc_class="IfcLaborResource")
resource_time = ifcopenshell.api.run("resource.add_resource_time", self.file, resource=resource)
resource_time.ScheduleWork = "PT48H"
ifcopenshell.api.run("sequence.assign_process", self.file, relating_process=subtask, related_object=resource)
ifcopenshell.api.run("sequence.calculate_task_duration", self.file, task=subtask)
assert subtask.TaskTime.ScheduleDuration == "P6D"