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

Hackathon/edge mesh #378

Merged
merged 59 commits into from
Oct 12, 2023
Merged

Hackathon/edge mesh #378

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
ba90699
add dummy files
Zhouyuan-Chen Sep 22, 2023
5095f98
fixed problem
Zhouyuan-Chen Sep 22, 2023
f792fb4
added throws for safety
Zhouyuan-Chen Sep 22, 2023
d412649
implemented some EdgeMesh functions
Zhouyuan-Chen Sep 22, 2023
96325c6
add EdgeMeshOperationExecutor and DEBUG_EdgeMesh
Zhouyuan-Chen Sep 26, 2023
b749fac
add EdgeMesh_example and test code
Zhouyuan-Chen Sep 27, 2023
01ba6f1
fix a bug for EdgeMesh::initialize, the loop's condition wrong.
Zhouyuan-Chen Sep 27, 2023
d9e3742
Merge remote-tracking branch 'origin/main' into hackathon/edge_mesh
zlyfunction Sep 27, 2023
37392a7
get the desired frame for edgemesh operation executor
zlyfunction Sep 27, 2023
b551d2d
implement edgemesh split_edge
zlyfunction Sep 27, 2023
913e166
fimish edgemesh split_edge with return tuple
zlyfunction Sep 27, 2023
455c867
correct edgemsh split without aorientation assumptions
zlyfunction Sep 27, 2023
a75edd4
implement edge mesh connectivity
JcDai Sep 27, 2023
b6e2844
take care of the case of self loop
zlyfunction Sep 27, 2023
588530a
a complete draft of edge mesh operations
zlyfunction Sep 27, 2023
2f50e69
Merge branch 'hackathon/edge_mesh' of https://github.com/wildmeshing/…
JcDai Sep 27, 2023
b006e30
implemented edge mesh
JcDai Sep 27, 2023
1a91445
add 1d topology unit test
JcDai Sep 27, 2023
7f9f178
add implementation for operations in edgemesh clas
JcDai Sep 27, 2023
0f1e5c4
fix typo
JcDai Sep 27, 2023
4b549e2
add debug_edgemesh examples
JcDai Sep 27, 2023
d6f79e0
fix bug
JcDai Sep 27, 2023
51e750d
rename tmoe to emoe
zlyfunction Sep 27, 2023
9d210e5
add 1d tuple tests
JcDai Sep 27, 2023
4c1fc6d
Merge branch 'hackathon/edge_mesh' of https://github.com/wildmeshing/…
JcDai Sep 27, 2023
6cd9330
Merge remote-tracking branch 'origin/main' into hackathon/edge_mesh
JcDai Sep 27, 2023
8443678
clean codes
JcDai Sep 27, 2023
93078ed
fix collapse
zlyfunction Sep 28, 2023
0191bc1
add test simplices_to_delete_for_split_1D
zlyfunction Sep 28, 2023
f9339ea
add test simplices_to_delete
zlyfunction Sep 28, 2023
e680734
add split and collapse test, need fix collapse
zlyfunction Sep 28, 2023
36f5b4b
fix ccw, still need fix collapse
zlyfunction Sep 28, 2023
d5ae116
add more 1d topology test
JcDai Sep 28, 2023
8cbc009
Merge branch 'hackathon/edge_mesh' of https://github.com/wildmeshing/…
JcDai Sep 28, 2023
436714d
fix collapse, seems to be correct
zlyfunction Sep 28, 2023
3af5411
Merge branch 'hackathon/edge_mesh' of https://github.com/wildmeshing/…
JcDai Sep 28, 2023
d3fd978
add is_simplex_deleted function in DEBUG_EdgeMesh
zlyfunction Sep 28, 2023
8163b71
fix collapse edge ev update
zlyfunction Sep 28, 2023
36ef0f2
fix bug for self loop otopo init
JcDai Sep 28, 2023
4fff8d8
Merge branch 'main' into hackathon/edge_mesh
Sep 29, 2023
e43b219
collapse test add return_tuple check and delete simplex test
Sep 29, 2023
4f59656
fix bug in update ve in collapse edge
Sep 29, 2023
e20fd21
finish testing collapse edge
Sep 29, 2023
add571d
fix bug in split_edge ev update
Sep 29, 2023
22c615a
finish split test
zlyfunction Sep 29, 2023
3844c20
refactor based on comments
JcDai Oct 3, 2023
57f8aae
Merge remote-tracking branch 'origin/main' into hackathon/edge_mesh
JcDai Oct 3, 2023
cf18878
add throw
JcDai Oct 3, 2023
56e6040
redo changes in TriMesh
JcDai Oct 3, 2023
d3cd444
rollback the redo for Trimesh
JcDai Oct 3, 2023
29a6674
refactor based on comments
zlyfunction Oct 4, 2023
fd11974
reuse hash acc in tests
zlyfunction Oct 4, 2023
88f62a7
fix DEBUG_EdgeMesh::operator==
zlyfunction Oct 4, 2023
0409e9b
Merge branch 'main' into hackathon/edge_mesh
zlyfunction Oct 9, 2023
281e5cc
Merge branch 'main' of https://github.com/wildmeshing/wildmeshing-too…
zlyfunction Oct 9, 2023
6540991
modify to fit the changes happend in main branch
zlyfunction Oct 9, 2023
3ee54bc
typo in comment
zlyfunction Oct 11, 2023
25251ca
fix compile
zlyfunction Oct 11, 2023
e991d24
delete TODO in comments
zlyfunction Oct 11, 2023
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
6 changes: 6 additions & 0 deletions src/wmtk/EdgeMesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ Tuple EdgeMesh::switch_tuple(const Tuple& tuple, PrimitiveType type) const
auto ee = ee_accessor.vector_attribute(tuple);

