fixes while testing 1.33.0

[mothur.git] / sharedthetayc.cpp

diff --git a/sharedthetayc.cpp b/sharedthetayc.cpp
index 2567110a79fde8ef9499c048927b246b49109ccd..864c6e63712cdc78d2cc0320ff2869c6deff196f 100644 (file)
--- a/sharedthetayc.cpp
+++ b/sharedthetayc.cpp
@@ -10,51 +10,81 @@
 #include "sharedthetayc.h"
 
 /***********************************************************************/
-EstOutput ThetaYC::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput ThetaYC::getValues(vector<SharedRAbundVector*> shared) {
        try {   
-               data.resize(1,0);
+               data.resize(3,0.0000);
                
-               int Atotal = 0;
-               int Btotal = 0;
-               float thetaYC = 0;
-               float relA = 0;
-               float relB = 0;
-               float a = 0;
-               float b = 0;
+               double Atotal = 0;
+               double Btotal = 0;
+               double thetaYC = 0;
+               double pi = 0;
+               double qi = 0;
+               double a = 0;
+               double b = 0;
+               double d = 0;
+               
+               double sumPcubed = 0;
+               double sumQcubed = 0;
+               double sumPQsq = 0;
+               double sumPsqQ = 0;
                
                //get the total values we need to calculate the theta denominator sums
-               for (int i = 0; i < shared1->size(); i++) {
+               for (int i = 0; i < shared[0]->getNumBins(); i++) {
                        //store in temps to avoid multiple repetitive function calls
-                       Atotal += shared1->getAbundance(i);
-                       Btotal += shared2->getAbundance(i);
+                       Atotal += (double)shared[0]->getAbundance(i);
+                       Btotal += (double)shared[1]->getAbundance(i);
                }
                
                //calculate the theta denominator sums
-               for (int j = 0; j < shared1->size(); j++) {
+               for (int j = 0; j < shared[0]->getNumBins(); j++) {
                        //store in temps to avoid multiple repetitive function calls
-                       relA = shared1->getAbundance(j) / (float)Atotal;
-                       relB = shared2->getAbundance(j) / (float)Btotal;
+                       pi = shared[0]->getAbundance(j) / Atotal;
+                       qi = shared[1]->getAbundance(j) / Btotal;
                                        
-                       a += relA * relB;
-                       b += pow((relA-relB),2);
+                       a += pi * pi;
+                       b += qi * qi;
+                       d += pi * qi;
+                       
+                       sumPcubed += pi * pi * pi;
+                       sumQcubed += qi * qi * qi;
+                       sumPQsq += pi * qi * qi;
+                       sumPsqQ += pi * pi * qi;
                }
 
-               thetaYC = a / (float) (b+a);
+               thetaYC = d / (a + b - d);
                
                if (isnan(thetaYC) || isinf(thetaYC)) { thetaYC = 0; }
                
+               double varA = 4 / Atotal * (sumPcubed - a * a);
+               double varB = 4 / Btotal * (sumQcubed - b * b);
+               double varD = sumPQsq / Atotal + sumPsqQ / Btotal - d * d * (1/Atotal + 1/Btotal);
+               double covAD = 2 / Atotal * (sumPsqQ - a * d);
+               double covBD = 2 / Btotal * (sumPQsq - b* d);
+               
+               double varT = d * d * (varA + varB) / pow(a + b - d, (double)4.0) + pow(a+b, (double)2.0) * varD / pow(a+b-d, (double)4.0)
+                                               - 2.0 * (a + b) * d / pow(a + b - d, (double)4.0) * (covAD + covBD);
+               
+               double ci = 1.95 * sqrt(varT);
+               
                data[0] = thetaYC;
+               data[1] = thetaYC - ci;
+               data[2] = thetaYC + ci;
+               
+               if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
+               if (isnan(data[1]) || isinf(data[1])) { data[1] = 0; }
+               if (isnan(data[2]) || isinf(data[2])) { data[2] = 0; }
                
+               data[0] = 1.0 - data[0];
+        double hold = data[1];
+        data[1] = 1.0 - data[2];
+        data[2] = 1.0 - hold;
+        
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the ThetaYC class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "ThetaYC", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the ThetaYC class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/