Add TetraMeshData class - #441

Open
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh
Open

Add TetraMeshData class#441
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh

Conversation

@munechika-koyo

@munechika-koyomunechika-koyo commented Feb 15, 2025

Copy link
Copy Markdown
Contributor

Proposal of new feature: TetraMeshData

TL;DR: Reading files in the created tree structure will greatly enhance the speed of the process with this PR.

Description

I would propose a new feature, the TetraMeshData class, modeled after the existing MeshData definition.
(I have already suggested #407 but would like to split the function.)

It was implemented with the following objectives:

  • Saving/Loading from the file formatted .rsm, which has constructed a K-D tree structure.
  • Offering useful methods like calculating a tetrahedral volume and barycenter.

Additionally, this class will be used when loading mesh files formatted as .vtk or .obj, which contain tetrahedral (3-D unstructured) mesh data in the future.

Examples of the use:

  1. Creating the instance of TetraMeshData
>>>fromraysect.primitive.mesh.tetra_meshimportTetraMeshData>>>verts= [[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]]
>>>tets= [[0, 1, 2, 3]]
>>>tetra=TetraMeshData(verts, tets)
  1. Calculating the volume of a tetrahedron
>>>tetra.volume(0)
0.166666# == 1 x 1 x 0.5 / 3.0>>>tetra.volume_total()
0.166666
  1. Calculating the barycenter of a tetrahedron
>>>tetra.barycenter(0)
Point3D(0.25, 0.25, 0.25)
  1. Saving as .rsm
>>>tetra.save("tetra.rsm")
  1. Loading from a .rsm file
>>>TetraMeshData.from_file("tetra.rsm")
<raysect.primitive.mesh.tetra_mesh.TetraMeshDataat0x1336e7440>

Speed test

I attempted to compare the instancing of Discrete3DMesh with TetraMeshData loaded from a file.
As a mesh file, I used the stanford_bunny.mesh file located in demos/resources/.

elapse time (sec)
Create Discrete3DMesh15.441215
Create TetraMeshData15.894989
Load TetraMeshData from file01.766619

I attained a loading speed for tetra mesh that is approximately 9 times faster than generating TetraMeshData using vertices and tetrahedral index arrays.
This difference is expected to widen as the vertex data size increases.
The test script that I used is in the collapsed section below.

Test script
fromdatetimeimporttimedeltafrompathlibimportPathfromtimeitimporttimeitimportnumpyasnpfromraysect.core.math.function.float.function3d.interpolateimportDiscrete3DMeshfromraysect.primitive.mesh.tetra_meshimportTetraMeshDatadefload_mesh(mesh_filepath):
vertices= []
tetrahedra= []
withopen(mesh_filepath, "r") asf:
lines=f.readlines()
i=0whilei<len(lines):
line=lines[i].strip()
ifnotlineorline.startswith("#"):
i+=1continue# Check section headers (case-sensitive)ifline=="Vertices":
i+=1vertex_count=int(lines[i].strip())
i+=1for_inrange(vertex_count):
parts=lines[i].strip().split()
# take only the first 3 coordinatesvertices.append([float(v) forvinparts[:3]])
i+=1continueelifline=="Tetrahedra":
i+=1tet_count=int(lines[i].strip())
i+=1for_inrange(tet_count):
parts=lines[i].strip().split()
# take only the first 4 indices, converting them to int.tetrahedra.append([int(idx) foridxinparts[:4]])
i+=1continuei+=1vertices=np.array(vertices)
tetrahedra=np.array(tetrahedra, dtype=np.int32) -1# 0-based indexingreturnvertices, tetrahedradefcreate_discrete3dmesh(vertices, tetrahedra):
returnDiscrete3DMesh(
vertices, tetrahedra, np.ones((tetrahedra.shape[0])), False, 0
)
defcreate_tetrameshdata(vertices, tetrahedra):
returnTetraMeshData(vertices, tetrahedra)
defload_tetrameshdata(mesh_filepath):
returnTetraMeshData.from_file(mesh_filepath)
if__name__=="__main__":
ROOT=Path(__file__).parentmesh_file=ROOT/"demos"/"resources"/"stanford_bunny.mesh"vertices, tetrahedra=load_mesh(mesh_file)
# Save tetramesh data in advancetetra=TetraMeshData(vertices, tetrahedra)
tetra_file=ROOT/"temp_tetra.rsm"tetra.save(tetra_file)
# === Measure time ===loop=5# create Discrete3DMeshresult=timeit(
"create_discrete3dmesh(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create Discrete3DMesh: {elapsed_time}")
# create TetraMeshDataresult=timeit(
"create_tetrameshdata(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create TetraMeshData: {elapsed_time}")
# load TetraMeshData from fileresult=timeit("load_tetrameshdata(tetra_file)", globals=globals(), number=loop)
elapsed_time=timedelta(seconds=result/loop)
print(f"Load TetraMeshData from file: {elapsed_time}")

Class structure

The structure of the TetraMeshData I implemented is as follows.

classDiagram
class KDTree3DCore {
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
}
class TetraMeshData {
+__init__(object vertices, object tetrahedra, bint tolerant=True)
+__getstate__()
+__setstate__(state)
+__reduce__()
+vertices
+tetrahedra
+Point3D vertex(int index)
+ndarray tetrahedron(int index)
+Point3D barycenter(int index)
+double volume(int index)
+double volume_total()
+BoundingBox3D bounding_box(AffineMatrix3D to_world)
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
+classmethod from_file(cls, file)
}
KDTree3DCore <|-- TetraMeshData
Loading

Details of unit test

I also implemented a unit test for TestMeshData in raysect/primitive/mesh/tests/test_tetra_mesh.py.
Below is a table showing the correspondence between the methods of the TestTetraMeshData class in unit tests and the methods tested in the TestMeshData class.

Test Method Name in TestTetraMeshDataTested Method/Function in TetraMeshData
test_initialization()__init__()
test_invalid_tetrahedron_indices()__init__()
test_vertex_method()vertex()
test_invalid_vertex_index()vertex()
test_barycenter()barycenter()
test_compute_volume()volume(), volume_total()
test_is_contained()is_contained()
test_bounding_box()bounding_box()
test_pickle_state ()__getstate__(), __setstate__(), save(), load()

I would appreciate it if you would review it and make any suggestions and comments.

@munechika-koyo
munechika-koyo marked this pull request as ready for review February 15, 2025 12:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@munechika-koyo
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Add TetraMeshData class - #441

