Changes in src/libcfa/rational.c [f621a148:6e4b913]

File:

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

src/libcfa/rational.c

@@ -10 +10 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 27 17:05:06 2017
-// Update Count     : 51
+// Last Modified On : Sat Jul  9 11:18:04 2016
+// Update Count     : 40
 // 
 
@@ -30 +30 @@
 // Calculate greatest common denominator of two numbers, the first of which may be negative. Used to reduce rationals.
 // alternative: https://en.wikipedia.org/wiki/Binary_GCD_algorithm
-static RationalImpl gcd( RationalImpl a, RationalImpl b ) {
+static long int gcd( long int a, long int b ) {
         for ( ;; ) {                                                                            // Euclid's algorithm
-                RationalImpl r = a % b;
+                long int r = a % b;
           if ( r == 0 ) break;
                 a = b;
@@ -40 +40 @@
 } // gcd
 
-static RationalImpl simplify( RationalImpl *n, RationalImpl *d ) {
+static long int simplify( long int *n, long int *d ) {
         if ( *d == 0 ) {
                 serr | "Invalid rational number construction: denominator cannot be equal to 0." | endl;
@@ -56 +56 @@
 } // rational
 
-void ?{}( Rational * r, RationalImpl n ) {
+void ?{}( Rational * r, long int n ) {
         r{ n, 1 };
 } // rational
 
-void ?{}( Rational * r, RationalImpl n, RationalImpl d ) {
-        RationalImpl t = simplify( &n, &d );                            // simplify
+void ?{}( Rational * r, long int n, long int d ) {
+        long int t = simplify( &n, &d );                                        // simplify
         r->numerator = n / t;
         r->denominator = d / t;
@@ -67 +67 @@
 
 
-// getter for numerator/denominator
-
-RationalImpl numerator( Rational r ) {
+// getter/setter for numerator/denominator
+
+long int numerator( Rational r ) {
         return r.numerator;
 } // numerator
 
-RationalImpl denominator( Rational r ) {
-        return r.denominator;
-} // denominator
-
-[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational src ) {
-        return *dest = src.[ numerator, denominator ];
-}
-
-// setter for numerator/denominator
-
-RationalImpl numerator( Rational r, RationalImpl n ) {
-        RationalImpl prev = r.numerator;
-        RationalImpl t = gcd( abs( n ), r.denominator );                // simplify
+long int numerator( Rational r, long int n ) {
+        long int prev = r.numerator;
+        long int t = gcd( abs( n ), r.denominator );            // simplify
         r.numerator = n / t;
         r.denominator = r.denominator / t;
@@ -91 +81 @@
 } // numerator
 
-RationalImpl denominator( Rational r, RationalImpl d ) {
-        RationalImpl prev = r.denominator;
-        RationalImpl t = simplify( &r.numerator, &d );                  // simplify
+long int denominator( Rational r ) {
+        return r.denominator;
+} // denominator
+
+long int denominator( Rational r, long int d ) {
+        long int prev = r.denominator;
+        long int t = simplify( &r.numerator, &d );                      // simplify
         r.numerator = r.numerator / t;
         r.denominator = d / t;
@@ -176 +170 @@
 
 // http://www.ics.uci.edu/~eppstein/numth/frap.c
-Rational narrow( double f, RationalImpl md ) {
+Rational narrow( double f, long int md ) {
         if ( md <= 1 ) {                                                                        // maximum fractional digits too small?
                 return (Rational){ f, 1};                                               // truncate fraction
@@ -182 +176 @@
 
         // continued fraction coefficients
-        RationalImpl m00 = 1, m11 = 1, m01 = 0, m10 = 0;
-        RationalImpl ai, t;
+        long int m00 = 1, m11 = 1, m01 = 0, m10 = 0;
+        long int ai, t;
 
         // find terms until denom gets too big
         for ( ;; ) {
-                ai = (RationalImpl)f;
+                ai = (long int)f;
           if ( ! (m10 * ai + m11 <= md) ) break;
                 t = m00 * ai + m01;
@@ -208 +202 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype *is, Rational *r ) {
-        RationalImpl t;
+        long int t;
         is | &(r->numerator) | &(r->denominator);
         t = simplify( &(r->numerator), &(r->denominator) );