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

Support member object reflection with approx.hpp and compare.hpp #706

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support member object reflection with approx.hpp and compare.hpp #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4959b99
Support member object reflection with approx.hpp and compare.hpp
stephenberry Jan 10, 2024
d3c2393
figuring out reflection handling for comparisons
stephenberry Jan 10, 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
74 changes: 70 additions & 4 deletions include/glaze/compare/approx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,81 @@ namespace glz
// Test that two meta objects are equal, with epsilon support for floating point values
struct approx_equal_to final
{
template <detail::glaze_object_t T>
template <class T> requires (detail::glaze_object_t<T> || detail::reflectable<T>)
constexpr bool operator()(T&& lhs, T&& rhs) noexcept
{
constexpr auto N = std::tuple_size_v<meta_t<T>>;
constexpr auto N = [] {
if constexpr (detail::reflectable<T>) {
return detail::count_members<T>;
}
else {
return std::tuple_size_v<meta_t<T>>;
}
}();

[[maybe_unused]] decltype(auto) t_lhs = [&] {
if constexpr (detail::reflectable<T>) {
if constexpr (std::is_const_v<std::remove_reference_t<decltype(lhs)>>) {
static constinit auto tuple_of_ptrs = make_const_tuple_from_struct<T>();
populate_tuple_ptr(lhs, tuple_of_ptrs);
return tuple_of_ptrs;
}
else {
static constinit auto tuple_of_ptrs = make_tuple_from_struct<T>();
populate_tuple_ptr(lhs, tuple_of_ptrs);
return tuple_of_ptrs;
}
}
else {
return nullptr;
}
}();

[[maybe_unused]] decltype(auto) t_rhs = [&] {
if constexpr (detail::reflectable<T>) {
if constexpr (std::is_const_v<std::remove_reference_t<decltype(rhs)>>) {
static constinit auto tuple_of_ptrs = make_const_tuple_from_struct<T>();
populate_tuple_ptr(rhs, tuple_of_ptrs);
return tuple_of_ptrs;
}
else {
static constinit auto tuple_of_ptrs = make_tuple_from_struct<T>();
populate_tuple_ptr(rhs, tuple_of_ptrs);
return tuple_of_ptrs;
}
}
else {
return nullptr;
}
}();

using V = std::decay_t<T>;

bool equal = true;
for_each<N>([&](auto I) {
auto& l = detail::get_member(lhs, get<1>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<1>(get<I>(meta_v<T>)));
using Element = detail::glaze_tuple_element<I, N, T>;
constexpr size_t member_index = Element::member_index;

decltype(auto) lhs_member = [&] {
if constexpr (detail::reflectable<T>) {
return std::get<I>(t_lhs);
}
else {
return get<member_index>(get<I>(meta_v<V>));
}
}();

decltype(auto) rhs_member = [&] {
if constexpr (detail::reflectable<T>) {
return std::get<I>(t_rhs);
}
else {
return get<member_index>(get<I>(meta_v<V>));
}
}();

auto& l = detail::get_member(lhs, lhs_member);
auto& r = detail::get_member(rhs, rhs_member);
using V = std::decay_t<decltype(l)>;
if constexpr (std::floating_point<V> && requires { meta<std::decay_t<T>>::compare_epsilon; }) {
if (std::abs(l - r) >= meta<std::decay_t<T>>::compare_epsilon) {
Expand Down
79 changes: 62 additions & 17 deletions include/glaze/compare/compare.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,32 @@ namespace glz
struct equal_to final
{
template <detail::glaze_object_t T>
constexpr bool operator()(T&& lhs, T&& rhs) noexcept
bool operator()(T&& lhs, T&& rhs) noexcept
{
if constexpr (std::equality_comparable<T>) {
return lhs == rhs;
}
else {
constexpr auto N = std::tuple_size_v<meta_t<T>>;
constexpr auto N = [] {
if constexpr (detail::reflectable<T>) {
return detail::count_members<T>;
}
else {
return std::tuple_size_v<meta_t<T>>;
}
}();

bool equal = true;
for_each<N>([&](auto I) {
auto& l = detail::get_member(lhs, get<1>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<1>(get<I>(meta_v<T>)));
using Element = detail::glaze_tuple_element<I, N, T>;
constexpr size_t member_index = Element::member_index;
auto& l = detail::get_member(lhs, get<member_index>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<member_index>(get<I>(meta_v<T>)));
if (!std::equal_to{}(l, r)) {
equal = false;
}
});

return equal;
}
}
Expand All @@ -39,12 +48,21 @@ namespace glz
template <detail::glaze_object_t T>
constexpr bool operator()(T&& lhs, T&& rhs) noexcept
{
constexpr auto N = std::tuple_size_v<meta_t<T>>;
constexpr auto N = [] {
if constexpr (detail::reflectable<T>) {
return detail::count_members<T>;
}
else {
return std::tuple_size_v<meta_t<T>>;
}
}();

bool less_than = true;
for_each<N>([&](auto I) {
auto& l = detail::get_member(lhs, get<1>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<1>(get<I>(meta_v<T>)));
using Element = detail::glaze_tuple_element<I, N, T>;
constexpr size_t member_index = Element::member_index;
auto& l = detail::get_member(lhs, get<member_index>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<member_index>(get<I>(meta_v<T>)));
if (!std::less{}(l, r)) {
less_than = false;
}
Expand All @@ -59,12 +77,21 @@ namespace glz
template <detail::glaze_object_t T>
constexpr bool operator()(T&& lhs, T&& rhs) noexcept
{
constexpr auto N = std::tuple_size_v<meta_t<T>>;
constexpr auto N = [] {
if constexpr (detail::reflectable<T>) {
return detail::count_members<T>;
}
else {
return std::tuple_size_v<meta_t<T>>;
}
}();

bool less_than = true;
for_each<N>([&](auto I) {
auto& l = detail::get_member(lhs, get<1>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<1>(get<I>(meta_v<T>)));
using Element = detail::glaze_tuple_element<I, N, T>;
constexpr size_t member_index = Element::member_index;
auto& l = detail::get_member(lhs, get<member_index>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<member_index>(get<I>(meta_v<T>)));
if (!std::less_equal{}(l, r)) {
less_than = false;
}
Expand All @@ -79,12 +106,21 @@ namespace glz
template <detail::glaze_object_t T>
constexpr bool operator()(T&& lhs, T&& rhs) noexcept
{
constexpr auto N = std::tuple_size_v<meta_t<T>>;
constexpr auto N = [] {
if constexpr (detail::reflectable<T>) {
return detail::count_members<T>;
}
else {
return std::tuple_size_v<meta_t<T>>;
}
}();

bool greater_than = true;
for_each<N>([&](auto I) {
auto& l = detail::get_member(lhs, get<1>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<1>(get<I>(meta_v<T>)));
using Element = detail::glaze_tuple_element<I, N, T>;
constexpr size_t member_index = Element::member_index;
auto& l = detail::get_member(lhs, get<member_index>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<member_index>(get<I>(meta_v<T>)));
if (!std::greater{}(l, r)) {
greater_than = false;
}
Expand All @@ -99,12 +135,21 @@ namespace glz
template <detail::glaze_object_t T>
constexpr bool operator()(T&& lhs, T&& rhs) noexcept
{
constexpr auto N = std::tuple_size_v<meta_t<T>>;
constexpr auto N = [] {
if constexpr (detail::reflectable<T>) {
return detail::count_members<T>;
}
else {
return std::tuple_size_v<meta_t<T>>;
}
}();

bool greater_than = true;
for_each<N>([&](auto I) {
auto& l = detail::get_member(lhs, get<1>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<1>(get<I>(meta_v<T>)));
using Element = detail::glaze_tuple_element<I, N, T>;
constexpr size_t member_index = Element::member_index;
auto& l = detail::get_member(lhs, get<member_index>(get<I>(meta_v<T>)));
auto& r = detail::get_member(rhs, get<member_index>(get<I>(meta_v<T>)));
if (!std::greater_equal{}(l, r)) {
greater_than = false;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/compare_test/compare_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ template <>
struct glz::meta<float_compare_t>
{
using T = float_compare_t;
static constexpr auto value = object("x", &T::x, "y", &T::y, "z", &T::z);
static constexpr auto value = object(&T::x, &T::y, &T::z);

static constexpr auto compare_epsilon = 0.1;
};
Expand Down
Loading