toby/FractionTask
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

inv, more errors (for pow in future), toDouble and toFloat (untested)

Browse source
This commit is contained in:
Tobias Berger 2021-09-21 11:40:44 +02:00
parent 912644d841
commit 2e778ff3f4
3 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fraction.cpp
View file

@ -70,6 +70,12 @@ namespace FractionNS {
QString Fraction::display() const { QString Fraction::display() const {
return QString::number(m_numerator) + '/' + QString::number(m_denominator); return QString::number(m_numerator) + '/' + QString::number(m_denominator);
} }
Fraction& Fraction::inv() const {
return *new Fraction(m_denominator, m_numerator);
}
float Fraction::toFloat() const { return float(m_numerator) / m_denominator; }
double Fraction::toDouble() const { return double(m_numerator) / m_denominator; }
bool Fraction::operator==(const int n) const { bool Fraction::operator==(const int n) const {
return (double(m_numerator) / double(m_denominator)) == n; return (double(m_numerator) / double(m_denominator)) == n;

11
fraction.hpp
View file

@ -3,10 +3,9 @@
#include <QString> #include <QString>
namespace FractionNS { namespace FractionNS {
class divide_by_zero_error : public std::logic_error { struct divide_by_zero_error : public std::logic_error { divide_by_zero_error() : std::logic_error("tried to divide by zero") {}; };
public: struct not_real_error : public std::logic_error { not_real_error() : std::logic_error("value is not a real number") {}; };
divide_by_zero_error() : std::logic_error("tried to divide by zero") {}; struct not_defined_error : public std::logic_error { not_defined_error() : std::logic_error("operation result is not defined") {}; };
};
class Fraction class Fraction
{ {
@ -26,6 +25,10 @@ namespace FractionNS {
void setDenominator(const int); void setDenominator(const int);
QString display() const; QString display() const;
Fraction& inv() const;
float toFloat() const;
double toDouble() const;
// Binary comparison operators // Binary comparison operators
bool operator==(const int) const; bool operator==(const int) const;

21
tst_fractiontest.cpp
View file

@ -28,9 +28,12 @@ private slots:
void test_greater_than(); void test_greater_than();
void test_less_than_or_equal(); void test_less_than_or_equal();
void test_greater_than_or_equal(); void test_greater_than_or_equal();
void test_inverse();
}; };
FractionTest::FractionTest() {}; FractionTest::FractionTest() {
qDebug();
};
FractionTest::~FractionTest() {}; FractionTest::~FractionTest() {};
void FractionTest::test_constructor() { void FractionTest::test_constructor() {
@ -423,6 +426,22 @@ void FractionTest::test_greater_than_or_equal() {
} }
void FractionTest::test_inverse() {
const Fraction f1 = Fraction(3, 2);
const Fraction f2 = Fraction(2, 3);
QCOMPARE(f1.inv(), f2);
QCOMPARE(f2.inv(), f1);
const Fraction f3 = Fraction(0, 2);
bool threw_divide_by_zero_error = false;
try {
f3.inv();
} catch (const divide_by_zero_error&) {
threw_divide_by_zero_error = true;
}
QVERIFY(threw_divide_by_zero_error);
}
QTEST_APPLESS_MAIN(FractionTest) QTEST_APPLESS_MAIN(FractionTest)
#include "tst_fractiontest.moc" #include "tst_fractiontest.moc"