/***********************************************************************/
-EstOutput SharedSorClass::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput SorClass::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
data.resize(1,0);
- for (int i = 0; i < shared1->size(); i++) {
+ for (int i = 0; i < shared[0]->size(); 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);
- S1 += tempA;
- S2 += tempB;
+ //find number of bins in shared1 and shared2
+ if (tempA != 0) { S1++; }
+ if (tempB != 0) { S2++; }
//they are shared
if ((tempA != 0) && (tempB != 0)) { S12++; }
return data;
}
catch(exception& e) {
- cout << "Standard Error: " << e.what() << " has occurred in the SharedSorClass class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+ m->errorOut(e, "SorClass", "getValues");
exit(1);
}
- catch(...) {
- cout << "An unknown error has occurred in the SharedSorClass class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
- exit(1);
- }
}
/***********************************************************************/