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.

Sign up for GitHub

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

Jump to bottom

Port rest of reference counting validation checks to new infrastructure #2368

Merged
merged 18 commits into from
May 29, 2024
Merged

Port rest of reference counting validation checks to new infrastructure #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
15f47a2
Clean up imports
hannobraun May 29, 2024
9da967d
Port part of validation test to new infrastructure
hannobraun May 29, 2024
96617ee
Port part of validation test to new infrastructure
hannobraun May 29, 2024
e5d7a54
Port part of validation test to new infrastructure
hannobraun May 29, 2024
d714275
Port rest of validation test to new infrastructure
hannobraun May 29, 2024
8743c60
Move tests closer to code under test
hannobraun May 29, 2024
d5cb497
Make test names more specific
hannobraun May 29, 2024
57269cf
Update test names
hannobraun May 29, 2024
4ed903e
Simplify variable names
hannobraun May 29, 2024
4031971
Simplify variable names
hannobraun May 29, 2024
27b84a0
Prepare for follow-on change
hannobraun May 29, 2024
ba5d82c
Use more targeted test condition
hannobraun May 29, 2024
d3ac878
Derive invalid solid from valid one
hannobraun May 29, 2024
1fe77d0
Derive invalid solid from valid one
hannobraun May 29, 2024
73d9b16
Derive invalid solid from valid one
hannobraun May 29, 2024
6fd750b
Derive invalid solid from valid one
hannobraun May 29, 2024
f4a5d90
Use more targeted test conditions
hannobraun May 29, 2024
5a91557
Make helper struct private
hannobraun May 29, 2024
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
261 changes: 26 additions & 235 deletions crates/fj-core/src/validate/solid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::iter::repeat;
use crate::{
geometry::Geometry,
storage::Handle,
topology::{Solid, Vertex},
validation::checks::ReferenceCounter,
topology::{Cycle, Face, HalfEdge, Region, Shell, Solid, Vertex},
validation::{checks::MultipleReferencesToObject, ValidationCheck},
};
use fj_math::Point;

Expand All @@ -17,8 +17,31 @@ impl Validate for Solid {
errors: &mut Vec<ValidationError>,
geometry: &Geometry,
) {
errors.extend(
MultipleReferencesToObject::<Face, Shell>::check(
self, geometry, config,
)
.map(Into::into),
);
errors.extend(
MultipleReferencesToObject::<Region, Face>::check(
self, geometry, config,
)
.map(Into::into),
);
errors.extend(
MultipleReferencesToObject::<Cycle, Region>::check(
self, geometry, config,
)
.map(Into::into),
);
errors.extend(
MultipleReferencesToObject::<HalfEdge, Cycle>::check(
self, geometry, config,
)
.map(Into::into),
);
SolidValidationError::check_vertices(self, geometry, config, errors);
SolidValidationError::check_object_references(self, config, errors);
}
}

Expand Down Expand Up @@ -134,236 +157,4 @@ impl SolidValidationError {
}
}
}

fn check_object_references(
solid: &Solid,
_config: &ValidationConfig,
errors: &mut Vec<ValidationError>,
) {
let mut faces = ReferenceCounter::new();
let mut regions = ReferenceCounter::new();
let mut cycles = ReferenceCounter::new();
let mut half_edges = ReferenceCounter::new();

solid.shells().iter().for_each(|s| {
s.faces().into_iter().for_each(|f| {
faces.count(f.clone(), s.clone());
regions.count(f.region().clone(), f.clone());
f.region().all_cycles().for_each(|c| {
cycles.count(c.clone(), f.region().clone());
c.half_edges().into_iter().for_each(|e| {
half_edges.count(e.clone(), c.clone());
})
})
})
});

errors.extend(faces.multiples().map(Into::into));
errors.extend(regions.multiples().map(Into::into));
errors.extend(cycles.multiples().map(Into::into));
errors.extend(half_edges.multiples().map(Into::into));
}
}