Open
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh
Open

Add TetraMeshData class#441
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh

Conversation

@munechika-koyo

@munechika-koyomunechika-koyo commented Feb 15, 2025

Copy link
Copy Markdown
Contributor

Proposal of new feature: TetraMeshData

TL;DR: Reading files in the created tree structure will greatly enhance the speed of the process with this PR.

Description

I would propose a new feature, the TetraMeshData class, modeled after the existing MeshData definition.
(I have already suggested #407 but would like to split the function.)

It was implemented with the following objectives:

  • Saving/Loading from the file formatted .rsm, which has constructed a K-D tree structure.
  • Offering useful methods like calculating a tetrahedral volume and barycenter.

Additionally, this class will be used when loading mesh files formatted as .vtk or .obj, which contain tetrahedral (3-D unstructured) mesh data in the future.

Examples of the use:

  1. Creating the instance of TetraMeshData
>>>fromraysect.primitive.mesh.tetra_meshimportTetraMeshData>>>verts= [[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]]
>>>tets= [[0, 1, 2, 3]]
>>>tetra=TetraMeshData(verts, tets)
  1. Calculating the volume of a tetrahedron
>>>tetra.volume(0)
0.166666# == 1 x 1 x 0.5 / 3.0>>>tetra.volume_total()
0.166666
  1. Calculating the barycenter of a tetrahedron
>>>tetra.barycenter(0)
Point3D(0.25, 0.25, 0.25)
  1. Saving as .rsm
>>>tetra.save("tetra.rsm")
  1. Loading from a .rsm file
>>>TetraMeshData.from_file("tetra.rsm")
<raysect.primitive.mesh.tetra_mesh.TetraMeshDataat0x1336e7440>

Speed test

I attempted to compare the instancing of Discrete3DMesh with TetraMeshData loaded from a file.
As a mesh file, I used the stanford_bunny.mesh file located in demos/resources/.

elapse time (sec)
Create Discrete3DMesh15.441215
Create TetraMeshData15.894989
Load TetraMeshData from file01.766619

I attained a loading speed for tetra mesh that is approximately 9 times faster than generating TetraMeshData using vertices and tetrahedral index arrays.
This difference is expected to widen as the vertex data size increases.
The test script that I used is in the collapsed section below.

Test script
fromdatetimeimporttimedeltafrompathlibimportPathfromtimeitimporttimeitimportnumpyasnpfromraysect.core.math.function.float.function3d.interpolateimportDiscrete3DMeshfromraysect.primitive.mesh.tetra_meshimportTetraMeshDatadefload_mesh(mesh_filepath):
vertices= []
tetrahedra= []
withopen(mesh_filepath, "r") asf:
lines=f.readlines()
i=0whilei<len(lines):
line=lines[i].strip()
ifnotlineorline.startswith("#"):
i+=1continue# Check section headers (case-sensitive)ifline=="Vertices":
i+=1vertex_count=int(lines[i].strip())
i+=1for_inrange(vertex_count):
parts=lines[i].strip().split()
# take only the first 3 coordinatesvertices.append([float(v) forvinparts[:3]])
i+=1continueelifline=="Tetrahedra":
i+=1tet_count=int(lines[i].strip())
i+=1for_inrange(tet_count):
parts=lines[i].strip().split()
# take only the first 4 indices, converting them to int.tetrahedra.append([int(idx) foridxinparts[:4]])
i+=1continuei+=1vertices=np.array(vertices)
tetrahedra=np.array(tetrahedra, dtype=np.int32) -1# 0-based indexingreturnvertices, tetrahedradefcreate_discrete3dmesh(vertices, tetrahedra):
returnDiscrete3DMesh(
vertices, tetrahedra, np.ones((tetrahedra.shape[0])), False, 0
)
defcreate_tetrameshdata(vertices, tetrahedra):
returnTetraMeshData(vertices, tetrahedra)
defload_tetrameshdata(mesh_filepath):
returnTetraMeshData.from_file(mesh_filepath)
if__name__=="__main__":
ROOT=Path(__file__).parentmesh_file=ROOT/"demos"/"resources"/"stanford_bunny.mesh"vertices, tetrahedra=load_mesh(mesh_file)
# Save tetramesh data in advancetetra=TetraMeshData(vertices, tetrahedra)
tetra_file=ROOT/"temp_tetra.rsm"tetra.save(tetra_file)
# === Measure time ===loop=5# create Discrete3DMeshresult=timeit(
"create_discrete3dmesh(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create Discrete3DMesh: {elapsed_time}")
# create TetraMeshDataresult=timeit(
"create_tetrameshdata(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create TetraMeshData: {elapsed_time}")
# load TetraMeshData from fileresult=timeit("load_tetrameshdata(tetra_file)", globals=globals(), number=loop)
elapsed_time=timedelta(seconds=result/loop)
print(f"Load TetraMeshData from file: {elapsed_time}")

Class structure

The structure of the TetraMeshData I implemented is as follows.

classDiagram
class KDTree3DCore {
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
}
class TetraMeshData {
+__init__(object vertices, object tetrahedra, bint tolerant=True)
+__getstate__()
+__setstate__(state)
+__reduce__()
+vertices
+tetrahedra
+Point3D vertex(int index)
+ndarray tetrahedron(int index)
+Point3D barycenter(int index)
+double volume(int index)
+double volume_total()
+BoundingBox3D bounding_box(AffineMatrix3D to_world)
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
+classmethod from_file(cls, file)
}
KDTree3DCore <|-- TetraMeshData
Loading

Details of unit test

I also implemented a unit test for TestMeshData in raysect/primitive/mesh/tests/test_tetra_mesh.py.
Below is a table showing the correspondence between the methods of the TestTetraMeshData class in unit tests and the methods tested in the TestMeshData class.

Test Method Name in TestTetraMeshDataTested Method/Function in TetraMeshData
test_initialization()__init__()
test_invalid_tetrahedron_indices()__init__()
test_vertex_method()vertex()
test_invalid_vertex_index()vertex()
test_barycenter()barycenter()
test_compute_volume()volume(), volume_total()
test_is_contained()is_contained()
test_bounding_box()bounding_box()
test_pickle_state ()__getstate__(), __setstate__(), save(), load()

I would appreciate it if you would review it and make any suggestions and comments.

@munechika-koyo
munechika-koyo marked this pull request as ready for review February 15, 2025 12:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@munechika-koyo
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add TetraMeshData class - #441

Open
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh
Open

