X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fparanoidnumber.h;h=a175ed5ddd68cffb4b88cd3812acb2e3e3f9f0b2;hp=3a38286ae706d03bd9babe981cb02c235458bd8b;hb=326f04a375ce3120f7e8957e3d7cd5f296f513e3;hpb=b29310a04a51cd7d39d0858e2dec8a75c15cf097

diff --git a/src/paranoidnumber.h b/src/paranoidnumber.h
index 3a38286..a175ed5 100644
--- a/src/paranoidnumber.h
+++ b/src/paranoidnumber.h
@@ -19,11 +19,11 @@
 //#define PARANOID_CACHE_RESULTS
 
 //#define PARANOID_USE_ARENA
-#define PARANOID_SIZE_LIMIT 10
+//#define PARANOID_SIZE_LIMIT 3
 
 
 // Define to compare all ops against double ops and check within epsilon
-//#define PARANOID_COMPARE_EPSILON 1e-
+//#define PARANOID_COMPARE_EPSILON 1e-6
 #ifdef PARANOID_COMPARE_EPSILON
 #define CompareForSanity(...) ParanoidNumber::CompareForSanityEx(__func__, __FILE__, __LINE__, __VA_ARGS__)
 #endif
@@ -93,6 +93,7 @@ namespace IPDF
 				#endif
 				#ifdef PARANOID_CACHE_RESULTS
 					m_cached_result = value;
+					m_cache_valid = true;
 				#endif 
 			}
 			
@@ -104,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)
 				{
@@ -265,6 +267,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
@@ -275,7 +278,7 @@ namespace IPDF
 			class Arena
 			{
 				public:
-					Arena(int64_t block_size = 10000000);
+					Arena(int64_t block_size = 10000);
 					~Arena();
 					
 					void * allocate(size_t bytes);
@@ -308,7 +311,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);