Indentation

main
Micke Nordin 2 years ago
parent 8dda4fe71b
commit aec0995aaf
Signed by: micke
GPG Key ID: 014B273D614BE877

@ -5,10 +5,10 @@
using namespace std;
class fraction {
private:
private:
signed long long n = 0;
signed long long d = 1;
signed long long gcd (signed long long a, signed long long b) const {
signed long long gcd(signed long long a, signed long long b) const {
if (b == 0) {
return a;
}
@ -17,41 +17,41 @@ class fraction {
int get_precision(double a) {
string s = to_string(a);
int i = s.length() - 1;
while (s[i] == '0'){
while (s[i] == '0') {
i--;
}
s.erase(i+1,s.length());
s.erase(i + 1, s.length());
bool point = false;
int count = 0;
for(int i = 0; i < s.length(); i++) {
if(s[i] == '.') {
for (int i = 0; i < s.length(); i++) {
if (s[i] == '.') {
point = true;
} else {
if(point) {
if (point) {
count++;
}
}
}
return count;
}
public:
public:
// Constructors
fraction() {
}
fraction() {}
fraction(const fraction &q) {
signed long long hcf = gcd(q.n,q.d);
signed long long hcf = gcd(q.n, q.d);
n = q.n / hcf;
d = q.d / hcf;
}
fraction(signed long long a, signed long long b) {
signed long long hcf = gcd(a,b);
signed long long hcf = gcd(a, b);
n = a / hcf;
d = b / hcf;
}
fraction(int a, int b) {
signed long long hcf = gcd(a,b);
n = (signed long long) a / hcf;
d = (signed long long) b / hcf;
signed long long hcf = gcd(a, b);
n = (signed long long)a / hcf;
d = (signed long long)b / hcf;
}
fraction(int a) {
fraction q(a, 1);
@ -61,7 +61,7 @@ class fraction {
fraction(double dec) {
int precision = get_precision(dec);
signed long long denominator = 1;
for(int i = 0; i < precision; i++) {
for (int i = 0; i < precision; i++) {
denominator *= 10;
}
signed long long numerator = dec * denominator;
@ -70,17 +70,11 @@ class fraction {
d = q.d;
}
// Member functions
int get_sign() const {
return (!(n >= 0) != !(d >=0)) ? -1 : 1;
}
signed long long get_n() const {
return n;
}
signed long long get_d() const {
return d;
}
int get_sign() const { return (!(n >= 0) != !(d >= 0)) ? -1 : 1; }
signed long long get_n() const { return n; }
signed long long get_d() const { return d; }
double to_double() const {
double dec = (double) n / (double) d ;
double dec = (double)n / (double)d;
return dec;
}
// Operators
@ -109,59 +103,59 @@ class fraction {
return q;
}
fraction operator/(const fraction &that) const {
fraction a(this->n,this->d);
fraction b(that.d,that.n);
fraction a(this->n, this->d);
fraction b(that.d, that.n);
return a * b;
}
friend ostream &operator<<( ostream &os, const fraction &q ) {
friend ostream &operator<<(ostream &os, const fraction &q) {
signed long long num = q.n;
signed long long den = q.d;
string s = "";
if(q.n < 0) {
if (q.n < 0) {
s = "-";
num = num * -1;
}
if(q.d < 0) {
if (q.d < 0) {
s = "-";
den = den * -1;
}
if(q.get_sign() == 1) {
if (q.get_sign() == 1) {
string s = "";
}
if( q.d == q.n) {
if (q.d == q.n) {
os << s << 1;
} else if(q.d == 1) {
} else if (q.d == 1) {
os << s << num;
} else {
os << s << '(' << num << '/' << den << ')';
}
return os;
}
void operator=(const fraction &q ) {
void operator=(const fraction &q) {
n = q.n;
d = q.d;
}
void operator=(const int i ) {
n = (signed long long) i;
d = (signed long long) 1;
void operator=(const int i) {
n = (signed long long)i;
d = (signed long long)1;
}
void operator=(const double dec ) {
void operator=(const double dec) {
const fraction q(dec);
n = q.n;
d = q.d;
}
bool operator>(const fraction &q ) const {
signed long long hcf = gcd(d,q.d);
bool operator>(const fraction &q) const {
signed long long hcf = gcd(d, q.d);
fraction a(*this * hcf);
fraction b(q * hcf);
return (a.n > b.n);
}
bool operator>(const int i ) const {
bool operator>(const int i) const {
fraction q(i);
return (*this > q);
}
bool operator==(const fraction &q ) const {
return ((n == q.n) && (d == q.d) );
bool operator==(const fraction &q) const {
return ((n == q.n) && (d == q.d));
}
bool operator==(const int i) const {
fraction q(i);
@ -171,8 +165,8 @@ class fraction {
fraction q(dec);
return (*this == q);
}
bool operator!=(const fraction &q ) const {
return ( (n != q.n) || (d != q.d) );
bool operator!=(const fraction &q) const {
return ((n != q.n) || (d != q.d));
}
bool operator!=(const int i) const {
fraction q(i);

Loading…
Cancel
Save