Add TetraMeshData class#441
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh

Conversation

@munechika-koyo

@munechika-koyomunechika-koyo commented Feb 15, 2025

Copy link
Copy Markdown
Contributor

Proposal of new feature: TetraMeshData

TL;DR: Reading files in the created tree structure will greatly enhance the speed of the process with this PR.

Description

I would propose a new feature, the TetraMeshData class, modeled after the existing MeshData definition.
(I have already suggested #407 but would like to split the function.)

It was implemented with the following objectives:

  • Saving/Loading from the file formatted .rsm, which has constructed a K-D tree structure.
  • Offering useful methods like calculating a tetrahedral volume and barycenter.

Additionally, this class will be used when loading mesh files formatted as .vtk or .obj, which contain tetrahedral (3-D unstructured) mesh data in the future.

Examples of the use:

  1. Creating the instance of TetraMeshData
>>>fromraysect.primitive.mesh.tetra_meshimportTetraMeshData>>>verts= [[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]]
>>>tets= [[0, 1, 2, 3]]
>>>tetra=TetraMeshData(verts, tets)
  1. Calculating the volume of a tetrahedron
>>>tetra.volume(0)
0.166666# == 1 x 1 x 0.5 / 3.0>>>tetra.volume_total()
0.166666
  1. Calculating the barycenter of a tetrahedron
>>>tetra.barycenter(0)
Point3D(0.25, 0.25, 0.25)
  1. Saving as .rsm
>>>tetra.save("tetra.rsm")
  1. Loading from a .rsm file
>>>TetraMeshData.from_file("tetra.rsm")
<raysect.primitive.mesh.tetra_mesh.TetraMeshDataat0x1336e7440>

Speed test

I attempted to compare the instancing of Discrete3DMesh with TetraMeshData loaded from a file.
As a mesh file, I used the stanford_bunny.mesh file located in demos/resources/.

elapse time (sec)
Create Discrete3DMesh15.441215
Create TetraMeshData15.894989
Load TetraMeshData from file01.766619

I attained a loading speed for tetra mesh that is approximately 9 times faster than generating TetraMeshData using vertices and tetrahedral index arrays.
This difference is expected to widen as the vertex data size increases.
The test script that I used is in the collapsed section below.

Test script
fromdatetimeimporttimedeltafrompathlibimportPathfromtimeitimporttimeitimportnumpyasnpfromraysect.core.math.function.float.function3d.interpolateimportDiscrete3DMeshfromraysect.primitive.mesh.tetra_meshimportTetraMeshDatadefload_mesh(mesh_filepath):
vertices= []
tetrahedra= []
withopen(mesh_filepath, "r") asf:
lines=f.readlines()
i=0whilei<len(lines):
line=lines[i].strip()
ifnotlineorline.startswith("#"):
i+=1continue# Check section headers (case-sensitive)ifline=="Vertices":
i+=1vertex_count=int(lines[i].strip())
i+=1for_inrange(vertex_count):
parts=lines[i].strip().split()
# take only the first 3 coordinatesvertices.append([float(v) forvinparts[:3]])
i+=1continueelifline=="Tetrahedra":
i+=1tet_count=int(lines[i].strip())
i+=1for_inrange(tet_count):
parts=lines[i].strip().split()
# take only the first 4 indices, converting them to int.tetrahedra.append([int(idx) foridxinparts[:4]])
i+=1continuei+=1vertices=np.array(vertices)
tetrahedra=np.array(tetrahedra, dtype=np.int32) -1# 0-based indexingreturnvertices, tetrahedradefcreate_discrete3dmesh(vertices, tetrahedra):
returnDiscrete3DMesh(
vertices, tetrahedra, np.ones((tetrahedra.shape[0])), False, 0
)
defcreate_tetrameshdata(vertices, tetrahedra):
returnTetraMeshData(vertices, tetrahedra)
defload_tetrameshdata(mesh_filepath):
returnTetraMeshData.from_file(mesh_filepath)
if__name__=="__main__":
ROOT=Path(__file__).parentmesh_file=ROOT/"demos"/"resources"/"stanford_bunny.mesh"vertices, tetrahedra=load_mesh(mesh_file)
# Save tetramesh data in advancetetra=TetraMeshData(vertices, tetrahedra)
tetra_file=ROOT/"temp_tetra.rsm"tetra.save(tetra_file)
# === Measure time ===loop=5# create Discrete3DMeshresult=timeit(
"create_discrete3dmesh(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create Discrete3DMesh: {elapsed_time}")
# create TetraMeshDataresult=timeit(
"create_tetrameshdata(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create TetraMeshData: {elapsed_time}")
# load TetraMeshData from fileresult=timeit("load_tetrameshdata(tetra_file)", globals=globals(), number=loop)
elapsed_time=timedelta(seconds=result/loop)
print(f"Load TetraMeshData from file: {elapsed_time}")

Class structure

The structure of the TetraMeshData I implemented is as follows.

classDiagram
class KDTree3DCore {
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
}
class TetraMeshData {
+__init__(object vertices, object tetrahedra, bint tolerant=True)
+__getstate__()
+__setstate__(state)
+__reduce__()
+vertices
+tetrahedra
+Point3D vertex(int index)
+ndarray tetrahedron(int index)
+Point3D barycenter(int index)
+double volume(int index)
+double volume_total()
+BoundingBox3D bounding_box(AffineMatrix3D to_world)
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
+classmethod from_file(cls, file)
}
KDTree3DCore <|-- TetraMeshData
Loading

Details of unit test

I also implemented a unit test for TestMeshData in raysect/primitive/mesh/tests/test_tetra_mesh.py.
Below is a table showing the correspondence between the methods of the TestTetraMeshData class in unit tests and the methods tested in the TestMeshData class.

Test Method Name in TestTetraMeshDataTested Method/Function in TetraMeshData
test_initialization()__init__()
test_invalid_tetrahedron_indices()__init__()
test_vertex_method()vertex()
test_invalid_vertex_index()vertex()
test_barycenter()barycenter()
test_compute_volume()volume(), volume_total()
test_is_contained()is_contained()
test_bounding_box()bounding_box()
test_pickle_state ()__getstate__(), __setstate__(), save(), load()

I would appreciate it if you would review it and make any suggestions and comments.

@munechika-koyo
munechika-koyo marked this pull request as ready for review February 15, 2025 12:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@munechika-koyo
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add TetraMeshData class - #441

Open
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh
Open

Add TetraMeshData class#441
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh

Conversation

@munechika-koyo

@munechika-koyomunechika-koyo commented Feb 15, 2025

Copy link
Copy Markdown
Contributor

Proposal of new feature: TetraMeshData

TL;DR: Reading files in the created tree structure will greatly enhance the speed of the process with this PR.

Description

I would propose a new feature, the TetraMeshData class, modeled after the existing MeshData definition.
(I have already suggested #407 but would like to split the function.)

It was implemented with the following objectives:

  • Saving/Loading from the file formatted .rsm, which has constructed a K-D tree structure.
  • Offering useful methods like calculating a tetrahedral volume and barycenter.

Additionally, this class will be used when loading mesh files formatted as .vtk or .obj, which contain tetrahedral (3-D unstructured) mesh data in the future.

Examples of the use:

  1. Creating the instance of TetraMeshData
>>>fromraysect.primitive.mesh.tetra_meshimportTetraMeshData>>>verts= [[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]]
>>>tets= [[0, 1, 2, 3]]
>>>tetra=TetraMeshData(verts, tets)
  1. Calculating the volume of a tetrahedron
>>>tetra.volume(0)
0.166666# == 1 x 1 x 0.5 / 3.0>>>tetra.volume_total()
0.166666
  1. Calculating the barycenter of a tetrahedron
>>>tetra.barycenter(0)
Point3D(0.25, 0.25, 0.25)
  1. Saving as .rsm
>>>tetra.save("tetra.rsm")
  1. Loading from a .rsm file
>>>TetraMeshData.from_file("tetra.rsm")
<raysect.primitive.mesh.tetra_mesh.TetraMeshDataat0x1336e7440>

Speed test

I attempted to compare the instancing of Discrete3DMesh with TetraMeshData loaded from a file.
As a mesh file, I used the stanford_bunny.mesh file located in demos/resources/.

elapse time (sec)
Create Discrete3DMesh15.441215
Create TetraMeshData15.894989
Load TetraMeshData from file01.766619

I attained a loading speed for tetra mesh that is approximately 9 times faster than generating TetraMeshData using vertices and tetrahedral index arrays.
This difference is expected to widen as the vertex data size increases.
The test script that I used is in the collapsed section below.

Test script
fromdatetimeimporttimedeltafrompathlibimportPathfromtimeitimporttimeitimportnumpyasnpfromraysect.core.math.function.float.function3d.interpolateimportDiscrete3DMeshfromraysect.primitive.mesh.tetra_meshimportTetraMeshDatadefload_mesh(mesh_filepath):
vertices= []
tetrahedra= []
withopen(mesh_filepath, "r") asf:
lines=f.readlines()
i=0whilei<len(lines):
line=lines[i].strip()
ifnotlineorline.startswith("#"):
i+=1continue# Check section headers (case-sensitive)ifline=="Vertices":
i+=1vertex_count=int(lines[i].strip())
i+=1for_inrange(vertex_count):
parts=lines[i].strip().split()
# take only the first 3 coordinatesvertices.append([float(v) forvinparts[:3]])
i+=1continueelifline=="Tetrahedra":
i+=1tet_count=int(lines[i].strip())
i+=1for_inrange(tet_count):
parts=lines[i].strip().split()
# take only the first 4 indices, converting them to int.tetrahedra.append([int(idx) foridxinparts[:4]])
i+=1continuei+=1vertices=np.array(vertices)
tetrahedra=np.array(tetrahedra, dtype=np.int32) -1# 0-based indexingreturnvertices, tetrahedradefcreate_discrete3dmesh(vertices, tetrahedra):
returnDiscrete3DMesh(
vertices, tetrahedra, np.ones((tetrahedra.shape[0])), False, 0
)
defcreate_tetrameshdata(vertices, tetrahedra):
returnTetraMeshData(vertices, tetrahedra)
defload_tetrameshdata(mesh_filepath):
returnTetraMeshData.from_file(mesh_filepath)
if__name__=="__main__":
ROOT=Path(__file__).parentmesh_file=ROOT/"demos"/"resources"/"stanford_bunny.mesh"vertices, tetrahedra=load_mesh(mesh_file)
# Save tetramesh data in advancetetra=TetraMeshData(vertices, tetrahedra)
tetra_file=ROOT/"temp_tetra.rsm"tetra.save(tetra_file)
# === Measure time ===loop=5# create Discrete3DMeshresult=timeit(
"create_discrete3dmesh(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create Discrete3DMesh: {elapsed_time}")
# create TetraMeshDataresult=timeit(
"create_tetrameshdata(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create TetraMeshData: {elapsed_time}")
# load TetraMeshData from fileresult=timeit("load_tetrameshdata(tetra_file)", globals=globals(), number=loop)
elapsed_time=timedelta(seconds=result/loop)
print(f"Load TetraMeshData from file: {elapsed_time}")

Class structure

The structure of the TetraMeshData I implemented is as follows.

classDiagram
class KDTree3DCore {
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
}
class TetraMeshData {
+__init__(object vertices, object tetrahedra, bint tolerant=True)
+__getstate__()
+__setstate__(state)
+__reduce__()
+vertices
+tetrahedra
+Point3D vertex(int index)
+ndarray tetrahedron(int index)
+Point3D barycenter(int index)
+double volume(int index)
+double volume_total()
+BoundingBox3D bounding_box(AffineMatrix3D to_world)
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
+classmethod from_file(cls, file)
}
KDTree3DCore <|-- TetraMeshData
Loading

Details of unit test

I also implemented a unit test for TestMeshData in raysect/primitive/mesh/tests/test_tetra_mesh.py.
Below is a table showing the correspondence between the methods of the TestTetraMeshData class in unit tests and the methods tested in the TestMeshData class.

Test Method Name in TestTetraMeshDataTested Method/Function in TetraMeshData
test_initialization()__init__()
test_invalid_tetrahedron_indices()__init__()
test_vertex_method()vertex()
test_invalid_vertex_index()vertex()
test_barycenter()barycenter()
test_compute_volume()volume(), volume_total()
test_is_contained()is_contained()
test_bounding_box()bounding_box()
test_pickle_state ()__getstate__(), __setstate__(), save(), load()

I would appreciate it if you would review it and make any suggestions and comments.

@munechika-koyo
munechika-koyo marked this pull request as ready for review February 15, 2025 12:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@munechika-koyo
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Add TetraMeshData class - #441

Open
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh
Open

Add TetraMeshData class#441
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh

Conversation

@munechika-koyo

