git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix kerning for the first pair of characters
[ipdf/code.git]
/
src
/
real.h
diff --git
a/src/real.h
b/src/real.h
index
798ea0b
..
406cb8e
100644
(file)
--- a/
src/real.h
+++ b/
src/real.h
@@
-2,12
+2,13
@@
#define _REAL_H
#include "common.h"
#define _REAL_H
#include "common.h"
+#include <cmath>
#define REAL_SINGLE 0
#define REAL_DOUBLE 1
#define REAL_LONG_DOUBLE 2
#define REAL_SINGLE 0
#define REAL_DOUBLE 1
#define REAL_LONG_DOUBLE 2
-#define REAL_
SINGLE_FAST2SUM 3 //TODO: Remove, is FITH
+#define REAL_
VFPU 3
#define REAL_RATIONAL 4
#define REAL_RATIONAL_ARBINT 5
#define REAL_RATIONAL 4
#define REAL_RATIONAL_ARBINT 5
@@
-15,9
+16,9
@@
#error "REAL was not defined!"
#endif
#error "REAL was not defined!"
#endif
-#if REAL
>= REAL_SINGLE_FAST2SUM
- #include "
real_fast2sum
.h"
-#endif
//REAL
+#if REAL
== REAL_VFPU
+ #include "
vfpu
.h"
+#endif
#if REAL == REAL_RATIONAL
#include "rational.h"
#if REAL == REAL_RATIONAL
#include "rational.h"
@@
-39,12
+40,11
@@
namespace IPDF
typedef double Real;
#elif REAL == REAL_LONG_DOUBLE
typedef long double Real;
typedef double Real;
#elif REAL == REAL_LONG_DOUBLE
typedef long double Real;
-#elif REAL == REAL_
SINGLE_FAST2SUM
- typedef
RealF2S<float>
Real;
+#elif REAL == REAL_
VFPU
+ typedef
VFPU::VFloat
Real;
inline float Float(const Real & r) {return r.m_value;}
inline double Double(const Real & r) {return r.m_value;}
#elif REAL == REAL_RATIONAL
inline float Float(const Real & r) {return r.m_value;}
inline double Double(const Real & r) {return r.m_value;}
#elif REAL == REAL_RATIONAL
-
typedef Rational<int64_t> Real;
inline float Float(const Real & r) {return (float)r.ToDouble();}
inline double Double(const Real & r) {return r.ToDouble();}
typedef Rational<int64_t> Real;
inline float Float(const Real & r) {return (float)r.ToDouble();}
inline double Double(const Real & r) {return r.ToDouble();}
@@
-54,12
+54,7
@@
namespace IPDF
typedef Rational<ARBINT> Real;
inline float Float(const Real & r) {return (float)r.ToDouble();}
inline double Double(const Real & r) {return r.ToDouble();}
typedef Rational<ARBINT> Real;
inline float Float(const Real & r) {return (float)r.ToDouble();}
inline double Double(const Real & r) {return r.ToDouble();}
- inline Rational<ARBINT> pow(const Rational<ARBINT> & a, const Rational<ARBINT> & b)
- {
- ARBINT P(std::pow(static_cast<double>(a.P), b.ToDouble()));
- ARBINT Q(std::pow(static_cast<double>(a.Q), b.ToDouble()));
- return Rational<ARBINT>(P,Q);
- }
+
#else
#error "Type of Real unspecified."
#endif //REAL
#else
#error "Type of Real unspecified."
#endif //REAL
@@
-73,6
+68,22
@@
namespace IPDF
inline double Double(float f) {return (double)f;}
inline double Double(double f) {return (double)f;}
inline double Double(long double f) {return (double)(f);}
inline double Double(float f) {return (double)f;}
inline double Double(double f) {return (double)f;}
inline double Double(long double f) {return (double)(f);}
+ inline double Sqrt(double f) {return sqrt(f);}
+
+ inline Real Power(const Real & a, int n)
+ {
+ if (n < 0)
+ {
+ return Power(Real(1)/a, -n);
+ }
+ Real r(1);
+ for (int i = 0; i < n; ++i)
+ r *= a;
+ return r;
+ }
+
+
+
}
#endif //_REAL_H
}
#endif //_REAL_H
UCC
git Repository :: git.ucc.asn.au