long gcid_new = ee(tuple.m_local_vid);

// TODO: This is for special case self-loop, just to make sure the local vid of the returned
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this TODO still a TODO?

// tuple is the same as the input. (When doing double-switch this is needed)
if (gcid_new == tuple.m_global_cid) return tuple;
zlyfunction marked this conversation as resolved.
Show resolved Hide resolved


long lvid_new = -1;

ConstAccessor<long> ev_accessor = create_const_accessor<long>(m_ev_handle);
Expand Down
2 changes: 1 addition & 1 deletion src/wmtk/EdgeMesh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class EdgeMesh : public Mesh
bool is_boundary_vertex(const Tuple& tuple) const override;
bool is_boundary_edge(const Tuple& tuple) const override
{
throw("This function doesn't make sense for edgemesh");
throw("This function doesn't make sense for EdgeMesh");
}

void initialize(Eigen::Ref<const RowVectors2l> E);
Expand Down
16 changes: 9 additions & 7 deletions src/wmtk/EdgeMeshOperationExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ std::vector<Tuple> EdgeMesh::EdgeMeshOperationExecutor::prepare_operating_tuples
const
{
// this function is designed as a helper for multi_mesh
throw("this function is not tested");
return MultiMeshManager::map_edge_tuple_to_all_children(m_mesh, m_operating_tuple);
JcDai marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down Expand Up @@ -106,14 +107,14 @@ Tuple EdgeMesh::EdgeMeshOperationExecutor::split_edge_single_mesh()
// for 2 new edges
auto ee_new_0 = ee_accessor.index_access().vector_attribute(new_eids[0]);
auto ee_new_1 = ee_accessor.index_access().vector_attribute(new_eids[1]);
ee_new_0[(local_vid + 1) % 2] = new_eids[1];
ee_new_0[local_vid ^ 1] = new_eids[1];
ee_new_1[local_vid] = new_eids[0];
if (m_is_self_loop) {
ee_new_0[local_vid] = new_eids[1];
ee_new_1[(local_vid + 1) % 2] = new_eids[0];
ee_new_1[local_vid ^ 1] = new_eids[0];
} else {
ee_new_0[local_vid] = m_neighbor_eids[0];
ee_new_1[(local_vid + 1) % 2] = m_neighbor_eids[1];
ee_new_1[local_vid ^ 1] = m_neighbor_eids[1];
// for neighbor edges
for (long i = 0; i < 2; i++) {
if (m_neighbor_eids[i] != -1) {
Expand All @@ -122,7 +123,8 @@ Tuple EdgeMesh::EdgeMeshOperationExecutor::split_edge_single_mesh()
auto ev_neighbor =
ev_accessor.index_access().vector_attribute(m_neighbor_eids[i]);
for (long j = 0; j < 2; j++) {
if (ee_neighbor[j] == m_operating_edge_id && ev_neighbor[j] == m_spine_vids[i]) {
if (ee_neighbor[j] == m_operating_edge_id &&
ev_neighbor[j] == m_spine_vids[i]) {
ee_neighbor[j] = new_eids[i];
break;
}
Expand All @@ -138,9 +140,9 @@ Tuple EdgeMesh::EdgeMeshOperationExecutor::split_edge_single_mesh()
auto ev_new_0 = ev_accessor.index_access().vector_attribute(new_eids[0]);
auto ev_new_1 = ev_accessor.index_access().vector_attribute(new_eids[1]);
ev_new_0[local_vid] = m_spine_vids[0];
ev_new_0[(local_vid + 1) % 2] = v_new;
ev_new_0[local_vid ^ 1] = v_new;
ev_new_1[local_vid] = v_new;
ev_new_1[(local_vid + 1) % 2] = m_spine_vids[1];
ev_new_1[local_vid ^ 1] = m_spine_vids[1];
}

// update ve
Expand Down Expand Up @@ -189,7 +191,7 @@ Tuple EdgeMesh::EdgeMeshOperationExecutor::collapse_edge_single_mesh()
auto ee_neighbor = ee_accessor.index_access().vector_attribute(m_neighbor_eids[i]);
for (long j = 0; j < 2; j++) {
if (ee_neighbor[j] == m_operating_edge_id) {
ee_neighbor[j] = m_neighbor_eids[(i + 1) % 2];
ee_neighbor[j] = m_neighbor_eids[i ^ 1];
break;
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/wmtk/EdgeMeshOperationExecutor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class EdgeMesh::EdgeMeshOperationExecutor
/**
* @brief gather all simplices that are deleted in a split
*
* The deleted simplices are exactly the open star of the edge
* The deleted simplex is the edge itself
zlyfunction marked this conversation as resolved.
Show resolved Hide resolved
*/
static const std::array<std::vector<long>, 2> get_split_simplices_to_delete(
JcDai marked this conversation as resolved.
Show resolved Hide resolved
const Tuple& tuple,
Expand All @@ -29,9 +29,7 @@ class EdgeMesh::EdgeMeshOperationExecutor
/**
* @brief gather all simplices that are deleted in a collapse
*
* The deleted simplices are the intersection of the open star of the vertex and the closed star
* of the edge. This comes down to one vertex, three edges, and two faces if the edge is on the
* interior. On the boundary it is one vertex, two edges, and one face.
* The deleted simplices are the vertex and the edge of the input tuple
*/
static const std::array<std::vector<long>, 2> get_collapse_simplices_to_delete(
JcDai marked this conversation as resolved.
Show resolved Hide resolved
const Tuple& tuple,
Expand Down
24 changes: 18 additions & 6 deletions src/wmtk/Types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,27 @@
#include <Eigen/Core>

namespace wmtk {
using RowVectors3l = Eigen::Matrix<long, Eigen::Dynamic, 3>;
using RowVectors2l = Eigen::Matrix<long, Eigen::Dynamic, 2>;
using VectorXl = Eigen::Matrix<long, Eigen::Dynamic, 1>;
using RowVectors4l = Eigen::Matrix<long, Eigen::Dynamic, 4>;
using RowVectors6l = Eigen::Matrix<long, Eigen::Dynamic, 6>;
using RowVectors3d = Eigen::Matrix<double, Eigen::Dynamic, 3>;
template <typename T, int C>
using RowVectors = Eigen::Matrix<T, Eigen::Dynamic, C>;

template <typename T, int R>
using Vector = Eigen::Matrix<T, R, 1>;
template <typename T>
using VectorX = Vector<T, Eigen::Dynamic>;

template <typename T, int C>
using RowVector = Eigen::Matrix<T, 1, C>;
template <typename T>
using RowVectorX = RowVector<T, Eigen::Dynamic>;

using VectorXl = VectorX<long>;
using RowVector2d = RowVector<double, 2>;
using RowVector3d = RowVector<double, 3>;
using RowVectors2l = RowVectors<long, 2>;
using RowVectors3l = RowVectors<long, 3>;
using RowVectors4l = RowVectors<long, 4>;
using RowVectors6l = RowVectors<long, 6>;
using RowVectors2d = RowVectors<double, 2>;
using RowVectors3d = RowVectors<double, 3>;

} // namespace wmtk
4 changes: 2 additions & 2 deletions src/wmtk/utils/edgemesh_topology_initialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ std::tuple<RowVectors2l, VectorXl> edgemesh_topology_initialization(
RowVectors2l EE;
VectorXl VE;

long vertex_count = E.maxCoeff() + 1;
const long vertex_count = E.maxCoeff() + 1;

// store the complete vertex-edge connnectivity
std::vector<std::vector<long>> complete_VE(vertex_count);
Expand All @@ -38,7 +38,7 @@ std::tuple<RowVectors2l, VectorXl> edgemesh_topology_initialization(
}
} else {
// non-boundary vertex
for (int k = 0; k < 2; ++k) {
for (long k = 0; k < 2; ++k) {
if (E(complete_VE[i][k], 0) == i) {
EE(complete_VE[i][k], 0) = complete_VE[i][1 - k];
}
Expand Down
42 changes: 26 additions & 16 deletions tests/test_1d_operations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ TEST_CASE("simplices_to_delete_for_split_1D", "[operations][1D]")

const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
JcDai marked this conversation as resolved.
Show resolved Hide resolved
REQUIRE(m.is_valid(edge, hash_accessor));

auto executor = m.get_emoe(edge, hash_accessor);

executor.split_edge();
Expand All @@ -48,8 +49,9 @@ TEST_CASE("simplices_to_delete_for_split_1D", "[operations][1D]")

const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));

auto executor = m.get_emoe(edge, hash_accessor);

executor.split_edge();
Expand All @@ -70,8 +72,8 @@ TEST_CASE("simplices_to_delete_for_collapse_1D", "[operations][1D]")

const long edge_id = 2;
Tuple edge = m.tuple_from_edge_id(edge_id);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));
auto executor = m.get_emoe(edge, hash_accessor);

executor.collapse_edge();
Expand All @@ -90,8 +92,8 @@ TEST_CASE("simplices_to_delete_for_collapse_1D", "[operations][1D]")

const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));
auto executor = m.get_emoe(edge, hash_accessor);

executor.collapse_edge();
Expand All @@ -113,10 +115,11 @@ TEST_CASE("collapse_edge_1D", "[operations][1D]")

const long edge_id = 2;
Tuple edge = m.tuple_from_edge_id(edge_id);
REQUIRE(m.is_valid_slow(edge));
const long vertex_id = m._debug_id(edge, PV);

Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));
const long vertex_id = m._debug_id(edge, PV);

auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.collapse_edge();
Expand Down Expand Up @@ -147,8 +150,9 @@ TEST_CASE("collapse_edge_1D", "[operations][1D]")

const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));

auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.collapse_edge();
Expand All @@ -163,8 +167,8 @@ TEST_CASE("collapse_edge_1D", "[operations][1D]")

const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));
auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.collapse_edge();
Expand All @@ -180,8 +184,9 @@ TEST_CASE("collapse_edge_1D", "[operations][1D]")
const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
const long vertex_id = m._debug_id(edge, PV);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));

auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.collapse_edge();
Expand Down Expand Up @@ -213,8 +218,10 @@ TEST_CASE("collapse_edge_1D", "[operations][1D]")
const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
const long vertex_id = m._debug_id(edge, PV);
REQUIRE(m.is_valid_slow(edge));

Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));

auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.collapse_edge();
Expand Down Expand Up @@ -249,10 +256,11 @@ TEST_CASE("split_edge_1D", "[operations][1D]")

const long edge_id = 2;
Tuple edge = m.tuple_from_edge_id(edge_id);
REQUIRE(m.is_valid_slow(edge));
const long vertex_id = m._debug_id(edge, PV);

Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));
const long vertex_id = m._debug_id(edge, PV);

auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.split_edge();
Expand Down Expand Up @@ -293,8 +301,8 @@ TEST_CASE("split_edge_1D", "[operations][1D]")
const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
const long vertex_id = m._debug_id(edge, PV);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));
auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.split_edge();
Expand Down Expand Up @@ -333,8 +341,8 @@ TEST_CASE("split_edge_1D", "[operations][1D]")
const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
const long vertex_id = m._debug_id(edge, PV);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));
auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.split_edge();
Expand Down Expand Up @@ -372,8 +380,9 @@ TEST_CASE("split_edge_1D", "[operations][1D]")
const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
const long vertex_id = m._debug_id(edge, PV);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));

auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.split_edge();
Expand Down Expand Up @@ -414,8 +423,9 @@ TEST_CASE("split_edge_1D", "[operations][1D]")
const long edge_id = 0;
Tuple edge = m.tuple_from_edge_id(edge_id);
const long vertex_id = m._debug_id(edge, PV);
REQUIRE(m.is_valid_slow(edge));
Accessor<long> hash_accessor = m.get_cell_hash_accessor();
REQUIRE(m.is_valid(edge, hash_accessor));

auto executor = m.get_emoe(edge, hash_accessor);

const Tuple ret_tuple = executor.split_edge();
Expand Down
Loading