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

Fix missing ordered_value checks #45

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Fix missing ordered_value checks #45

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
3687495
First wave of fixes due to cocnept changes
jfalcou Dec 7, 2023
799eb81
still 3 floating_value -> floating_ordered...
jtlap Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/kyosu/functions/lpnorm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace kyosu
//! @code
//! namespace kyosu
//! {
//! template< floating_value P, typename T, typename ... Ts> auto lpnorm(P p, T z,Ts ... zs ) const noexcept
//! template< floating_ordered_value P, typename T, typename ... Ts> auto lpnorm(P p, T z,Ts ... zs ) const noexcept
//! }
//! @endcode
//!
Expand Down
2 changes: 1 addition & 1 deletion include/kyosu/types/cayley_dickson.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ namespace kyosu
auto val = cst( eve::as<as_real_type_t<T>>{} );
using val_t = std::remove_cvref_t<decltype(val)>;

if constexpr(!eve::floating_value<val_t>) return val;
if constexpr(!eve::floating_ordered_value<val_t>) return val;
else return as_cayley_dickson_n_t<eve::element_type_t<T>::static_size,val_t>(val);
}

Expand Down
2 changes: 1 addition & 1 deletion include/kyosu/types/impl/arithmetic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ namespace kyosu::_
using r_t = kyosu::as_cayley_dickson_t<C0,C1>;
using er_t = decltype(kyosu::abs(r_t{}));

if constexpr(eve::floating_value<C1> || eve::floating_value<C0>)
if constexpr(eve::floating_ordered_value<C1> || eve::floating_ordered_value<C0>)
{
return kyosu::real(c0)*kyosu::real(c1);
}
Expand Down
10 changes: 5 additions & 5 deletions include/kyosu/types/impl/math.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ namespace kyosu::_
}
}

template<eve::floating_value T, typename ...Cs>
template<eve::floating_ordered_value T, typename ...Cs>
KYOSU_FORCEINLINE constexpr
auto dispatch(eve::tag_of<kyosu::lpnorm> const&, T const & p, Cs const &... zs) noexcept
{
Expand Down Expand Up @@ -352,7 +352,7 @@ namespace kyosu::_
else if constexpr((dimension_v<C0> <= 2) && (dimension_v<C1> <= 2))
{
r_t r;
if constexpr(eve::floating_value<C0> && kyosu::concepts::complex<C1>) // c1 is complex c0 is real
if constexpr(eve::floating_ordered_value<C0> && kyosu::concepts::complex<C1>) // c1 is complex c0 is real
{
auto [rc1, ic1] = c1;
auto lgac0 = eve::log_abs(c0);
Expand All @@ -372,7 +372,7 @@ namespace kyosu::_
r = kyosu::if_else(isposc0, r1, r2);
}
}
else if constexpr(eve::floating_value<C1> ) // c0 is complex c1 is real
else if constexpr(eve::floating_ordered_value<C1> ) // c0 is complex c1 is real
{
auto lc0 = kyosu::log_abs(c0);
auto argc0 = kyosu::arg(c0);
Expand Down Expand Up @@ -400,11 +400,11 @@ namespace kyosu::_
}
else
{
if constexpr(eve::floating_value<C1>) //c0 cayley c1 real
if constexpr(eve::floating_ordered_value<C1>) //c0 cayley c1 real
{
return cayley_extend(pow, c0, c1);
}
else if constexpr(eve::floating_value<C0>)//c1 cayley c0 real
else if constexpr(eve::floating_ordered_value<C0>)//c1 cayley c0 real
{
return cayley_extend_rev(pow, c0, c1);
}
Expand Down
10 changes: 5 additions & 5 deletions include/kyosu/types/impl/reals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

namespace kyosu::_
{
template<eve::floating_value T>
template<eve::floating_ordered_value T>
constexpr auto complex_(EVE_EXPECTS(eve::cpu_), T r) noexcept { return as_cayley_dickson_n_t<2,T>(r, 0); }

template<eve::floating_value T0, eve::floating_value T1>
template<eve::floating_ordered_value T0, eve::floating_ordered_value T1>
constexpr auto complex_(EVE_EXPECTS(eve::cpu_), T0 r, T1 i) noexcept -> as_cayley_dickson_n_t<2,decltype(eve::add(r, i))>
{
return as_cayley_dickson_n_t<2, decltype(eve::add(r, i))>{r, i};
Expand All @@ -23,16 +23,16 @@ namespace kyosu::_

//=========================================================================================================================

template<eve::floating_value T>
template<eve::floating_ordered_value T>
constexpr auto quaternion_(EVE_EXPECTS(eve::cpu_), T r) noexcept { return as_cayley_dickson_n_t<4,T>(r, 0, 0, 0); }

template<eve::floating_value T0, eve::floating_value T1>
template<eve::floating_ordered_value T0, eve::floating_ordered_value T1>
constexpr auto quaternion_(EVE_EXPECTS(eve::cpu_), T0 r, T1 i) noexcept -> as_cayley_dickson_n_t<4, decltype(eve::add(r, i))>
{
return as_cayley_dickson_n_t<4, decltype(eve::add(r, i))>{r, i, 0, 0};
}

template<eve::floating_value T0, eve::floating_value T1, eve::floating_value T2, eve::floating_value T3>
template<eve::floating_ordered_value T0, eve::floating_ordered_value T1, eve::floating_ordered_value T2, eve::floating_ordered_value T3>
constexpr auto quaternion_(EVE_EXPECTS(eve::cpu_), T0 r, T1 i, T2 j, T3 k) noexcept -> as_cayley_dickson_n_t<4, decltype(eve::add(r, i, j, k))>
{
return as_cayley_dickson_n_t<4, decltype(eve::add(r, i, j, k))>{r, i, j, k};
Expand Down