#[cfg(test)]
mod tests {
use crate::{
assert_contains_err,
geometry::GlobalPath,
operations::{
build::{BuildFace, BuildHalfEdge, BuildSurface},
insert::Insert,
},
topology::{Cycle, Face, HalfEdge, Region, Shell, Solid, Surface},
validate::{Validate, ValidationError},
Core,
};

#[test]
fn should_find_face_multiple_references() -> anyhow::Result<()> {
let mut core = Core::new();

let surface = Surface::from_uv(
GlobalPath::circle_from_radius(1.),
[0., 1., 1.],
&mut core,
);

let shared_face = Face::new(
surface.clone(),
Region::new(
Cycle::new(vec![HalfEdge::circle(
[0., 0.],
1.,
surface,
&mut core,
)])
.insert(&mut core),
vec![],
)
.insert(&mut core),
)
.insert(&mut core);

let invalid_solid = Solid::new(vec![
Shell::new(vec![shared_face.clone()]).insert(&mut core),
Shell::new(vec![
shared_face,
Face::triangle(
[[0., 0., 0.], [1., 0., 0.], [1., 1., 0.]],
&mut core,
)
.insert(&mut core)
.face,
])
.insert(&mut core),
])
.insert(&mut core);

assert_contains_err!(
core,
invalid_solid,
ValidationError::MultipleReferencesToFace(_)
);

let valid_solid = Solid::new(vec![]).insert(&mut core);
valid_solid.validate_and_return_first_error(&core.layers.geometry)?;

// Ignore remaining validation errors.
let _ = core.layers.validation.take_errors();

Ok(())
}

#[test]
fn should_find_region_multiple_references() -> anyhow::Result<()> {
let mut core = Core::new();

let surface = Surface::from_uv(
GlobalPath::circle_from_radius(1.),
[0., 0., 1.],
&mut core,
);

let shared_region = Region::new(
Cycle::new(vec![HalfEdge::circle(
[0., 0.],
1.,
surface.clone(),
&mut core,
)])
.insert(&mut core),
vec![],
)
.insert(&mut core);

let invalid_solid = Solid::new(vec![Shell::new(vec![
Face::new(surface.clone(), shared_region.clone()).insert(&mut core),
Face::new(surface, shared_region.clone()).insert(&mut core),
])
.insert(&mut core)])
.insert(&mut core);

assert_contains_err!(
core,
invalid_solid,
ValidationError::MultipleReferencesToRegion(_)
);

let valid_solid = Solid::new(vec![]).insert(&mut core);
valid_solid.validate_and_return_first_error(&core.layers.geometry)?;

// Ignore remaining validation errors.
let _ = core.layers.validation.take_errors();

Ok(())
}

#[test]
fn should_find_cycle_multiple_references() -> anyhow::Result<()> {
let mut core = Core::new();

let surface = Surface::from_uv(
GlobalPath::circle_from_radius(1.),
[0., 0., 1.],
&mut core,
);

let shared_cycle = Cycle::new(vec![HalfEdge::circle(
[0., 0.],
1.,
surface.clone(),
&mut core,
)])
.insert(&mut core);

let invalid_solid = Solid::new(vec![Shell::new(vec![
Face::new(
surface.clone(),
Region::new(shared_cycle.clone(), vec![]).insert(&mut core),
)
.insert(&mut core),
Face::new(
surface,
Region::new(shared_cycle, vec![]).insert(&mut core),
)
.insert(&mut core),
])
.insert(&mut core)])
.insert(&mut core);

assert_contains_err!(
core,
invalid_solid,
ValidationError::MultipleReferencesToCycle(_)
);

let valid_solid = Solid::new(vec![]).insert(&mut core);
valid_solid.validate_and_return_first_error(&core.layers.geometry)?;

// Ignore remaining validation errors.
let _ = core.layers.validation.take_errors();

Ok(())
}

#[test]
fn should_find_half_edge_multiple_references() -> anyhow::Result<()> {
let mut core = Core::new();

let surface = Surface::from_uv(
GlobalPath::circle_from_radius(1.),
[0., 0., 1.],
&mut core,
);

let shared_edge =
HalfEdge::circle([0., 0.], 1., surface.clone(), &mut core);

let invalid_solid = Solid::new(vec![Shell::new(vec![Face::new(
surface,
Region::new(
Cycle::new(vec![shared_edge.clone()]).insert(&mut core),
vec![Cycle::new(vec![shared_edge.clone()]).insert(&mut core)],
)
.insert(&mut core),
)
.insert(&mut core)])
.insert(&mut core)])
.insert(&mut core);

assert_contains_err!(
core,
invalid_solid,
ValidationError::MultipleReferencesToHalfEdge(_)
);

let valid_solid = Solid::new(vec![]).insert(&mut core);
valid_solid.validate_and_return_first_error(&core.layers.geometry)?;

// Ignore remaining validation errors.
let _ = core.layers.validation.take_errors();

Ok(())
}
}
2 changes: 1 addition & 1 deletion crates/fj-core/src/validation/checks/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ pub use self::{
face_winding::InteriorCycleHasInvalidWinding,
half_edge_connection::AdjacentHalfEdgesNotConnected,
half_edge_has_no_sibling::HalfEdgeHasNoSibling,
multiple_references::{MultipleReferencesToObject, ReferenceCounter},
multiple_references::MultipleReferencesToObject,
};
Loading