Skip to content

Commit 0caddd6

Browse files
MelchiorSchuhMelchiorSchuh
authored
Merge pull request #3 from Geode-solutions/fix/degeneration_criterion
Fix/degeneration criterion
2 parents ab413c8 + ebb710e commit 0caddd6

File tree

11 files changed

+479
-31
lines changed

11 files changed

+479
-31
lines changed

‎include/geode/inspector/criterion/degeneration/edgedcurve_degeneration.h‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (c) 2019 - 2021 Geode-solutions
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
* SOFTWARE.
21+
*
22+
*/
23+
24+
#pragma once
25+
26+
#include <geode/basic/pimpl.h>
27+
28+
#include <geode/inspector/common.h>
29+
30+
namespace geode
31+
{
32+
FORWARD_DECLARATION_DIMENSION_CLASS( EdgedCurve );
33+
} // namespace geode
34+
35+
namespace geode
36+
{
37+
/*!
38+
* Class for inspecting the degeneration of an EdgedCurve
39+
*/
40+
template < index_t dimension >
41+
class opengeode_inspector_inspector_api EdgedCurveDegeneration
42+
{
43+
OPENGEODE_DISABLE_COPY( EdgedCurveDegeneration );
44+
45+
public:
46+
EdgedCurveDegeneration( const EdgedCurve< dimension >& mesh );
47+
~EdgedCurveDegeneration();
48+
49+
bool is_mesh_degenerated() const;
50+
51+
index_t nb_degenerated_edges() const;
52+
53+
std::vector< index_t > degenerated_edges() const;
54+
55+
private:
56+
IMPLEMENTATION_MEMBER( impl_ );
57+
};
58+
ALIAS_2D_AND_3D( EdgedCurveDegeneration );
59+
} // namespace geode

‎include/geode/inspector/criterion/degeneration/solid_degeneration.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@
3030
namespace geode
3131
{
3232
FORWARD_DECLARATION_DIMENSION_CLASS( SolidMesh );
33-
ALIAS_3D( SolidMesh );
3433
} // namespace geode
3534

3635
namespace geode
3736
{
3837
/*!
3938
* Class for inspecting the degeneration of a SolidMesh
4039
*/
40+
template < index_t dimension >
4141
class opengeode_inspector_inspector_api SolidMeshDegeneration
4242
{
4343
OPENGEODE_DISABLE_COPY( SolidMeshDegeneration );
4444

4545
public:
46-
SolidMeshDegeneration( const SolidMesh3D& mesh );
46+
SolidMeshDegeneration( const SolidMesh< dimension >& mesh );
4747
~SolidMeshDegeneration();
4848

4949
bool is_mesh_degenerated() const;
@@ -55,4 +55,5 @@ namespace geode
5555
private:
5656
IMPLEMENTATION_MEMBER( impl_ );
5757
};
58+
ALIAS_2D_AND_3D( SolidMeshDegeneration );
5859
} // namespace geode

‎include/geode/inspector/criterion/private/degeneration_impl.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ namespace geode
3232
/*!
3333
* Implementation of the inspection of the degeneration of a Mesh
3434
*/
35-
template < class MeshType >
36-
class opengeode_inspector_inspector_api DegenerationImpl
35+
template < typename Mesh >
36+
class DegenerationImpl
3737
{
38-
OPENGEODE_DISABLE_COPY( DegenerationImpl );
39-
4038
public:
41-
DegenerationImpl( const MeshType& mesh );
39+
DegenerationImpl( const Mesh& mesh );
4240

4341
bool is_mesh_degenerated() const;
4442

@@ -50,7 +48,7 @@ namespace geode
5048
bool edge_is_degenerated( index_t edge_index ) const;
5149

5250
private:
53-
const MeshType& mesh_;
51+
const Mesh& mesh_;
5452
};
5553
} // namespace detail
5654
} // namespace geode

