Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant validation check #2267

Merged
merged 1 commit into from
Mar 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 3 additions & 93 deletions crates/fj-core/src/validate/edge.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use fj_math::{Point, Scalar};

use crate::{
geometry::Geometry,
objects::HalfEdge,
Expand All @@ -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 {}