Changeset 2319 for branches/0.6-stable

Timestamp:

Aug 20, 2010, 9:11:30 PM (13 years ago)

Author:

Peter

Message:

fixed more problems with overflow in Fisher. refs #638

Location:

branches/0.6-stable

Files:

• test/fisher_test.cc (modified) (1 diff)
• yat/statistics/Fisher.cc (modified) (1 diff)

branches/0.6-stable/test/fisher_test.cc

@@ -136 +136 @@
     suite.xadd(false);
   }
-  f.p_value();
+  suite.add(suite.equal_fix(f.p_value(), 0.0123, 0.0001));
   f.p_value_one_sided();
 }

branches/0.6-stable/yat/statistics/Fisher.cc

@@ -66 +66 @@
   {
     // use floting point arithmetic to avoid overflow
-    double N = static_cast<double>(a_) + static_cast<double>(b_) 
-      + static_cast<double>(c_) + static_cast<double>(d_);
-    a =((a_+b_)*(a_+c_)) / N;
-    b =((a_+b_)*(b_+d_)) / N;
-    c =((c_+d_)*(a_+c_)) / N;
-    d =((c_+d_)*(b_+d_)) / N;
+    double a1 = a_;
+    double b1 = b_;
+    double c1 = c_;
+    double d1 = d_;
+    double N = a1 + b1 + c1 + d1;
+    a =((a1+b1)*(a1+c1)) / N;
+    b =((a1+b1)*(b1+d1)) / N;
+    c =((c1+d1)*(a1+c1)) / N;
+    d =((c1+d1)*(b1+d1)) / N;
   }