changing command name classify.shared to classifyrf.shared

[mothur.git] / sharedthetan.cpp

diff --git a/sharedthetan.cpp b/sharedthetan.cpp
index d118be94baca17e01f9cc11ce2e437f2955c4063..644adee677820f92a7c8cf87c41d65908a1e957b 100644 (file)
--- a/sharedthetan.cpp
+++ b/sharedthetan.cpp
@@ -14,20 +14,20 @@ EstOutput ThetaN::getValues(vector<SharedRAbundVector*> shared) {
        try {   
                data.resize(1,0);
                
-               int Atotal, Btotal, tempA, tempB;
+               double Atotal, Btotal, tempA, tempB;
                Atotal = 0; Btotal = 0; 
-               float numerator, denominator, thetaN, sumSharedA, sumSharedB, a, b, d;
+               double numerator, denominator, thetaN, sumSharedA, sumSharedB, a, b, d;
                numerator = 0.0; denominator = 0.0; thetaN = 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++) {
+               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);
@@ -46,7 +46,7 @@ EstOutput ThetaN::getValues(vector<SharedRAbundVector*> shared) {
                
                if (isnan(thetaN) || isinf(thetaN)) { thetaN = 0; }
                
-               data[0] = thetaN;
+               data[0] = 1.0 - thetaN;
                
                return data;
        }