Changes in src/libcfa/rational.c [6c6455f:561f730]

File:

• src/libcfa/rational.c (modified) (2 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 : Mon May 15 21:29:23 2017
-// Update Count     : 149
+// Last Modified On : Sun May 14 17:25:19 2017
+// Update Count     : 131
 // 
 
@@ -190 +190 @@
 // conversion
 
-forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
-double widen( Rational(RationalImpl) r ) {
-        return convert( r.numerator ) / convert( r.denominator );
-} // widen
-
-// http://www.ics.uci.edu/~eppstein/numth/frap.c
-forall ( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); RationalImpl convert( double ); } )
-Rational(RationalImpl) narrow( double f, RationalImpl md ) {
-        if ( md <= (RationalImpl){1} ) {                                        // maximum fractional digits too small?
-                return (Rational(RationalImpl)){ convert( f ), (RationalImpl){1}}; // truncate fraction
-        } // if
-
-        // continued fraction coefficients
-        RationalImpl m00 = {1}, m11 = { 1 }, m01 = { 0 }, m10 = { 0 };
-        RationalImpl ai, t;
-
-        // find terms until denom gets too big
-        for ( ;; ) {
-                ai = convert( f );
-          if ( ! (m10 * ai + m11 <= md) ) break;
-                t = m00 * ai + m01;
-                m01 = m00;
-                m00 = t;
-                t = m10 * ai + m11;
-                m11 = m10;
-                m10 = t;
-                double temp = convert( ai );
-          if ( f == temp ) break;                                                       // prevent division by zero
-                f = 1 / (f - temp);
-          if ( f > (double)0x7FFFFFFF ) break;                          // representation failure
-        } // for
-        return (Rational(RationalImpl)){ m00, m10 };
-} // narrow
+// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+// double widen( Rational(RationalImpl) r ) {
+//      return (double)r.numerator / (double)r.denominator;
+// } // widen
+
+// // http://www.ics.uci.edu/~eppstein/numth/frap.c
+// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+// Rational(RationalImpl) narrow( double f, RationalImpl md ) {
+//      if ( md <= 1 ) {                                                                        // maximum fractional digits too small?
+//              return (Rational(RationalImpl)){ f, 1};                 // truncate fraction
+//      } // if
+
+//      // continued fraction coefficients
+//      RationalImpl m00 = 1, m11 = 1, m01 = 0, m10 = 0;
+//      RationalImpl ai, t;
+
+//      // find terms until denom gets too big
+//      for ( ;; ) {
+//              ai = (RationalImpl)f;
+//        if ( ! (m10 * ai + m11 <= md) ) break;
+//              t = m00 * ai + m01;
+//              m01 = m00;
+//              m00 = t;
+//              t = m10 * ai + m11;
+//              m11 = m10;
+//              m10 = t;
+//              t = (double)ai;
+//        if ( f == t ) break;                                                          // prevent division by zero
+//        f = 1 / (f - (double)t);
+//        if ( f > (double)0x7FFFFFFF ) break;                          // representation failure
+//      } 
+//      return (Rational(RationalImpl)){ m00, m10 };
+// } // narrow