coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-10-28 18:07:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed 'value' to 'type'

Browse Source 
Added C++14 constant tests
This commit is contained in:
John Wellbelove 2025-01-23 09:37:40 +00:00
parent 360f503bcf
commit 44df80219b
2 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/etl/ratio.h
View File

@ -143,7 +143,7 @@ namespace etl
public:
using value = ratio<R1::num / gcd, R1::den / gcd>;
using type = ratio<R1::num / gcd, R1::den / gcd>;
};
template<typename R1, typename R2>
@ -155,14 +155,14 @@ namespace etl
public:
using value = typename ratio_reduce<ratio<R1::num * lcm / R1::den + R2::num * lcm / R2::den, lcm>>::value;
using type = typename ratio_reduce<ratio<R1::num * lcm / R1::den + R2::num * lcm / R2::den, lcm>>::type;
};
template<typename R1, typename R2>
struct ratio_subtract
{
public:
using value = typename ratio_add<R1, ratio<-R2::num, R2::den>>::value;
using type = typename ratio_add<R1, ratio<-R2::num, R2::den>>::type;
};
template<typename R1, typename R2>
@ -173,51 +173,51 @@ namespace etl
static ETL_CONSTEXPR11 intmax_t gcd2 = etl::private_ratio::ratio_gcd<intmax_t, R2::num, R1::den>::value;
public:
using value = ratio<(R1::num / gcd1) * (R2::num / gcd2), (R1::den / gcd2) * (R2::den / gcd1)>;
using type = ratio<(R1::num / gcd1) * (R2::num / gcd2), (R1::den / gcd2) * (R2::den / gcd1)>;
};
template<typename R1, typename R2>
struct ratio_divide
{
public:
using value = typename ratio_multiply<R1, ratio<R2::den, R2::num>>::value;
using type = typename ratio_multiply<R1, ratio<R2::den, R2::num>>::type;
};
}
template<typename R1, typename R2>
using ratio_add = typename private_ratio::ratio_add<R1, R2>::value;
using ratio_add = typename private_ratio::ratio_add<R1, R2>::type;
template<typename R1, typename R2>
using ratio_subtract = typename private_ratio::ratio_subtract<R1, R2>::value;
using ratio_subtract = typename private_ratio::ratio_subtract<R1, R2>::type;
template<typename R1, typename R2>
using ratio_multiply = typename private_ratio::ratio_multiply<R1, R2>::value;
using ratio_multiply = typename private_ratio::ratio_multiply<R1, R2>::type;
template<typename R1, typename R2>
using ratio_divide = typename private_ratio::ratio_divide<R1, R2>::value;
using ratio_divide = typename private_ratio::ratio_divide<R1, R2>::type;
template<typename R1, typename R2>
struct ratio_equal: etl::integral_constant<bool, (R1::num == R2::num && R1::den == R2::den)>
struct ratio_equal : etl::integral_constant<bool, (R1::num == R2::num && R1::den == R2::den)>
{
};
template<typename R1, typename R2>
struct ratio_not_equal: etl::integral_constant<bool, (R1::num != R2::num || R1::den != R2::den)>
struct ratio_not_equal : etl::integral_constant<bool, (R1::num != R2::num || R1::den != R2::den)>
{
};
template<typename R1, typename R2>
struct ratio_less: etl::integral_constant<bool, (R1::num * R2::den < R2::num * R1::den)>
struct ratio_less : etl::integral_constant<bool, (R1::num * R2::den < R2::num * R1::den)>
{
};
template<typename R1, typename R2>
struct ratio_less_equal: etl::integral_constant<bool, (R1::num * R2::den <= R2::num * R1::den)>
struct ratio_less_equal : etl::integral_constant<bool, (R1::num * R2::den <= R2::num * R1::den)>
{
};
template<typename R1, typename R2>
struct ratio_greater: etl::integral_constant<bool, (R1::num * R2::den > R2::num * R1::den)>
struct ratio_greater : etl::integral_constant<bool, (R1::num * R2::den > R2::num * R1::den)>
{
};

30
test/test_ratio.cpp
View File

@ -87,6 +87,11 @@ namespace
CHECK((etl::ratio_equal<r1, r1>::value));
CHECK((!etl::ratio_equal<r1, r2>::value));
#if ETL_USING_CPP14
CHECK((etl::ratio_equal_v<r1, r1>));
CHECK((!etl::ratio_equal_v<r1, r2>));
#endif
}
//*************************************************************************
@ -97,6 +102,11 @@ namespace
CHECK((!etl::ratio_not_equal<r1, r1>::value));
CHECK((etl::ratio_not_equal<r1, r2>::value));
#if ETL_USING_CPP14
CHECK((!etl::ratio_not_equal_v<r1, r1>));
CHECK((etl::ratio_not_equal_v<r1, r2>));
#endif
}
//*************************************************************************
@ -107,6 +117,11 @@ namespace
CHECK((etl::ratio_less<r1, r2>::value));
CHECK((!etl::ratio_less<r2, r1>::value));
#if ETL_USING_CPP14
CHECK((etl::ratio_less_v<r1, r2>));
CHECK((!etl::ratio_less_v<r1, r1>));
#endif
}
//*************************************************************************
@ -117,6 +132,11 @@ namespace
CHECK((etl::ratio_less_equal<r1, r1>::value));
CHECK((etl::ratio_less_equal<r1, r2>::value));
#if ETL_USING_CPP14
CHECK((etl::ratio_less_equal_v<r1, r1>));
CHECK((etl::ratio_less_equal_v<r1, r1>));
#endif
}
//*************************************************************************
@ -127,6 +147,11 @@ namespace
CHECK((etl::ratio_greater<r1, r2>::value));
CHECK((!etl::ratio_greater<r2, r1>::value));
#if ETL_USING_CPP14
CHECK((etl::ratio_greater_v<r1, r2>));
CHECK((!etl::ratio_greater_v<r2, r1>));
#endif
}
//*************************************************************************
@ -137,6 +162,11 @@ namespace
CHECK((etl::ratio_greater_equal<r1, r1>::value));
CHECK((etl::ratio_greater_equal<r1, r2>::value));
#if ETL_USING_CPP14
CHECK((etl::ratio_greater_equal_v<r1, r1>));
CHECK((etl::ratio_greater_equal_v<r1, r2>));
#endif
}
};