rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-01-12 11:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2267 from hannobraun/validation

Browse Source 
Remove redundant validation check
This commit is contained in:
Hanno Braun 2024-03-18 12:27:02 +01:00 committed by GitHub
commit 08c3def6c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
crates/fj-core/src/validate/edge.rs
View File

@ -1,5 +1,3 @@
use fj_math::{Point, Scalar};
use crate::{
geometry::Geometry,
objects::HalfEdge,
@ -11,101 +9,13 @@ use super::Validate;
impl Validate for HalfEdge {
fn validate(
&self,
config: &ValidationConfig,
errors: &mut Vec<ValidationError>,
_: &ValidationConfig,
_: &mut Vec<ValidationError>,
_: &Geometry,
) {
EdgeValidationError::check_vertex_coincidence(self, config, errors);
}
}
/// [`HalfEdge`] validation failed
#[derive(Clone, Debug, thiserror::Error)]
pub enum EdgeValidationError {
/// [`HalfEdge`]'s vertices are coincident
#[error(
"Vertices of `Edge` on curve are coincident\n\
- Position of back vertex: {back_position:?}\n\
- Position of front vertex: {front_position:?}\n\
- `Edge`: {half_edge:#?}"
)]
VerticesAreCoincident {
/// The position of the back vertex
back_position: Point<1>,
/// The position of the front vertex
front_position: Point<1>,
/// The distance between the two vertices
distance: Scalar,
/// The edge
half_edge: HalfEdge,
},
}
impl EdgeValidationError {
fn check_vertex_coincidence(
edge: &HalfEdge,
config: &ValidationConfig,
errors: &mut Vec<ValidationError>,
) {
let [back_position, front_position] = edge.boundary().inner;
let distance = (back_position - front_position).magnitude();
if distance < config.distinct_min_distance {
errors.push(
Self::VerticesAreCoincident {
back_position,
front_position,
distance,
half_edge: edge.clone(),
}
.into(),
);
}
}
}
#[cfg(test)]
mod tests {
use fj_math::Point;
use crate::{
assert_contains_err,
objects::HalfEdge,
operations::build::BuildHalfEdge,
validate::{EdgeValidationError, Validate},
validation::ValidationError,
Core,
};
#[test]
fn edge_vertices_are_coincident() -> anyhow::Result<()> {
let mut core = Core::new();
let valid =
HalfEdge::line_segment([[0., 0.], [1., 0.]], None, &mut core);
let invalid = {
let boundary = [Point::from([0.]); 2];
HalfEdge::new(
valid.path(),
boundary,
valid.curve().clone(),
valid.start_vertex().clone(),
)
};
valid.validate_and_return_first_error(&core.layers.geometry)?;
assert_contains_err!(
core,
invalid,
ValidationError::Edge(
EdgeValidationError::VerticesAreCoincident { .. }
)
);
Ok(())
}
}
pub enum EdgeValidationError {}