@munechika-koyomunechika-koyo commented Feb 15, 2025

Copy link
Copy Markdown
Contributor

Proposal of new feature: TetraMeshData

TL;DR: Reading files in the created tree structure will greatly enhance the speed of the process with this PR.

Description

I would propose a new feature, the TetraMeshData class, modeled after the existing MeshData definition.
(I have already suggested #407 but would like to split the function.)

It was implemented with the following objectives:

  • Saving/Loading from the file formatted .rsm, which has constructed a K-D tree structure.
  • Offering useful methods like calculating a tetrahedral volume and barycenter.

Additionally, this class will be used when loading mesh files formatted as .vtk or .obj, which contain tetrahedral (3-D unstructured) mesh data in the future.

Examples of the use:

  1. Creating the instance of TetraMeshData
>>>fromraysect.primitive.mesh.tetra_meshimportTetraMeshData>>>verts= [[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]]
>>>tets= [[0, 1, 2, 3]]
>>>tetra=TetraMeshData(verts, tets)
  1. Calculating the volume of a tetrahedron
>>>tetra.volume(0)
0.166666# == 1 x 1 x 0.5 / 3.0>>>tetra.volume_total()
0.166666
  1. Calculating the barycenter of a tetrahedron
>>>tetra.barycenter(0)
Point3D(0.25, 0.25, 0.25)
  1. Saving as .rsm
>>>tetra.save("tetra.rsm")
  1. Loading from a .rsm file
>>>TetraMeshData.from_file("tetra.rsm")
<raysect.primitive.mesh.tetra_mesh.TetraMeshDataat0x1336e7440>

Speed test

I attempted to compare the instancing of Discrete3DMesh with TetraMeshData loaded from a file.
As a mesh file, I used the stanford_bunny.mesh file located in demos/resources/.

elapse time (sec)
Create Discrete3DMesh15.441215
Create TetraMeshData15.894989
Load TetraMeshData from file01.766619

I attained a loading speed for tetra mesh that is approximately 9 times faster than generating TetraMeshData using vertices and tetrahedral index arrays.
This difference is expected to widen as the vertex data size increases.
The test script that I used is in the collapsed section below.

Test script
fromdatetimeimporttimedeltafrompathlibimportPathfromtimeitimporttimeitimportnumpyasnpfromraysect.core.math.function.float.function3d.interpolateimportDiscrete3DMeshfromraysect.primitive.mesh.tetra_meshimportTetraMeshDatadefload_mesh(mesh_filepath):
vertices= []
tetrahedra= []
withopen(mesh_filepath, "r") asf:
lines=f.readlines()
i=0whilei<len(lines):
line=lines[i].strip()
ifnotlineorline.startswith("#"):
i+=1continue# Check section headers (case-sensitive)ifline=="Vertices":
i+=1vertex_count=int(lines[i].strip())
i+=1for_inrange(vertex_count):
parts=lines[i].strip().split()
# take only the first 3 coordinatesvertices.append([float(v) forvinparts[:3]])
i+=1continueelifline=="Tetrahedra":
i+=1tet_count=int(lines[i].strip())
i+=1for_inrange(tet_count):
parts=lines[i].strip().split()
# take only the first 4 indices, converting them to int.tetrahedra.append([int(idx) foridxinparts[:4]])
i+=1continuei+=1vertices=np.array(vertices)
tetrahedra=np.array(tetrahedra, dtype=np.int32) -1# 0-based indexingreturnvertices, tetrahedradefcreate_discrete3dmesh(vertices, tetrahedra):
returnDiscrete3DMesh(
vertices, tetrahedra, np.ones((tetrahedra.shape[0])), False, 0
)
defcreate_tetrameshdata(vertices, tetrahedra):
returnTetraMeshData(vertices, tetrahedra)
defload_tetrameshdata(mesh_filepath):
returnTetraMeshData.from_file(mesh_filepath)
if__name__=="__main__":
ROOT=Path(__file__).parentmesh_file=ROOT/"demos"/"resources"/"stanford_bunny.mesh"vertices, tetrahedra=load_mesh(mesh_file)
# Save tetramesh data in advancetetra=TetraMeshData(vertices, tetrahedra)
tetra_file=ROOT/"temp_tetra.rsm"tetra.save(tetra_file)
# === Measure time ===loop=5# create Discrete3DMeshresult=timeit(
"create_discrete3dmesh(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create Discrete3DMesh: {elapsed_time}")
# create TetraMeshDataresult=timeit(
"create_tetrameshdata(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create TetraMeshData: {elapsed_time}")
# load TetraMeshData from fileresult=timeit("load_tetrameshdata(tetra_file)", globals=globals(), number=loop)
elapsed_time=timedelta(seconds=result/loop)
print(f"Load TetraMeshData from file: {elapsed_time}")

Class structure

The structure of the TetraMeshData I implemented is as follows.

classDiagram
class KDTree3DCore {
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
}
class TetraMeshData {
+__init__(object vertices, object tetrahedra, bint tolerant=True)
+__getstate__()
+__setstate__(state)
+__reduce__()
+vertices
+tetrahedra
+Point3D vertex(int index)
+ndarray tetrahedron(int index)
+Point3D barycenter(int index)
+double volume(int index)
+double volume_total()
+BoundingBox3D bounding_box(AffineMatrix3D to_world)
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
+classmethod from_file(cls, file)
}
KDTree3DCore <|-- TetraMeshData
Loading

Details of unit test

I also implemented a unit test for TestMeshData in raysect/primitive/mesh/tests/test_tetra_mesh.py.
Below is a table showing the correspondence between the methods of the TestTetraMeshData class in unit tests and the methods tested in the TestMeshData class.

Test Method Name in TestTetraMeshDataTested Method/Function in TetraMeshData
test_initialization()__init__()
test_invalid_tetrahedron_indices()__init__()
test_vertex_method()vertex()
test_invalid_vertex_index()vertex()
test_barycenter()barycenter()
test_compute_volume()volume(), volume_total()
test_is_contained()is_contained()
test_bounding_box()bounding_box()
test_pickle_state ()__getstate__(), __setstate__(), save(), load()

I would appreciate it if you would review it and make any suggestions and comments.

@munechika-koyo
munechika-koyo marked this pull request as ready for review February 15, 2025 12:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@munechika-koyo
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add TetraMeshData class - #441

Open
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh
Open

Add TetraMeshData class#441
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh

Conversation

@munechika-koyo

@munechika-koyomunechika-koyo commented Feb 15, 2025

