Browse Source

add double constructor

jezv 11 months ago
parent
commit
57c6780fdb
1 changed files with 3 additions and 11 deletions
  1. 3 11
      Fractional.cpp

+ 3 - 11
Fractional.cpp

@@ -11,21 +11,13 @@ Fraction::Fraction(long long int num, long long int denum)
     int layer, spec;
     while(num > 1 or denum > 1)
     {
-        if (num == 0 or denum == 0) {
-            cout << num + denum << endl;
-            layers.add(num + denum);
-            break;
-        }
+        if (num == 0 or denum == 0) break;
         layer = num / denum;
         spec = denum;
         denum = num - (layer*denum);
         num = spec;
-        cout << layer;
         layers.add(layer);
-        cout << " added\n";
-        cout << num << ' ' << denum << endl; 
     }
-    cout << "init success" << endl;
 }
 
 Fraction::Fraction(Rational r)
@@ -33,9 +25,9 @@ Fraction::Fraction(Rational r)
     Fraction(r.num, r.denum);
 }
 
-Fraction::Fraction(double d)
+Fraction::Fraction(double x)
 {
-    
+    Fraction(Rational(x));
 }
 
 Fraction::operator Rational()