X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fparanoidnumber.h;h=29e15d599dd73f3f14f4d6dc3be997dee02a33cc;hp=041e445cde382ee2adf676fbf9ab39f0353f0c35;hb=a8297c3461718f2d9afc7a2f8ca620d320ac5f97;hpb=3917214a11bf76381ddc528e3fe51de9ec038d42

diff --git a/src/paranoidnumber.h b/src/paranoidnumber.h
index 041e445..29e15d5 100644
--- a/src/paranoidnumber.h
+++ b/src/paranoidnumber.h
@@ -19,12 +19,14 @@
 //#define PARANOID_CACHE_RESULTS
 
 //#define PARANOID_USE_ARENA
-#define PARANOID_SIZE_LIMIT 1
+#define PARANOID_SIZE_LIMIT 4
 
 
 // Define to compare all ops against double ops and check within epsilon
-#define PARANOID_COMPARE_EPSILON 1e-6
+//#define PARANOID_COMPARE_EPSILON 1e-6
+#ifdef PARANOID_COMPARE_EPSILON
 #define CompareForSanity(...) ParanoidNumber::CompareForSanityEx(__func__, __FILE__, __LINE__, __VA_ARGS__)
+#endif
 
 namespace IPDF
 {
@@ -91,6 +93,7 @@ namespace IPDF
 				#endif
 				#ifdef PARANOID_CACHE_RESULTS
 					m_cached_result = value;
+					m_cache_valid = true;
 				#endif 
 			}
 			
@@ -102,6 +105,7 @@ namespace IPDF
 				#endif
 				#ifdef PARANOID_CACHE_RESULTS
 					m_cached_result = cpy.m_cached_result;
+					m_cache_valid = cpy.m_cache_valid;
 				#endif 
 				for (int i = 0; i < NOP; ++i)
 				{
@@ -141,6 +145,8 @@ namespace IPDF
 			// Like this one. It isn't const.
 			double ToDouble() const {return (double)Digit();}
 			
+			operator double() const {return ToDouble();}
+			
 			// This one is probably const.
 			bool Floating() const 
 			{
@@ -233,6 +239,7 @@ namespace IPDF
 			
 			std::string Str() const;
 
+			#ifdef PARANOID_COMPARE_EPSILON
 			inline void CompareForSanityEx(const char * func, const char * file, int line, const digit_t & compare, const digit_t & arg, const digit_t & eps = PARANOID_COMPARE_EPSILON)
 			{
 				if (!SanityCheck())
@@ -244,7 +251,7 @@ namespace IPDF
 					Fatal("This: %.30lf vs Expected: %.30lf", Digit(), compare);
 				}
 			}
-
+			#endif
 			
 			std::string PStr() const;
 			
@@ -262,6 +269,7 @@ namespace IPDF
 			digit_t m_value;	
 			#ifdef PARANOID_CACHE_RESULTS
 				digit_t m_cached_result;
+				bool m_cache_valid;
 			#endif
 			std::vector<ParanoidNumber*> m_next[4];
 			#ifdef PARANOID_SIZE_LIMIT
@@ -272,7 +280,7 @@ namespace IPDF
 			class Arena
 			{
 				public:
-					Arena(int64_t block_size = 10000000);
+					Arena(int64_t block_size = 10000);
 					~Arena();
 					
 					void * allocate(size_t bytes);
@@ -305,7 +313,7 @@ template <class T>
 T ParanoidNumber::Convert() const
 {
 	#ifdef PARANOID_CACHE_RESULTS
-	if (!isnan((float(m_cached_result))))
+	if (m_cache_valid)
 		return (T)m_cached_result;
 	#endif
 	T value(m_value);
@@ -326,6 +334,8 @@ T ParanoidNumber::Convert() const
 
 
 
+
+
 }
 
 #endif //_PARANOIDNUMBER_H