Changes in libcfa/src/rational.hfa [5dc4c7e:fd54fef]

File:

• libcfa/src/rational.hfa (modified) (2 diffs)

libcfa/src/rational.hfa

@@ -12 +12 @@
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 20 17:45:29 2021
-// Update Count     : 118
+// Last Modified On : Tue Mar 26 23:16:10 2019
+// Update Count     : 109
 //
 
@@ -19 +19 @@
 
 #include "iostream.hfa"
-#include "math.trait.hfa"                                                               // Arithmetic
+
+trait scalar( T ) {
+};
+
+trait arithmetic( T | scalar( T ) ) {
+        int !?( T );
+        int ?==?( T, T );
+        int ?!=?( T, T );
+        int ?<?( T, T );
+        int ?<=?( T, T );
+        int ?>?( T, T );
+        int ?>=?( T, T );
+        void ?{}( T &, zero_t );
+        void ?{}( T &, one_t );
+        T +?( T );
+        T -?( T );
+        T ?+?( T, T );
+        T ?-?( T, T );
+        T ?*?( T, T );
+        T ?/?( T, T );
+        T ?%?( T, T );
+        T ?/=?( T &, T );
+        T abs( T );
+};
 
 // implementation
 
-forall( T | Arithmetic( T ) ) {
+forall( RationalImpl | arithmetic( RationalImpl ) ) {
         struct Rational {
-                T numerator, denominator;                                               // invariant: denominator > 0
+                RationalImpl numerator, denominator;                    // invariant: denominator > 0
         }; // Rational
 
         // constructors
 
-        void ?{}( Rational(T) & r );
-        void ?{}( Rational(T) & r, zero_t );
-        void ?{}( Rational(T) & r, one_t );
-        void ?{}( Rational(T) & r, T n );
-        void ?{}( Rational(T) & r, T n, T d );
+        void ?{}( Rational(RationalImpl) & r );
+        void ?{}( Rational(RationalImpl) & r, RationalImpl n );
+        void ?{}( Rational(RationalImpl) & r, RationalImpl n, RationalImpl d );
+        void ?{}( Rational(RationalImpl) & r, zero_t );
+        void ?{}( Rational(RationalImpl) & r, one_t );
 
         // numerator/denominator getter
 
-        T numerator( Rational(T) r );
-        T denominator( Rational(T) r );
-        [ T, T ] ?=?( & [ T, T ] dest, Rational(T) src );
+        RationalImpl numerator( Rational(RationalImpl) r );
+        RationalImpl denominator( Rational(RationalImpl) r );
+        [ RationalImpl, RationalImpl ] ?=?( & [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src );
 
         // numerator/denominator setter
 
-        T numerator( Rational(T) r, T n );
-        T denominator( Rational(T) r, T d );
+        RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n );
+        RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d );
 
         // comparison
 
-        int ?==?( Rational(T) l, Rational(T) r );
-        int ?!=?( Rational(T) l, Rational(T) r );
-        int ?!=?( Rational(T) l, zero_t );                                      // => !
-        int ?<?( Rational(T) l, Rational(T) r );
-        int ?<=?( Rational(T) l, Rational(T) r );
-        int ?>?( Rational(T) l, Rational(T) r );
-        int ?>=?( Rational(T) l, Rational(T) r );
+        int ?==?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+        int ?!=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+        int ?<?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+        int ?<=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+        int ?>?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+        int ?>=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 
         // arithmetic
 
-        Rational(T) +?( Rational(T) r );
-        Rational(T) -?( Rational(T) r );
-        Rational(T) ?+?( Rational(T) l, Rational(T) r );
-        Rational(T) ?+=?( Rational(T) & l, Rational(T) r );
-        Rational(T) ?+=?( Rational(T) & l, one_t );                     // => ++?, ?++
-        Rational(T) ?-?( Rational(T) l, Rational(T) r );
-        Rational(T) ?-=?( Rational(T) & l, Rational(T) r );
-        Rational(T) ?-=?( Rational(T) & l, one_t );                     // => --?, ?--
-        Rational(T) ?*?( Rational(T) l, Rational(T) r );
-        Rational(T) ?*=?( Rational(T) & l, Rational(T) r );
-        Rational(T) ?/?( Rational(T) l, Rational(T) r );
-        Rational(T) ?/=?( Rational(T) & l, Rational(T) r );
+        Rational(RationalImpl) +?( Rational(RationalImpl) r );
+        Rational(RationalImpl) -?( Rational(RationalImpl) r );
+        Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+        Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+        Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+        Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 
         // I/O
-        forall( istype & | istream( istype ) | { istype & ?|?( istype &, T & ); } )
-        istype & ?|?( istype &, Rational(T) & );
+        forall( istype & | istream( istype ) | { istype & ?|?( istype &, RationalImpl & ); } )
+        istype & ?|?( istype &, Rational(RationalImpl) & );
 
-        forall( ostype & | ostream( ostype ) | { ostype & ?|?( ostype &, T ); } ) {
-                ostype & ?|?( ostype &, Rational(T) );
-                void ?|?( ostype &, Rational(T) );
+        forall( ostype & | ostream( ostype ) | { ostype & ?|?( ostype &, RationalImpl ); } ) {
+                ostype & ?|?( ostype &, Rational(RationalImpl) );
+                void ?|?( ostype &, Rational(RationalImpl) );
         } // distribution
 } // distribution
 
-forall( T | Arithmetic( T ) | { T ?\?( T, unsigned long ); } ) {
-        Rational(T) ?\?( Rational(T) x, long int y );
-        Rational(T) ?\=?( Rational(T) & x, long int y );
-} // distribution
+forall( RationalImpl | arithmetic( RationalImpl ) |{RationalImpl ?\?( RationalImpl, unsigned long );} )
+Rational(RationalImpl) ?\?( Rational(RationalImpl) x, long int y );
 
 // conversion
-forall( T | Arithmetic( T ) | { double convert( T ); } )
-double widen( Rational(T) r );
-forall( T | Arithmetic( T ) | { double convert( T );  T convert( double );} )
-Rational(T) narrow( double f, T md );
+forall( RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
+double widen( Rational(RationalImpl) r );
+forall( RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl );  RationalImpl convert( double );} )
+Rational(RationalImpl) narrow( double f, RationalImpl md );
 
 // Local Variables: //