RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:17:44 +00:00
Code Issues Activity Actions

AK: Fix FixedPoint to integral comparisons

Browse source 
Add tests to ensure that the fixed point numbers compare correctly to
integrals
This commit is contained in:
kleines Filmröllchen 2022-02-15 00:32:55 +01:00 • committed by Andreas Kling
parent f5fd2f3857
commit 5d6e3441fe
2 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

28
AK/FixedPoint.h
View file

@ -261,42 +261,22 @@ public:
template<Integral I> template<Integral I>
bool operator>(I other) const bool operator>(I other) const
{ {
if (m_value > 0) return !(*this <= other);
return (m_value >> precision) > other || (m_value >> precision == other && (m_value & radix_mask));
if (other > 0)
return false;
return (m_value >> precision) > other || !(m_value >> precision == other && (m_value & radix_mask));
} }
template<Integral I> template<Integral I>
bool operator>=(I other) const bool operator>=(I other) const
{ {
if (m_value > 0) return !(*this < other);
return (m_value >> precision) >= other || (m_value >> precision == other && (m_value & radix_mask));
if (other > 0)
return false;
return (m_value >> precision) >= other || !(m_value >> precision == other && (m_value & radix_mask));
} }
template<Integral I> template<Integral I>
bool operator<(I other) const bool operator<(I other) const
{ {
if (m_value > 0) return (m_value >> precision) < other || m_value < (other << precision);
return (m_value >> precision) < other || !(m_value >> precision == other && (m_value & radix_mask));
if (other > 0)
return true;
return (m_value >> precision) < other || (m_value >> precision == other && (m_value & radix_mask));
} }
template<Integral I> template<Integral I>
bool operator<=(I other) const bool operator<=(I other) const
{ {
if (m_value > 0) return *this < other || *this == other;
return (m_value >> precision) <= other || !(m_value >> precision == other && (m_value & radix_mask));
if (other > 0)
return true;
return (m_value >> precision) <= other || (m_value >> precision == other && (m_value & radix_mask));
} }
// Casting from a float should be faster than casting to a float // Casting from a float should be faster than casting to a float

25
Tests/AK/TestFixedPoint.cpp
View file

@ -73,6 +73,31 @@ TEST_CASE(rounding)
EXPECT_EQ(Type(-1.5).ltrunk(), -1); EXPECT_EQ(Type(-1.5).ltrunk(), -1);
} }
TEST_CASE(comparison)
{
EXPECT(Type(0) < 1);
EXPECT(Type(0) <= 1);
EXPECT(Type(0) <= 0);
EXPECT(Type(-10) <= -10);
EXPECT(Type(4.25) > 4);
EXPECT(Type(4.25) >= 4);
EXPECT(Type(4.25) <= 5);
EXPECT(Type(4.25) < 5);
EXPECT(Type(1.5) > 1);
EXPECT(!(FixedPoint<4, u8>(2) > 128));
EXPECT(!(FixedPoint<4, u8>(2) >= 128));
EXPECT(Type(-6.25) < -6);
EXPECT(Type(-6.25) <= -6);
EXPECT(Type(-6.75) > -7);
EXPECT(Type(-6.75) >= -7);
EXPECT(Type(17) == 17);
EXPECT(Type(-8) != -9);
}
TEST_CASE(cast) TEST_CASE(cast)
{ {
FixedPoint<16, u32> downcast_value1(FixedPoint<32, u64>(123.4567)); FixedPoint<16, u32> downcast_value1(FixedPoint<32, u64>(123.4567));