Copy link
Copy Markdown
Contributor

Proposal of new feature: TetraMeshData

TL;DR: Reading files in the created tree structure will greatly enhance the speed of the process with this PR.

Description

I would propose a new feature, the TetraMeshData class, modeled after the existing MeshData definition.
(I have already suggested #407 but would like to split the function.)

It was implemented with the following objectives:

  • Saving/Loading from the file formatted .rsm, which has constructed a K-D tree structure.
  • Offering useful methods like calculating a tetrahedral volume and barycenter.

Additionally, this class will be used when loading mesh files formatted as .vtk or .obj, which contain tetrahedral (3-D unstructured) mesh data in the future.

Examples of the use:

  1. Creating the instance of TetraMeshData
>>>fromraysect.primitive.mesh.tetra_meshimportTetraMeshData>>>verts= [[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]]
>>>tets= [[0, 1, 2, 3]]
>>>tetra=TetraMeshData(verts, tets)
  1. Calculating the volume of a tetrahedron
>>>tetra.volume(0)
0.166666# == 1 x 1 x 0.5 / 3.0>>>tetra.volume_total()
0.166666
  1. Calculating the barycenter of a tetrahedron
>>>tetra.barycenter(0)
Point3D(0.25, 0.25, 0.25)
  1. Saving as .rsm
>>>tetra.save("tetra.rsm")
  1. Loading from a .rsm file
>>>TetraMeshData.from_file("tetra.rsm")
<raysect.primitive.mesh.tetra_mesh.TetraMeshDataat0x1336e7440>

Speed test

I attempted to compare the instancing of Discrete3DMesh with TetraMeshData loaded from a file.
As a mesh file, I used the stanford_bunny.mesh file located in demos/resources/.

elapse time (sec)
Create Discrete3DMesh15.441215
Create TetraMeshData15.894989
Load TetraMeshData from file01.766619

I attained a loading speed for tetra mesh that is approximately 9 times faster than generating TetraMeshData using vertices and tetrahedral index arrays.
This difference is expected to widen as the vertex data size increases.
The test script that I used is in the collapsed section below.

Test script
fromdatetimeimporttimedeltafrompathlibimportPathfromtimeitimporttimeitimportnumpyasnpfromraysect.core.math.function.float.function3d.interpolateimportDiscrete3DMeshfromraysect.primitive.mesh.tetra_meshimportTetraMeshDatadefload_mesh(mesh_filepath):
vertices= []
tetrahedra= []
withopen(mesh_filepath, "r") asf:
lines=f.readlines()
i=0whilei<len(lines):
line=lines[i].strip()
ifnotlineorline.startswith("#"):
i+=1continue# Check section headers (case-sensitive)ifline=="Vertices":
i+=1vertex_count=int(lines[i].strip())
i+=1for_inrange(vertex_count):
parts=lines[i].strip().split()
# take only the first 3 coordinatesvertices.append([float(v) forvinparts[:3]])
i+=1continueelifline=="Tetrahedra":
i+=1tet_count=int(lines[i].strip())
i+=1for_inrange(tet_count):
parts=lines[i].strip().split()
# take only the first 4 indices, converting them to int.tetrahedra.append([int(idx) foridxinparts[:4]])
i+=1continuei+=1vertices=np.array(vertices)
tetrahedra=np.array(tetrahedra, dtype=np.int32) -1# 0-based indexingreturnvertices, tetrahedradefcreate_discrete3dmesh(vertices, tetrahedra):
returnDiscrete3DMesh(
vertices, tetrahedra, np.ones((tetrahedra.shape[0])), False, 0
)
defcreate_tetrameshdata(vertices, tetrahedra):
returnTetraMeshData(vertices, tetrahedra)
defload_tetrameshdata(mesh_filepath):
returnTetraMeshData.from_file(mesh_filepath)
if__name__=="__main__":
ROOT=Path(__file__).parentmesh_file=ROOT/"demos"/"resources"/"stanford_bunny.mesh"vertices, tetrahedra=load_mesh(mesh_file)
# Save tetramesh data in advancetetra=TetraMeshData(vertices, tetrahedra)
tetra_file=ROOT/"temp_tetra.rsm"tetra.save(tetra_file)
# === Measure time ===loop=5# create Discrete3DMeshresult=timeit(
"create_discrete3dmesh(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create Discrete3DMesh: {elapsed_time}")
# create TetraMeshDataresult=timeit(
"create_tetrameshdata(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create TetraMeshData: {elapsed_time}")
# load TetraMeshData from fileresult=timeit("load_tetrameshdata(tetra_file)", globals=globals(), number=loop)
elapsed_time=timedelta(seconds=result/loop)
print(f"Load TetraMeshData from file: {elapsed_time}")

Class structure

The structure of the TetraMeshData I implemented is as follows.

classDiagram
class KDTree3DCore {
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
}
class TetraMeshData {
+__init__(object vertices, object tetrahedra, bint tolerant=True)
+__getstate__()
+__setstate__(state)
+__reduce__()
+vertices
+tetrahedra
+Point3D vertex(int index)
+ndarray tetrahedron(int index)
+Point3D barycenter(int index)
+double volume(int index)
+double volume_total()
+BoundingBox3D bounding_box(AffineMatrix3D to_world)
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
+classmethod from_file(cls, file)
}
KDTree3DCore <|-- TetraMeshData
Loading

Details of unit test

I also implemented a unit test for TestMeshData in raysect/primitive/mesh/tests/test_tetra_mesh.py.
Below is a table showing the correspondence between the methods of the TestTetraMeshData class in unit tests and the methods tested in the TestMeshData class.

Test Method Name in TestTetraMeshDataTested Method/Function in TetraMeshData
test_initialization()__init__()
test_invalid_tetrahedron_indices()__init__()
test_vertex_method()vertex()
test_invalid_vertex_index()vertex()
test_barycenter()barycenter()
test_compute_volume()volume(), volume_total()
test_is_contained()is_contained()
test_bounding_box()bounding_box()
test_pickle_state ()__getstate__(), __setstate__(), save(), load()

I would appreciate it if you would review it and make any suggestions and comments.

@munechika-koyo
munechika-koyo marked this pull request as ready for review February 15, 2025 12:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@munechika-koyo
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add TetraMeshData class - #441

Open
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh
Open

Add TetraMeshData class#441
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh

Conversation

@munechika-koyo

@munechika-koyomunechika-koyo commented Feb 15, 2025

Copy link
Copy Markdown
Contributor

