SquareGameLiberationFront/F.E.I.S
1
0
Fork 0
mirror of https://gitlab.com/square-game-liberation-front/F.E.I.S.git synced 2025-03-01 07:50:25 +01:00
Code Releases Wiki Activity

More fixes in numeric types

Browse Source
This commit is contained in:
Stepland 2022-12-27 13:48:27 +01:00
parent 5f4ba2bfd6
commit ea339874f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/special_numeric_types.cpp
View File

@ -18,7 +18,7 @@ Fraction::Fraction(const unsigned long long a, const unsigned long long b) {
Fraction::Fraction(const Decimal& d) { Fraction::Fraction(const Decimal& d) {
const auto reduced = d.reduce(); const auto reduced = d.reduce();
const mpq_class sign = (reduced.sign() > 0 ? 1 : -1); const mpq_class sign = (reduced.sign() > 0 ? 1 : -1);
const mpq_class coefficient = reduced.coeff().u64(); const mpq_class coefficient = Fraction{reduced.coeff().u64()}.value;
const auto exponent = reduced.exponent(); const auto exponent = reduced.exponent();
const mpq_class power = fast_pow(mpq_class(10), std::abs(exponent)); const mpq_class power = fast_pow(mpq_class(10), std::abs(exponent));
if (exponent >= 0) { if (exponent >= 0) {
@ -142,7 +142,7 @@ std::int64_t convert_to_i64(const mpz_class& z) {
const mpz_class abs = positive ? z : -z; const mpz_class abs = positive ? z : -z;
/* We can only get unsigned longs from GMP (32 garanteed bits), so we have /* We can only get unsigned longs from GMP (32 garanteed bits), so we have
to split between low and high */ to split between low and high */
const mpz_class low = abs & INT64_C(0x00000000ffffffff); const mpz_class low = abs & 0x00000000ffffffffUL;
const mpz_class high = abs >> 32; const mpz_class high = abs >> 32;
const auto low_ul = low.get_ui(); const auto low_ul = low.get_ui();
const auto high_ul = high.get_ui(); const auto high_ul = high.get_ui();
@ -214,13 +214,13 @@ Fraction convert_to_fraction(const Decimal& d) {
}; };
Fraction round_beats(Fraction beats, std::uint64_t denominator) { Fraction round_beats(Fraction beats, std::uint64_t denominator) {
beats *= denominator; beats *= Fraction{denominator};
const auto nearest = round_fraction(beats); const auto nearest = round_fraction(beats);
return nearest / Fraction{denominator}; return nearest / Fraction{denominator};
}; };
Fraction floor_beats(Fraction beats, std::uint64_t denominator) { Fraction floor_beats(Fraction beats, std::uint64_t denominator) {
beats *= denominator; beats *= Fraction{denominator};
const auto nearest = floor_fraction(beats); const auto nearest = floor_fraction(beats);
return nearest / Fraction{denominator}; return nearest / Fraction{denominator};
}; };