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

diff --git a/src/paranoidnumber.h b/src/paranoidnumber.h
index 6ad24f2..041e445 100644
--- a/src/paranoidnumber.h
+++ b/src/paranoidnumber.h
@@ -19,12 +19,12 @@
 //#define PARANOID_CACHE_RESULTS
 
 //#define PARANOID_USE_ARENA
-#define PARANOID_SIZE_LIMIT 0
+#define PARANOID_SIZE_LIMIT 1
 
 
 // Define to compare all ops against double ops and check within epsilon
 #define PARANOID_COMPARE_EPSILON 1e-6
-#define CompareForSanity(...) this->ParanoidNumber::CompareForSanityEx(__func__, __FILE__, __LINE__, __VA_ARGS__)
+#define CompareForSanity(...) ParanoidNumber::CompareForSanityEx(__func__, __FILE__, __LINE__, __VA_ARGS__)
 
 namespace IPDF
 {
@@ -87,7 +87,7 @@ namespace IPDF
 			ParanoidNumber(PARANOID_DIGIT_T value=0) : m_value(value), m_next()
 			{
 				#ifdef PARANOID_SIZE_LIMIT
-					m_size = 0;
+					m_size = 1;
 				#endif
 				#ifdef PARANOID_CACHE_RESULTS
 					m_cached_result = value;
@@ -111,6 +111,9 @@ namespace IPDF
 							m_next[i].push_back(new ParanoidNumber(*next)); // famous last words...
 					}
 				}
+				#ifdef PARANOID_COMPARE_EPSILON
+					CompareForSanity(cpy.Digit(), cpy.Digit());
+				#endif
 				//assert(SanityCheck());
 			}
 			
@@ -171,47 +174,60 @@ namespace IPDF
 			
 			
 			// None of these are actually const
-			bool operator<(const ParanoidNumber & a) const {return ToDouble() < a.ToDouble();}
-			bool operator<=(const ParanoidNumber & a) const {return this->operator<(a) || this->operator==(a);}
-			bool operator>(const ParanoidNumber & a) const {return !(this->operator<=(a));}
-			bool operator>=(const ParanoidNumber & a) const {return !(this->operator<(a));}
-			bool operator==(const ParanoidNumber & a) const {return ToDouble() == a.ToDouble();}
-			bool operator!=(const ParanoidNumber & a) const {return !(this->operator==(a));}
+			bool operator<(const ParanoidNumber & a) const {return Digit() < a.Digit();}
+			bool operator<=(const ParanoidNumber & a) const {return Digit() <= a.Digit();}
+			bool operator>(const ParanoidNumber & a) const {return Digit() > a.Digit();}
+			bool operator>=(const ParanoidNumber & a) const {return Digit() >= a.Digit();}
+			bool operator==(const ParanoidNumber & a) const {return Digit() == a.Digit();}
+			bool operator!=(const ParanoidNumber & a) const {return Digit() != a.Digit();}
 			
 			ParanoidNumber operator-() const
 			{
-				ParanoidNumber neg(0);
-				neg -= *this;
+				ParanoidNumber neg(*this);
+				neg.Negate();
+				#ifdef PARANOID_COMPARE_EPSILON
+					neg.CompareForSanity(-Digit(), Digit());
+				#endif
 				return neg;
 			}
 			
+			void Negate();
+			
+			
 			ParanoidNumber operator+(const ParanoidNumber & a) const
 			{
 				ParanoidNumber result(*this);
-				a.SanityCheck();
 				result += a;
+				#ifdef PARANOID_COMPARE_EPSILON
+					result.CompareForSanity(Digit()+a.Digit(), a.Digit());
+				#endif
 				return result;
 			}
 			ParanoidNumber operator-(const ParanoidNumber & a) const
 			{
 				ParanoidNumber result(*this);
 				result -= a;
+				#ifdef PARANOID_COMPARE_EPSILON
+					result.CompareForSanity(Digit()-a.Digit(), a.Digit());
+				#endif
 				return result;
 			}
 			ParanoidNumber operator*(const ParanoidNumber & a) const
 			{
 				ParanoidNumber result(*this);
 				result *= a;
-				if (!result.SanityCheck())
-				{
-					Fatal("Blargh");
-				}
+				#ifdef PARANOID_COMPARE_EPSILON
+					result.CompareForSanity(Digit()*a.Digit(), a.Digit());
+				#endif
 				return result;
 			}
 			ParanoidNumber operator/(const ParanoidNumber & a) const
 			{
 				ParanoidNumber result(*this);
 				result /= a;
+				#ifdef PARANOID_COMPARE_EPSILON
+					result.CompareForSanity(Digit()/a.Digit(), a.Digit());
+				#endif
 				return result;
 			}
 			
@@ -219,6 +235,8 @@ namespace IPDF
 
 			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())
+					Fatal("This is insane!");
 				if (fabs(Digit() - compare) > eps)
 				{
 					Error("Called via %s(%lf) (%s:%d)", func, arg, file, line);