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

test_model - simplify stair generation kwargs

Browse Source
This commit is contained in:
Andrej730
2025-11-05 18:08:22 +05:00
parent e543785959
commit 169c4392a9
1 changed files with 46 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/test/tool/test_model.py
+46 -85
View File
@@ -30,6 +30,7 @@ import bonsai.core.tool
import bonsai.tool as tool import bonsai.tool as tool
import numpy as np import numpy as np
import json import json
from typing import Any
from test.bim.bootstrap import NewFile from test.bim.bootstrap import NewFile
from bonsai.tool.model import Model as subject from bonsai.tool.model import Model as subject
from ifcopenshell.util.shape_builder import V, ShapeBuilder from ifcopenshell.util.shape_builder import V, ShapeBuilder
@@ -222,18 +223,20 @@ class TestGenerateStair2DProfile(NewFile):
for vert, vert_gen in zip(verts, verts_gen, strict=True): for vert, vert_gen in zip(verts, verts_gen, strict=True):
assert np.allclose(vert, V(vert_gen), atol=0.01) assert np.allclose(vert, V(vert_gen), atol=0.01)
CONCRETE_STAIR_KWARGS: dict[str, Any] = {
"base_slab_depth": 0.25,
"has_top_nib": False,
"height": 1.0,
"number_of_treads": 3,
"stair_type": "CONCRETE",
"top_slab_depth": 0.25,
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
}
def test_create_concrete_stair(self): def test_create_concrete_stair(self):
kwargs = { kwargs = self.CONCRETE_STAIR_KWARGS.copy()
"base_slab_depth": 0.25,
"has_top_nib": False,
"height": 1.0,
"number_of_treads": 3,
"stair_type": "CONCRETE",
"top_slab_depth": 0.25,
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
}
verts_data = ( verts_data = (
V(0.0, 0, 0.0), V(0.0, 0, 0.0),
V(0.0, 0, 0.25), V(0.0, 0, 0.25),
@@ -269,17 +272,8 @@ class TestGenerateStair2DProfile(NewFile):
self.compare_data(generated_profile, expected_profile) self.compare_data(generated_profile, expected_profile)
def test_create_concrete_stair_nib(self): def test_create_concrete_stair_nib(self):
kwargs = { kwargs = self.CONCRETE_STAIR_KWARGS.copy()
"base_slab_depth": 0.25, kwargs["has_top_nib"] = True
"has_top_nib": True,
"height": 1.0,
"number_of_treads": 3,
"stair_type": "CONCRETE",
"top_slab_depth": 0.25,
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
}
verts_data = ( verts_data = (
V(0.0, 0, 0.0), V(0.0, 0, 0.0),
V(0.0, 0, 0.25), V(0.0, 0, 0.25),
@@ -318,19 +312,8 @@ class TestGenerateStair2DProfile(NewFile):
self.compare_data(generated_profile, expected_profile) self.compare_data(generated_profile, expected_profile)
def test_create_concrete_stair_zero_width_first_tread(self): def test_create_concrete_stair_zero_width_first_tread(self):
"""Test concrete stair with zero-width first tread""" kwargs = self.CONCRETE_STAIR_KWARGS.copy()
kwargs = { kwargs["custom_first_last_tread_run"] = (0.0, None)
"base_slab_depth": 0.25,
"has_top_nib": False,
"height": 1.0,
"number_of_treads": 3,
"stair_type": "CONCRETE",
"top_slab_depth": 0.25,
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
"custom_first_last_tread_run": (0.0, 0.0),
}
verts_data = ( verts_data = (
V(0.0, 0, 0.0), V(0.0, 0, 0.0),
# First tread skipped - goes straight to second tread # First tread skipped - goes straight to second tread
@@ -361,19 +344,8 @@ class TestGenerateStair2DProfile(NewFile):
self.compare_data(generated_profile, expected_profile) self.compare_data(generated_profile, expected_profile)
def test_create_concrete_stair_zero_width_last_tread(self): def test_create_concrete_stair_zero_width_last_tread(self):
"""Test concrete stair with zero-width last tread""" kwargs = self.CONCRETE_STAIR_KWARGS.copy()
kwargs = { kwargs["custom_first_last_tread_run"] = (None, 0.0)
"base_slab_depth": 0.25,
"has_top_nib": False,
"height": 1.0,
"number_of_treads": 3,
"stair_type": "CONCRETE",
"top_slab_depth": 0.25,
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
"custom_first_last_tread_run": (0.0, 0.0),
}
verts_data = ( verts_data = (
V(0.0, 0, 0.0), V(0.0, 0, 0.0),
V(0.0, 0, 0.25), V(0.0, 0, 0.25),
@@ -405,15 +377,17 @@ class TestGenerateStair2DProfile(NewFile):
generated_profile = subject.generate_stair_2d_profile(**kwargs) generated_profile = subject.generate_stair_2d_profile(**kwargs)
self.compare_data(generated_profile, expected_profile) self.compare_data(generated_profile, expected_profile)
WOOD_STEEL_STAIR_KWARGS: dict[str, Any] = {
"height": 1.0,
"number_of_treads": 3,
"stair_type": "WOOD/STEEL",
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
}
def test_create_wood_steel_stair(self): def test_create_wood_steel_stair(self):
kwargs = { kwargs = self.WOOD_STEEL_STAIR_KWARGS.copy()
"height": 1.0,
"number_of_treads": 3,
"stair_type": "WOOD/STEEL",
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
}
verts_data = ( verts_data = (
V(0.0, 0, 0.0), V(0.0, 0, 0.0),
V(0.3, 0, 0.0), V(0.3, 0, 0.0),
@@ -458,16 +432,8 @@ class TestGenerateStair2DProfile(NewFile):
self.compare_data(generated_profile, expected_profile) self.compare_data(generated_profile, expected_profile)
def test_create_wood_steel_stair_zero_width_first_tread(self): def test_create_wood_steel_stair_zero_width_first_tread(self):
"""Test wood/steel stair with zero-width first tread""" kwargs = self.WOOD_STEEL_STAIR_KWARGS.copy()
kwargs = { kwargs["custom_first_last_tread_run"] = (0.0, None)
"height": 1.0,
"number_of_treads": 3,
"stair_type": "WOOD/STEEL",
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
"custom_first_last_tread_run": (0.0, 0.0),
}
verts_data = ( verts_data = (
# First tread skipped - start at second tread # First tread skipped - start at second tread
V(0.0, 0, 0.25), V(0.0, 0, 0.25),
@@ -506,15 +472,9 @@ class TestGenerateStair2DProfile(NewFile):
def test_create_wood_steel_stair_zero_width_last_tread(self): def test_create_wood_steel_stair_zero_width_last_tread(self):
"""Test wood/steel stair with zero-width last tread""" """Test wood/steel stair with zero-width last tread"""
kwargs = { kwargs = self.WOOD_STEEL_STAIR_KWARGS.copy()
"height": 1.0, kwargs["custom_first_last_tread_run"] = (None, 0.0)
"number_of_treads": 3,
"stair_type": "WOOD/STEEL",
"tread_depth": 0.25,
"tread_run": 0.3,
"width": 1.2,
"custom_first_last_tread_run": (0.0, 0.0),
}
verts_data = ( verts_data = (
V(0.0, 0, 0.0), V(0.0, 0, 0.0),
V(0.3, 0, 0.0), V(0.3, 0, 0.0),
@@ -551,8 +511,16 @@ class TestGenerateStair2DProfile(NewFile):
generated_profile = subject.generate_stair_2d_profile(**kwargs) generated_profile = subject.generate_stair_2d_profile(**kwargs)
self.compare_data(generated_profile, expected_profile) self.compare_data(generated_profile, expected_profile)
GENERIC_STAIR_KWARGS: dict[str, Any] = {
"height": 1.0,
"number_of_treads": 3,
"stair_type": "GENERIC",
"tread_run": 0.3,
"width": 1.2,
}
def test_create_generic_stair(self): def test_create_generic_stair(self):
kwargs = {"height": 1.0, "number_of_treads": 3, "stair_type": "GENERIC", "tread_run": 0.3, "width": 1.2} kwargs = self.GENERIC_STAIR_KWARGS.copy()
verts_data = ( verts_data = (
V(0.0, 0, 0.0), V(0.0, 0, 0.0),
V(0.0, 0, 0.25), V(0.0, 0, 0.25),
@@ -585,15 +553,8 @@ class TestGenerateStair2DProfile(NewFile):
self.compare_data(generated_profile, expected_profile) self.compare_data(generated_profile, expected_profile)
def test_create_generic_stair_zero_width_treads(self): def test_create_generic_stair_zero_width_treads(self):
"""Test generic stair with zero-width first and last treads""" kwargs = self.GENERIC_STAIR_KWARGS.copy()
kwargs = { kwargs["custom_first_last_tread_run"] = (0.0, 0.0)
"height": 1.0,
"number_of_treads": 3,
"stair_type": "GENERIC",
"tread_run": 0.3,
"width": 1.2,
"custom_first_last_tread_run": (0.0, 0.0),
}
verts_data = ( verts_data = (
V(0.0, 0, 0.0), V(0.0, 0, 0.0),
# First tread skipped # First tread skipped