ProjetMAM/Pivot
Archived
4
1
Fork 0
Code Issues Pull Requests Actions Releases 2 Activity

refactor NR

Browse Source
This commit is contained in:
Simon Pribylski
2024-02-25 20:28:01 +01:00
parent ad288b3661
commit abd5c7ac56
2 changed files with 111 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/NR.cpp
View File

@@ -1,159 +1,130 @@
#include "NR.h" #include "NR.h"
#include <cassert>
#include <iostream> #include <iostream>
int PGCD(int x, int y) { int PGCD(int x, int y) {
if (x == 0 || y == 0) if (x == 0 || y == 0)
return 1; return 1;
else if (x % y == 0) else if (x % y == 0)
return abs(y); return std::abs(y);
else else
return PGCD(y, x % y); return PGCD(y, x % y);
} }
NR::NR(int numerator, int denominator) { NR::NR() : m_Numerator(0), m_Denominator(1) {}
NRset(numerator, denominator);
NR::NR(int entier) : m_Numerator(entier), m_Denominator(1) {}
NR::NR(int numerator, int denominator) :
m_Numerator((denominator > 0) ? numerator : -numerator), m_Denominator(std::abs(denominator)) {
assert(denominator != 0);
} }
void NR::NRset(int numerator, int denominator) { void NR::Reduce() {
if(denominator > 0)
m_Numerator = numerator;
else
m_Numerator = (-1)*numerator;
if(denominator == 0) {
std::cout<<"Essaie de créer une fraction avec un dénominateur = 0, impossible"<<std::endl;
exit(EXIT_FAILURE);
}
else
m_Denominator = abs(denominator);
}
void NR::reduceNR() {
int divisor = PGCD(m_Denominator, m_Numerator); int divisor = PGCD(m_Denominator, m_Numerator);
m_Denominator /= divisor; m_Denominator /= divisor;
m_Numerator /= divisor; m_Numerator /= divisor;
} }
void NR::invertNR() { void NR::Invert() {
NRset(m_Denominator, m_Numerator); *this = NR(m_Denominator, m_Numerator);
} }
int NR::NRgetNum() const { int NR::GetNumerator() const {
return m_Numerator; return m_Numerator;
} }
int NR::NRgetDen() const { int NR::GetDenominator() const {
return m_Denominator; return m_Denominator;
} }
NR& NR::operator =(const NR& opNR) {
NRset(opNR.NRgetNum(),opNR.NRgetDen());
return *this;
}
bool NR::operator==(const NR& opNR) const { bool NR::operator==(const NR& opNR) const {
return (m_Numerator * opNR.NRgetDen() == m_Denominator * opNR.NRgetNum()); return (m_Numerator * opNR.GetDenominator() == m_Denominator * opNR.GetNumerator());
} }
bool NR::operator<(const NR& opNR) const { bool NR::operator<(const NR& opNR) const {
return (m_Numerator * opNR.NRgetDen() < m_Denominator * opNR.NRgetNum()); return (m_Numerator * opNR.GetDenominator() < m_Denominator * opNR.GetNumerator());
} }
bool NR::operator>(const NR& opNR) const { bool NR::operator>(const NR& opNR) const {
return (m_Numerator * opNR.NRgetDen() > m_Denominator * opNR.NRgetNum()); return (m_Numerator * opNR.GetDenominator() > m_Denominator * opNR.GetNumerator());
} }
bool NR::operator!=(const NR& opNR) const { bool NR::operator!=(const NR& opNR) const {
return (not (*this == opNR)); return !(*this == opNR);
} }
bool NR::operator<=(const NR& opNR) const { bool NR::operator<=(const NR& opNR) const {
return (not (*this > opNR)); return !(*this > opNR);
} }
bool NR::operator>=(const NR& opNR) const { bool NR::operator>=(const NR& opNR) const {
return (not (*this < opNR)); return !(*this < opNR);
} }
std::ostream& operator<<(std::ostream& os, const NR& opNR) { std::ostream& operator<<(std::ostream& os, const NR& opNR) {
os<<opNR.NRgetNum()<<"/"<<opNR.NRgetDen(); os << opNR.GetNumerator() << "/" << opNR.GetDenominator();
return os; return os;
} }
std::istream& operator>>(std::istream& is, NR& opNR) { std::istream& operator>>(std::istream& is, NR& opNR) {
int num, den; char slash;
std::cout<<"Numerator: "; is >> opNR.m_Numerator >> slash >> opNR.m_Denominator;
is>>num; opNR.Reduce();
std::cout<<"Denominator: ";
is>>den;
opNR.NRset(num, den);
return is; return is;
} }
NR NR::operator+(const NR& opNR) const { NR NR::operator+(const NR& opNR) const {
int num, den; int num, den;
num = m_Numerator * opNR.NRgetDen(); num = m_Numerator * opNR.GetDenominator();
den = m_Denominator * opNR.NRgetDen(); den = m_Denominator * opNR.GetDenominator();
num += (opNR.NRgetNum() * m_Denominator); num += (opNR.GetNumerator() * m_Denominator);
NR result(num, den); NR result(num, den);
return result; return result;
} }
NR NR::operator-(const NR& opNR) const { NR NR::operator-(const NR& opNR) const {
int num, den; int num, den;
num = m_Numerator * opNR.NRgetDen(); num = m_Numerator * opNR.GetDenominator();
den = m_Denominator * opNR.NRgetDen(); den = m_Denominator * opNR.GetDenominator();
num -= (opNR.NRgetNum() * m_Denominator); num -= (opNR.GetNumerator() * m_Denominator);
NR result(num, den); NR result(num, den);
return result; return result;
} }
NR NR::operator*(const NR& opNR) const { NR NR::operator*(const NR& opNR) const {
int num, den; int num, den;
num = m_Numerator * opNR.NRgetNum(); num = m_Numerator * opNR.GetNumerator();
den = m_Denominator * opNR.NRgetDen(); den = m_Denominator * opNR.GetDenominator();
NR result(num, den); NR result(num, den);
return result; return result;
} }
NR NR::operator/(const NR& opNR) const { NR NR::operator/(const NR& opNR) const {
int num, den; int num, den;
num = m_Numerator * opNR.NRgetDen(); num = m_Numerator * opNR.GetDenominator();
den = m_Denominator * opNR.NRgetNum(); den = m_Denominator * opNR.GetNumerator();
NR result(num, den); NR result(num, den);
return result; return result;
} }
void NR::test() { NR& NR::operator+=(const NR& opNR) {
NR* frac = new NR; *this = *this + opNR;
NR frac2(3); return *this;
NR frac3(2,5); }
int a, b;
std::cout<<"PGCD : entrez deux entiers"<<std::endl; NR& NR::operator-=(const NR& opNR) {
std::cin>>a>>b; *this = *this - opNR;
std::cout<<PGCD(a,b)<<std::endl; return *this;
std::cout<<"frac : entrez deux entiers"<<std::endl; }
std::cin>>a>>b;
NR fractest(a, b); NR& NR::operator*=(const NR& opNR) {
std::cout<<fractest<<" + "<<frac3<<" = "<<std::endl; *this = *this * opNR;
std::cout<<">> "<<(fractest + frac3)<<std::endl; return *this;
std::cout<<">> "<<(fractest + frac3).NRgetNum()<<"/"<<(fractest + frac3).NRgetDen()<<std::endl; }
fractest = fractest + frac3;
std::cout<<">> "<<fractest<<std::endl; NR& NR::operator/=(const NR& opNR) {
frac->NRset(2, 4); *this = *this / opNR;
NR anotherfrac; return *this;
std::cin>>anotherfrac;
std::cout<<"Compare "<<fractest<<" and "<<anotherfrac<<" : ==? "<<(fractest == anotherfrac)<<" <? "<<(fractest < anotherfrac)<<" >=? "<<(fractest >= anotherfrac)<< std::endl;
std::cout<<anotherfrac<<" - "<<*frac<<" = "<<anotherfrac - *frac<<std::endl;
std::cout<<anotherfrac<<" * "<<*frac<<" = "<<std::endl<<">> "<<anotherfrac * *frac<<std::endl;
fractest = anotherfrac * *frac;
std::cout<<">> "<<fractest<<std::endl;
fractest.reduceNR();
std::cout<<">> "<<fractest<<std::endl;
std::cout<<anotherfrac<<" / "<<frac2<<" = "<<anotherfrac / frac2<<std::endl;
NR numNR(2,4);
NR otherNR(3,1);
std::cout<<numNR<<" - "<<otherNR<<" = "<<std::endl;
NR subNR = numNR - otherNR;
std::cout<<">> "<<(numNR - otherNR)<<std::endl<<">> "<<subNR<<std::endl;
delete frac;
} }