‎src/geode/inspector/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ add_geode_library(
2323
FOLDER "geode/inspector"
2424
SOURCES
2525
"common.cpp"
26+
"criterion/degeneration/edgedcurve_degeneration.cpp"
2627
"criterion/degeneration/surface_degeneration.cpp"
2728
"criterion/degeneration/solid_degeneration.cpp"
2829
"criterion/private/degeneration_impl.cpp"
2930
PUBLIC_HEADERS
3031
"common.h"
32+
"criterion/degeneration/edgedcurve_degeneration.h"
3133
"criterion/degeneration/surface_degeneration.h"
3234
"criterion/degeneration/solid_degeneration.h"
3335
PRIVATE_HEADERS

‎src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
/*
2+
* Copyright (c) 2019 - 2021 Geode-solutions
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
* SOFTWARE.
21+
*
22+
*/
23+
24+
#include <geode/inspector/criterion/degeneration/edgedcurve_degeneration.h>
25+
#include <geode/inspector/criterion/private/degeneration_impl.h>
26+
27+
#include <geode/basic/pimpl_impl.h>
28+
29+
#include <geode/mesh/core/edged_curve.h>
30+
31+
namespace geode
32+
{
33+
template < index_t dimension >
34+
class EdgedCurveDegeneration< dimension >::Impl
35+
{
36+
public:
37+
Impl( const EdgedCurve< dimension >& mesh ) : mesh_( mesh ) {}
38+
39+
bool is_mesh_degenerated() const
40+
{
41+
for( const auto edge_index : Range{ mesh_.nb_edges() } )
42+
{
43+
if( mesh_.edge_length( edge_index ) < global_epsilon )
44+
{
45+
return true;
46+
}
47+
}
48+
return false;
49+
}
50+
51+
index_t nb_degenerated_edges() const
52+
{
53+
index_t nb_degeneration{ 0 };
54+
for( const auto edge_index : Range{ mesh_.nb_edges() } )
55+
{
56+
if( mesh_.edge_length( edge_index ) < global_epsilon )
57+
{
58+
nb_degeneration++;
59+
}
60+
}
61+
return nb_degeneration;
62+
}
63+
64+
std::vector< index_t > degenerated_edges() const
65+
{
66+
std::vector< index_t > degenerated_edges_index;
67+
for( const auto edge_index : Range{ mesh_.nb_edges() } )
68+
{
69+
if( mesh_.edge_length( edge_index ) < global_epsilon )
70+
{
71+
degenerated_edges_index.push_back( edge_index );
72+
}
73+
}
74+
return degenerated_edges_index;
75+
}
76+
77+
private:
78+
const EdgedCurve< dimension >& mesh_;
79+
};
80+
81+
template < index_t dimension >
82+
EdgedCurveDegeneration< dimension >::EdgedCurveDegeneration(
83+
const EdgedCurve< dimension >& mesh )
84+
: impl_( mesh )
85+
{
86+
}
87+
88+
template < index_t dimension >
89+
EdgedCurveDegeneration< dimension >::~EdgedCurveDegeneration()
90+
{
91+
}
92+
93+
template < index_t dimension >
94+
bool EdgedCurveDegeneration< dimension >::is_mesh_degenerated() const
95+
{
96+
return impl_->is_mesh_degenerated();
97+
}
98+
99+
template < index_t dimension >
100+
index_t EdgedCurveDegeneration< dimension >::nb_degenerated_edges() const
101+
{
102+
return impl_->nb_degenerated_edges();
103+
}
104+
105+
template < index_t dimension >
106+
std::vector< index_t >
107+
EdgedCurveDegeneration< dimension >::degenerated_edges() const
108+
{
109+
return impl_->degenerated_edges();
110+
}
111+
112+
template class opengeode_inspector_inspector_api
113+
EdgedCurveDegeneration< 2 >;
114+
template class opengeode_inspector_inspector_api
115+
EdgedCurveDegeneration< 3 >;
116+
} // namespace geode

‎src/geode/inspector/criterion/degeneration/solid_degeneration.cpp‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,47 @@
3030

3131
namespace geode
3232
{
33-
class SolidMeshDegeneration::Impl
34-
: public detail::DegenerationImpl< SolidMesh3D >
33+
template < index_t dimension >
34+
class SolidMeshDegeneration< dimension >::Impl
35+
: public detail::DegenerationImpl< SolidMesh< dimension > >
3536
{
3637
public:
37-
Impl( const SolidMesh3D& mesh )
38-
: detail::DegenerationImpl< SolidMesh3D >{ mesh }
38+
Impl( const SolidMesh< dimension >& mesh )
39+
: detail::DegenerationImpl< SolidMesh< dimension > >{ mesh }
3940
{
4041
}
4142
};
4243

43-
SolidMeshDegeneration::SolidMeshDegeneration( const SolidMesh3D& mesh )
44+
template < index_t dimension >
45+
SolidMeshDegeneration< dimension >::SolidMeshDegeneration(
46+
const SolidMesh< dimension >& mesh )
4447
: impl_( mesh )
4548
{
4649
}
4750

48-
SolidMeshDegeneration::~SolidMeshDegeneration() {}
51+
template < index_t dimension >
52+
SolidMeshDegeneration< dimension >::~SolidMeshDegeneration()
53+
{
54+
}
4955

50-
bool SolidMeshDegeneration::is_mesh_degenerated() const
56+
template < index_t dimension >
57+
bool SolidMeshDegeneration< dimension >::is_mesh_degenerated() const
5158
{
5259
return impl_->is_mesh_degenerated();
5360
}
5461

55-
index_t SolidMeshDegeneration::nb_degenerated_edges() const
62+
template < index_t dimension >
63+
index_t SolidMeshDegeneration< dimension >::nb_degenerated_edges() const
5664
{
5765
return impl_->nb_degenerated_edges();
5866
}
5967

60-
std::vector< index_t > SolidMeshDegeneration::degenerated_edges() const
68+
template < index_t dimension >
69+
std::vector< index_t >
70+
SolidMeshDegeneration< dimension >::degenerated_edges() const
6171
{
6272
return impl_->degenerated_edges();
6373
}
74+
75+
template class opengeode_inspector_inspector_api SolidMeshDegeneration< 3 >;
6476
} // namespace geode

‎src/geode/inspector/criterion/private/degeneration_impl.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,20 @@ namespace geode
5252
return true;
5353
}
5454
}
55-
5655
return false;
5756
}
5857

