changes while testing

[mothur.git] / sharedochiai.cpp

diff --git a/sharedochiai.cpp b/sharedochiai.cpp
index 9a64a2c6ec72d8d7db93deea70ddadc9c9b12752..b49fa4a3cc5730b0a97b0eefe30f952a7671f932 100644 (file)
--- a/sharedochiai.cpp
+++ b/sharedochiai.cpp
@@ -11,9 +11,9 @@
 
 /***********************************************************************/
 
-EstOutput SharedOchiai::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput Ochiai::getValues(vector<SharedRAbundVector*> shared) {
        try {
-               int S1, S2, S12, tempA, tempB;
+               double S1, S2, S12, tempA, tempB;
                S1 = 0; S2 = 0; S12 = 0; tempA = 0; tempB = 0; 
                
                /*S1, S2 = number of OTUs observed or estimated in A and B 
@@ -21,10 +21,10 @@ EstOutput SharedOchiai::getValues(SharedRAbundVector* shared1, SharedRAbundVecto
 
                data.resize(1,0);
                
-               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
-                       tempA = shared1->getAbundance(i);
-                       tempB = shared2->getAbundance(i);
+                       tempA = shared[0]->getAbundance(i);
+                       tempB = shared[1]->getAbundance(i);
                        
                        if (tempA != 0) { S1++; }
                        if (tempB != 0) { S2++; } 
@@ -40,13 +40,9 @@ EstOutput SharedOchiai::getValues(SharedRAbundVector* shared1, SharedRAbundVecto
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the SharedOchiai class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "Ochiai", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the SharedOchiai class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/