Proposal of new feature: TetraMeshData

TL;DR: Reading files in the created tree structure will greatly enhance the speed of the process with this PR.

Description

I would propose a new feature, the TetraMeshData class, modeled after the existing MeshData definition.
(I have already suggested #407 but would like to split the function.)

It was implemented with the following objectives:

  • Saving/Loading from the file formatted .rsm, which has constructed a K-D tree structure.
  • Offering useful methods like calculating a tetrahedral volume and barycenter.

Additionally, this class will be used when loading mesh files formatted as .vtk or .obj, which contain tetrahedral (3-D unstructured) mesh data in the future.

Examples of the use:

  1. Creating the instance of TetraMeshData
>>>fromraysect.primitive.mesh.tetra_meshimportTetraMeshData>>>verts= [[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]]
>>>tets= [[0, 1, 2, 3]]
>>>tetra=TetraMeshData(verts, tets)
  1. Calculating the volume of a tetrahedron
>>>tetra.volume(0)
0.166666# == 1 x 1 x 0.5 / 3.0>>>tetra.volume_total()
0.166666
  1. Calculating the barycenter of a tetrahedron
>>>tetra.barycenter(0)
Point3D(0.25, 0.25, 0.25)
  1. Saving as .rsm
>>>tetra.save("tetra.rsm")
  1. Loading from a .rsm file
>>>TetraMeshData.from_file("tetra.rsm")
<raysect.primitive.mesh.tetra_mesh.TetraMeshDataat0x1336e7440>

Speed test

I attempted to compare the instancing of Discrete3DMesh with TetraMeshData loaded from a file.
As a mesh file, I used the stanford_bunny.mesh file located in demos/resources/.

elapse time (sec)
Create Discrete3DMesh15.441215
Create TetraMeshData15.894989
Load TetraMeshData from file01.766619

I attained a loading speed for tetra mesh that is approximately 9 times faster than generating TetraMeshData using vertices and tetrahedral index arrays.
This difference is expected to widen as the vertex data size increases.
The test script that I used is in the collapsed section below.

Test script
fromdatetimeimporttimedeltafrompathlibimportPathfromtimeitimporttimeitimportnumpyasnpfromraysect.core.math.function.float.function3d.interpolateimportDiscrete3DMeshfromraysect.primitive.mesh.tetra_meshimportTetraMeshDatadefload_mesh(mesh_filepath):
vertices= []
tetrahedra= []
withopen(mesh_filepath, "r") asf:
lines=f.readlines()
i=0whilei<len(lines):
line=lines[i].strip()
ifnotlineorline.startswith("#"):
i+=1continue# Check section headers (case-sensitive)ifline=="Vertices":
i+=1vertex_count=int(lines[i].strip())
i+=1for_inrange(vertex_count):
parts=lines[i].strip().split()
# take only the first 3 coordinatesvertices.append([float(v) forvinparts[:3]])
i+=1continueelifline=="Tetrahedra":
i+=1tet_count=int(lines[i].strip())
i+=1for_inrange(tet_count):
parts=lines[i].strip().split()
# take only the first 4 indices, converting them to int.tetrahedra.append([int(idx) foridxinparts[:4]])
i+=1continuei+=1vertices=np.array(vertices)
tetrahedra=np.array(tetrahedra, dtype=np.int32) -1# 0-based indexingreturnvertices, tetrahedradefcreate_discrete3dmesh(vertices, tetrahedra):
returnDiscrete3DMesh(
vertices, tetrahedra, np.ones((tetrahedra.shape[0])), False, 0
)
defcreate_tetrameshdata(vertices, tetrahedra):
returnTetraMeshData(vertices, tetrahedra)
defload_tetrameshdata(mesh_filepath):
returnTetraMeshData.from_file(mesh_filepath)
if__name__=="__main__":
ROOT=Path(__file__).parentmesh_file=ROOT/"demos"/"resources"/"stanford_bunny.mesh"vertices, tetrahedra=load_mesh(mesh_file)
# Save tetramesh data in advancetetra=TetraMeshData(vertices, tetrahedra)
tetra_file=ROOT/"temp_tetra.rsm"tetra.save(tetra_file)
# === Measure time ===loop=5# create Discrete3DMeshresult=timeit(
"create_discrete3dmesh(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create Discrete3DMesh: {elapsed_time}")
# create TetraMeshDataresult=timeit(
"create_tetrameshdata(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create TetraMeshData: {elapsed_time}")
# load TetraMeshData from fileresult=timeit("load_tetrameshdata(tetra_file)", globals=globals(), number=loop)
elapsed_time=timedelta(seconds=result/loop)
print(f"Load TetraMeshData from file: {elapsed_time}")

Class structure

The structure of the TetraMeshData I implemented is as follows.

classDiagram
class KDTree3DCore {
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
}
class TetraMeshData {
+__init__(object vertices, object tetrahedra, bint tolerant=True)
+__getstate__()
+__setstate__(state)
+__reduce__()
+vertices
+tetrahedra
+Point3D vertex(int index)
+ndarray tetrahedron(int index)
+Point3D barycenter(int index)
+double volume(int index)
+double volume_total()
+BoundingBox3D bounding_box(AffineMatrix3D to_world)
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
+classmethod from_file(cls, file)
}
KDTree3DCore <|-- TetraMeshData
Loading

Details of unit test

I also implemented a unit test for TestMeshData in raysect/primitive/mesh/tests/test_tetra_mesh.py.
Below is a table showing the correspondence between the methods of the TestTetraMeshData class in unit tests and the methods tested in the TestMeshData class.

Test Method Name in TestTetraMeshDataTested Method/Function in TetraMeshData
test_initialization()__init__()
test_invalid_tetrahedron_indices()__init__()
test_vertex_method()vertex()
test_invalid_vertex_index()vertex()
test_barycenter()barycenter()
test_compute_volume()volume(), volume_total()
test_is_contained()is_contained()
test_bounding_box()bounding_box()
test_pickle_state ()__getstate__(), __setstate__(), save(), load()

I would appreciate it if you would review it and make any suggestions and comments.

@munechika-koyo
munechika-koyo marked this pull request as ready for review February 15, 2025 12:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@munechika-koyo
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Add TetraMeshData class - #441

Open
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh
Open

Add TetraMeshData class#441
munechika-koyo wants to merge 5 commits into
raysect:masterfrom
munechika-koyo:feature/tetra_mesh

Conversation

@munechika-koyo

