micke/mmathlib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix output and mov sign out front

Browse source
This commit is contained in:
Micke Nordin 2020-04-19 22:54:13 +02:00
parent 3849d1b833
commit 6924ce6031
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fractions.hpp
View file

@ -58,9 +58,6 @@ class fraction {
d = q.d; d = q.d;
} }
fraction(double dec) { fraction(double dec) {
if(dec < 0) {
dec = dec * (double) -1;
}
int precision = get_precision(dec); int precision = get_precision(dec);
signed long long denominator = 1; signed long long denominator = 1;
for(int i = 0; i < precision; i++) { for(int i = 0; i < precision; i++) {
@ -116,12 +113,26 @@ class fraction {
return a * b; 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) {
s = "-";
num = num * -1;
}
if(q.d < 0) {
s = "-";
den = den * -1;
}
if(q.get_sign() == 1) {
string s = "";
}
if( q.d == q.n) { if( q.d == q.n) {
os << 1; os << s << 1;
} else if(q.d == 1) { } else if(q.d == 1) {
os << q.n; os << s << num;
} else { } else {
os << '(' << q.n << '/' << q.d << ')'; os << s << '(' << num << '/' << den << ')';
} }
return os; return os;
} }