5958
template < class MeshType >
6059
index_t DegenerationImpl< MeshType >::nb_degenerated_edges() const
6160
{
6261
index_t nb_degeneration{ 0 };
63-
6462
for( const auto edge_index : Range{ mesh_.edges().nb_edges() } )
6563
{
6664
if( edge_is_degenerated( edge_index ) )
6765
{
6866
nb_degeneration++;
6967
}
7068
}
71-
7269
return nb_degeneration;
7370
}
7471

@@ -77,15 +74,13 @@ namespace geode
7774
DegenerationImpl< MeshType >::degenerated_edges() const
7875
{
7976
std::vector< index_t > degenerated_edges_index;
80-
8177
for( const auto edge_index : Range{ mesh_.edges().nb_edges() } )
8278
{
8379
if( edge_is_degenerated( edge_index ) )
8480
{
8581
degenerated_edges_index.push_back( edge_index );
8682
}
8783
}
88-
8984
return degenerated_edges_index;
9085
}
9186

‎tests/inspector/CMakeLists.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1919
# SOFTWARE.
2020

21+
add_geode_test(
22+
SOURCE "test-edgedcurve-degeneration.cpp"
23+
DEPENDENCIES
24+
OpenGeode::basic
25+
OpenGeode::geometry
26+
OpenGeode::mesh
27+
${PROJECT_NAME}::inspector
28+
)
29+
2130
add_geode_test(
2231
SOURCE "test-surface-degeneration.cpp"
2332
DEPENDENCIES

0 commit comments

Comments
 (0)