@munechika-koyomunechika-koyo commented Feb 15, 2025

Copy link
Copy Markdown
Contributor

Proposal of new feature: TetraMeshData

TL;DR: Reading files in the created tree structure will greatly enhance the speed of the process with this PR.

Description

I would propose a new feature, the TetraMeshData class, modeled after the existing MeshData definition.
(I have already suggested #407 but would like to split the function.)

It was implemented with the following objectives:

  • Saving/Loading from the file formatted .rsm, which has constructed a K-D tree structure.
  • Offering useful methods like calculating a tetrahedral volume and barycenter.

Additionally, this class will be used when loading mesh files formatted as .vtk or .obj, which contain tetrahedral (3-D unstructured) mesh data in the future.

Examples of the use:

  1. Creating the instance of TetraMeshData
>>>fromraysect.primitive.mesh.tetra_meshimportTetraMeshData>>>verts= [[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]]
>>>tets= [[0, 1, 2, 3]]
>>>tetra=TetraMeshData(verts, tets)
  1. Calculating the volume of a tetrahedron
>>>tetra.volume(0)
0.166666# == 1 x 1 x 0.5 / 3.0>>>tetra.volume_total()
0.166666
  1. Calculating the barycenter of a tetrahedron
>>>tetra.barycenter(0)
Point3D(0.25, 0.25, 0.25)
  1. Saving as .rsm
>>>tetra.save("tetra.rsm")
  1. Loading from a .rsm file
>>>TetraMeshData.from_file("tetra.rsm")
<raysect.primitive.mesh.tetra_mesh.TetraMeshDataat0x1336e7440>

Speed test

I attempted to compare the instancing of Discrete3DMesh with TetraMeshData loaded from a file.
As a mesh file, I used the stanford_bunny.mesh file located in demos/resources/.

elapse time (sec)
Create Discrete3DMesh15.441215
Create TetraMeshData15.894989
Load TetraMeshData from file01.766619

I attained a loading speed for tetra mesh that is approximately 9 times faster than generating TetraMeshData using vertices and tetrahedral index arrays.
This difference is expected to widen as the vertex data size increases.
The test script that I used is in the collapsed section below.

Test script
fromdatetimeimporttimedeltafrompathlibimportPathfromtimeitimporttimeitimportnumpyasnpfromraysect.core.math.function.float.function3d.interpolateimportDiscrete3DMeshfromraysect.primitive.mesh.tetra_meshimportTetraMeshDatadefload_mesh(mesh_filepath):
vertices= []
tetrahedra= []
withopen(mesh_filepath, "r") asf:
lines=f.readlines()
i=0whilei<len(lines):
line=lines[i].strip()
ifnotlineorline.startswith("#"):
i+=1continue# Check section headers (case-sensitive)ifline=="Vertices":
i+=1vertex_count=int(lines[i].strip())
i+=1for_inrange(vertex_count):
parts=lines[i].strip().split()
# take only the first 3 coordinatesvertices.append([float(v) forvinparts[:3]])
i+=1continueelifline=="Tetrahedra":
i+=1tet_count=int(lines[i].strip())
i+=1for_inrange(tet_count):
parts=lines[i].strip().split()
# take only the first 4 indices, converting them to int.tetrahedra.append([int(idx) foridxinparts[:4]])
i+=1continuei+=1vertices=np.array(vertices)
tetrahedra=np.array(tetrahedra, dtype=np.int32) -1# 0-based indexingreturnvertices, tetrahedradefcreate_discrete3dmesh(vertices, tetrahedra):
returnDiscrete3DMesh(
vertices, tetrahedra, np.ones((tetrahedra.shape[0])), False, 0
)
defcreate_tetrameshdata(vertices, tetrahedra):
returnTetraMeshData(vertices, tetrahedra)
defload_tetrameshdata(mesh_filepath):
returnTetraMeshData.from_file(mesh_filepath)
if__name__=="__main__":
ROOT=Path(__file__).parentmesh_file=ROOT/"demos"/"resources"/"stanford_bunny.mesh"vertices, tetrahedra=load_mesh(mesh_file)
# Save tetramesh data in advancetetra=TetraMeshData(vertices, tetrahedra)
tetra_file=ROOT/"temp_tetra.rsm"tetra.save(tetra_file)
# === Measure time ===loop=5# create Discrete3DMeshresult=timeit(
"create_discrete3dmesh(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create Discrete3DMesh: {elapsed_time}")
# create TetraMeshDataresult=timeit(
"create_tetrameshdata(vertices, tetrahedra)", globals=globals(), number=loop
)
elapsed_time=timedelta(seconds=result/loop)
print(f"Create TetraMeshData: {elapsed_time}")
# load TetraMeshData from fileresult=timeit("load_tetrameshdata(tetra_file)", globals=globals(), number=loop)
elapsed_time=timedelta(seconds=result/loop)
print(f"Load TetraMeshData from file: {elapsed_time}")

Class structure

The structure of the TetraMeshData I implemented is as follows.

classDiagram
class KDTree3DCore {
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
}
class TetraMeshData {
+__init__(object vertices, object tetrahedra, bint tolerant=True)
+__getstate__()
+__setstate__(state)
+__reduce__()
+vertices
+tetrahedra
+Point3D vertex(int index)
+ndarray tetrahedron(int index)
+Point3D barycenter(int index)
+double volume(int index)
+double volume_total()
+BoundingBox3D bounding_box(AffineMatrix3D to_world)
+bint is_contained(Point3D point)
+void save(object file)
+void load(object file)
+classmethod from_file(cls, file)
}
KDTree3DCore <|-- TetraMeshData
Loading

Details of unit test

I also implemented a unit test for TestMeshData in raysect/primitive/mesh/tests/test_tetra_mesh.py.
Below is a table showing the correspondence between the methods of the TestTetraMeshData class in unit tests and the methods tested in the TestMeshData class.

Test Method Name in TestTetraMeshDataTested Method/Function in TetraMeshData
test_initialization()__init__()
test_invalid_tetrahedron_indices()__init__()
test_vertex_method()vertex()
test_invalid_vertex_index()vertex()
test_barycenter()barycenter()
test_compute_volume()volume(), volume_total()
test_is_contained()is_contained()
test_bounding_box()bounding_box()
test_pickle_state ()__getstate__(), __setstate__(), save(), load()

I would appreciate it if you would review it and make any suggestions and comments.

@munechika-koyo
munechika-koyo marked this pull request as ready for review February 15, 2025 12:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@munechika-koyo