Skip to content

Commit

Permalink
Expect &Geometry in ValidationCheck::check
Browse files Browse the repository at this point in the history
  • Loading branch information
hannobraun committed Mar 18, 2024
1 parent 5e2a977 commit ec748fc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
5 changes: 3 additions & 2 deletions crates/fj-core/src/validate/cycle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ impl Validate for Cycle {
&self,
config: &ValidationConfig,
errors: &mut Vec<ValidationError>,
_: &Geometry,
geometry: &Geometry,
) {
errors.extend(
AdjacentHalfEdgesNotConnected::check(self, config).map(Into::into),
AdjacentHalfEdgesNotConnected::check(self, geometry, config)
.map(Into::into),
);
}
}
2 changes: 2 additions & 0 deletions crates/fj-core/src/validation/checks/half_edge_connection.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use fj_math::{Point, Scalar};

use crate::{
geometry::Geometry,
objects::{Cycle, HalfEdge},
storage::Handle,
validation::{validation_check::ValidationCheck, ValidationConfig},
Expand Down Expand Up @@ -40,6 +41,7 @@ pub struct AdjacentHalfEdgesNotConnected {
impl ValidationCheck<Cycle> for AdjacentHalfEdgesNotConnected {
fn check(
object: &Cycle,
_: &Geometry,
config: &ValidationConfig,
) -> impl Iterator<Item = Self> {
object.half_edges().pairs().filter_map(|(first, second)| {
Expand Down
9 changes: 5 additions & 4 deletions crates/fj-core/src/validation/validation_check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pub trait ValidationCheck<T>: Sized {
/// Run the validation check on the implementing object
fn check(
object: &T,
geometry: &Geometry,
config: &ValidationConfig,
) -> impl Iterator<Item = Self>;

Expand All @@ -21,10 +22,10 @@ pub trait ValidationCheck<T>: Sized {
/// for use in unit tests), and thus always uses the default configuration.
fn check_and_return_first_error(
object: &T,
_: &Geometry,
geometry: &Geometry,
) -> Result<(), Self> {
let config = ValidationConfig::default();
let mut errors = Self::check(object, &config);
let mut errors = Self::check(object, geometry, &config);

if let Some(err) = errors.next() {
return Err(err);
Expand All @@ -37,12 +38,12 @@ pub trait ValidationCheck<T>: Sized {
///
/// This method is designed for convenience over flexibility (it is intended
/// for use in unit tests), and thus always uses the default configuration.
fn check_and_expect_one_error(object: &T, _: &Geometry) -> Self
fn check_and_expect_one_error(object: &T, geometry: &Geometry) -> Self
where
Self: Display,
{
let config = ValidationConfig::default();
let mut errors = Self::check(object, &config).peekable();
let mut errors = Self::check(object, geometry, &config).peekable();

let err = errors
.next()
Expand Down

0 comments on commit ec748fc

Please sign in to comment.