X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedmorisitahorn.cpp;h=16a759089f079e426d302745e34575f55640f30c;hp=f9c1b6be1035ef85e6ea0e2c25be118cd99b9c97;hb=a8e2df1b96a57f5f29576b08361b86a96a8eff4f;hpb=510b1cfc25cd79391d6973ca20c5ec25fb1bb3b2 diff --git a/sharedmorisitahorn.cpp b/sharedmorisitahorn.cpp index f9c1b6b..16a7590 100644 --- a/sharedmorisitahorn.cpp +++ b/sharedmorisitahorn.cpp @@ -14,43 +14,41 @@ EstOutput MorHorn::getValues(vector shared) { try { data.resize(1,0); - int Atotal, Btotal, tempA, tempB; + double Atotal, Btotal, tempA, tempB; Atotal = 0; Btotal = 0; - float morhorn, sumSharedA, sumSharedB, a, b, d; + double morhorn, sumSharedA, sumSharedB, a, b, d; morhorn = 0.0; sumSharedA = 0.0; sumSharedB = 0.0; a = 0.0; b = 0.0; d = 0.0; //get the total values we need to calculate the theta denominator sums - for (int i = 0; i < shared[0]->size(); i++) { + for (int i = 0; i < shared[0]->getNumBins(); i++) { //store in temps to avoid multiple repetitive function calls Atotal += shared[0]->getAbundance(i); Btotal += shared[1]->getAbundance(i); } - //calculate the theta denominator sums - for (int j = 0; j < shared[0]->size(); j++) { + //calculate the denominator sums + for (int j = 0; j < shared[0]->getNumBins(); j++) { //store in temps to avoid multiple repetitive function calls tempA = shared[0]->getAbundance(j); tempB = shared[1]->getAbundance(j); + float relA = tempA / Atotal; + float relB = tempB / Btotal; - a += tempA * tempA; - b += tempB * tempB; - d += tempA * tempB; + a += relA * relA; + b += relB * relB; + d += relA * relB; } - a /= double(Atotal * Atotal); - b /= double(Btotal * Btotal); - d /= double(Atotal * Btotal); - - morhorn = (2 * d) / (a + b); - - if (isnan(morhorn) || isinf(morhorn)) { morhorn = 0; } + morhorn = 1- (2 * d) / (a + b); + + if (isnan(morhorn) || isinf(morhorn)) { morhorn = 1; } data[0] = morhorn; return data; } catch(exception& e) { - errorOut(e, "MorHorn", "getValues"); + m->errorOut(e, "MorHorn", "getValues"); exit(1); } }