Changes in src/libcfa/rational.c [d1ab5331:45161b4d]

File:

• src/libcfa/rational.c (modified) (5 diffs)

src/libcfa/rational.c

@@ -11 +11 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  4 14:16:14 2016
-// Update Count     : 25
+// Last Modified On : Tue Apr 12 21:26:42 2016
+// Update Count     : 21
 // 
 
@@ -18 +18 @@
 #include "fstream"
 #include "stdlib"
-#include "math"                                                                                 // floor
 
 
@@ -53 +52 @@
 // constructors
 
-void ?{}( Rational * r ) {
-    r{ 0, 1 };
+Rational rational() {
+    return (Rational){ 0, 1 };
 } // rational
 
-void ?{}( Rational * r, long int n ) {
-    r{ n, 1 };
+Rational rational( long int n ) {
+    return (Rational){ n, 1 };
 } // rational
 
-void ?{}( Rational * r, long int n, long int d ) {
+Rational rational( long int n, long int d ) {
     long int t = simplify( &n, &d );                                    // simplify
-    r->numerator = n / t;
-        r->denominator = d / t;
+    return (Rational){ n / t, d / t };
 } // rational
 
@@ -173 +171 @@
 Rational narrow( double f, long int md ) {
         if ( md <= 1 ) {                                                                        // maximum fractional digits too small?
-                return (Rational){ f, 1};                                               // truncate fraction
+                Rational t = rational( f, 1 );                                  // truncate fraction
+                return t;
         } // if
 
@@ -199 +198 @@
                 k[2] = x * k[1] + k[0]; k[0] = k[1]; k[1] = k[2];
         } // for
-        return (Rational){ neg ? -h[1] : h[1], k[1] };
+        Rational t = rational( neg ? -h[1] : h[1], k[1] );
+        return t;
 } // narrow