Commit bb4e0f36 authored by Quentin Kaci's avatar Quentin Kaci
Browse files

Modify and add some tests with canonization

parent 9b5cc049
Pipeline #28503 passed with stages
in 8 minutes and 26 seconds
......@@ -73,7 +73,7 @@ namespace mln::morpho
}
edges.on_finish_insert();
return internal::alphatree_from_graph<A>(edges, node_map, nb_leaves, false);
return internal::alphatree_from_graph<A>(edges, node_map, nb_leaves, true);
}
} // namespace internal
......
......@@ -2,7 +2,9 @@
#include <mln/accu/accumulators/count.hpp>
#include <mln/core/colors.hpp>
#include <mln/core/image/ndimage.hpp>
#include <mln/core/neighborhood/c26.hpp>
#include <mln/core/neighborhood/c4.hpp>
#include <mln/core/neighborhood/c8.hpp>
#include <gtest/gtest.h>
......@@ -16,13 +18,11 @@ TEST(Morpho, AreaWatershedHierarchyGray)
{121, 112, 121, 112, 163}, //
};
std::vector<int> expected_parent = {0, 0, 1, 2, 2, 3, 5, 0, 6, 1, 9, 4, 3, 11, 7, 14, 15,
16, 8, 18, 19, 20, 4, 21, 7, 14, 15, 16, 17, 9, 10, 10, 5, 17,
18, 19, 20, 21, 12, 6, 11, 13, 23, 12, 22, 22, 13, 23, 8};
std::vector<int> expected_parent = {0, 0, 1, 1, 0, 4, 5, 6, 7, 1, 9, 10, 2, 8, 12,
14, 15, 16, 2, 14, 3, 20, 17, 18, 3, 24, 21, 22, 14};
std::vector<unsigned long> expected_values = {6, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
std::vector<unsigned long> expected_values = {6, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
auto [tree, _] = mln::morpho::watershed_hierarchy(
input, mln::accu::features::count<>(), mln::c4,
......@@ -39,6 +39,37 @@ TEST(Morpho, AreaWatershedHierarchyGray)
}
}
TEST(Morpho, AreaWatershedHierarchyGrayHQ)
{
mln::image2d<uint8_t> input = {
{163, 112, 42, 121, 112}, //
{42, 121, 1, 42, 255}, //
{1, 112, 121, 112, 121}, //
{112, 255, 42, 1, 42}, //
{121, 112, 121, 112, 163}, //
};
std::vector<int> expected_parent = {0, 0, 1, 1, 0, 4, 5, 6, 7, 1, 9, 10, 2, 8, 12,
14, 15, 16, 2, 14, 3, 20, 17, 18, 3, 24, 21, 22, 14};
std::vector<unsigned long> expected_values = {6, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
auto [tree, _] = mln::morpho::watershed_hierarchy(
input, mln::accu::features::count<>(), mln::c4,
[](const auto& a, const auto& b) -> std::uint8_t { return mln::functional::l2dist_t<>()(a, b); });
ASSERT_EQ(expected_parent.size(), tree.parent.size());
ASSERT_EQ(expected_values.size(), tree.values.size());
ASSERT_EQ(tree.parent.size(), tree.values.size());
for (std::size_t i = 0; i < expected_parent.size(); ++i)
{
EXPECT_EQ(expected_parent[i], tree.parent[i]);
EXPECT_EQ(expected_values[i], tree.values[i]);
}
}
TEST(Morpho, AreaWatershedHierarchyRGB)
{
mln::image2d<mln::rgb8> input = {
......@@ -49,13 +80,11 @@ TEST(Morpho, AreaWatershedHierarchyRGB)
{{255, 75, 0}, {31, 174, 0}, {255, 75, 0}, {31, 174, 0}, {255, 146, 0}}, //
};
std::vector<int> expected_parent = {0, 0, 0, 1, 1, 4, 5, 6, 2, 3, 8, 9, 11, 12, 7, 13, 2,
3, 14, 17, 18, 20, 15, 22, 18, 20, 11, 12, 13, 6, 21, 7, 4, 22,
14, 21, 15, 23, 23, 5, 8, 10, 17, 9, 16, 16, 10, 19, 19};
std::vector<int> expected_parent = {0, 0, 0, 0, 3, 2, 5, 6, 3, 4, 3, 3, 7, 3,
9, 12, 12, 16, 3, 1, 19, 2, 5, 1, 23, 20, 21, 26};
std::vector<unsigned long> expected_values = {3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
std::vector<unsigned long> expected_values = {3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
auto [tree, _] = mln::morpho::watershed_hierarchy(
input, mln::accu::features::count<>(), mln::c4,
......@@ -65,6 +94,66 @@ TEST(Morpho, AreaWatershedHierarchyRGB)
ASSERT_EQ(expected_values.size(), tree.values.size());
ASSERT_EQ(tree.parent.size(), tree.values.size());
for (std::size_t i = 0; i < expected_parent.size(); ++i)
{
EXPECT_EQ(expected_parent[i], tree.parent[i]);
EXPECT_EQ(expected_values[i], tree.values[i]);
}
}
TEST(Morpho, AreaWatershedHierarchyGrayC8)
{
mln::image2d<std::uint8_t> input = {
{128, 124, 150, 137, 106}, //
{116, 128, 156, 165, 117}, //
{117, 90, 131, 108, 151}, //
{107, 87, 118, 109, 167}, //
{107, 73, 125, 157, 117}, //
};
std::vector<int> expected_parent = {0, 0, 0, 0, 1, 3, 2, 3, 1, 4, 6, 5, 7, 8, 9,
2, 11, 4, 13, 4, 5, 15, 21, 17, 19, 5, 21, 22, 17, 23};
std::vector<unsigned long> expected_values = {7, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
auto [tree, _] = mln::morpho::watershed_hierarchy(
input, mln::accu::features::count<>(), mln::c8,
[](const auto& a, const auto& b) -> float { return mln::functional::l2dist_t<>()(a, b); });
ASSERT_EQ(expected_parent.size(), tree.parent.size());
ASSERT_EQ(expected_values.size(), tree.values.size());
ASSERT_EQ(tree.parent.size(), tree.values.size());
for (std::size_t i = 0; i < expected_parent.size(); ++i)
{
EXPECT_EQ(expected_parent[i], tree.parent[i]);
EXPECT_EQ(expected_values[i], tree.values[i]);
}
}
TEST(Morpho, AreaWatershedHierarchy3DImage)
{
const mln::image3d<uint8_t> input = {
{{10, 0, 0}, {10, 0, 0}, {12, 20, 38}}, //
{{13, 22, 16}, {15, 2, 6}, {37, 25, 12}}, //
{{11, 18, 0}, {25, 17, 11}, {9, 0, 5}} //
};
std::vector<int> expected_parent = {0, 0, 1, 0, 3, 3, 2, 2, 6, 1, 5, 8, 8, 7, 9, 9,
4, 10, 12, 8, 9, 18, 9, 8, 1, 17, 25, 24, 26, 28, 27};
std::vector<unsigned long> expected_values = {9, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
auto [tree, _] = mln::morpho::watershed_hierarchy(
input, mln::accu::features::count<>(), mln::c26,
[](const auto& a, const auto& b) -> float { return mln::functional::l2dist_t<>()(a, b); });
ASSERT_EQ(expected_parent.size(), tree.parent.size());
ASSERT_EQ(expected_values.size(), tree.values.size());
ASSERT_EQ(tree.parent.size(), tree.values.size());
for (std::size_t i = 0; i < expected_parent.size(); ++i)
{
EXPECT_EQ(expected_parent[i], tree.parent[i]);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment