Skip to content

fix(SurfaceBuilder): enable reproductible computation of polygon adja… #1258

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

Closed
panquez wants to merge 1 commit into from
Closed

fix(SurfaceBuilder): enable reproductible computation of polygon adja… #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/geode/mesh/builder/surface_mesh_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
}

template < geode::index_t dimension >
void update_polygon_around( const geode::SurfaceMesh< dimension >& surface,

Check warning on line 175 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:175:10 [readability-function-cognitive-complexity] 

function 'update_polygon_around' has cognitive complexity of 20 (threshold 10)
geode::SurfaceMeshBuilder< dimension >& builder,
absl::Span< const geode::index_t > old2new )
{
Expand Down Expand Up @@ -298,7 +298,7 @@
}

template < geode::index_t dimension >
geode::BijectiveMapping< geode::index_t > update_edge(

Check warning on line 301 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:301:47 [readability-function-size] 

function 'update_edge' exceeds recommended size/complexity thresholds
const geode::SurfaceMesh< dimension >& surface,
geode::SurfaceMeshBuilder< dimension >& builder,
const geode::PolygonVertex& polygon_vertex,
Expand Down Expand Up @@ -437,7 +437,7 @@
}

template < index_t dimension >
void SurfaceMeshBuilder< dimension >::replace_vertices(

Check warning on line 440 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:440:43 [readability-function-cognitive-complexity] 

function 'replace_vertices' has cognitive complexity of 12 (threshold 10)
const GenericMapping< index_t >& vertices_mapping )
{
for( const auto p : Range{ surface_mesh_.nb_polygons() } )
Expand All @@ -452,7 +452,7 @@
{
continue;
}
const auto old2news = vertices_mapping.in2out( old_vertex_id );

Check warning on line 455 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:455:28 [performance-unnecessary-copy-initialization] 

the const qualified variable 'old2news' is copy-constructed from a const reference; consider making it a const reference
OPENGEODE_ASSERT( old2news.size() == 1,
"[SurfaceMeshBuilder::replace_vertices] "
"Invalid mapping" );
Expand Down Expand Up @@ -523,7 +523,7 @@
for( const auto v :
LRange{ surface_mesh_.nb_polygon_vertices( p ) } )
{
const PolygonVertex id{ p, v };

Check warning on line 526 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:526:37 [readability-identifier-length] 

variable name 'id' is too short, expected at least 3 characters
const auto old_vertex = surface_mesh_.polygon_vertex( id );
const auto new_vertex = old2new[old_vertex];
OPENGEODE_ASSERT( new_vertex != NO_ID,
Expand Down Expand Up @@ -616,7 +616,7 @@
}

template < index_t dimension >
void SurfaceMeshBuilder< dimension >::compute_polygon_adjacencies(

Check warning on line 619 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:619:43 [readability-function-cognitive-complexity] 

function 'compute_polygon_adjacencies' has cognitive complexity of 40 (threshold 10)
absl::Span< const index_t > polygons_to_connect )
{
if( surface_mesh_.are_edges_enabled() )
Expand Down Expand Up @@ -654,7 +654,7 @@
else
{
using Edge = detail::VertexCycle< std::array< index_t, 2 > >;
absl::flat_hash_map< Edge, PolygonEdge > edges;
absl::linked_hash_map< Edge, PolygonEdge > edges;
for( const auto polygon : polygons_to_connect )
{
for( const auto e :
Expand Down Expand Up @@ -710,10 +710,10 @@
}

template < index_t dimension >
std::vector< index_t > SurfaceMeshBuilder< dimension >::delete_polygons(

Check warning on line 713 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:713:61 [readability-function-cognitive-complexity] 

function 'delete_polygons' has cognitive complexity of 11 (threshold 10)
const std::vector< bool >& to_delete )
{
const auto old2new = detail::mapping_after_deletion( to_delete );

Check failure on line 716 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:716:38 [clang-diagnostic-error] 

no member named 'mapping_after_deletion' in namespace 'geode::detail'
if( absl::c_find( to_delete, true ) == to_delete.end() )
{
return old2new;
Expand Down Expand Up @@ -777,7 +777,7 @@
}

template < geode::index_t dimension >
void SurfaceMeshBuilder< dimension >::update_polygon_adjacencies(

Check warning on line 780 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:780:43 [readability-function-cognitive-complexity] 

function 'update_polygon_adjacencies' has cognitive complexity of 11 (threshold 10)
absl::Span< const geode::index_t > old2new )
{
for( const auto p : geode::Range{ surface_mesh_.nb_polygons() } )
Expand All @@ -785,7 +785,7 @@
for( const auto e :
geode::LRange{ surface_mesh_.nb_polygon_edges( p ) } )
{
const geode::PolygonEdge id{ p, e };

Check warning on line 788 in src/geode/mesh/builder/surface_mesh_builder.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/builder/surface_mesh_builder.cpp:788:42 [readability-identifier-length] 

variable name 'id' is too short, expected at least 3 characters
if( const auto adj = surface_mesh_.polygon_adjacent( id ) )
{
const auto new_adjacent = old2new[adj.value()];
Expand Down
2 changes: 0 additions & 2 deletions src/geode/mesh/core/solid_edges.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

#include <geode/mesh/core/solid_edges.hpp>

#include <absl/container/flat_hash_set.h>

#include <bitsery/brief_syntax/array.h>

#include <geode/basic/attribute_manager.hpp>
Expand Down Expand Up @@ -65,7 +63,7 @@

public:
Impl() = default;
Impl( const SolidMesh< dimension >& solid )

Check warning on line 66 in src/geode/mesh/core/solid_edges.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/core/solid_edges.cpp:66:9 [google-explicit-constructor] 

single-argument constructors must be marked explicit to avoid unintentional implicit conversions
{
for( const auto p : Range{ solid.nb_polyhedra() } )
{
Expand Down
2 changes: 0 additions & 2 deletions src/geode/mesh/core/solid_facets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

#include <geode/mesh/core/solid_facets.hpp>

#include <absl/container/flat_hash_set.h>

#include <bitsery/brief_syntax/array.h>

#include <geode/basic/attribute_manager.hpp>
Expand Down
2 changes: 0 additions & 2 deletions src/geode/mesh/core/texture_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

#include <geode/mesh/core/texture_manager.hpp>

#include <absl/container/flat_hash_map.h>

#include <bitsery/ext/std_map.h>

#include <geode/basic/attribute_manager.hpp>
Expand Down
2 changes: 0 additions & 2 deletions src/geode/mesh/helpers/repair_polygon_orientations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@

#include <queue>

#include <absl/container/flat_hash_map.h>

#include <geode/basic/logger.hpp>
#include <geode/basic/uuid.hpp>

Expand Down
Loading