30
src/NR.h
View File

@@ -8,18 +8,12 @@ class NR {
int m_Denominator; // has to be > 0, sign is carried by the numerator int m_Denominator; // has to be > 0, sign is carried by the numerator
public: public:
NR() : m_Numerator(0), m_Denominator(1) {} NR();
NR(int entier);
NR(int entier) : m_Numerator(entier), m_Denominator(1) {}
NR(int numerator, int denominator); // check if denominator != 0 NR(int numerator, int denominator); // check if denominator != 0
void NRset(int numerator, int denominator); //same
void reduceNR(); //divide by PGCD, not automatically called yet int GetNumerator() const;
void invertNR(); int GetDenominator() const;
int NRgetNum() const;
int NRgetDen() const;
NR& operator =(const NR& opNR);
bool operator==(const NR& opNR) const; bool operator==(const NR& opNR) const;
bool operator<(const NR& opNR) const; bool operator<(const NR& opNR) const;
@@ -29,15 +23,23 @@ class NR {
bool operator<=(const NR& opNR) const; bool operator<=(const NR& opNR) const;
bool operator>=(const NR& opNR) const; bool operator>=(const NR& opNR) const;
friend std::ostream& operator <<(std::ostream& os, const NR& opNR);
friend std::istream& operator >>(std::istream& os, NR& opNR);
NR operator+(const NR& opNR) const; NR operator+(const NR& opNR) const;
NR operator-(const NR& opNR) const; NR operator-(const NR& opNR) const;
NR operator*(const NR& opNR) const; NR operator*(const NR& opNR) const;
NR operator/(const NR& opNR) const; NR operator/(const NR& opNR) const;
static void test(); NR& operator+=(const NR& opNR);
NR& operator-=(const NR& opNR);
NR& operator*=(const NR& opNR);
NR& operator/=(const NR& opNR);
void Invert();
friend std::ostream& operator<<(std::ostream& os, const NR& opNR);
friend std::istream& operator>>(std::istream& os, NR& opNR);
private:
void Reduce();
}; };
int PGCD(int x, int y); int PGCD(int x, int y);