|
@@ -1,23 +1,12 @@
|
|
|
#include "Fraction.h"
|
|
|
-#include "Rational.h"
|
|
|
+#include "../Rational.h"
|
|
|
#include <iostream>
|
|
|
#include <cmath>
|
|
|
|
|
|
using namespace std;
|
|
|
|
|
|
|
|
|
-Fraction::Fraction(Rational r)
|
|
|
-{
|
|
|
- Fractain(r.num, r.denum);
|
|
|
-}
|
|
|
-
|
|
|
-Fraction::Fraction(double d)
|
|
|
-{
|
|
|
-
|
|
|
-}
|
|
|
-
|
|
|
-
|
|
|
-void Fraction::Fractain(long long num, long long denum)
|
|
|
+Fraction::Fraction(long long int num, long long int denum)
|
|
|
{
|
|
|
int layer, spec;
|
|
|
while(num > 1 or denum > 1)
|
|
@@ -30,13 +19,23 @@ void Fraction::Fractain(long long num, long long denum)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+Fraction::Fraction(Rational r)
|
|
|
+{
|
|
|
+ Fraction(r.num, r.denum);
|
|
|
+}
|
|
|
+
|
|
|
+Fraction::Fraction(double d)
|
|
|
+{
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
Fraction::operator Rational()
|
|
|
{
|
|
|
long long num = 1;
|
|
|
long long denum = layers.pop();
|
|
|
int spec;
|
|
|
cout << '(' << num << '/' << denum << ')' << endl;
|
|
|
- while(!layers.isNull())
|
|
|
+ while(layers.lenght > 0)
|
|
|
{
|
|
|
spec = denum;
|
|
|
denum = num + denum * layers.pop();
|