init
This commit is contained in:
parent
a56705383f
commit
f6833a3d48
4 changed files with 200 additions and 0 deletions
17
Cargo.lock
generated
17
Cargo.lock
generated
|
|
@ -20,6 +20,12 @@ version = "0.2.16"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
|
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anyhow"
|
||||||
|
version = "1.0.81"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "approx"
|
name = "approx"
|
||||||
version = "0.5.1"
|
version = "0.5.1"
|
||||||
|
|
@ -474,6 +480,16 @@ dependencies = [
|
||||||
"wide",
|
"wide",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "simple_delaunay_lib"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "git+https://github.com/ibujah/simple_delaunay_lib#2812ea85f936723bb9ae3a1cd131589738b41821"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"log",
|
||||||
|
"robust 1.1.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "smallvec"
|
name = "smallvec"
|
||||||
version = "1.13.2"
|
version = "1.13.2"
|
||||||
|
|
@ -577,6 +593,7 @@ dependencies = [
|
||||||
"itertools 0.12.1",
|
"itertools 0.12.1",
|
||||||
"rand",
|
"rand",
|
||||||
"rayon",
|
"rayon",
|
||||||
|
"simple_delaunay_lib",
|
||||||
"statrs",
|
"statrs",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,10 @@ edition = "2021"
|
||||||
[lib]
|
[lib]
|
||||||
name = "xenobalanus"
|
name = "xenobalanus"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = ["three-d"]
|
||||||
|
three-d = ["dep:simple_delaunay_lib"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
delaunator = "1.0.2"
|
delaunator = "1.0.2"
|
||||||
geo = "0.28.0"
|
geo = "0.28.0"
|
||||||
|
|
@ -14,3 +18,4 @@ itertools = "0.12.1"
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
rayon = "1.9.0"
|
rayon = "1.9.0"
|
||||||
statrs = "0.16.0"
|
statrs = "0.16.0"
|
||||||
|
simple_delaunay_lib = { version = "0.2.0", git = "https://github.com/ibujah/simple_delaunay_lib", optional = true }
|
||||||
10
src/lib.rs
10
src/lib.rs
|
|
@ -6,6 +6,10 @@ use std::cmp::{min, max};
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
|
|
||||||
|
#[cfg(feature = "three-d")]
|
||||||
|
use simple_delaunay_lib::delaunay_3d::delaunay_struct_3d::DelaunayStructure3D;
|
||||||
|
mod threedee;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy)]
|
||||||
pub struct Point {
|
pub struct Point {
|
||||||
pub x: f32,
|
pub x: f32,
|
||||||
|
|
@ -166,6 +170,9 @@ pub struct Xenobalanus {
|
||||||
geometry_data: GeometryData,
|
geometry_data: GeometryData,
|
||||||
points: Vec<Point>,
|
points: Vec<Point>,
|
||||||
triangulation: Vec<usize>,
|
triangulation: Vec<usize>,
|
||||||
|
#[cfg(feature = "three-d")]
|
||||||
|
nodes: Vec<crate::threedee::Point3D>,
|
||||||
|
tetrahedrons: DelaunayStructure3D,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Xenobalanus {
|
impl Xenobalanus {
|
||||||
|
|
@ -174,6 +181,9 @@ impl Xenobalanus {
|
||||||
geometry_data: GeometryData::new(),
|
geometry_data: GeometryData::new(),
|
||||||
points: Vec::new(),
|
points: Vec::new(),
|
||||||
triangulation: Vec::new(),
|
triangulation: Vec::new(),
|
||||||
|
#[cfg(feature = "three-d")]
|
||||||
|
nodes: Vec::new(),
|
||||||
|
tetrahedrons: DelaunayStructure3D::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
168
src/threedee.rs
Normal file
168
src/threedee.rs
Normal file
|
|
@ -0,0 +1,168 @@
|
||||||
|
use rand::Rng;
|
||||||
|
use simple_delaunay_lib::delaunay_3d::simplicial_struct_3d::Node;
|
||||||
|
use std::cmp::{min, max};
|
||||||
|
use std::collections::HashSet;
|
||||||
|
|
||||||
|
use super::{Edge, Xenobalanus};
|
||||||
|
|
||||||
|
pub struct Point3D {
|
||||||
|
x: f32,
|
||||||
|
y: f32,
|
||||||
|
z: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Point3D {
|
||||||
|
|
||||||
|
pub fn new(coords: (f32, f32, f32)) -> Point3D {
|
||||||
|
Point3D {x: coords.0, y: coords.1, z: coords.2 }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn arr(&self) -> [f64; 3] {
|
||||||
|
[self.x as f64, self.y as f64, self.z as f64]
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn distance(&self,point: &Point3D) -> f32 {
|
||||||
|
(
|
||||||
|
(point.x - &self.x).powi(2) +
|
||||||
|
(point.y - &self.y).powi(2) +
|
||||||
|
(point.z - &self.z).powi(2)
|
||||||
|
).sqrt()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Xenobalanus {
|
||||||
|
|
||||||
|
pub fn random_points_3d(&mut self, center: (f32, f32), side_length: f32, num_points: u32) {
|
||||||
|
|
||||||
|
// generate random points in a cube
|
||||||
|
let min_x = center.0 - side_length / 2.0;
|
||||||
|
let max_x = center.0 + side_length / 2.0;
|
||||||
|
let min_y = center.1 - side_length / 2.0;
|
||||||
|
let max_y = center.1 + side_length / 2.0;
|
||||||
|
let min_z = center.0 - side_length / 2.0;
|
||||||
|
let max_z = center.0 + side_length / 2.0;
|
||||||
|
let mut rng: rand::prelude::ThreadRng = rand::thread_rng();
|
||||||
|
for _ in 0..num_points {
|
||||||
|
let x = min_x + rng.gen_range(0.0..=1.0) as f32 * ( max_x - min_x);
|
||||||
|
let y: f32 = min_y + rng.gen_range(0.0..=1.0) as f32 * ( max_y - min_y);
|
||||||
|
let z: f32 = min_y + rng.gen_range(0.0..=1.0) as f32 * ( max_z - min_z);
|
||||||
|
self.nodes.push(Point3D {x, y, z});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn delaunay_3d(&mut self) {
|
||||||
|
|
||||||
|
let vertices: Vec<[f64; 3]> = self.nodes.iter().map(|node| {
|
||||||
|
node.arr()
|
||||||
|
}).collect();
|
||||||
|
self.tetrahedrons.insert_vertices(&vertices, true).unwrap_or_default();
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_tetrahedron_inf(&mut self, vertex1: usize, vertex2: usize, vertex3: usize) {
|
||||||
|
|
||||||
|
let p1 = self.tetrahedrons.get_vertices()[vertex1];
|
||||||
|
let p2 = self.tetrahedrons.get_vertices()[vertex2];
|
||||||
|
let p3 = self.tetrahedrons.get_vertices()[vertex3];
|
||||||
|
|
||||||
|
let n1 = Point3D::new((p1[0] as f32, p1[1] as f32, p1[2] as f32));
|
||||||
|
let n2 = Point3D::new((p2[0] as f32, p2[1] as f32, p2[2] as f32));
|
||||||
|
let n3 = Point3D::new((p3[0] as f32, p3[1] as f32, p3[2] as f32));
|
||||||
|
|
||||||
|
let l12 = n1.distance(&n2);
|
||||||
|
let l23 = n2.distance(&n3);
|
||||||
|
let l31 = n3.distance(&n1);
|
||||||
|
|
||||||
|
let edge1 = Edge(min(vertex1, vertex2), max(vertex1, vertex2));
|
||||||
|
let edge2 = Edge(min(vertex2, vertex3), max(vertex2, vertex3));
|
||||||
|
let edge3 = Edge(min(vertex3, vertex1), max(vertex3, vertex1));
|
||||||
|
|
||||||
|
self.geometry_data.edge_lengths.insert(edge1, l12);
|
||||||
|
self.geometry_data.edge_lengths.insert(edge2, l23);
|
||||||
|
self.geometry_data.edge_lengths.insert(edge3, l31);
|
||||||
|
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex1).or_insert_with(HashSet::new).insert(vertex2);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex2).or_insert_with(HashSet::new).insert(vertex1);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex2).or_insert_with(HashSet::new).insert(vertex3);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex3).or_insert_with(HashSet::new).insert(vertex2);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex3).or_insert_with(HashSet::new).insert(vertex1);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex1).or_insert_with(HashSet::new).insert(vertex3);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_tetrahedron(&mut self, vertex1: usize, vertex2: usize, vertex3: usize, vertex4: usize) {
|
||||||
|
|
||||||
|
let p1 = self.tetrahedrons.get_vertices()[vertex1];
|
||||||
|
let p2 = self.tetrahedrons.get_vertices()[vertex2];
|
||||||
|
let p3 = self.tetrahedrons.get_vertices()[vertex3];
|
||||||
|
let p4 = self.tetrahedrons.get_vertices()[vertex4];
|
||||||
|
|
||||||
|
let n1 = Point3D::new((p1[0] as f32, p1[1] as f32, p1[2] as f32));
|
||||||
|
let n2 = Point3D::new((p2[0] as f32, p2[1] as f32, p2[2] as f32));
|
||||||
|
let n3 = Point3D::new((p3[0] as f32, p3[1] as f32, p3[2] as f32));
|
||||||
|
let n4 = Point3D::new((p4[0] as f32, p4[1] as f32, p4[2] as f32));
|
||||||
|
|
||||||
|
let l12 = &n1.distance(&n2);
|
||||||
|
let l23 = &n2.distance(&n3);
|
||||||
|
let l34 = &n3.distance(&n4);
|
||||||
|
let l41 = &n4.distance(&n1);
|
||||||
|
|
||||||
|
let edge1 = Edge(min(vertex1, vertex2), max(vertex1, vertex2));
|
||||||
|
let edge2 = Edge(min(vertex2, vertex3), max(vertex2, vertex3));
|
||||||
|
let edge3 = Edge(min(vertex3, vertex4), max(vertex3, vertex4));
|
||||||
|
let edge4 = Edge(min(vertex4, vertex1), max(vertex4, vertex1));
|
||||||
|
|
||||||
|
self.geometry_data.edge_lengths.insert(edge1, *l12);
|
||||||
|
self.geometry_data.edge_lengths.insert(edge2, *l23);
|
||||||
|
self.geometry_data.edge_lengths.insert(edge3, *l34);
|
||||||
|
self.geometry_data.edge_lengths.insert(edge4, *l41);
|
||||||
|
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex1).or_insert_with(HashSet::new).insert(vertex2);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex2).or_insert_with(HashSet::new).insert(vertex1);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex2).or_insert_with(HashSet::new).insert(vertex3);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex3).or_insert_with(HashSet::new).insert(vertex2);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex3).or_insert_with(HashSet::new).insert(vertex4);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex4).or_insert_with(HashSet::new).insert(vertex3);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex4).or_insert_with(HashSet::new).insert(vertex1);
|
||||||
|
self.geometry_data.vertex_connections.entry(vertex1).or_insert_with(HashSet::new).insert(vertex4);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn preprocess_3d(&mut self) {
|
||||||
|
let structure = self.tetrahedrons.get_simplicial();
|
||||||
|
let num_tetras = structure.get_nb_tetrahedra();
|
||||||
|
|
||||||
|
for tetra_idx in 0..num_tetras {
|
||||||
|
let tetrahedron = match self.tetrahedrons.get_simplicial().get_tetrahedron(tetra_idx) {
|
||||||
|
Ok(tetra) => tetra.nodes(),
|
||||||
|
Err(_) => {
|
||||||
|
println!("Error getting tetrahedron at index {}", tetra_idx);
|
||||||
|
continue; // Skip this iteration and proceed with the next one
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let [node1, node2, node3, node4] = tetrahedron;
|
||||||
|
match (node1, node2, node3, node4) {
|
||||||
|
(Node::Infinity, Node::Value(ind_v2), Node::Value(ind_v3), Node::Value(ind_v4)) => {
|
||||||
|
self.add_tetrahedron_inf(ind_v2, ind_v3, ind_v4);
|
||||||
|
},
|
||||||
|
(Node::Value(ind_v1), Node::Infinity, Node::Value(ind_v3), Node::Value(ind_v4)) => {
|
||||||
|
self.add_tetrahedron_inf(ind_v3, ind_v4, ind_v1);
|
||||||
|
},
|
||||||
|
(Node::Value(ind_v1), Node::Value(ind_v2), Node::Infinity, Node::Value(ind_v4)) => {
|
||||||
|
self.add_tetrahedron_inf(ind_v4, ind_v1, ind_v2);
|
||||||
|
},
|
||||||
|
(Node::Value(ind_v1), Node::Value(ind_v2), Node::Value(ind_v3), Node::Infinity) => {
|
||||||
|
self.add_tetrahedron_inf(ind_v1, ind_v2, ind_v3);
|
||||||
|
},
|
||||||
|
(Node::Value(ind_v1), Node::Value(ind_v2), Node::Value(ind_v3), Node::Value(ind_v4)) => {
|
||||||
|
self.add_tetrahedron(ind_v1, ind_v2, ind_v3, ind_v4);
|
||||||
|
},
|
||||||
|
(_, _, _, _) => {
|
||||||
|
println!("Encountered an unexpected pattern of nodes");
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue